ipmi:pci: Blacklist a Realtek "IPMI" device

Realtek has some sort of "Virtual" IPMI device on the PCI bus as a
KCS controller, but whatever it is, it's not one.  Ignore it if seen.

Reported-by: Chris Chiu <chiu@endlessm.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Tested-by: Daniel Drake <drake@endlessm.com>

diff --git a/drivers/char/ipmi/ipmi_si_pci.c b/drivers/char/ipmi/ipmi_si_pci.c
index b1c055540b26074aab2457f1fa2209e83e432843..f54ca6869ed2c3f62d3c2d31daea3c5044642b9f 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_pci.c
+++ b/drivers/char/ipmi/ipmi_si_pci.c
@@ -62,12 +62,24 @@ static int ipmi_pci_probe_regspacing(struct si_sm_io *io)
        return DEFAULT_REGSPACING;
 }
 
+static struct pci_device_id ipmi_pci_blacklist[] = {
+       /*
+        * This is a "Virtual IPMI device", whatever that is.  It appears
+        * as a KCS device by the class, but it is not one.
+        */
+       { PCI_VDEVICE(REALTEK, 0x816c) },
+       { 0, }
+};
+
 static int ipmi_pci_probe(struct pci_dev *pdev,
                                    const struct pci_device_id *ent)
 {
        int rv;
        struct si_sm_io io;
 
+       if (pci_match_id(ipmi_pci_blacklist, pdev))
+               return -ENODEV;
+
        memset(&io, 0, sizeof(io));
        io.addr_source = SI_PCI;
        dev_info(&pdev->dev, "probing via PCI");