Skip to content

Commit 37a48e6

Browse files
bjorn-helgaasgregkh
authored andcommitted
PCI: Apply _HPX settings only to relevant devices
[ Upstream commit 977509f7c5c6fb992ffcdf4291051af343b91645 ] Previously we didn't check the type of device before trying to apply Type 1 (PCI-X) or Type 2 (PCIe) Setting Records from _HPX. We don't support PCI-X Setting Records, so this was harmless, but the warning was useless. We do support PCIe Setting Records, and we didn't check whether a device was PCIe before applying settings. I don't think anything bad happened on non-PCIe devices because pcie_capability_clear_and_set_word(), pcie_cap_has_lnkctl(), etc., would fail before doing any harm. But it's ugly to depend on those internals. Check the device type before attempting to apply Type 1 and Type 2 Setting Records (Type 0 records are applicable to PCI, PCI-X, and PCIe devices). A side benefit is that this prevents useless "not supported" warnings when a BIOS supplies a Type 1 (PCI-X) Setting Record and we try to apply it to every single device: pci 0000:00:00.0: PCI-X settings not supported After this patch, we'll get the warning only when a BIOS supplies a Type 1 record and we have a PCI-X device to which it should be applied. Link: https://bugzilla.kernel.org/show_bug.cgi?id=187731 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 57d2ce1 commit 37a48e6

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

drivers/pci/probe.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,8 +1414,16 @@ static void program_hpp_type0(struct pci_dev *dev, struct hpp_type0 *hpp)
14141414

14151415
static void program_hpp_type1(struct pci_dev *dev, struct hpp_type1 *hpp)
14161416
{
1417-
if (hpp)
1418-
dev_warn(&dev->dev, "PCI-X settings not supported\n");
1417+
int pos;
1418+
1419+
if (!hpp)
1420+
return;
1421+
1422+
pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
1423+
if (!pos)
1424+
return;
1425+
1426+
dev_warn(&dev->dev, "PCI-X settings not supported\n");
14191427
}
14201428

14211429
static bool pcie_root_rcb_set(struct pci_dev *dev)
@@ -1441,6 +1449,9 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)
14411449
if (!hpp)
14421450
return;
14431451

1452+
if (!pci_is_pcie(dev))
1453+
return;
1454+
14441455
if (hpp->revision > 1) {
14451456
dev_warn(&dev->dev, "PCIe settings rev %d not supported\n",
14461457
hpp->revision);

0 commit comments

Comments
 (0)