Commit 1c531d82 authored Jan 25, 2013 by Myron Stowe Committed by Bjorn Helgaas Jan 30, 2013

PCI: Use PCI Express Capability accessor



Use PCI Express Capability access functions to simplify device
Capabilities Register usages.

Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent 7c9c003c

drivers/pci/access.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -472,7 +472,7 @@ EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);

		static inline int pcie_cap_version(const struct pci_dev *dev)
		{
		return dev->pcie_flags_reg & PCI_EXP_FLAGS_VERS;
		return pcie_caps_reg(dev) & PCI_EXP_FLAGS_VERS;
		}

		static inline bool pcie_cap_has_devctl(const struct pci_dev *dev)
		@@ -497,7 +497,7 @@ static inline bool pcie_cap_has_sltctl(const struct pci_dev *dev)
		return pcie_cap_version(dev) > 1 \|\|
		type == PCI_EXP_TYPE_ROOT_PORT \|\|
		(type == PCI_EXP_TYPE_DOWNSTREAM &&
		dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT);
		pcie_caps_reg(dev) & PCI_EXP_FLAGS_SLOT);
		}

		static inline bool pcie_cap_has_rtctl(const struct pci_dev *dev)

drivers/pci/pcie/portdrv_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -272,7 +272,7 @@ static int get_port_device_capability(struct pci_dev *dev)

		/* Hot-Plug Capable */
		if ((cap_mask & PCIE_PORT_SERVICE_HP) &&
		dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT) {
		pcie_caps_reg(dev) & PCI_EXP_FLAGS_SLOT) {
		pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, &reg32);
		if (reg32 & PCI_EXP_SLTCAP_HPC) {
		services \|= PCIE_PORT_SERVICE_HP;

include/linux/pci.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1707,7 +1707,7 @@ static inline u16 pcie_caps_reg(const struct pci_dev *dev)
		*/
		static inline int pci_pcie_type(const struct pci_dev *dev)
		{
		return (dev->pcie_flags_reg & PCI_EXP_FLAGS_TYPE) >> 4;
		return (pcie_caps_reg(dev) & PCI_EXP_FLAGS_TYPE) >> 4;
		}

		void pci_request_acs(void);