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

Commit 45e829ea authored by Stefan Assmann's avatar Stefan Assmann Committed by Jesse Barnes
Browse files

PCI: change PCI nomenclature in drivers/pci/ (comment changes) 

Changing occurrences of variants of PCI-X and PCIe to the PCI-SIG
terms listed in the "Trademark and Logo Usage Guidelines".
http://www.pcisig.com/developers/procedures/logos/Trademark_and_Logo_Usage_Guidelines_updated_112206.pdf



Patch is limited to drivers/pci/ and changes concern comments only.

Signed-off-by: default avatarStefan Assmann <sassmann@redhat.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 57148688

drivers/pci/hotplug/shpchp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ struct controller { 
#define PCI_DEVICE_ID_AMD_GOLAM_7450	0x7450

#define PCI_DEVICE_ID_AMD_GOLAM_7450	0x7450

#define PCI_DEVICE_ID_AMD_POGO_7458	0x7458

#define PCI_DEVICE_ID_AMD_POGO_7458	0x7458





/* AMD PCIX bridge registers */

/* AMD PCI-X bridge registers */

#define PCIX_MEM_BASE_LIMIT_OFFSET	0x1C

#define PCIX_MEM_BASE_LIMIT_OFFSET	0x1C

#define PCIX_MISCII_OFFSET		0x48

#define PCIX_MISCII_OFFSET		0x48

#define PCIX_MISC_BRIDGE_ERRORS_OFFSET	0x80

#define PCIX_MISC_BRIDGE_ERRORS_OFFSET	0x80

drivers/pci/intel-iommu.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -304,7 +304,7 @@ struct device_domain_info { 
	int segment;		/* PCI domain */

	int segment;		/* PCI domain */

	u8 bus;			/* PCI bus number */

	u8 bus;			/* PCI bus number */

	u8 devfn;		/* PCI devfn number */

	u8 devfn;		/* PCI devfn number */

	struct pci_dev *dev; /* it's NULL for PCIE-to-PCI bridge */

	struct pci_dev *dev; /* it's NULL for PCIe-to-PCI bridge */

	struct intel_iommu *iommu; /* IOMMU used by this device */

	struct intel_iommu *iommu; /* IOMMU used by this device */

	struct dmar_domain *domain; /* pointer to domain */

	struct dmar_domain *domain; /* pointer to domain */

};

};
@@ -1611,7 +1611,7 @@ domain_context_mapping(struct dmar_domain *domain, struct pci_dev *pdev, 
			return ret;

			return ret;

		parent = parent->bus->self;

		parent = parent->bus->self;

	}

	}

	if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */

	if (pci_is_pcie(tmp)) /* this is a PCIe-to-PCI bridge */

		return domain_context_mapping_one(domain,

		return domain_context_mapping_one(domain,

					pci_domain_nr(tmp->subordinate),

					pci_domain_nr(tmp->subordinate),

					tmp->subordinate->number, 0,

					tmp->subordinate->number, 0,
@@ -3319,7 +3319,7 @@ static void iommu_detach_dependent_devices(struct intel_iommu *iommu, 
					 parent->devfn);

					 parent->devfn);

			parent = parent->bus->self;

			parent = parent->bus->self;

		}

		}

		if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */

		if (pci_is_pcie(tmp)) /* this is a PCIe-to-PCI bridge */

			iommu_detach_dev(iommu,

			iommu_detach_dev(iommu,

				tmp->subordinate->number, 0);

				tmp->subordinate->number, 0);

		else /* this is a legacy PCI bridge */

		else /* this is a legacy PCI bridge */

drivers/pci/intr_remapping.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -528,7 +528,7 @@ int set_msi_sid(struct irte *irte, struct pci_dev *dev) 




	bridge = pci_find_upstream_pcie_bridge(dev);

	bridge = pci_find_upstream_pcie_bridge(dev);

	if (bridge) {

	if (bridge) {

		if (pci_is_pcie(bridge))/* this is a PCIE-to-PCI/PCIX bridge */

		if (pci_is_pcie(bridge))/* this is a PCIe-to-PCI/PCIX bridge */

			set_irte_sid(irte, SVT_VERIFY_BUS, SQ_ALL_16,

			set_irte_sid(irte, SVT_VERIFY_BUS, SQ_ALL_16,

				(bridge->bus->number << 8) | dev->bus->number);

				(bridge->bus->number << 8) | dev->bus->number);

		else /* this is a legacy PCI bridge */

		else /* this is a legacy PCI bridge */

drivers/pci/pci.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1153,11 +1153,11 @@ pci_disable_device(struct pci_dev *dev) 




/**

/**

 * pcibios_set_pcie_reset_state - set reset state for device dev

 * pcibios_set_pcie_reset_state - set reset state for device dev

 * @dev: the PCI-E device reset

 * @dev: the PCIe device reset

 * @state: Reset state to enter into

 * @state: Reset state to enter into

 *

 *

 *

 *

 * Sets the PCI-E reset state for the device. This is the default

 * Sets the PCIe reset state for the device. This is the default

 * implementation. Architecture implementations can override this.

 * implementation. Architecture implementations can override this.

 */

 */

int __attribute__ ((weak)) pcibios_set_pcie_reset_state(struct pci_dev *dev,

int __attribute__ ((weak)) pcibios_set_pcie_reset_state(struct pci_dev *dev,
@@ -1168,7 +1168,7 @@ int __attribute__ ((weak)) pcibios_set_pcie_reset_state(struct pci_dev *dev, 




/**

/**

 * pci_set_pcie_reset_state - set reset state for device dev

 * pci_set_pcie_reset_state - set reset state for device dev

 * @dev: the PCI-E device reset

 * @dev: the PCIe device reset

 * @state: Reset state to enter into

 * @state: Reset state to enter into

 *

 *

 *

 *

drivers/pci/pcie/aer/aer_inject.c

+2 −2
Original line number Original line Diff line number Diff line 
/*

/*

 * PCIE AER software error injection support.

 * PCIe AER software error injection support.

 *

 *

 * Debuging PCIE AER code is quite difficult because it is hard to

 * Debuging PCIe AER code is quite difficult because it is hard to

 * trigger various real hardware errors. Software based error

 * trigger various real hardware errors. Software based error

 * injection can fake almost all kinds of errors with the help of a

 * injection can fake almost all kinds of errors with the help of a

 * user space helper tool aer-inject, which can be gotten from:

 * user space helper tool aer-inject, which can be gotten from: