Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21081886 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Greg Kroah-Hartman
Browse files

scsi: Revert "scsi: core: map PQ=1, PDT=other values to SCSI_SCAN_TARGET_PRESENT" 

[ Upstream commit 15600159bcc6abbeae6b33a849bef90dca28b78f ]

This reverts commit 948e922f.

Not all targets that return PQ=1 and PDT=0 should be ignored. While
the SCSI spec is vague in this department, there appears to be a
critical mass of devices which rely on devices being accessible with
this combination of reported values.

Fixes: 948e922f ("scsi: core: map PQ=1, PDT=other values to SCSI_SCAN_TARGET_PRESENT")
Link: https://lore.kernel.org/r/yq1lelrleqr.fsf@ca-mkp.ca.oracle.com


Acked-by: default avatarBart Van Assche <bvanassche@acm.org>
Acked-by: default avatarMartin Wilck <mwilck@suse.com>
Acked-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 14be8b0c

drivers/scsi/scsi_scan.c

+3 −4
Original line number Diff line number Diff line
@@ -1130,8 +1130,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget, 
	 * that no LUN is present, so don't add sdev in these cases.

	 * Two specific examples are:

	 * 1) NetApp targets: return PQ=1, PDT=0x1f

	 * 2) IBM/2145 targets: return PQ=1, PDT=0

	 * 3) USB UFI: returns PDT=0x1f, with the PQ bits being "reserved"

	 * 2) USB UFI: returns PDT=0x1f, with the PQ bits being "reserved"

	 *    in the UFI 1.0 spec (we cannot rely on reserved bits).

	 *

	 * References:
@@ -1145,8 +1144,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget, 
	 * PDT=00h Direct-access device (floppy)

	 * PDT=1Fh none (no FDD connected to the requested logical unit)

	 */

	if (((result[0] >> 5) == 1 ||

	    (starget->pdt_1f_for_no_lun && (result[0] & 0x1f) == 0x1f)) &&

	if (((result[0] >> 5) == 1 || starget->pdt_1f_for_no_lun) &&

	    (result[0] & 0x1f) == 0x1f &&

	    !scsi_is_wlun(lun)) {

		SCSI_LOG_SCAN_BUS(3, sdev_printk(KERN_INFO, sdev,

					"scsi scan: peripheral device type"