Re: PATCH: Stop megaraid trashing other i960 based devices

From: hch
Date: Sat May 22 2004 - 11:03:33 EST


On Sat, May 22, 2004 at 11:46:59AM -0400, Alan Cox wrote:
> --- drivers/scsi/megaraid.c~ 2004-05-22 16:34:01.976198176 +0100
> +++ drivers/scsi/megaraid.c 2004-05-22 16:38:58.176168936 +0100
> @@ -4609,6 +4609,21 @@
>
> pci_bus = pdev->bus->number;
> pci_dev_func = pdev->devfn;
> +
> + if(pdev->vendor == PCI_VENDOR_ID_INTEL) /* The megaraid3 stuff reports the id of the intel
> + part which is not remotely specific to the megaraid */
> + {
> + u16 magic;
> + /* Don't fall over the Compaq management cards using the same PCI identifier */
> + if(pdev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ &&
> + pdev->subsystem_device == 0xC000)
> + return -ENODEV;
> + /* Now check the magic signature byte */
> + pci_read_config_word(pdev, PCI_CONF_AMISIG, &magic);
> + if(magic != HBA_SIGNATURE_471 && magic != HBA_SIGNATURE)
> + return -ENODEV;
> + /* Ok it is probably a megaraid */
> + }

I think we should add all valid subvendor ids to the pci_id table instead.
Especially to not consude the hotplug package.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/