From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jacob Pan Subject: [PATCH 4/5] x86/iosf: kconfig and used by other drivers Date: Mon, 28 Apr 2014 07:04:39 -0700 Message-ID: <1398693880-13428-5-git-send-email-jacob.jun.pan@linux.intel.com> References: <1398693880-13428-1-git-send-email-jacob.jun.pan@linux.intel.com> Return-path: In-Reply-To: <1398693880-13428-1-git-send-email-jacob.jun.pan@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org To: Linux PM , Rafael Wysocki , LKML Cc: "David E. Box" , Alan Cox , Durgadoss R , Kristen Carlson Accardi , Jacob Pan List-Id: linux-pm@vger.kernel.org Allow Kconfig selection for IOSF driver. Fix warning condition when MBI interface dummy functions are called at runtime. Signed-off-by: Jacob Pan --- arch/x86/Kconfig | 2 +- arch/x86/include/asm/iosf_mbi.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 25d2c6f..cda587b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2375,7 +2375,7 @@ config X86_DMA_REMAP depends on STA2X11 config IOSF_MBI - bool + bool "Intel OnChip System Fabric mailbox" depends on PCI ---help--- To be selected by modules requiring access to the Intel OnChip System diff --git a/arch/x86/include/asm/iosf_mbi.h b/arch/x86/include/asm/iosf_mbi.h index 9fc5402..74336f0 100644 --- a/arch/x86/include/asm/iosf_mbi.h +++ b/arch/x86/include/asm/iosf_mbi.h @@ -5,7 +5,6 @@ #ifndef IOSF_MBI_SYMS_H #define IOSF_MBI_SYMS_H -#ifdef CONFIG_IOSF_MBI #define MBI_MCR_OFFSET 0xD0 #define MBI_MDR_OFFSET 0xD4 @@ -52,6 +51,8 @@ #define BT_MBI_PCIE_READ 0x00 #define BT_MBI_PCIE_WRITE 0x01 +#ifdef CONFIG_IOSF_MBI + bool iosf_mbi_available(void); /** @@ -101,21 +102,21 @@ bool iosf_mbi_available(void) static inline int iosf_mbi_read(u8 port, u8 opcode, u32 offset, u32 *mdr) { - WARN(); + WARN(1, "MBI driver not available"); return -EPERM; } static inline int iosf_mbi_write(u8 port, u8 opcode, u32 offset, u32 mdr) { - WARN(); + WARN(1, "MBI driver not available"); return -EPERM; } static inline int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask) { - WARN(); + WARN(1, "MBI driver not available"); return -EPERM; } #endif /* CONFIG_IOSF_MBI */ -- 1.8.1.2