Commit 6ee63481 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Kamal Mostafa

PCI: Fix TI816X class code quirk

commit d1541dc9 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: 63c44080 ("PCI: Add quirk for setting valid class for TI816X Endpoint")
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: Hemant Pedanekar <hemantp@ti.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent bcb7c15e
...@@ -2859,12 +2859,15 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors); ...@@ -2859,12 +2859,15 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors);
static void fixup_ti816x_class(struct pci_dev *dev) static void fixup_ti816x_class(struct pci_dev *dev)
{ {
u32 class = dev->class;
/* TI 816x devices do not have class code set when in PCIe boot mode */ /* TI 816x devices do not have class code set when in PCIe boot mode */
dev_info(&dev->dev, "Setting PCI class for 816x PCIe device\n"); dev->class = PCI_CLASS_MULTIMEDIA_VIDEO << 8;
dev->class = PCI_CLASS_MULTIMEDIA_VIDEO; dev_info(&dev->dev, "PCI class overridden (%#08x -> %#08x)\n",
class, dev->class);
} }
DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_TI, 0xb800, DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_TI, 0xb800,
PCI_CLASS_NOT_DEFINED, 0, fixup_ti816x_class); PCI_CLASS_NOT_DEFINED, 0, fixup_ti816x_class);
/* Some PCIe devices do not work reliably with the claimed maximum /* Some PCIe devices do not work reliably with the claimed maximum
* payload size supported. * payload size supported.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment