Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull x86 fixes from Ingo Molnar:
 "This contains three commits to fix memory corruption bugs with certain
  Apple AirPort cards, plus a fix for a X86_BUG() ID definitions collision
  bug in asm/cpufeatures.h"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/quirks: Add early quirk to reset Apple AirPort card
  x86/quirks: Reintroduce scanning of secondary buses
  x86/quirks: Apply nvidia_bugs quirk only on root bus
  x86/cpu: Fix duplicated X86_BUG(9) macro
parents 2cc499b3 abb2bafd

arch/x86/include/asm/cpufeatures.h

+2 −4
Original line number Diff line number Diff line
@@ -301,10 +301,6 @@ 
#define X86_BUG_FXSAVE_LEAK	X86_BUG(6) /* FXSAVE leaks FOP/FIP/FOP */

#define X86_BUG_CLFLUSH_MONITOR	X86_BUG(7) /* AAI65, CLFLUSH required before MONITOR */

#define X86_BUG_SYSRET_SS_ATTRS	X86_BUG(8) /* SYSRET doesn't fix up SS attrs */

#define X86_BUG_NULL_SEG	X86_BUG(9) /* Nulling a selector preserves the base */

#define X86_BUG_SWAPGS_FENCE	X86_BUG(10) /* SWAPGS without input dep on GS */





#ifdef CONFIG_X86_32

/*

 * 64-bit kernels don't use X86_BUG_ESPFIX.  Make the define conditional
@@ -312,5 +308,7 @@ 
 */

#define X86_BUG_ESPFIX		X86_BUG(9) /* "" IRET to 16-bit SS corrupts ESP/RSP high bits */

#endif

#define X86_BUG_NULL_SEG	X86_BUG(10) /* Nulling a selector preserves the base */

#define X86_BUG_SWAPGS_FENCE	X86_BUG(11) /* SWAPGS without input dep on GS */



#endif /* _ASM_X86_CPUFEATURES_H */

arch/x86/kernel/early-quirks.c

+92 −13
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ 


#include <linux/pci.h>

#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/dmi.h>

#include <linux/pci_ids.h>

#include <linux/bcma/bcma.h>

#include <linux/bcma/bcma_regs.h>

#include <drm/i915_drm.h>

#include <asm/pci-direct.h>

#include <asm/dma.h>
@@ -21,6 +25,9 @@ 
#include <asm/iommu.h>

#include <asm/gart.h>

#include <asm/irq_remapping.h>

#include <asm/early_ioremap.h>



#define dev_err(msg)  pr_err("pci 0000:%02x:%02x.%d: %s", bus, slot, func, msg)



static void __init fix_hypertransport_config(int num, int slot, int func)

{
@@ -75,6 +82,13 @@ static void __init nvidia_bugs(int num, int slot, int func) 
{

#ifdef CONFIG_ACPI

#ifdef CONFIG_X86_IO_APIC

	/*

	 * Only applies to Nvidia root ports (bus 0) and not to

	 * Nvidia graphics cards with PCI ports on secondary buses.

	 */

	if (num)

		return;



	/*

	 * All timer overrides on Nvidia are

	 * wrong unless HPET is enabled.
@@ -590,6 +604,61 @@ static void __init force_disable_hpet(int num, int slot, int func) 
#endif

}



#define BCM4331_MMIO_SIZE	16384

#define BCM4331_PM_CAP		0x40

#define bcma_aread32(reg)	ioread32(mmio + 1 * BCMA_CORE_SIZE + reg)

#define bcma_awrite32(reg, val)	iowrite32(val, mmio + 1 * BCMA_CORE_SIZE + reg)



static void __init apple_airport_reset(int bus, int slot, int func)

{

	void __iomem *mmio;

	u16 pmcsr;

	u64 addr;

	int i;



	if (!dmi_match(DMI_SYS_VENDOR, "Apple Inc."))

		return;



	/* Card may have been put into PCI_D3hot by grub quirk */

	pmcsr = read_pci_config_16(bus, slot, func, BCM4331_PM_CAP + PCI_PM_CTRL);



	if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0) {

		pmcsr &= ~PCI_PM_CTRL_STATE_MASK;

		write_pci_config_16(bus, slot, func, BCM4331_PM_CAP + PCI_PM_CTRL, pmcsr);

		mdelay(10);



		pmcsr = read_pci_config_16(bus, slot, func, BCM4331_PM_CAP + PCI_PM_CTRL);

		if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0) {

			dev_err("Cannot power up Apple AirPort card\n");

			return;

		}

	}



	addr  =      read_pci_config(bus, slot, func, PCI_BASE_ADDRESS_0);

	addr |= (u64)read_pci_config(bus, slot, func, PCI_BASE_ADDRESS_1) << 32;

	addr &= PCI_BASE_ADDRESS_MEM_MASK;



	mmio = early_ioremap(addr, BCM4331_MMIO_SIZE);

	if (!mmio) {

		dev_err("Cannot iomap Apple AirPort card\n");

		return;

	}



	pr_info("Resetting Apple AirPort card (left enabled by EFI)\n");



	for (i = 0; bcma_aread32(BCMA_RESET_ST) && i < 30; i++)

		udelay(10);



	bcma_awrite32(BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);

	bcma_aread32(BCMA_RESET_CTL);

	udelay(1);



	bcma_awrite32(BCMA_RESET_CTL, 0);

	bcma_aread32(BCMA_RESET_CTL);

	udelay(10);



	early_iounmap(mmio, BCM4331_MMIO_SIZE);

}



