lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list] 
Message-Id: <20190125181616.62609-5-olof@lixom.net>
Date:   Fri, 25 Jan 2019 10:16:15 -0800
From:   Olof Johansson <olof@...om.net>
To:     linux-kernel@...r.kernel.org
Cc:     linux-accelerators@...ts.ozlabs.org,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Frederic Barrat <fbarrat@...ux.ibm.com>,
        Andrew Donnellan <andrew.donnellan@....ibm.com>,
        ogabbay@...ana.ai, airlied@...hat.com, jglisse@...hat.com,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Subject: [PATCH 4/5] ocxl: Move to drivers/accel

Move include files in separate commit, so leave them alone for now.

Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Frederic Barrat <fbarrat@...ux.ibm.com>
Cc: Andrew Donnellan <andrew.donnellan@....ibm.com>
Cc: Arnd Bergmann <arnd@...db.de>
Signed-off-by: Olof Johansson <olof@...om.net>
---
 MAINTAINERS                                  | 2 +-
 drivers/accel/Kconfig                        | 1 +
 drivers/accel/Makefile                       | 1 +
 drivers/{misc => accel}/ocxl/Kconfig         | 0
 drivers/{misc => accel}/ocxl/Makefile        | 0
 drivers/{misc => accel}/ocxl/afu_irq.c       | 0
 drivers/{misc => accel}/ocxl/config.c        | 0
 drivers/{misc => accel}/ocxl/context.c       | 0
 drivers/{misc => accel}/ocxl/file.c          | 0
 drivers/{misc => accel}/ocxl/link.c          | 0
 drivers/{misc => accel}/ocxl/main.c          | 0
 drivers/{misc => accel}/ocxl/ocxl_internal.h | 0
 drivers/{misc => accel}/ocxl/pasid.c         | 0
 drivers/{misc => accel}/ocxl/pci.c           | 0
 drivers/{misc => accel}/ocxl/sysfs.c         | 0
 drivers/{misc => accel}/ocxl/trace.c         | 0
 drivers/{misc => accel}/ocxl/trace.h         | 0
 drivers/misc/Kconfig                         | 1 -
 drivers/misc/Makefile                        | 1 -
 19 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/{misc => accel}/ocxl/Kconfig (100%)
 rename drivers/{misc => accel}/ocxl/Makefile (100%)
 rename drivers/{misc => accel}/ocxl/afu_irq.c (100%)
 rename drivers/{misc => accel}/ocxl/config.c (100%)
 rename drivers/{misc => accel}/ocxl/context.c (100%)
 rename drivers/{misc => accel}/ocxl/file.c (100%)
 rename drivers/{misc => accel}/ocxl/link.c (100%)
 rename drivers/{misc => accel}/ocxl/main.c (100%)
 rename drivers/{misc => accel}/ocxl/ocxl_internal.h (100%)
 rename drivers/{misc => accel}/ocxl/pasid.c (100%)
 rename drivers/{misc => accel}/ocxl/pci.c (100%)
 rename drivers/{misc => accel}/ocxl/sysfs.c (100%)
 rename drivers/{misc => accel}/ocxl/trace.c (100%)
 rename drivers/{misc => accel}/ocxl/trace.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 97aed390129f0..a1b2ba3bd402d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11012,7 +11012,7 @@ L:	linuxppc-dev@...ts.ozlabs.org
 S:	Supported
 F:	arch/powerpc/platforms/powernv/ocxl.c
 F:	arch/powerpc/include/asm/pnv-ocxl.h
-F:	drivers/misc/ocxl/
+F:	drivers/accel/ocxl/
 F:	include/misc/ocxl*
 F:	include/uapi/misc/ocxl.h
 F:	Documentation/accelerators/ocxl.rst
diff --git a/drivers/accel/Kconfig b/drivers/accel/Kconfig
index c0754448efdf0..1790630c560e6 100644
--- a/drivers/accel/Kconfig
+++ b/drivers/accel/Kconfig
@@ -14,5 +14,6 @@ if ACCEL
 comment "HW Accellerator drivers"
 
 source "drivers/accel/cxl/Kconfig"
+source "drivers/accel/ocxl/Kconfig"
 
 endif
