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

Merge branch 'x86-fixes-for-linus' of... 

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/amd-iommu: Fix PCI hotplug with passthrough mode
  x86/amd-iommu: Fix passthrough mode
  x86: mmio-mod.c: Use pr_fmt
  x86: kmmio.c: Add and use pr_fmt(fmt)
  x86: i8254.c: Add pr_fmt(fmt)
  x86: setup_percpu.c: Use pr_<level> and add pr_fmt(fmt)
  x86: es7000_32.c: Use pr_<level> and add pr_fmt(fmt)
  x86: Print DMI_BOARD_NAME as well as DMI_PRODUCT_NAME from __show_regs()
  x86: Factor duplicated code out of __show_regs() into show_regs_common()
  arch/x86/kernel/microcode*: Use pr_fmt() and remove duplicated KERN_ERR prefix
  x86, mce: fix confusion between bank attributes and mce attributes
  x86/mce: Set up timer unconditionally
  x86: Fix bogus warning in apic_noop.apic_write()
  x86: Fix typo in arch/x86/mm/kmmio.c
  x86: ASUS P4S800 reboot=bios quirk
parents df7147b3 9cf78267

arch/x86/include/asm/amd_iommu_proto.h

+3 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ extern void amd_iommu_flush_all_domains(void); 
extern void amd_iommu_flush_all_devices(void);

extern void amd_iommu_apply_erratum_63(u16 devid);

extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);



extern int amd_iommu_init_devices(void);

extern void amd_iommu_uninit_devices(void);

extern void amd_iommu_init_notifier(void);

#ifndef CONFIG_AMD_IOMMU_STATS



static inline void amd_iommu_stats_init(void) { }

arch/x86/include/asm/system.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct task_struct *__switch_to(struct task_struct *prev, 
struct tss_struct;

void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,

		      struct tss_struct *tss);

extern void show_regs_common(void);



#ifdef CONFIG_X86_32

arch/x86/kernel/amd_iommu.c

+42 −4
Original line number Diff line number Diff line
@@ -166,6 +166,43 @@ static void iommu_uninit_device(struct device *dev) 
{

	kfree(dev->archdata.iommu);

}



void __init amd_iommu_uninit_devices(void)

{

	struct pci_dev *pdev = NULL;



	for_each_pci_dev(pdev) {



		if (!check_device(&pdev->dev))

			continue;



		iommu_uninit_device(&pdev->dev);

	}

}



int __init amd_iommu_init_devices(void)

{

	struct pci_dev *pdev = NULL;

	int ret = 0;



	for_each_pci_dev(pdev) {



		if (!check_device(&pdev->dev))

			continue;



		ret = iommu_init_device(&pdev->dev);

		if (ret)

			goto out_free;

	}



	return 0;



out_free:



	amd_iommu_uninit_devices();



	return ret;

}

#ifdef CONFIG_AMD_IOMMU_STATS



/*
@@ -1587,6 +1624,11 @@ static struct notifier_block device_nb = { 
	.notifier_call = device_change_notifier,

};



void amd_iommu_init_notifier(void)

{

	bus_register_notifier(&pci_bus_type, &device_nb);

}



/*****************************************************************************

 *

 * The next functions belong to the dma_ops mapping/unmapping code.
@@ -2145,8 +2187,6 @@ static void prealloc_protection_domains(void) 
		if (!check_device(&dev->dev))

			continue;



		iommu_init_device(&dev->dev);



		/* Is there already any domain for it? */

		if (domain_for_device(&dev->dev))

			continue;
@@ -2215,8 +2255,6 @@ int __init amd_iommu_init_dma_ops(void) 


	register_iommu(&amd_iommu_ops);



	bus_register_notifier(&pci_bus_type, &device_nb);



	amd_iommu_stats_init();



	return 0;

arch/x86/kernel/amd_iommu_init.c

+9 −0
Original line number Diff line number Diff line
@@ -1274,6 +1274,10 @@ static int __init amd_iommu_init(void) 
	if (ret)

		goto free;



	ret = amd_iommu_init_devices();

	if (ret)

		goto free;



	if (iommu_pass_through)

		ret = amd_iommu_init_passthrough();

	else
@@ -1281,6 +1285,8 @@ static int __init amd_iommu_init(void) 
	if (ret)

		goto free;



	amd_iommu_init_notifier();



	enable_iommus();



	if (iommu_pass_through)
@@ -1296,6 +1302,9 @@ out: 
	return ret;



free:



	amd_iommu_uninit_devices();



	free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,

		   get_order(MAX_DOMAIN_ID/8));

arch/x86/kernel/apic/apic_noop.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static u32 noop_apic_read(u32 reg) 


static void noop_apic_write(u32 reg, u32 v)

{

	WARN_ON_ONCE((cpu_has_apic || !disable_apic));

	WARN_ON_ONCE(cpu_has_apic && !disable_apic);

}



struct apic apic_noop = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE