Commit f5d3ca6f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/errors' 

- Add PCI_ERROR_RESPONSE and related definitions for signaling and checking
  for transaction errors on PCI (Naveen Naidu)

- Fabricate PCI_ERROR_RESPONSE data (~0) in config read wrappers, instead
  of in host controller drivers, when transactions fail on PCI (Naveen
  Naidu)

- Use PCI_POSSIBLE_ERROR() to check for possible failure of config reads
  (Naveen Naidu)

* pci/errors:
  PCI: xgene: Use PCI_ERROR_RESPONSE to identify config read errors
  PCI: hv: Use PCI_ERROR_RESPONSE to identify config read errors
  PCI: keystone: Use PCI_ERROR_RESPONSE to identify config read errors
  PCI: Use PCI_ERROR_RESPONSE to identify config read errors
  PCI: cpqphp: Use PCI_POSSIBLE_ERROR() to check config reads
  PCI/PME: Use PCI_POSSIBLE_ERROR() to check config reads
  PCI/DPC: Use PCI_POSSIBLE_ERROR() to check config reads
  PCI: pciehp: Use PCI_POSSIBLE_ERROR() to check config reads
  PCI: vmd: Use PCI_POSSIBLE_ERROR() to check config reads
  PCI/ERR: Use PCI_POSSIBLE_ERROR() to check config reads
  PCI: rockchip-host: Drop error data fabrication when config read fails
  PCI: rcar-host: Drop error data fabrication when config read fails
  PCI: altera: Drop error data fabrication when config read fails
  PCI: mvebu: Drop error data fabrication when config read fails
  PCI: aardvark: Drop error data fabrication when config read fails
  PCI: kirin: Drop error data fabrication when config read fails
  PCI: histb: Drop error data fabrication when config read fails
  PCI: exynos: Drop error data fabrication when config read fails
  PCI: mediatek: Drop error data fabrication when config read fails
  PCI: iproc: Drop error data fabrication when config read fails
  PCI: thunder: Drop error data fabrication when config read fails
  PCI: Drop error data fabrication when config read fails
  PCI: Use PCI_SET_ERROR_RESPONSE() for disconnected devices
  PCI: Set error response data when config read fails
  PCI: Add PCI_ERROR_RESPONSE and related definitions
parents da43f08d c78b9a9c

drivers/pci/access.c

+19 −17
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ int noinline pci_bus_read_config_##size \ 
	if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;	\

	pci_lock_config(flags);						\

	res = bus->ops->read(bus, devfn, pos, len, &data);		\

	if (res)							\

		PCI_SET_ERROR_RESPONSE(value);				\

	else								\

		*value = (type)data;					\

	pci_unlock_config(flags);					\

	return res;							\
@@ -80,10 +83,8 @@ int pci_generic_config_read(struct pci_bus *bus, unsigned int devfn, 
	void __iomem *addr;



	addr = bus->ops->map_bus(bus, devfn, where);

	if (!addr) {

		*val = ~0;

	if (!addr)

		return PCIBIOS_DEVICE_NOT_FOUND;

	}



	if (size == 1)

		*val = readb(addr);
@@ -122,10 +123,8 @@ int pci_generic_config_read32(struct pci_bus *bus, unsigned int devfn, 
	void __iomem *addr;



	addr = bus->ops->map_bus(bus, devfn, where & ~0x3);

	if (!addr) {

		*val = ~0;

	if (!addr)

		return PCIBIOS_DEVICE_NOT_FOUND;

	}



	*val = readl(addr);
@@ -228,6 +227,9 @@ int pci_user_read_config_##size \ 
	ret = dev->bus->ops->read(dev->bus, dev->devfn,			\

					pos, sizeof(type), &data);	\

	raw_spin_unlock_irq(&pci_lock);				\

	if (ret)							\

		PCI_SET_ERROR_RESPONSE(val);				\

	else								\

		*val = (type)data;					\

	return pcibios_err_to_errno(ret);				\

}									\
@@ -410,9 +412,9 @@ int pcie_capability_read_word(struct pci_dev *dev, int pos, u16 *val) 
	if (pcie_capability_reg_implemented(dev, pos)) {

		ret = pci_read_config_word(dev, pci_pcie_cap(dev) + pos, val);

		/*

		 * Reset *val to 0 if pci_read_config_word() fails, it may

		 * have been written as 0xFFFF if hardware error happens

		 * during pci_read_config_word().

		 * Reset *val to 0 if pci_read_config_word() fails; it may

		 * have been written as 0xFFFF (PCI_ERROR_RESPONSE) if the

		 * config read failed on PCI.

		 */

		if (ret)

			*val = 0;
@@ -445,9 +447,9 @@ int pcie_capability_read_dword(struct pci_dev *dev, int pos, u32 *val) 
	if (pcie_capability_reg_implemented(dev, pos)) {

		ret = pci_read_config_dword(dev, pci_pcie_cap(dev) + pos, val);

		/*

		 * Reset *val to 0 if pci_read_config_dword() fails, it may

		 * have been written as 0xFFFFFFFF if hardware error happens

		 * during pci_read_config_dword().

		 * Reset *val to 0 if pci_read_config_dword() fails; it may

		 * have been written as 0xFFFFFFFF (PCI_ERROR_RESPONSE) if

		 * the config read failed on PCI.

		 */

		if (ret)

			*val = 0;
@@ -523,7 +525,7 @@ EXPORT_SYMBOL(pcie_capability_clear_and_set_dword); 
int pci_read_config_byte(const struct pci_dev *dev, int where, u8 *val)

{

	if (pci_dev_is_disconnected(dev)) {

		*val = ~0;

		PCI_SET_ERROR_RESPONSE(val);

		return PCIBIOS_DEVICE_NOT_FOUND;

	}

	return pci_bus_read_config_byte(dev->bus, dev->devfn, where, val);
@@ -533,7 +535,7 @@ EXPORT_SYMBOL(pci_read_config_byte); 
int pci_read_config_word(const struct pci_dev *dev, int where, u16 *val)

{

	if (pci_dev_is_disconnected(dev)) {

		*val = ~0;

		PCI_SET_ERROR_RESPONSE(val);

		return PCIBIOS_DEVICE_NOT_FOUND;

	}

	return pci_bus_read_config_word(dev->bus, dev->devfn, where, val);
@@ -544,7 +546,7 @@ int pci_read_config_dword(const struct pci_dev *dev, int where, 
					u32 *val)

{

	if (pci_dev_is_disconnected(dev)) {

		*val = ~0;

		PCI_SET_ERROR_RESPONSE(val);

		return PCIBIOS_DEVICE_NOT_FOUND;

	}

	return pci_bus_read_config_dword(dev->bus, dev->devfn, where, val);

drivers/pci/controller/dwc/pci-exynos.c

+1 −3
Original line number Diff line number Diff line
@@ -216,10 +216,8 @@ static int exynos_pcie_rd_own_conf(struct pci_bus *bus, unsigned int devfn, 
{

	struct dw_pcie *pci = to_dw_pcie_from_pp(bus->sysdata);



	if (PCI_SLOT(devfn)) {

		*val = ~0;

	if (PCI_SLOT(devfn))

		return PCIBIOS_DEVICE_NOT_FOUND;

	}



	*val = dw_pcie_read_dbi(pci, where, size);

	return PCIBIOS_SUCCESSFUL;

drivers/pci/controller/dwc/pci-keystone.c

+3 −3
Original line number Diff line number Diff line
@@ -747,9 +747,9 @@ static int ks_pcie_config_legacy_irq(struct keystone_pcie *ks_pcie) 


#ifdef CONFIG_ARM

/*

 * When a PCI device does not exist during config cycles, keystone host gets a

 * bus error instead of returning 0xffffffff. This handler always returns 0

 * for this kind of faults.

 * When a PCI device does not exist during config cycles, keystone host

 * gets a bus error instead of returning 0xffffffff (PCI_ERROR_RESPONSE).

 * This handler always returns 0 for this kind of fault.

 */

static int ks_pcie_fault(unsigned long addr, unsigned int fsr,

			 struct pt_regs *regs)

drivers/pci/controller/dwc/pcie-histb.c

+1 −3
Original line number Diff line number Diff line
@@ -127,10 +127,8 @@ static int histb_pcie_rd_own_conf(struct pci_bus *bus, unsigned int devfn, 
{

	struct dw_pcie *pci = to_dw_pcie_from_pp(bus->sysdata);



	if (PCI_SLOT(devfn)) {

		*val = ~0;

	if (PCI_SLOT(devfn))

		return PCIBIOS_DEVICE_NOT_FOUND;

	}



	*val = dw_pcie_read_dbi(pci, where, size);

	return PCIBIOS_SUCCESSFUL;

drivers/pci/controller/dwc/pcie-kirin.c

+1 −3
Original line number Diff line number Diff line
@@ -530,10 +530,8 @@ static int kirin_pcie_rd_own_conf(struct pci_bus *bus, unsigned int devfn, 
{

	struct dw_pcie *pci = to_dw_pcie_from_pp(bus->sysdata);



	if (PCI_SLOT(devfn)) {

		*val = ~0;

	if (PCI_SLOT(devfn))

		return PCIBIOS_DEVICE_NOT_FOUND;

	}



	*val = dw_pcie_read_dbi(pci, where, size);

	return PCIBIOS_SUCCESSFUL;