rar: Move the RAR driver into the right place as its now clean
Subsystems (2)
PATCH 1/1 rar: Move the RAR driver into the right place as its now clean
We exit staging rar! rar! rar!...
Signed-off-by Alan Cox <[email protected]>
---
drivers/platform/x86/Kconfig | 22 + drivers/platform/x86/Makefile | 1 drivers/platform/x86/intel_rar_register.c | 671 +++++++++++++++++++++++++++ drivers/staging/Kconfig | 2 drivers/staging/Makefile | 1 drivers/staging/memrar/memrar_handler.c | 3 drivers/staging/rar_register/Kconfig | 30 - drivers/staging/rar_register/Makefile | 2 drivers/staging/rar_register/rar_register.c | 675 --------------------------- drivers/staging/rar_register/rar_register.h | 44 -- include/linux/rar_register.h | 44 ++ 11 files changed, 739 insertions(+), 756 deletions(-) create mode 100644 drivers/platform/x86/intel_rar_register.c delete mode 100644 drivers/staging/rar_register/Kconfig delete mode 100644 drivers/staging/rar_register/Makefile delete mode 100644 drivers/staging/rar_register/rar_register.c delete mode 100644 drivers/staging/rar_register/rar_register.h create mode 100644 include/linux/rar_register.h
drivers/platform/x86/Kconfig +22 -0
@@ -537,4 +537,26 @@ config INTEL_SCU_IPC some embedded Intel x86 platforms. This is not needed for PC-type machines. +config RAR_REGISTER + bool "Restricted Access Region Register Driver" + depends on PCI && X86_MRST + default n + ---help--- + This driver allows other kernel drivers access to the + contents of the restricted access region control registers. + + The restricted access region control registers + (rar_registers) are used to pass address and + locking information on restricted access regions + to other drivers that use restricted access regions. + + The restricted access regions are regions of memory + on the Intel MID Platform that are not accessible to + the x86 processor, but are accessible to dedicated + processors on board peripheral devices. + + The purpose of the restricted access regions is to + protect sensitive data from compromise by unauthorized + programs running on the x86 processor. + endif # X86_PLATFORM_DEVICES
drivers/platform/x86/Makefile +1 -0
@@ -26,3 +26,4 @@ obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o obj-$(CONFIG_TOSHIBA_BT_RFKILL) += toshiba_bluetooth.o obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o +obj-$(CONFIG_RAR_REGISTER) += intel_rar_register.o
drivers/platform/x86/intel_rar_register.c new file +671 -0
671 lines not on this page · raw message
drivers/staging/Kconfig +0 -2
@@ -109,8 +109,6 @@ source "drivers/staging/hv/Kconfig" source "drivers/staging/vme/Kconfig" -source "drivers/staging/rar_register/Kconfig" - source "drivers/staging/memrar/Kconfig" source "drivers/staging/sep/Kconfig"
drivers/staging/Makefile +0 -1
@@ -35,7 +35,6 @@ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_FB_UDL) += udlfb/ obj-$(CONFIG_HYPERV) += hv/ obj-$(CONFIG_VME_BUS) += vme/ -obj-$(CONFIG_RAR_REGISTER) += rar_register/ obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/ obj-$(CONFIG_DX_SEP) += sep/ obj-$(CONFIG_IIO) += iio/
drivers/staging/memrar/memrar_handler.c +1 -2
@@ -47,8 +47,7 @@#include <linux/mm.h> #include <linux/ioport.h> #include <linux/io.h> - -#include "../rar_register/rar_register.h" +#include <linux/rar_register.h> #include "memrar.h" #include "memrar_allocator.h"
drivers/staging/rar_register/Kconfig deleted +0 -30
@@ -1,30 +0,0 @@ -# -# RAR device configuration -# - -menu "RAR Register Driver" -# -# Restricted Access Register Manager -# -config RAR_REGISTER - tristate "Restricted Access Region Register Driver" - depends on PCI - default n - ---help--- - This driver allows other kernel drivers access to the - contents of the restricted access region control registers. - - The restricted access region control registers - (rar_registers) are used to pass address and - locking information on restricted access regions - to other drivers that use restricted access regions. - - The restricted access regions are regions of memory - on the Intel MID Platform that are not accessible to - the x86 processor, but are accessible to dedicated - processors on board peripheral devices. - - The purpose of the restricted access regions is to - protect sensitive data from compromise by unauthorized - programs running on the x86 processor. -endmenu
drivers/staging/rar_register/Makefile deleted +0 -2
@@ -1,2 +0,0 @@ -EXTRA_CFLAGS += -DLITTLE__ENDIAN -obj-$(CONFIG_RAR_REGISTER) += rar_register.o
drivers/staging/rar_register/rar_register.c deleted +0 -675
675 lines not on this page · raw message
drivers/staging/rar_register/rar_register.h deleted +0 -44
44 lines not on this page · raw message
include/linux/rar_register.h new file +44 -0
44 lines not on this page · raw message
Quoted 3 lines · Alan Cox
We exit staging rar! rar! rar!...
Signed-off-by Alan Cox <[email protected]>
Nice, no objection from me.
Matthew, do you want to take this in the platform driver tree, or do you want me to take this through the staging tree?
If you want to take it, that's fine with me, feel free to add an:
to the patch.
If not, just let me know and I can easily take it.
thanks,
greg k-h
Quoted 9 lines · Greg KH
Quoted 3 lines · Alan Cox
We exit staging rar! rar! rar!...
Signed-off-by Alan Cox <[email protected]>Nice, no objection from me.
Matthew, do you want to take this in the platform driver tree, or do you want me to take this through the staging tree?
I've no problem taking it.
Signature · 1 line
Matthew Garrett | [email protected]