#define QFLAG_APPLY_ONCE 	0x1

#define QFLAG_APPLIED		0x2
@@ -603,12 +672,6 @@ struct chipset { 
	void (*f)(int num, int slot, int func);

};



/*

 * Only works for devices on the root bus. If you add any devices

 * not on bus 0 readd another loop level in early_quirks(). But

 * be careful because at least the Nvidia quirk here relies on

 * only matching on bus 0.

 */

static struct chipset early_qrk[] __initdata = {

	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,

	  PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, nvidia_bugs },
@@ -638,9 +701,13 @@ static struct chipset early_qrk[] __initdata = { 
	 */

	{ PCI_VENDOR_ID_INTEL, 0x0f00,

		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},

	{ PCI_VENDOR_ID_BROADCOM, 0x4331,

	  PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},

	{}

};



static void __init early_pci_scan_bus(int bus);



/**

 * check_dev_quirk - apply early quirks to a given PCI device

 * @num: bus number
@@ -649,7 +716,7 @@ static struct chipset early_qrk[] __initdata = { 
 *

 * Check the vendor & device ID against the early quirks table.

 *

 * If the device is single function, let early_quirks() know so we don't

 * If the device is single function, let early_pci_scan_bus() know so we don't

 * poke at this device again.

 */

static int __init check_dev_quirk(int num, int slot, int func)
@@ -658,6 +725,7 @@ static int __init check_dev_quirk(int num, int slot, int func) 
	u16 vendor;

	u16 device;

	u8 type;

	u8 sec;

	int i;



	class = read_pci_config_16(num, slot, func, PCI_CLASS_DEVICE);
@@ -685,25 +753,36 @@ static int __init check_dev_quirk(int num, int slot, int func) 


	type = read_pci_config_byte(num, slot, func,

				    PCI_HEADER_TYPE);



	if ((type & 0x7f) == PCI_HEADER_TYPE_BRIDGE) {

		sec = read_pci_config_byte(num, slot, func, PCI_SECONDARY_BUS);

		if (sec > num)

			early_pci_scan_bus(sec);

	}



	if (!(type & 0x80))

		return -1;



	return 0;

}



void __init early_quirks(void)

static void __init early_pci_scan_bus(int bus)

{

	int slot, func;



	if (!early_pci_allowed())

		return;



	/* Poor man's PCI discovery */

	/* Only scan the root bus */

	for (slot = 0; slot < 32; slot++)

		for (func = 0; func < 8; func++) {

			/* Only probe function 0 on single fn devices */

			if (check_dev_quirk(0, slot, func))

			if (check_dev_quirk(bus, slot, func))

				break;

		}

}



void __init early_quirks(void)

{

	if (!early_pci_allowed())

		return;



	early_pci_scan_bus(0);

}

drivers/bcma/bcma_private.h

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#include <linux/bcma/bcma.h>

#include <linux/delay.h>



#define BCMA_CORE_SIZE		0x1000



#define bcma_err(bus, fmt, ...) \

	pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)

#define bcma_warn(bus, fmt, ...) \

include/linux/bcma/bcma.h

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ struct bcma_host_ops { 
#define BCMA_CORE_DEFAULT		0xFFF



#define BCMA_MAX_NR_CORES		16

#define BCMA_CORE_SIZE			0x1000



/* Chip IDs of PCIe devices */

#define BCMA_CHIP_ID_BCM4313	0x4313