[PATCH 4.4 02/75] scsi: Add QEMU CD-ROM to VPD Inquiry Blacklist

2016-06-22 Thread Greg Kroah-Hartman
4.4-stable review patch.  If anyone has any objections, please let me know.

--

From: Ewan D. Milne 

commit fbd83006e3e536fcb103228d2422ea63129ccb03 upstream.

Linux fails to boot as a guest with a QEMU CD-ROM:

[4.439488] ata2.00: ATAPI: QEMU CD-ROM, 0.8.2, max UDMA/100
[4.443649] ata2.00: configured for MWDMA2
[4.450267] scsi 1:0:0:0: CD-ROMQEMU QEMU CD-ROM  0.8. 
PQ: 0 ANSI: 5
[4.464317] ata2.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x6 frozen
[4.464319] ata2.00: BMDMA stat 0x5
[4.464339] ata2.00: cmd a0/01:00:00:00:01/00:00:00:00:00/a0 tag 0 dma 16640 
in
[4.464339]  Inquiry 12 01 00 00 ff 00res 
48/20:02:00:24:00/00:00:00:00:00/a0 Emask 0x2 (HSM violation)
[4.464341] ata2.00: status: { DRDY DRQ }
[4.465864] ata2: soft resetting link
[4.625971] ata2.00: configured for MWDMA2
[4.628290] ata2: EH complete
[4.646670] ata2.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x6 frozen
[4.646671] ata2.00: BMDMA stat 0x5
[4.646683] ata2.00: cmd a0/01:00:00:00:01/00:00:00:00:00/a0 tag 0 dma 16640 
in
[4.646683]  Inquiry 12 01 00 00 ff 00res 
48/20:02:00:24:00/00:00:00:00:00/a0 Emask 0x2 (HSM violation)
[4.646685] ata2.00: status: { DRDY DRQ }
[4.648193] ata2: soft resetting link

...

Fix this by suppressing VPD inquiry for this device.

Signed-off-by: Ewan D. Milne 
Reported-by: Jan Stancek 
Tested-by: Jan Stancek 
Reviewed-by: Johannes Thumshirn 
Signed-off-by: Martin K. Petersen 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/scsi/scsi_devinfo.c |1 +
 1 file changed, 1 insertion(+)

--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -227,6 +227,7 @@ static struct {
{"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
{"Promise", "VTrak E610f", NULL, BLIST_SPARSELUN | BLIST_NO_RSOC},
{"Promise", "", NULL, BLIST_SPARSELUN},
+   {"QEMU", "QEMU CD-ROM", NULL, BLIST_SKIP_VPD_PAGES},
{"QNAP", "iSCSI Storage", NULL, BLIST_MAX_1024},
{"SYNOLOGY", "iSCSI Storage", NULL, BLIST_MAX_1024},
{"QUANTUM", "XP34301", "1071", BLIST_NOTQ},




[PATCH 4.4 02/75] scsi: Add QEMU CD-ROM to VPD Inquiry Blacklist

2016-06-22 Thread Greg Kroah-Hartman
4.4-stable review patch.  If anyone has any objections, please let me know.

--

From: Ewan D. Milne 

commit fbd83006e3e536fcb103228d2422ea63129ccb03 upstream.

Linux fails to boot as a guest with a QEMU CD-ROM:

[4.439488] ata2.00: ATAPI: QEMU CD-ROM, 0.8.2, max UDMA/100
[4.443649] ata2.00: configured for MWDMA2
[4.450267] scsi 1:0:0:0: CD-ROMQEMU QEMU CD-ROM  0.8. 
PQ: 0 ANSI: 5
[4.464317] ata2.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x6 frozen
[4.464319] ata2.00: BMDMA stat 0x5
[4.464339] ata2.00: cmd a0/01:00:00:00:01/00:00:00:00:00/a0 tag 0 dma 16640 
in
[4.464339]  Inquiry 12 01 00 00 ff 00res 
48/20:02:00:24:00/00:00:00:00:00/a0 Emask 0x2 (HSM violation)
[4.464341] ata2.00: status: { DRDY DRQ }
[4.465864] ata2: soft resetting link
[4.625971] ata2.00: configured for MWDMA2
[4.628290] ata2: EH complete
[4.646670] ata2.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x6 frozen
[4.646671] ata2.00: BMDMA stat 0x5
[4.646683] ata2.00: cmd a0/01:00:00:00:01/00:00:00:00:00/a0 tag 0 dma 16640 
in
[4.646683]  Inquiry 12 01 00 00 ff 00res 
48/20:02:00:24:00/00:00:00:00:00/a0 Emask 0x2 (HSM violation)
[4.646685] ata2.00: status: { DRDY DRQ }
[4.648193] ata2: soft resetting link

...

Fix this by suppressing VPD inquiry for this device.

Signed-off-by: Ewan D. Milne 
Reported-by: Jan Stancek 
Tested-by: Jan Stancek 
Reviewed-by: Johannes Thumshirn 
Signed-off-by: Martin K. Petersen 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/scsi/scsi_devinfo.c |1 +
 1 file changed, 1 insertion(+)

--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -227,6 +227,7 @@ static struct {
{"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
{"Promise", "VTrak E610f", NULL, BLIST_SPARSELUN | BLIST_NO_RSOC},
{"Promise", "", NULL, BLIST_SPARSELUN},
+   {"QEMU", "QEMU CD-ROM", NULL, BLIST_SKIP_VPD_PAGES},
{"QNAP", "iSCSI Storage", NULL, BLIST_MAX_1024},
{"SYNOLOGY", "iSCSI Storage", NULL, BLIST_MAX_1024},
{"QUANTUM", "XP34301", "1071", BLIST_NOTQ},