Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (c7e15899) · Commits · 戴 / test

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,8 @@ enum uv_bios_cmd {
		UV_BIOS_WATCHLIST_ALLOC,
		UV_BIOS_WATCHLIST_FREE,
		UV_BIOS_MEMPROTECT,
		UV_BIOS_GET_PARTITION_ADDR
		UV_BIOS_GET_PARTITION_ADDR,
		UV_BIOS_SET_LEGACY_VGA_TARGET
		};

		/*
		@@ -96,6 +97,7 @@ extern int uv_bios_mq_watchlist_alloc(unsigned long, unsigned int,
		extern int uv_bios_mq_watchlist_free(int, int);
		extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect);
		extern s64 uv_bios_reserved_page_pa(u64, u64 , u64 , u64 *);
		extern int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus);

		extern void uv_bios_init(void);

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ struct mm_struct;
		extern enum uv_system_type get_uv_system_type(void);
		extern int is_uv_system(void);
		extern void uv_cpu_init(void);
		extern void uv_nmi_init(void);
		extern void uv_system_init(void);
		extern const struct cpumask uv_flush_tlb_others(const struct cpumask cpumask,
		struct mm_struct *mm,

arch/x86/include/asm/x86_init.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ struct x86_cpuinit_ops {
		* @get_wallclock: get time from HW clock like RTC etc.
		* @set_wallclock: set time back to HW clock
		* @is_untracked_pat_range exclude from PAT logic
		* @nmi_init enable NMI on cpus
		*/
		struct x86_platform_ops {
		unsigned long (*calibrate_tsc)(void);
		@@ -133,6 +134,7 @@ struct x86_platform_ops {
		int (*set_wallclock)(unsigned long nowtime);
		void (*iommu_shutdown)(void);
		bool (*is_untracked_pat_range)(u64 start, u64 end);
		void (*nmi_init)(void);
		};

		extern struct x86_init_ops x86_init;

arch/x86/kernel/apic/x2apic_uv_x.c

+74 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@
		#include <linux/cpu.h>
		#include <linux/init.h>
		#include <linux/io.h>
		#include <linux/pci.h>
		#include <linux/kdebug.h>

		#include <asm/uv/uv_mmrs.h>
		#include <asm/uv/uv_hub.h>
		@@ -34,10 +36,13 @@

		DEFINE_PER_CPU(int, x2apic_extra_bits);

		#define PR_DEVEL(fmt, args...) pr_devel("%s: " fmt, __func__, args)

		static enum uv_system_type uv_system_type;
		static u64 gru_start_paddr, gru_end_paddr;
		int uv_min_hub_revision_id;
		EXPORT_SYMBOL_GPL(uv_min_hub_revision_id);
		static DEFINE_SPINLOCK(uv_nmi_lock);

		static inline bool is_GRU_range(u64 start, u64 end)
		{
		@@ -71,6 +76,7 @@ static int __init uv_acpi_madt_oem_check(char oem_id, char oem_table_id)
		if (!strcmp(oem_id, "SGI")) {
		nodeid = early_get_nodeid();
		x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;
		x86_platform.nmi_init = uv_nmi_init;
		if (!strcmp(oem_table_id, "UVL"))
		uv_system_type = UV_LEGACY_APIC;
		else if (!strcmp(oem_table_id, "UVX"))
		@@ -553,6 +559,30 @@ late_initcall(uv_init_heartbeat);

		#endif /* !CONFIG_HOTPLUG_CPU */

		/* Direct Legacy VGA I/O traffic to designated IOH */
		int uv_set_vga_state(struct pci_dev *pdev, bool decode,
		unsigned int command_bits, bool change_bridge)
		{
		int domain, bus, rc;

		PR_DEVEL("devfn %x decode %d cmd %x chg_brdg %d\n",
		pdev->devfn, decode, command_bits, change_bridge);

		if (!change_bridge)
		return 0;

		if ((command_bits & PCI_COMMAND_IO) == 0)
		return 0;

		domain = pci_domain_nr(pdev->bus);
		bus = pdev->bus->number;

		rc = uv_bios_set_legacy_vga_target(decode, domain, bus);
		PR_DEVEL("vga decode %d %x:%x, rc: %d\n", decode, domain, bus, rc);

		return rc;
		}

		/*
		* Called on each cpu to initialize the per_cpu UV data area.
		* FIXME: hotplug not supported yet
		@@ -569,6 +599,46 @@ void __cpuinit uv_cpu_init(void)
		set_x2apic_extra_bits(uv_hub_info->pnode);
		}

		/*
		* When NMI is received, print a stack trace.
		*/
		int uv_handle_nmi(struct notifier_block self, unsigned long reason, void data)
		{
		if (reason != DIE_NMI_IPI)
		return NOTIFY_OK;
		/*
		* Use a lock so only one cpu prints at a time
		* to prevent intermixed output.
		*/
		spin_lock(&uv_nmi_lock);
		pr_info("NMI stack dump cpu %u:\n", smp_processor_id());
		dump_stack();
		spin_unlock(&uv_nmi_lock);

		return NOTIFY_STOP;
		}

		static struct notifier_block uv_dump_stack_nmi_nb = {
		.notifier_call = uv_handle_nmi
		};

		void uv_register_nmi_notifier(void)
		{
		if (register_die_notifier(&uv_dump_stack_nmi_nb))
		printk(KERN_WARNING "UV NMI handler failed to register\n");
		}

		void uv_nmi_init(void)
		{
		unsigned int value;

		/*
		* Unmask NMI on all cpus
		*/
		value = apic_read(APIC_LVT1) \| APIC_DM_NMI;
		value &= ~APIC_LVT_MASKED;
		apic_write(APIC_LVT1, value);
		}

		void __init uv_system_init(void)
		{
		@@ -690,5 +760,9 @@ void __init uv_system_init(void)

		uv_cpu_init();
		uv_scir_register_cpu_notifier();
		uv_register_nmi_notifier();
		proc_mkdir("sgi_uv", NULL);

		/* register Legacy VGA I/O redirection handler */
		pci_register_set_vga_state(uv_set_vga_state);
		}

arch/x86/kernel/bios_uv.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,25 @@ s64 uv_bios_freq_base(u64 clock_type, u64 *ticks_per_second)
		}
		EXPORT_SYMBOL_GPL(uv_bios_freq_base);

		/*
		* uv_bios_set_legacy_vga_target - Set Legacy VGA I/O Target
		* @decode: true to enable target, false to disable target
		* @domain: PCI domain number
		* @bus: PCI bus number
		*
		* Returns:
		* 0: Success
		* -EINVAL: Invalid domain or bus number
		* -ENOSYS: Capability not available
		* -EBUSY: Legacy VGA I/O cannot be retargeted at this time
		*/
		int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus)
		{
		return uv_bios_call(UV_BIOS_SET_LEGACY_VGA_TARGET,
		(u64)decode, (u64)domain, (u64)bus, 0, 0);
		}
		EXPORT_SYMBOL_GPL(uv_bios_set_legacy_vga_target);


		#ifdef CONFIG_EFI
		void uv_bios_init(void)

Admin message