x86/platform changes for v3.16
Linus,
Please pull the latest x86-platform-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-for-linus
# HEAD: 04725ad59474d24553d526fa774179ecd2922342 x86, iosf: Add PCI ID macros for better readability
IOSF (Intel OnChip System Fabric) updates:
- generalize the IOSF interface to allow mixed mode drivers: non-IOSF drivers to utilize of IOSF features on IOSF platforms.
- add 'Quark X1000' IOSF/MBI support
- clean up BayTrail and Quark PCI ID enumeration
Thanks,
Ingo
------------------>
David E. Box (1):
x86, iosf: Make IOSF driver modular and usable by more drivers
Ong Boon Leong (3):
x86, iosf: Added Quark MBI identifiers x86, iosf: Add Quark X1000 PCI ID
x86, iosf: Add PCI ID macros for better readability
arch/x86/Kconfig | 7 ++---- arch/x86/include/asm/iosf_mbi.h | 55 +++++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/iosf_mbi.c | 13 +++++++++- 3 files changed, 69 insertions(+), 6 deletions(-)
arch/x86/Kconfig +2 -5
@@ -2375,12 +2375,9 @@ config X86_DMA_REMAP depends on STA2X11 config IOSF_MBI - bool + tristate + default m depends on PCI - ---help--- - To be selected by modules requiring access to the Intel OnChip System - Fabric (IOSF) Sideband MailBox Interface (MBI). For MBI platforms - enumerable by PCI. source "net/Kconfig"
arch/x86/include/asm/iosf_mbi.h +55 -0
65 lines not on this page · raw message
arch/x86/kernel/iosf_mbi.c +12 -1
@@ -25,6 +25,9 @@#include <asm/iosf_mbi.h> +#define PCI_DEVICE_ID_BAYTRAIL 0x0F00 +#define PCI_DEVICE_ID_QUARK_X1000 0x0958 +static DEFINE_SPINLOCK (iosf_mbi_lock);static inline u32 iosf_mbi_form_mcr (u8 op,u8 port,u8 offset)
@@ -177,6 +180,13 @@ int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask) }EXPORT_SYMBOL (iosf_mbi_modify); +bool iosf_mbi_available (void ) +{ +/* Mbi isn't hot-pluggable. No remove routine is provided */ +return mbi_pdev; +} +EXPORT_SYMBOL (iosf_mbi_available); +static int iosf_mbi_probe (struct pci_dev *pdev,const struct pci_device_id *unused) {
@@ -193,7 +203,8 @@ static int iosf_mbi_probe(struct pci_dev *pdev, }static DEFINE_PCI_DEVICE_TABLE (iosf_mbi_pci_ids) = { - {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x0F00 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_BAYTRAIL ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_QUARK_X1000 ) }, {0 , }, };MODULE_DEVICE_TABLE (pci, iosf_mbi_pci_ids);