diff --git a/debian/changelog b/debian/changelog index af534c9b9..0b2be64b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ linux (3.10.12-1) UNRELEASED; urgency=low [ Ben Hutchings ] * Revert "genl: Hold reference on correct module while netlink-dump." from 3.10.12 to avoid an ABI change + * mvsas: Recognise device/subsystem 9485/9485 as 88SE9485 -- Ben Hutchings Sat, 14 Sep 2013 19:58:07 +0100 diff --git a/debian/patches/features/all/mvsas-Recognise-device-subsystem-9485-9485-as-88SE94.patch b/debian/patches/features/all/mvsas-Recognise-device-subsystem-9485-9485-as-88SE94.patch new file mode 100644 index 000000000..af5e3662d --- /dev/null +++ b/debian/patches/features/all/mvsas-Recognise-device-subsystem-9485-9485-as-88SE94.patch @@ -0,0 +1,43 @@ +From: Ben Hutchings +Date: Mon, 16 Sep 2013 03:26:32 +0100 +Subject: mvsas: Recognise device/subsystem 9485/9485 as 88SE9485 +Forwarded: http://mid.gmane.org/1379298957.23881.10.camel@deadeye.wl.decadent.org.uk + +Matt Taggart reported that mvsas didn't bind to the Marvell +SAS controller on a Supermicro AOC-SAS2LP-MV8 board. + +lspci reports it as: + +01:00.0 RAID bus controller [0104]: Marvell Technology Group Ltd. Device [1b4b:9485] (rev 03) + Subsystem: Marvell Technology Group Ltd. Device [1b4b:9485] +[...] + +Add it to the device table as chip_9485. + +Reported-by: Matt Taggart +Tested-by: Matt Taggart +Signed-off-by: Ben Hutchings +--- + drivers/scsi/mvsas/mv_init.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c +index 7b7381d..83fa5f8 100644 +--- a/drivers/scsi/mvsas/mv_init.c ++++ b/drivers/scsi/mvsas/mv_init.c +@@ -729,6 +729,15 @@ static struct pci_device_id mvs_pci_table[] = { + .class_mask = 0, + .driver_data = chip_9485, + }, ++ { ++ .vendor = PCI_VENDOR_ID_MARVELL_EXT, ++ .device = 0x9485, ++ .subvendor = PCI_ANY_ID, ++ .subdevice = 0x9485, ++ .class = 0, ++ .class_mask = 0, ++ .driver_data = chip_9485, ++ }, + { PCI_VDEVICE(OCZ, 0x1021), chip_9485}, /* OCZ RevoDrive3 */ + { PCI_VDEVICE(OCZ, 0x1022), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */ + { PCI_VDEVICE(OCZ, 0x1040), chip_9485}, /* OCZ RevoDrive3/zDriveR4 (exact model unknown) */ diff --git a/debian/patches/series b/debian/patches/series index b032cd6d7..1d8a6aece 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -127,3 +127,4 @@ bugfix/all/HID-check-for-NULL-field-when-setting-values.patch # ABI stability debian/net-sched-avoid-abi-change-in-3.10.12.patch debian/revert-genl-hold-reference-on-correct-module.patch +features/all/mvsas-Recognise-device-subsystem-9485-9485-as-88SE94.patch