lkml.org 
[lkml]   [2015]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 033/107] PCI: Fix TI816X class code quirk
    3.2.72-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Bjorn Helgaas <bhelgaas@google.com>

    commit d1541dc977d376406f4584d8eb055488655c98ec upstream.

    In fixup_ti816x_class(), we assigned "class = PCI_CLASS_MULTIMEDIA_VIDEO".
    But PCI_CLASS_MULTIMEDIA_VIDEO is only the two-byte base class/sub-class
    and needs to be shifted to make space for the low-order interface byte.

    Shift PCI_CLASS_MULTIMEDIA_VIDEO to set the correct class code.

    Fixes: 63c4408074cb ("PCI: Add quirk for setting valid class for TI816X Endpoint")
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    CC: Hemant Pedanekar <hemantp@ti.com>
    [bwh: Backported to 3.2: the class check is done in this function as there
    is no DECLARE_PCI_FIXUP_CLASS_EARLY()]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/pci/quirks.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/drivers/pci/quirks.c
    +++ b/drivers/pci/quirks.c
    @@ -2875,8 +2875,9 @@ static void __devinit fixup_ti816x_class
    {
    /* TI 816x devices do not have class code set when in PCIe boot mode */
    if (dev->class == PCI_CLASS_NOT_DEFINED) {
    - dev_info(&dev->dev, "Setting PCI class for 816x PCIe device\n");
    - dev->class = PCI_CLASS_MULTIMEDIA_VIDEO;
    + dev->class = PCI_CLASS_MULTIMEDIA_VIDEO << 8;
    + dev_info(&dev->dev, "PCI class overridden (%#08x -> %#08x)\n",
    + PCI_CLASS_NOT_DEFINED, dev->class);
    }
    }
    DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_TI, 0xb800, fixup_ti816x_class);


    \
     
     \ /
      Last update: 2015-10-09 03:01    [W:4.165 / U:0.964 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site