diff --git a/drivers/accel/Makefile b/drivers/accel/Makefile
index 752a54e227ad7..313867582ff5a 100644
--- a/drivers/accel/Makefile
+++ b/drivers/accel/Makefile
@@ -4,3 +4,4 @@
 #
 
 obj-$(CONFIG_CXL_BASE)		+= cxl/
+obj-$(CONFIG_OCXL)		+= ocxl/
diff --git a/drivers/misc/ocxl/Kconfig b/drivers/accel/ocxl/Kconfig
similarity index 100%
rename from drivers/misc/ocxl/Kconfig
rename to drivers/accel/ocxl/Kconfig
diff --git a/drivers/misc/ocxl/Makefile b/drivers/accel/ocxl/Makefile
similarity index 100%
rename from drivers/misc/ocxl/Makefile
rename to drivers/accel/ocxl/Makefile
diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/accel/ocxl/afu_irq.c
similarity index 100%
rename from drivers/misc/ocxl/afu_irq.c
rename to drivers/accel/ocxl/afu_irq.c
diff --git a/drivers/misc/ocxl/config.c b/drivers/accel/ocxl/config.c
similarity index 100%
rename from drivers/misc/ocxl/config.c
rename to drivers/accel/ocxl/config.c
diff --git a/drivers/misc/ocxl/context.c b/drivers/accel/ocxl/context.c
similarity index 100%
rename from drivers/misc/ocxl/context.c
rename to drivers/accel/ocxl/context.c
diff --git a/drivers/misc/ocxl/file.c b/drivers/accel/ocxl/file.c
similarity index 100%
rename from drivers/misc/ocxl/file.c
rename to drivers/accel/ocxl/file.c
diff --git a/drivers/misc/ocxl/link.c b/drivers/accel/ocxl/link.c
similarity index 100%
rename from drivers/misc/ocxl/link.c
rename to drivers/accel/ocxl/link.c
diff --git a/drivers/misc/ocxl/main.c b/drivers/accel/ocxl/main.c
similarity index 100%
rename from drivers/misc/ocxl/main.c
rename to drivers/accel/ocxl/main.c
diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/accel/ocxl/ocxl_internal.h
similarity index 100%
rename from drivers/misc/ocxl/ocxl_internal.h
rename to drivers/accel/ocxl/ocxl_internal.h
diff --git a/drivers/misc/ocxl/pasid.c b/drivers/accel/ocxl/pasid.c
similarity index 100%
rename from drivers/misc/ocxl/pasid.c
rename to drivers/accel/ocxl/pasid.c
diff --git a/drivers/misc/ocxl/pci.c b/drivers/accel/ocxl/pci.c
similarity index 100%
rename from drivers/misc/ocxl/pci.c
rename to drivers/accel/ocxl/pci.c
diff --git a/drivers/misc/ocxl/sysfs.c b/drivers/accel/ocxl/sysfs.c
similarity index 100%
rename from drivers/misc/ocxl/sysfs.c
rename to drivers/accel/ocxl/sysfs.c
diff --git a/drivers/misc/ocxl/trace.c b/drivers/accel/ocxl/trace.c
similarity index 100%
rename from drivers/misc/ocxl/trace.c
rename to drivers/accel/ocxl/trace.c
diff --git a/drivers/misc/ocxl/trace.h b/drivers/accel/ocxl/trace.h
similarity index 100%
rename from drivers/misc/ocxl/trace.h
rename to drivers/accel/ocxl/trace.h
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 02153382d67b6..35c11005a5150 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -532,6 +532,5 @@ source "drivers/misc/vmw_vmci/Kconfig"
 source "drivers/misc/mic/Kconfig"
 source "drivers/misc/genwqe/Kconfig"
 source "drivers/misc/echo/Kconfig"
-source "drivers/misc/ocxl/Kconfig"
 source "drivers/misc/cardreader/Kconfig"
 endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 72fa4fc42a2d6..2ee4eeb573b58 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -55,6 +55,5 @@ obj-$(CONFIG_VEXPRESS_SYSCFG)	+= vexpress-syscfg.o
 obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed-lpc-ctrl.o
 obj-$(CONFIG_ASPEED_LPC_SNOOP)	+= aspeed-lpc-snoop.o
 obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o
-obj-$(CONFIG_OCXL)		+= ocxl/
 obj-y				+= cardreader/
 obj-$(CONFIG_PVPANIC)   	+= pvpanic.o
-- 
2.11.0

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