tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
firewire fixes post v3.3-rc1
Add workarounds table entries for hardware bugs in
- FireWire part of Sound Blaster Audigy cards,
- Ricoh PCIe 1394 controllers.
Without these, several protocols, e.g. AV/C, do not work on the
Audigy, and the Ricoh PCIe controllers wouldn't work at all.
This does not concern the older Ricoh PCI controllers.
* tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: ohci: disable MSI on Ricoh controllers
firewire: ohci: add reset packet quirk for SB Audigy
+5
-1
+5
-1
drivers/firewire/ohci.c
+5
-1
drivers/firewire/ohci.c
···
263
263
static char ohci_driver_name[] = KBUILD_MODNAME;
264
264
265
265
#define PCI_DEVICE_ID_AGERE_FW643 0x5901
266
+
#define PCI_DEVICE_ID_CREATIVE_SB1394 0x4001
266
267
#define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380
267
268
#define PCI_DEVICE_ID_TI_TSB12LV22 0x8009
268
269
#define PCI_DEVICE_ID_TI_TSB12LV26 0x8020
···
290
289
{PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_AGERE_FW643, 6,
291
290
QUIRK_NO_MSI},
292
291
292
+
{PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_SB1394, PCI_ANY_ID,
293
+
QUIRK_RESET_PACKET},
294
+
293
295
{PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, PCI_ANY_ID,
294
296
QUIRK_NO_MSI},
295
297
···
303
299
QUIRK_NO_MSI},
304
300
305
301
{PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID,
306
-
QUIRK_CYCLE_TIMER},
302
+
QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},
307
303
308
304
{PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TSB12LV22, PCI_ANY_ID,
309
305
QUIRK_CYCLE_TIMER | QUIRK_RESET_PACKET | QUIRK_NO_1394A},