From c715a38bb7fc22fb8018b916c8a9f7ff017a8ad7 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 18 Jun 2010 14:05:52 +0100 Subject: [PATCH] rar: Move the RAR driver into the right place as its now clean We exit staging rar! rar! rar!... Signed-off-by: Alan Cox Signed-off-by: Matthew Garrett Acked-by: Greg Kroah-Hartman --- drivers/platform/x86/Kconfig | 22 ++++++++++++++++ drivers/platform/x86/Makefile | 1 + .../x86/intel_rar_register.c} | 8 ++---- 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 -- .../rar_register => include/linux}/rar_register.h | 0 9 files changed, 26 insertions(+), 43 deletions(-) rename drivers/{staging/rar_register/rar_register.c => platform/x86/intel_rar_register.c} (99%) delete mode 100644 drivers/staging/rar_register/Kconfig delete mode 100644 drivers/staging/rar_register/Makefile rename {drivers/staging/rar_register => include/linux}/rar_register.h (100%) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 724b2ed..2f173bc 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -539,6 +539,28 @@ 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. + config INTEL_IPS tristate "Intel Intelligent Power Sharing" depends on ACPI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 7318fc2..ed50eca 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -26,4 +26,5 @@ 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 obj-$(CONFIG_INTEL_IPS) += intel_ips.o diff --git a/drivers/staging/rar_register/rar_register.c b/drivers/platform/x86/intel_rar_register.c similarity index 99% rename from drivers/staging/rar_register/rar_register.c rename to drivers/platform/x86/intel_rar_register.c index 618503f..73f8e6d 100644 --- a/drivers/staging/rar_register/rar_register.c +++ b/drivers/platform/x86/intel_rar_register.c @@ -40,15 +40,12 @@ * Initial publish */ -#define DEBUG 1 - -#include "rar_register.h" - #include #include #include #include #include +#include /* === Lincroft Message Bus Interface === */ #define LNC_MCR_OFFSET 0xD0 /* Message Control Register */ @@ -155,7 +152,6 @@ static struct rar_device *_rar_to_device(int rar, int *off) return NULL; } - /** * rar_to_device - return the device handling this RAR * @rar: RAR number @@ -496,7 +492,7 @@ EXPORT_SYMBOL(rar_lock); * a driver that do require a valid RAR address. One of those * steps would be to call rar_get_address() * - * This function return 0 on success an error code on failure. + * This function return 0 on success or an error code on failure. */ int register_rar(int num, int (*callback)(unsigned long data), unsigned long data) diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 984a754..9dfef8a5 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -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" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 9fa2513..3dbf681 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -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/ diff --git a/drivers/staging/memrar/memrar_handler.c b/drivers/staging/memrar/memrar_handler.c index efa7fd6..41876f2 100644 --- a/drivers/staging/memrar/memrar_handler.c +++ b/drivers/staging/memrar/memrar_handler.c @@ -47,8 +47,7 @@ #include #include #include - -#include "../rar_register/rar_register.h" +#include #include "memrar.h" #include "memrar_allocator.h" diff --git a/drivers/staging/rar_register/Kconfig b/drivers/staging/rar_register/Kconfig deleted file mode 100644 index e9c2773..0000000 --- a/drivers/staging/rar_register/Kconfig +++ /dev/null @@ -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 diff --git a/drivers/staging/rar_register/Makefile b/drivers/staging/rar_register/Makefile deleted file mode 100644 index d5954cc..0000000 --- a/drivers/staging/rar_register/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_CFLAGS += -DLITTLE__ENDIAN -obj-$(CONFIG_RAR_REGISTER) += rar_register.o diff --git a/drivers/staging/rar_register/rar_register.h b/include/linux/rar_register.h similarity index 100% rename from drivers/staging/rar_register/rar_register.h rename to include/linux/rar_register.h -- 2.7.4