Commit c945d022 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform updates from Ingo Molnar:
 "Misc platform updates: SGI UV4 support additions, intel-mid Merrifield
  enhancements and purge of old code"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
  x86/platform/UV/NMI: Fix uneccessary kABI breakage
  x86/platform/UV: Clean up the NMI code to match current coding style
  x86/platform/UV: Ensure uv_system_init is called when necessary
  x86/platform/UV: Initialize PCH GPP_D_0 NMI Pin to be NMI source
  x86/platform/UV: Verify NMI action is valid, default is standard
  x86/platform/UV: Add basic CPU NMI health check
  x86/platform/UV: Add Support for UV4 Hubless NMIs
  x86/platform/UV: Add Support for UV4 Hubless systems
  x86/platform/UV: Clean up the UV APIC code
  x86/platform/intel-mid: Move watchdog registration to arch_initcall()
  x86/platform/intel-mid: Don't shadow error code of mp_map_gsi_to_irq()
  x86/platform/intel-mid: Allocate RTC interrupt for Merrifield
  x86/ioapic: Return suitable error code in mp_map_gsi_to_irq()
  x86/platform/UV: Fix 2 socket config problem
  x86/platform/UV: Fix panic with missing UVsystab support
  x86/platform/intel-mid: Enable RTC on Intel Merrifield
  x86/platform/intel: Remove PMIC GPIO block support
  x86/platform/intel-mid: Make intel_scu_device_register() static
  x86/platform/intel-mid: Enable GPIO keys on Merrifield
  x86/platform/intel-mid: Get rid of duplication of IPC handler
  ...
parents 8b5abde1 d48085f0

arch/x86/include/asm/intel-mid.h

+1 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ extern void intel_mid_pwr_power_off(void); 
extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev);



extern int get_gpio_by_name(const char *name);

extern void intel_scu_device_register(struct platform_device *pdev);

extern int __init sfi_parse_mrtc(struct sfi_table_header *table);

extern int __init sfi_parse_mtmr(struct sfi_table_header *table);

extern int sfi_mrtc_num;
@@ -42,10 +41,8 @@ struct devs_id { 
	char name[SFI_NAME_LEN + 1];

	u8 type;

	u8 delay;

	u8 msic;

	void *(*get_platform_data)(void *info);

	/* Custom handler for devices */

	void (*device_handler)(struct sfi_device_table_entry *pentry,

			       struct devs_id *dev);

};



#define sfi_device(i)								\

arch/x86/include/asm/uv/uv.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ struct mm_struct; 


extern enum uv_system_type get_uv_system_type(void);

extern int is_uv_system(void);

extern int is_uv_hubless(void);

extern void uv_cpu_init(void);

extern void uv_nmi_init(void);

extern void uv_system_init(void);
@@ -23,6 +24,7 @@ extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, 


static inline enum uv_system_type get_uv_system_type(void) { return UV_NONE; }

static inline int is_uv_system(void)	{ return 0; }

static inline int is_uv_hubless(void)	{ return 0; }

static inline void uv_cpu_init(void)	{ }

static inline void uv_system_init(void)	{ }

static inline const struct cpumask *

arch/x86/include/asm/uv/uv_hub.h

+3 −0
Original line number Diff line number Diff line
@@ -772,6 +772,7 @@ static inline int uv_num_possible_blades(void) 


/* Per Hub NMI support */

extern void uv_nmi_setup(void);

extern void uv_nmi_setup_hubless(void);



/* BMC sets a bit this MMR non-zero before sending an NMI */

#define UVH_NMI_MMR		UVH_SCRATCH5
@@ -799,6 +800,8 @@ struct uv_hub_nmi_s { 
	atomic_t	read_mmr_count;	/* count of MMR reads */

	atomic_t	nmi_count;	/* count of true UV NMIs */

	unsigned long	nmi_value;	/* last value read from NMI MMR */

	bool		hub_present;	/* false means UV hubless system */

	bool		pch_owner;	/* indicates this hub owns PCH */

};



struct uv_cpu_nmi_s {

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -1107,12 +1107,12 @@ int mp_map_gsi_to_irq(u32 gsi, unsigned int flags, struct irq_alloc_info *info) 


	ioapic = mp_find_ioapic(gsi);

	if (ioapic < 0)

		return -1;

		return -ENODEV;



	pin = mp_find_ioapic_pin(ioapic, gsi);

	idx = find_irq_entry(ioapic, pin, mp_INT);

	if ((flags & IOAPIC_MAP_CHECK) && idx < 0)

		return -1;

		return -ENODEV;



	return mp_map_pin_to_irq(gsi, idx, ioapic, pin, flags, info);

}

arch/x86/kernel/apic/x2apic_uv_x.c

+288 −260

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE