lkml.org 
[lkml]   [2017]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 096/138] PCI: Apply _HPX settings only to relevant devices
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bjorn Helgaas <bhelgaas@google.com>


    [ 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>
    ---
    drivers/pci/probe.c | 15 +++++++++++++--
    1 file changed, 13 insertions(+), 2 deletions(-)

    --- a/drivers/pci/probe.c
    +++ b/drivers/pci/probe.c
    @@ -1438,8 +1438,16 @@ static void program_hpp_type0(struct pci

    static void program_hpp_type1(struct pci_dev *dev, struct hpp_type1 *hpp)
    {
    - if (hpp)
    - dev_warn(&dev->dev, "PCI-X settings not supported\n");
    + int pos;
    +
    + if (!hpp)
    + return;
    +
    + pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
    + if (!pos)
    + return;
    +
    + dev_warn(&dev->dev, "PCI-X settings not supported\n");
    }

    static bool pcie_root_rcb_set(struct pci_dev *dev)
    @@ -1465,6 +1473,9 @@ static void program_hpp_type2(struct pci
    if (!hpp)
    return;

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

    \
     
     \ /
      Last update: 2017-11-28 12:52    [W:2.855 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site