PCI: Fix TI816X class code quirk (d1541dc9) · Commits · 戴 / test

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: ("PCI: Add quirk for setting valid class for TI816X Endpoint") Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com> CC: Hemant Pedanekar <hemantp@ti.com>

drivers/pci/quirks.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -2835,9 +2835,12 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors);

		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 */
		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",
		class, dev->class);
		}
		DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_TI, 0xb800,
		PCI_CLASS_NOT_DEFINED, 0, fixup_ti816x_class);

Admin message