This is a note to let you know that I've just added the patch titled
PCI: Remove PCIe Capability version checks
to the 3.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pci-remove-pcie-capability-version-checks.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From c8b303d0206b28c4ff3aecada47108d1655ae00f Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <[email protected]>
Date: Wed, 28 Aug 2013 11:33:53 -0600
Subject: PCI: Remove PCIe Capability version checks
From: Bjorn Helgaas <[email protected]>
commit c8b303d0206b28c4ff3aecada47108d1655ae00f upstream.
Previously we relied on the PCIe r3.0, sec 7.8, spec language that says
"For Functions that do not implement the [Link, Slot, Root] registers,
these spaces must be hardwired to 0b," which means that for v2 PCIe
capabilities, we don't need to check the device type at all.
But it's simpler if we don't need to check the capability version at all,
and I think the spec is explicit enough about which registers are required
for which types that we can remove the version checks.
Signed-off-by: Bjorn Helgaas <[email protected]>
Reviewed-By: Jiang Liu <[email protected]>
Acked-by: Myron Stowe <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/pci/access.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -484,8 +484,7 @@ static inline bool pcie_cap_has_lnkctl(c
{
int type = pci_pcie_type(dev);
- return pcie_cap_version(dev) > 1 ||
- type == PCI_EXP_TYPE_ENDPOINT ||
+ return type == PCI_EXP_TYPE_ENDPOINT ||
type == PCI_EXP_TYPE_LEG_END ||
type == PCI_EXP_TYPE_ROOT_PORT ||
type == PCI_EXP_TYPE_UPSTREAM ||
@@ -498,8 +497,7 @@ static inline bool pcie_cap_has_sltctl(c
{
int type = pci_pcie_type(dev);
- return pcie_cap_version(dev) > 1 ||
- type == PCI_EXP_TYPE_ROOT_PORT ||
+ return type == PCI_EXP_TYPE_ROOT_PORT ||
(type == PCI_EXP_TYPE_DOWNSTREAM &&
pcie_caps_reg(dev) & PCI_EXP_FLAGS_SLOT);
}
@@ -508,8 +506,7 @@ static inline bool pcie_cap_has_rtctl(co
{
int type = pci_pcie_type(dev);
- return pcie_cap_version(dev) > 1 ||
- type == PCI_EXP_TYPE_ROOT_PORT ||
+ return type == PCI_EXP_TYPE_ROOT_PORT ||
type == PCI_EXP_TYPE_RC_EC;
}
Patches currently in stable-queue which might be from [email protected] are
queue-3.11/pci-support-pcie-capability-slot-registers-only-for-ports-with-slots.patch
queue-3.11/pci-remove-pcie-capability-version-checks.patch
queue-3.11/pci-allow-pcie-capability-link-related-register-access-for-switches.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
