diff mbox

Add PCI ID and quirk for Intersil/Techwell TW686[4589] AV capture cards.

Message ID 20150619221359.GN7710@google.com (mailing list archive)
State New, archived
Delegated to: Bjorn Helgaas
Headers show

Commit Message

Bjorn Helgaas June 19, 2015, 10:13 p.m. UTC 
On Fri, Jun 19, 2015 at 10:00:15AM +0200, Krzysztof Ha?asa wrote:
> Intersil/Techwell TW686[4589]-based video capture cards have an empty
> (zero) class code. Fix it.
> 
> Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl>

Applied to pci/misc for v4.2, with minor tweak as below to use
PCI_CLASS_MULTIMEDIA_OTHER instead of a bare number.  Let me know
if you see any issues with this.  Thanks!


commit c1aa4f19cb8f7974126f2da74a35ae4ca1e60017
Author: Krzysztof =?utf-8?Q?Ha=C5=82asa?= <khalasa@piap.pl>
Date:   Fri Jun 19 10:00:15 2015 +0200

    PCI: Add quirk for Intersil/Techwell TW686[4589] AV capture cards
    
    Intersil/Techwell TW686[4589]-based video capture cards have an empty
    (zero) class code.  Fix it.
    
    Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>


> 
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -3662,6 +3662,26 @@ DECLARE_PCI_FIXUP_HEADER(0x1283, 0x8892, quirk_use_pcie_bridge_dma_alias);
>  DECLARE_PCI_FIXUP_HEADER(0x8086, 0x244e, quirk_use_pcie_bridge_dma_alias);
>  
>  /*
> + * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
> + * class code. Fix it.
> + */
> +
> +static void quirk_tw686x_class(struct pci_dev *pdev)
> +{
> +	/* Use "Multimedia controller" class */
> +	pdev->class = 0x048001;
> +	dev_info(&pdev->dev, "TW686x PCI class workaround enabled\n");
> +}
> +DECLARE_PCI_FIXUP_CLASS_EARLY(0x1797, 0x6864, PCI_CLASS_NOT_DEFINED, 0,
> +			      quirk_tw686x_class);
> +DECLARE_PCI_FIXUP_CLASS_EARLY(0x1797, 0x6865, PCI_CLASS_NOT_DEFINED, 0,
> +			      quirk_tw686x_class);
> +DECLARE_PCI_FIXUP_CLASS_EARLY(0x1797, 0x6868, PCI_CLASS_NOT_DEFINED, 0,
> +			      quirk_tw686x_class);
> +DECLARE_PCI_FIXUP_CLASS_EARLY(0x1797, 0x6869, PCI_CLASS_NOT_DEFINED, 0,
> +			      quirk_tw686x_class);
> +
> +/*
>   * AMD has indicated that the devices below do not support peer-to-peer
>   * in any system where they are found in the southbridge with an AMD
>   * IOMMU in the system.  Multifunction devices that do not support
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in

Comments

Krzysztof Hałasa June 22, 2015, 5:35 a.m. UTC | #1 
Bjorn Helgaas <bhelgaas@google.com> writes:

>> Intersil/Techwell TW686[4589]-based video capture cards have an empty
>> (zero) class code. Fix it.
>> 
> Applied to pci/misc for v4.2, with minor tweak as below to use
> PCI_CLASS_MULTIMEDIA_OTHER instead of a bare number.  Let me know
> if you see any issues with this.  Thanks!

Can't see any, thanks a lot.
diff mbox

Patch

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 54fa458..cbe0351 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3671,6 +3671,28 @@  DECLARE_PCI_FIXUP_HEADER(0x1283, 0x8892, quirk_use_pcie_bridge_dma_alias);
 DECLARE_PCI_FIXUP_HEADER(0x8086, 0x244e, quirk_use_pcie_bridge_dma_alias);
 
 /*
+ * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
+ * class code.  Fix it.
+ */
+static void quirk_tw686x_class(struct pci_dev *pdev)
+{
+	u32 class = pdev->class;
+
+	/* Use "Multimedia controller" class */
+	pdev->class = (PCI_CLASS_MULTIMEDIA_OTHER << 8) | 0x01;
+	dev_info(&pdev->dev, "TW686x PCI class overridden (%#08x -> %#08x)\n",
+		 class, pdev->class);
+}
+DECLARE_PCI_FIXUP_CLASS_EARLY(0x1797, 0x6864, PCI_CLASS_NOT_DEFINED, 0,
+			      quirk_tw686x_class);
+DECLARE_PCI_FIXUP_CLASS_EARLY(0x1797, 0x6865, PCI_CLASS_NOT_DEFINED, 0,
+			      quirk_tw686x_class);
+DECLARE_PCI_FIXUP_CLASS_EARLY(0x1797, 0x6868, PCI_CLASS_NOT_DEFINED, 0,
+			      quirk_tw686x_class);
+DECLARE_PCI_FIXUP_CLASS_EARLY(0x1797, 0x6869, PCI_CLASS_NOT_DEFINED, 0,
+			      quirk_tw686x_class);
+
+/*
  * AMD has indicated that the devices below do not support peer-to-peer
  * in any system where they are found in the southbridge with an AMD
  * IOMMU in the system.  Multifunction devices that do not support