firewire: ohci: fix regression with VIA VT6315, disable MSI
PATCH 1/2 firewire: ohci: fix regression with VIA VT6315, disable MSI
"VIA Technologies, Inc. VT6315 Series Firewire Controller [1106:3403]" does not generate any interrupts if Message Signaled Interrupts were enabled. This is a regression since kernel 2.6.36 in which MSI support was added to firewire-ohci. Hence blacklist MSI on all VIA controllers.
--- drivers/firewire/ohci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/firewire/ohci.c +2 -1
@@ -262,7 +262,8 @@ static const struct { {PCI_VENDOR_ID_AL, PCI_ANY_ID, QUIRK_CYCLE_TIMER}, {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, QUIRK_NO_MSI}, {PCI_VENDOR_ID_NEC, PCI_ANY_ID, QUIRK_CYCLE_TIMER}, - {PCI_VENDOR_ID_VIA, PCI_ANY_ID, QUIRK_CYCLE_TIMER}, + {PCI_VENDOR_ID_VIA, PCI_ANY_ID, QUIRK_CYCLE_TIMER | + QUIRK_NO_MSI}, {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, QUIRK_CYCLE_TIMER}, {PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_FW, QUIRK_BE_HEADERS}, };
Signature · 3 lines
Stefan Richter -=====-==-=- ==-- --=== http://arcgraph.de/sr/
PATCH 1/2 firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI
Agere FW643 rev 06, listed as "11c1:5901 (rev 06) (prog-if 10 [OHCI])", produced SBP-2 I/O errors since kernel 2.6.36. Disabling MSI fixes it.
Since MSI work on Agere FW643-E (same vendor and device ID, but rev 07), introduce a device revision field into firewire-ohci's quirks list so that different quirks can be defined for older and newer revisions.
---
Jonathan, can you confirm that this changed blacklist setup works for you? You need to apply patch 1/2 first to get patch 2/2 to apply without editing.
drivers/firewire/ohci.c | 49 ++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 15 deletions(-)
drivers/firewire/ohci.c +34 -15
@@ -242,6 +242,8 @@ static inline struct fw_ohci *fw_ohci(ststatic char ohci_driver_name[] =KBUILD_MODNAME ; +#define PCI_VENDOR_ID_AGERE PCI_VENDOR_ID_ATT +#define PCI_DEVICE_ID_FW643 0x5901#define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380#define PCI_DEVICE_ID_TI_TSB12LV22 0x8009
@@ -253,19 +255,34 @@ static char ohci_driver_name[] = KBUILD_/* In case of multiple matches in ohci_quirks[], only the first one is used. */ static const struct { -unsigned short vendor, device, flags; +unsigned short vendor, device, revision, flags; } ohci_quirks[] = { - {PCI_VENDOR_ID_TI ,PCI_DEVICE_ID_TI_TSB12LV22 ,QUIRK_CYCLE_TIMER | -QUIRK_RESET_PACKET | -QUIRK_NO_1394A }, - {PCI_VENDOR_ID_TI ,PCI_ANY_ID ,QUIRK_RESET_PACKET }, - {PCI_VENDOR_ID_AL ,PCI_ANY_ID ,QUIRK_CYCLE_TIMER }, - {PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB38X_FW ,QUIRK_NO_MSI }, - {PCI_VENDOR_ID_NEC ,PCI_ANY_ID ,QUIRK_CYCLE_TIMER }, - {PCI_VENDOR_ID_VIA ,PCI_ANY_ID ,QUIRK_CYCLE_TIMER | -QUIRK_NO_MSI }, - {PCI_VENDOR_ID_RICOH ,PCI_ANY_ID ,QUIRK_CYCLE_TIMER }, - {PCI_VENDOR_ID_APPLE ,PCI_DEVICE_ID_APPLE_UNI_N_FW ,QUIRK_BE_HEADERS }, + {PCI_VENDOR_ID_AGERE ,PCI_DEVICE_ID_FW643 ,6 , +QUIRK_NO_MSI }, + + {PCI_VENDOR_ID_AL ,PCI_ANY_ID ,PCI_ANY_ID , +QUIRK_CYCLE_TIMER }, + + {PCI_VENDOR_ID_APPLE ,PCI_DEVICE_ID_APPLE_UNI_N_FW ,PCI_ANY_ID , +QUIRK_BE_HEADERS }, + + {PCI_VENDOR_ID_JMICRON ,PCI_DEVICE_ID_JMICRON_JMB38X_FW ,PCI_ANY_ID , +QUIRK_NO_MSI }, + + {PCI_VENDOR_ID_NEC ,PCI_ANY_ID ,PCI_ANY_ID , +QUIRK_CYCLE_TIMER }, + + {PCI_VENDOR_ID_RICOH ,PCI_ANY_ID ,PCI_ANY_ID , +QUIRK_CYCLE_TIMER }, + + {PCI_VENDOR_ID_TI ,PCI_DEVICE_ID_TI_TSB12LV22 ,PCI_ANY_ID , +QUIRK_CYCLE_TIMER |QUIRK_RESET_PACKET |QUIRK_NO_1394A }, + + {PCI_VENDOR_ID_TI ,PCI_ANY_ID ,PCI_ANY_ID , +QUIRK_RESET_PACKET }, + + {PCI_VENDOR_ID_VIA ,PCI_ANY_ID ,PCI_ANY_ID , +QUIRK_CYCLE_TIMER |QUIRK_NO_MSI }, };/* This overrides anything that was found in ohci_quirks[]. */
@@ -2931,9 +2948,11 @@ static int __devinit pci_probe(struct pc }for (i =0 ; i <ARRAY_SIZE (ohci_quirks); i++) -if (ohci_quirks[i].vendor == dev->vendor && - (ohci_quirks[i].device == dev->device || - ohci_quirks[i].device == (unsigned short )PCI_ANY_ID )) { +if ((ohci_quirks[i].vendor == dev->vendor) && + (ohci_quirks[i].device == (unsigned short )PCI_ANY_ID || + ohci_quirks[i].device == dev->device) && + (ohci_quirks[i].revision == (unsigned short )PCI_ANY_ID || + ohci_quirks[i].revision >= dev->revision)) { ohci->quirks = ohci_quirks[i].flags;break ; }
Signature · 3 lines
Stefan Richter -=====-==-=- ==-- --=== http://arcgraph.de/sr/