[kernel] pci_set_mwi depends upon CONFIG_HAVE_PCI_SET_MWI

[openwrt.git] / target / linux / generic-2.6 / files / crypto / ocf / hifn / hifn7751.c

diff --git a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751.c b/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751.c
index 6459f35..e7fd5bb 100644 (file)
--- a/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751.c
+++ b/target/linux/generic-2.6/files/crypto/ocf/hifn/hifn7751.c
@@ -98,6 +98,10 @@ int hifn_maxbatch = 1;
 module_param(hifn_maxbatch, int, 0644);
 MODULE_PARM_DESC(hifn_maxbatch, "max ops to batch w/o interrupt");
 
+int hifn_cache_linesize = 0x10;
+module_param(hifn_cache_linesize, int, 0444);
+MODULE_PARM_DESC(hifn_cache_linesize, "PCI config cache line size");
+
 #ifdef MODULE_PARM
 char *hifn_pllconfig = NULL;
 MODULE_PARM(hifn_pllconfig, "s");
@@ -430,8 +434,10 @@ hifn_probe(struct pci_dev *dev, const struct pci_device_id *ent)
        if (pci_enable_device(dev) < 0)
                return(-ENODEV);
 
+#ifdef CONFIG_HAVE_PCI_SET_MWI
        if (pci_set_mwi(dev))
                return(-ENODEV);
+#endif
 
        if (!dev->irq) {
                printk("hifn: found device with no IRQ assigned. check BIOS settings!");
@@ -865,6 +871,8 @@ hifn_set_retry(struct hifn_softc *sc)
        /* NB: RETRY only responds to 8-bit reads/writes */
        pci_write_config_byte(sc->sc_pcidev, HIFN_RETRY_TIMEOUT, 0);
        pci_write_config_dword(sc->sc_pcidev, HIFN_TRDY_TIMEOUT, 0);
+       /* piggy back the cache line setting here */
+       pci_write_config_byte(sc->sc_pcidev, PCI_CACHE_LINE_SIZE, hifn_cache_linesize);
 }
 
 /*
@@ -2966,5 +2974,5 @@ module_init(hifn_init);
 module_exit(hifn_exit);
 
 MODULE_LICENSE("BSD");
-MODULE_AUTHOR("David McCullough <david_mccullough@securecomputing.com>");
+MODULE_AUTHOR("David McCullough <david_mccullough@mcafee.com>");
 MODULE_DESCRIPTION("OCF driver for hifn PCI crypto devices");