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

Commit 3d29935f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86/PCI: remove IOH range fetching
  PCI: fix nested spinlock hang in aer_inject
parents 474118d0 e8e06eae

arch/x86/pci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o 


obj-y				+= common.o early.o

obj-y				+= amd_bus.o

obj-$(CONFIG_X86_64)		+= bus_numa.o intel_bus.o

obj-$(CONFIG_X86_64)		+= bus_numa.o



ifeq ($(CONFIG_PCI_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

arch/x86/pci/intel_bus.c

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
/*

 * to read io range from IOH pci conf, need to do it after mmconfig is there

 */



#include <linux/delay.h>

#include <linux/dmi.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <asm/pci_x86.h>



#include "bus_numa.h"



static inline void print_ioh_resources(struct pci_root_info *info)

{

	int res_num;

	int busnum;

	int i;



	printk(KERN_DEBUG "IOH bus: [%02x, %02x]\n",

			info->bus_min, info->bus_max);

	res_num = info->res_num;

	busnum = info->bus_min;

	for (i = 0; i < res_num; i++) {

		struct resource *res;



		res = &info->res[i];

		printk(KERN_DEBUG "IOH bus: %02x index %x %s: [%llx, %llx]\n",

			busnum, i,

			(res->flags & IORESOURCE_IO) ? "io port" :

							"mmio",

			res->start, res->end);

	}

}



#define IOH_LIO			0x108

#define IOH_LMMIOL		0x10c

#define IOH_LMMIOH		0x110

#define IOH_LMMIOH_BASEU	0x114

#define IOH_LMMIOH_LIMITU	0x118

#define IOH_LCFGBUS		0x11c



static void __devinit pci_root_bus_res(struct pci_dev *dev)

{

	u16 word;

	u32 dword;

	struct pci_root_info *info;

	u16 io_base, io_end;

	u32 mmiol_base, mmiol_end;

	u64 mmioh_base, mmioh_end;

	int bus_base, bus_end;



	/* some sys doesn't get mmconf enabled */

	if (dev->cfg_size < 0x120)

		return;



	if (pci_root_num >= PCI_ROOT_NR) {

		printk(KERN_DEBUG "intel_bus.c: PCI_ROOT_NR is too small\n");

		return;

	}



	info = &pci_root_info[pci_root_num];

	pci_root_num++;



	pci_read_config_word(dev, IOH_LCFGBUS, &word);

	bus_base = (word & 0xff);

	bus_end = (word & 0xff00) >> 8;

	sprintf(info->name, "PCI Bus #%02x", bus_base);

	info->bus_min = bus_base;

	info->bus_max = bus_end;



	pci_read_config_word(dev, IOH_LIO, &word);

	io_base = (word & 0xf0) << (12 - 4);

	io_end = (word & 0xf000) | 0xfff;

	update_res(info, io_base, io_end, IORESOURCE_IO, 0);



	pci_read_config_dword(dev, IOH_LMMIOL, &dword);

	mmiol_base = (dword & 0xff00) << (24 - 8);

	mmiol_end = (dword & 0xff000000) | 0xffffff;

	update_res(info, mmiol_base, mmiol_end, IORESOURCE_MEM, 0);



	pci_read_config_dword(dev, IOH_LMMIOH, &dword);

	mmioh_base = ((u64)(dword & 0xfc00)) << (26 - 10);

	mmioh_end = ((u64)(dword & 0xfc000000) | 0x3ffffff);

	pci_read_config_dword(dev, IOH_LMMIOH_BASEU, &dword);

	mmioh_base |= ((u64)(dword & 0x7ffff)) << 32;

	pci_read_config_dword(dev, IOH_LMMIOH_LIMITU, &dword);

	mmioh_end |= ((u64)(dword & 0x7ffff)) << 32;

	update_res(info, mmioh_base, mmioh_end, IORESOURCE_MEM, 0);



	print_ioh_resources(info);

}



/* intel IOH */

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x342e, pci_root_bus_res);

drivers/pci/pcie/aer/aer_inject.c

+6 −6
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int aer_inject(struct aer_error_inj *einj) 
	unsigned long flags;

	unsigned int devfn = PCI_DEVFN(einj->dev, einj->fn);

	int pos_cap_err, rp_pos_cap_err;

	u32 sever, mask;

	u32 sever, cor_mask, uncor_mask;

	int ret = 0;



	dev = pci_get_domain_bus_and_slot((int)einj->domain, einj->bus, devfn);
@@ -339,6 +339,9 @@ static int aer_inject(struct aer_error_inj *einj) 
		goto out_put;

	}

	pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_SEVER, &sever);

	pci_read_config_dword(dev, pos_cap_err + PCI_ERR_COR_MASK, &cor_mask);

	pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_MASK,

			      &uncor_mask);



	rp_pos_cap_err = pci_find_ext_capability(rpdev, PCI_EXT_CAP_ID_ERR);

	if (!rp_pos_cap_err) {
@@ -374,17 +377,14 @@ static int aer_inject(struct aer_error_inj *einj) 
	err->header_log2 = einj->header_log2;

	err->header_log3 = einj->header_log3;



	pci_read_config_dword(dev, pos_cap_err + PCI_ERR_COR_MASK, &mask);

	if (einj->cor_status && !(einj->cor_status & ~mask)) {

	if (einj->cor_status && !(einj->cor_status & ~cor_mask)) {

		ret = -EINVAL;

		printk(KERN_WARNING "The correctable error(s) is masked "

				"by device\n");

		spin_unlock_irqrestore(&inject_lock, flags);

		goto out_put;

	}



	pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_MASK, &mask);

	if (einj->uncor_status && !(einj->uncor_status & ~mask)) {

	if (einj->uncor_status && !(einj->uncor_status & ~uncor_mask)) {

		ret = -EINVAL;

		printk(KERN_WARNING "The uncorrectable error(s) is masked "

				"by device\n");