x86/platform changes for v4.3
Subsystems (5)
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: e971aa2cbac02363a29e9358de3b688001191ffd x86/platform: Make atom/pmc_atom.c explicitly non-modular
The main changes are:
- Intel Atom platform updates. (Andy Shevchenko)
- Modularity fixlets. (Paul Gortmaker)
- x86 platform clockevents driver updates for lguest, uv and Xen. (Viresh Kumar)
- Microsoft Hyper-V TSC fixlet. (Vitaly Kuznetsov)
Thanks,
Ingo
------------------>
Andy Shevchenko (13):
x86/platform/intel/pmc_atom: Export accessors to PMC registers x86/platform/intel/pmc_atom: Print index of device in loop x86/platform/intel/pmc_atom: Supply register mappings via PMC object x86/platform/intel/pmc_atom: Add Cherrytrail PMC interface x86/platform/intel/pmc_atom: Move the PMC-Atom code to arch/x86/platform/atom x86/platform/iosf_mbi: Move to dedicated folder x86/platform/iosf_mbi: Check return value of debugfs_create properly x86/platform/iosf_mbi: Remove NULL pointer checks for pci_dev_put() x86/platform/iosf_mbi: Source cleanup
x86/platform/iosf_mbi: Add Intel Tangier PCI id x86/pci/intel_mid_pci: Work around for IRQ0 assignment x86/pci/intel_mid_pci: Propagate actual return code x86/pci/intel_mid_pci: Make intel_mid_pci_ops static
Paul Gortmaker (1):
x86/platform: Make atom/pmc_atom.c explicitly non-modular
Thomas Gleixner (1):
x86/pci/intel_mid_pci: Use proper constants for irq polarity
Viresh Kumar (3):
x86/lguest/timer: Migrate to new set-state interface x86/uv/time: Migrate to new set-state interface x86/xen/time: Migrate to new set-state interface
Vitaly Kuznetsov (1):
x86/hyperv: Mark the Hyper-V TSC as unstable
arch/x86/include/asm/iosf_mbi.h | 8 +-
arch/x86/include/asm/pmc_atom.h | 29 +++
arch/x86/kernel/Makefile | 2 -
arch/x86/kernel/cpu/mshyperv.c | 1 +
arch/x86/lguest/boot.c | 24 +-
arch/x86/pci/intel_mid_pci.c | 36 ++-
arch/x86/platform/Makefile | 1 +
arch/x86/platform/atom/Makefile | 3 +-
arch/x86/{kernel => platform/atom}/pmc_atom.c | 315 ++++++++++++++++---------
arch/x86/platform/intel/Makefile | 1 +
arch/x86/{kernel => platform/intel}/iosf_mbi.c | 27 +--
arch/x86/platform/uv/uv_time.c | 37 +--
arch/x86/xen/time.c | 80 +++----
13 files changed, 332 insertions(+), 232 deletions(-)
rename arch/x86/{kernel => platform/atom}/pmc_atom.c (52%)
create mode 100644 arch/x86/platform/intel/Makefile
rename arch/x86/{kernel => platform/intel}/iosf_mbi.c (93%)arch/x86/include/asm/iosf_mbi.h +4 -4
@@ -52,20 +52,20 @@/* Quark available units */ #define QRK_MBI_UNIT_HBA 0x00 -#define QRK_MBI_UNIT_HB 0x03 +#define QRK_MBI_UNIT_HB 0x03#define QRK_MBI_UNIT_RMU 0x04 -#define QRK_MBI_UNIT_MM 0x05 +#define QRK_MBI_UNIT_MM 0x05#define QRK_MBI_UNIT_MMESRAM 0x05#define QRK_MBI_UNIT_SOC 0x31/* Quark read/write opcodes */ #define QRK_MBI_HBA_READ 0x10#define QRK_MBI_HBA_WRITE 0x11 -#define QRK_MBI_HB_READ 0x10 +#define QRK_MBI_HB_READ 0x10#define QRK_MBI_HB_WRITE 0x11#define QRK_MBI_RMU_READ 0x10#define QRK_MBI_RMU_WRITE 0x11 -#define QRK_MBI_MM_READ 0x10 +#define QRK_MBI_MM_READ 0x10#define QRK_MBI_MM_WRITE 0x11#define QRK_MBI_MMESRAM_READ 0x12#define QRK_MBI_MMESRAM_WRITE 0x13
arch/x86/include/asm/pmc_atom.h +29 -0
@@ -18,6 +18,8 @@/* ValleyView Power Control Unit PCI Device ID */ #define PCI_DEVICE_ID_VLV_PMC 0x0F1C +/* CherryTrail Power Control Unit PCI Device ID */ +#define PCI_DEVICE_ID_CHT_PMC 0x229C/* PMC Memory mapped IO registers */ #define PMC_BASE_ADDR_OFFSET 0x44
@@ -29,6 +31,10 @@#define PMC_FUNC_DIS 0x34#define PMC_FUNC_DIS_2 0x38 +/* CHT specific bits in FUNC_DIS2 register */ +#define BIT_FD_GMM BIT(3) +#define BIT_FD_ISH BIT(4) +/* S0ix wake event control */ #define PMC_S0IX_WAKE_EN 0x3C
@@ -75,6 +81,21 @@#define PMC_PSS_BIT_USB BIT(16)#define PMC_PSS_BIT_USB_SUS BIT(17) +/* CHT specific bits in PSS register */ +#define PMC_PSS_BIT_CHT_UFS BIT(7) +#define PMC_PSS_BIT_CHT_UXD BIT(11) +#define PMC_PSS_BIT_CHT_UXD_FD BIT(12) +#define PMC_PSS_BIT_CHT_UX_ENG BIT(15) +#define PMC_PSS_BIT_CHT_USB_SUS BIT(16) +#define PMC_PSS_BIT_CHT_GMM BIT(17) +#define PMC_PSS_BIT_CHT_ISH BIT(18) +#define PMC_PSS_BIT_CHT_DFX_MASTER BIT(26) +#define PMC_PSS_BIT_CHT_DFX_CLUSTER1 BIT(27) +#define PMC_PSS_BIT_CHT_DFX_CLUSTER2 BIT(28) +#define PMC_PSS_BIT_CHT_DFX_CLUSTER3 BIT(29) +#define PMC_PSS_BIT_CHT_DFX_CLUSTER4 BIT(30) +#define PMC_PSS_BIT_CHT_DFX_CLUSTER5 BIT(31) +/* These registers reflect D3 status of functions */ #define PMC_D3_STS_0 0xA0
@@ -117,6 +138,10 @@#define BIT_USH_SS_PHY BIT(2)#define BIT_DFX BIT(3) +/* CHT specific bits in PMC_D3_STS_1 register */ +#define BIT_STS_GMM BIT(1) +#define BIT_STS_ISH BIT(2) +/* PMC I/O Registers */ #define ACPI_BASE_ADDR_OFFSET 0x40#define ACPI_BASE_ADDR_MASK 0xFFFFFE00
@@ -126,4 +151,8 @@#define SLEEP_TYPE_MASK 0xFFFFECFF#define SLEEP_TYPE_S5 0x1C00#define SLEEP_ENABLE 0x2000 + +extern int pmc_atom_read (int offset,u32 *value); +extern int pmc_atom_write (int offset,u32 value); +#endif /* PMC_ATOM_H */
arch/x86/kernel/Makefile +0 -2
@@ -107,8 +107,6 @@ obj-$(CONFIG_EFI) += sysfb_efi.o obj-$(CONFIG_PERF_EVENTS) += perf_regs.o obj-$(CONFIG_TRACING) += tracepoint.o -obj-$(CONFIG_IOSF_MBI) += iosf_mbi.o -obj-$(CONFIG_PMC_ATOM) += pmc_atom.o ### # 64 bit specific files
arch/x86/kernel/cpu/mshyperv.c +1 -0
@@ -141,6 +141,7 @@ static void __init ms_hyperv_init_platform(void) no_timer_check =1 ;#endif +mark_tsc_unstable ("running on Hyper-V" ); }const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
arch/x86/lguest/boot.c +6 -18
@@ -985,23 +985,11 @@ static int lguest_clockevent_set_next_event(unsigned long delta,return 0 ; } -static void lguest_clockevent_set_mode (enum clock_event_mode mode, -struct clock_event_device *evt) -{ -switch (mode) { -case CLOCK_EVT_MODE_UNUSED : -case CLOCK_EVT_MODE_SHUTDOWN : -/* A 0 argument shuts the clock down. */ -hcall (LHCALL_SET_CLOCKEVENT ,0 ,0 ,0 ,0 ); -break ; -case CLOCK_EVT_MODE_ONESHOT : -/* This is what we expect. */ -break ; -case CLOCK_EVT_MODE_PERIODIC : -BUG (); -case CLOCK_EVT_MODE_RESUME : -break ; - } +static int lguest_clockevent_shutdown (struct clock_event_device *evt) +{ +/* A 0 argument shuts the clock down. */ +hcall (LHCALL_SET_CLOCKEVENT ,0 ,0 ,0 ,0 ); +return 0 ; }/* This describes our primitive timer chip. */
@@ -1009,7 +997,7 @@ static struct clock_event_device lguest_clockevent = { .name = "lguest", .features = CLOCK_EVT_FEAT_ONESHOT, .set_next_event = lguest_clockevent_set_next_event, - .set_mode = lguest_clockevent_set_mode, + .set_state_shutdown = lguest_clockevent_shutdown, .rating = INT_MAX, .mult = 1, .shift = 0,
arch/x86/pci/intel_mid_pci.c +29 -7
@@ -35,6 +35,9 @@#define PCIE_CAP_OFFSET 0x100 +/* Quirks for the listed devices */ +#define PCI_DEVICE_ID_INTEL_MRFL_MMC 0x1190 +/* Fixed BAR fields */ #define PCIE_VNDR_CAP_ID_FIXED_BAR 0x00/* Fixed BAR (TBD) */ #define PCI_FIXED_BAR_0_SIZE 0x04
@@ -210,22 +213,41 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) {struct irq_alloc_info info;int polarity; +int ret;if (dev->irq_managed && dev->irq >0 )return 0 ; -if (intel_mid_identify_cpu () ==INTEL_MID_CPU_CHIP_TANGIER ) - polarity =0 ;/* active high */ -else - polarity =1 ;/* active low */ +switch (intel_mid_identify_cpu ()) { +case INTEL_MID_CPU_CHIP_TANGIER : + polarity =IOAPIC_POL_HIGH ; + +/* Special treatment for IRQ0 */ +if (dev->irq ==0 ) { +/* +* TNG has IRQ0 assigned to eMMC controller. But there +* are also other devices with bogus PCI configuration +* that have IRQ0 assigned. This check ensures that +* eMMC gets it. +*/ +if (dev->device !=PCI_DEVICE_ID_INTEL_MRFL_MMC ) +return -EBUSY ; + } +break ; +default : + polarity =IOAPIC_POL_LOW ; +break ; + } +ioapic_set_alloc_attr (&info,dev_to_node (&dev->dev),1 , polarity);/* * MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to * IOAPIC RTE entries, so we just enable RTE for the device. */ -if (mp_map_gsi_to_irq (dev->irq,IOAPIC_MAP_ALLOC , &info) <0 ) -return -EBUSY ; + ret =mp_map_gsi_to_irq (dev->irq,IOAPIC_MAP_ALLOC , &info); +if (ret <0 ) +return ret; dev->irq_managed =1 ;
@@ -241,7 +263,7 @@ static void intel_mid_pci_irq_disable(struct pci_dev *dev) } } -struct pci_ops intel_mid_pci_ops = { +static struct pci_ops intel_mid_pci_ops = { .read = pci_read, .write = pci_write, };
arch/x86/platform/Makefile +1 -0
@@ -5,6 +5,7 @@ obj-y += efi/ obj-y += geode/ obj-y += goldfish/ obj-y += iris/ +obj-y += intel/ obj-y += intel-mid/ obj-y += intel-quark/ obj-y += olpc/
arch/x86/platform/atom/Makefile +2 -1
@@ -1 +1,2 @@ -obj-$(CONFIG_PUNIT_ATOM_DEBUG) += punit_atom_debug.o +obj-$(CONFIG_PMC_ATOM) += pmc_atom.o +obj-$(CONFIG_PUNIT_ATOM_DEBUG) += punit_atom_debug.o
arch/x86/platform/atom/pmc_atom.c renamed from arch/x86/kernel/pmc_atom.c +202 -113
438 lines not on this page · raw message
arch/x86/platform/intel/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_IOSF_MBI) += iosf_mbi.o
arch/x86/platform/intel/iosf_mbi.c renamed from arch/x86/kernel/iosf_mbi.c +13 -14
@@ -30,7 +30,9 @@#define PCI_DEVICE_ID_BAYTRAIL 0x0F00#define PCI_DEVICE_ID_BRASWELL 0x2280#define PCI_DEVICE_ID_QUARK_X1000 0x0958 +#define PCI_DEVICE_ID_TANGIER 0x1170 +static struct pci_dev *mbi_pdev;static DEFINE_SPINLOCK (iosf_mbi_lock);static inline u32 iosf_mbi_form_mcr (u8 op,u8 port,u8 offset)
@@ -38,8 +40,6 @@ static inline u32 iosf_mbi_form_mcr(u8 op, u8 port, u8 offset)return (op <<24 ) | (port <<16 ) | (offset <<8 ) |MBI_ENABLE ; } -static struct pci_dev *mbi_pdev;/* one mbi device */ -static int iosf_mbi_pci_read_mdr (u32 mcrx,u32 mcr,u32 *mdr) {int result;
@@ -104,7 +104,7 @@ int iosf_mbi_read(u8 port, u8 opcode, u32 offset, u32 *mdr)unsigned long flags;int ret; -/*Access to the GFX unit is handled by GPU code */ +/* Access to the GFX unit is handled by GPU code */ if (port ==BT_MBI_UNIT_GFX ) {WARN_ON (1 );return -EPERM ;
@@ -127,7 +127,7 @@ int iosf_mbi_write(u8 port, u8 opcode, u32 offset, u32 mdr)unsigned long flags;int ret; -/*Access to the GFX unit is handled by GPU code */ +/* Access to the GFX unit is handled by GPU code */ if (port ==BT_MBI_UNIT_GFX ) {WARN_ON (1 );return -EPERM ;
@@ -151,7 +151,7 @@ int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask)unsigned long flags;int ret; -/*Access to the GFX unit is handled by GPU code */ +/* Access to the GFX unit is handled by GPU code */ if (port ==BT_MBI_UNIT_GFX ) {WARN_ON (1 );return -EPERM ;
@@ -240,17 +240,17 @@ static void iosf_sideband_debug_init(void)/* mdr */ d =debugfs_create_x32 ("mdr" ,0660 , iosf_dbg, &dbg_mdr); -if (IS_ERR_OR_NULL (d)) +if (!d) goto cleanup;/* mcrx */ -debugfs_create_x32 ("mcrx" ,0660 , iosf_dbg, &dbg_mcrx); -if (IS_ERR_OR_NULL (d)) + d =debugfs_create_x32 ("mcrx" ,0660 , iosf_dbg, &dbg_mcrx); +if (!d) goto cleanup;/* mcr - initiates mailbox tranaction */ -debugfs_create_file ("mcr" ,0660 , iosf_dbg, &dbg_mcr, &iosf_mcr_fops); -if (IS_ERR_OR_NULL (d)) + d =debugfs_create_file ("mcr" ,0660 , iosf_dbg, &dbg_mcr, &iosf_mcr_fops); +if (!d) goto cleanup;return ;
@@ -292,6 +292,7 @@ static const struct pci_device_id iosf_mbi_pci_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_BAYTRAIL) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_BRASWELL) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_QUARK_X1000) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_TANGIER) }, { 0, }, };MODULE_DEVICE_TABLE (pci, iosf_mbi_pci_ids);
@@ -314,10 +315,8 @@ static void __exit iosf_mbi_exit(void)iosf_debugfs_remove ();pci_unregister_driver (&iosf_mbi_pci_driver); -if (mbi_pdev) { -pci_dev_put (mbi_pdev); - mbi_pdev =NULL ; - } +pci_dev_put (mbi_pdev); + mbi_pdev =NULL ; }module_init (iosf_mbi_init);
arch/x86/platform/uv/uv_time.c +13 -24
@@ -32,8 +32,7 @@static cycle_t uv_read_rtc (struct clocksource *cs);static int uv_rtc_next_event (unsigned long ,struct clock_event_device *); -static void uv_rtc_timer_setup (enum clock_event_mode , -struct clock_event_device *); +static int uv_rtc_shutdown (struct clock_event_device *evt);static struct clocksource clocksource_uv = { .name =RTC_NAME ,
@@ -44,14 +43,14 @@ static struct clocksource clocksource_uv = { };static struct clock_event_device clock_event_device_uv = { - .name =RTC_NAME , - .features =CLOCK_EVT_FEAT_ONESHOT , - .shift =20 , - .rating =400 , - .irq =-1 , - .set_next_event = uv_rtc_next_event, - .set_mode = uv_rtc_timer_setup, - .event_handler =NULL , + .name =RTC_NAME , + .features =CLOCK_EVT_FEAT_ONESHOT , + .shift =20 , + .rating =400 , + .irq =-1 , + .set_next_event = uv_rtc_next_event, + .set_state_shutdown = uv_rtc_shutdown, + .event_handler =NULL , }; static DEFINE_PER_CPU(struct clock_event_device, cpu_ced);
@@ -321,24 +320,14 @@ static int uv_rtc_next_event(unsigned long delta, }/* -* Setup the RTC timer in oneshot mode +* Shutdown the RTC timer */ -static void uv_rtc_timer_setup (enum clock_event_mode mode, -struct clock_event_device *evt) +static int uv_rtc_shutdown (struct clock_event_device *evt) {int ced_cpu =cpumask_first (evt->cpumask); -switch (mode) { -case CLOCK_EVT_MODE_PERIODIC : -case CLOCK_EVT_MODE_ONESHOT : -case CLOCK_EVT_MODE_RESUME : -/* Nothing to do here yet */ -break ; -case CLOCK_EVT_MODE_UNUSED : -case CLOCK_EVT_MODE_SHUTDOWN : -uv_rtc_unset_timer (ced_cpu,1 ); -break ; - } +uv_rtc_unset_timer (ced_cpu,1 ); +return 0 ; }static void uv_rtc_interrupt (void )
arch/x86/xen/time.c +31 -49
121 lines not on this page · raw message