lkml.org 
[lkml]   [2011]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[12/80] PCI hotplug: shpchp: dont blindly claim non-AMD 0x7450 device IDs
    3.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Bjorn Helgaas <bhelgaas@google.com>

    commit 4cac2eb158c6da0c761689345c6cc5df788a6292 upstream.

    Previously we claimed device ID 0x7450, regardless of the vendor, which is
    clearly wrong. Now we'll claim that device ID only for AMD.

    I suspect this was just a typo in the original code, but it's possible this
    change will break shpchp on non-7450 AMD bridges. If so, we'll have to fix
    them as we find them.

    Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638863
    Reported-by: Ralf Jung <ralfjung-e@gmx.de>
    Cc: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/pci/hotplug/shpchp_core.c | 4 ++--
    drivers/pci/hotplug/shpchp_hpc.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/pci/hotplug/shpchp_core.c
    +++ b/drivers/pci/hotplug/shpchp_core.c
    @@ -278,8 +278,8 @@ static int get_adapter_status (struct ho

    static int is_shpc_capable(struct pci_dev *dev)
    {
    - if ((dev->vendor == PCI_VENDOR_ID_AMD) || (dev->device ==
    - PCI_DEVICE_ID_AMD_GOLAM_7450))
    + if (dev->vendor == PCI_VENDOR_ID_AMD &&
    + dev->device == PCI_DEVICE_ID_AMD_GOLAM_7450)
    return 1;
    if (!pci_find_capability(dev, PCI_CAP_ID_SHPC))
    return 0;
    --- a/drivers/pci/hotplug/shpchp_hpc.c
    +++ b/drivers/pci/hotplug/shpchp_hpc.c
    @@ -944,8 +944,8 @@ int shpc_init(struct controller *ctrl, s
    ctrl->pci_dev = pdev; /* pci_dev of the P2P bridge */
    ctrl_dbg(ctrl, "Hotplug Controller:\n");

    - if ((pdev->vendor == PCI_VENDOR_ID_AMD) || (pdev->device ==
    - PCI_DEVICE_ID_AMD_GOLAM_7450)) {
    + if (pdev->vendor == PCI_VENDOR_ID_AMD &&
    + pdev->device == PCI_DEVICE_ID_AMD_GOLAM_7450) {
    /* amd shpc driver doesn't use Base Offset; assume 0 */
    ctrl->mmio_base = pci_resource_start(pdev, 0);
    ctrl->mmio_size = pci_resource_len(pdev, 0);



    \
     
     \ /
      Last update: 2011-12-07 17:17    [W:0.021 / U:0.180 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site