From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
John Garry <john.garry@huawei.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 05/18] scsi: use real inquiry data when initialising devices
Date: Mon, 3 May 2021 17:03:20 +0200 [thread overview]
Message-ID: <20210503150333.130310-6-hare@suse.de> (raw)
In-Reply-To: <20210503150333.130310-1-hare@suse.de>
Use dummy inquiry data when initialising devices and not just
some 'nullnullnull' string.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/scsi_scan.c | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 9f1b7f3c650a..a50abba41ac1 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -81,7 +81,27 @@
#define SCSI_SCAN_TARGET_PRESENT 1
#define SCSI_SCAN_LUN_PRESENT 2
-static const char *scsi_null_device_strs = "nullnullnullnull";
+/*
+ * Dummy inquiry for virtual LUNs:
+ *
+ * standard INQUIRY: [qualifier indicates no connected LU]
+ * PQual=1 Device_type=31 RMB=0 LU_CONG=0 version=0x05 [SPC-3]
+ * [AERC=0] [TrmTsk=0] NormACA=0 HiSUP=0 Resp_data_format=2
+ * SCCS=0 ACC=0 TPGS=0 3PC=0 Protect=0 [BQue=0]
+ * EncServ=0 MultiP=0 [MChngr=0] [ACKREQQ=0] Addr16=0
+ * [RelAdr=0] WBus16=0 Sync=0 [Linked=0] [TranDis=0] CmdQue=0
+ * length=36 (0x24) Peripheral device type: no physical device on this lu
+ * Vendor identification: LINUX
+ * Product identification: VIRTUALLUN
+ * Product revision level: 1.0
+ */
+static const unsigned char scsi_null_inquiry[36] = {
+ 0x3f, 0x00, 0x05, 0x02, 0x1f, 0x00, 0x00, 0x00,
+ 0x4c, 0x49, 0x4e, 0x55, 0x58, 0x20, 0x20, 0x20,
+ 0x56, 0x49, 0x52, 0x54, 0x55, 0x41, 0x4c, 0x4c,
+ 0x55, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x31, 0x2e, 0x30, 0x20
+};
#define MAX_SCSI_LUNS 512
@@ -225,9 +245,10 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
if (!sdev)
goto out;
- sdev->vendor = scsi_null_device_strs;
- sdev->model = scsi_null_device_strs;
- sdev->rev = scsi_null_device_strs;
+ sdev->type = scsi_null_inquiry[0] & 0x1f;
+ sdev->vendor = scsi_null_inquiry + 8;
+ sdev->model = scsi_null_inquiry + 16;
+ sdev->rev = scsi_null_inquiry + 32;
sdev->host = shost;
sdev->queue_ramp_up_period = SCSI_DEFAULT_RAMP_UP_PERIOD;
sdev->id = starget->id;
@@ -254,11 +275,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
* slave_configure function */
sdev->max_device_blocked = SCSI_DEFAULT_DEVICE_BLOCKED;
- /*
- * Some low level driver could use device->type
- */
- sdev->type = -1;
-
/*
* Assume that the device will have handshaking problems,
* and then fix this field later if it turns out it
--
2.29.2
next prev parent reply other threads:[~2021-05-03 15:03 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 15:03 [PATCHv8 00/18] scsi: enabled reserved commands for LLDDs Hannes Reinecke
2021-05-03 15:03 ` [PATCH 01/18] fnic: kill 'exclude_id' argument to fnic_cleanup_io() Hannes Reinecke
2021-05-04 2:12 ` Bart Van Assche
2021-05-04 9:49 ` Christoph Hellwig
2021-05-03 15:03 ` [PATCH 02/18] fnic: use scsi_host_busy_iter() to traverse commands Hannes Reinecke
2021-05-04 9:50 ` Christoph Hellwig
2021-05-04 12:53 ` Hannes Reinecke
2021-05-03 15:03 ` [PATCH 03/18] scsi: add scsi_{get,put}_internal_cmd() helper Hannes Reinecke
2021-05-04 2:21 ` Bart Van Assche
2021-05-04 6:12 ` Hannes Reinecke
2021-06-23 10:57 ` John Garry
2021-06-23 13:48 ` Hannes Reinecke
2021-06-24 9:55 ` John Garry
2021-05-04 9:53 ` Christoph Hellwig
2021-05-04 12:54 ` Hannes Reinecke
2021-06-23 16:09 ` Bart Van Assche
2021-05-03 15:03 ` [PATCH 04/18] fnic: use internal commands Hannes Reinecke
2021-05-04 2:25 ` Bart Van Assche
2021-05-04 6:12 ` Hannes Reinecke
2021-05-03 15:03 ` Hannes Reinecke [this message]
2021-05-04 2:28 ` [PATCH 05/18] scsi: use real inquiry data when initialising devices Bart Van Assche
2021-05-04 9:55 ` Christoph Hellwig
2021-05-04 12:57 ` Hannes Reinecke
2021-05-03 15:03 ` [PATCH 06/18] scsi: Use dummy inquiry data for the host device Hannes Reinecke
2021-05-04 2:52 ` Bart Van Assche
2021-05-04 6:14 ` Hannes Reinecke
2021-05-03 15:03 ` [PATCH 07/18] scsi: revamp host device handling Hannes Reinecke
2021-05-04 3:06 ` Bart Van Assche
2021-05-04 6:15 ` Hannes Reinecke
2021-05-04 9:59 ` Christoph Hellwig
2021-05-04 13:10 ` Hannes Reinecke
2021-05-03 15:03 ` [PATCH 08/18] snic: use reserved commands Hannes Reinecke
2021-05-04 3:12 ` Bart Van Assche
2021-05-04 6:16 ` Hannes Reinecke
2021-05-03 15:03 ` [PATCH 09/18] snic: use tagset iter for traversing commands Hannes Reinecke
2021-05-04 9:59 ` Christoph Hellwig
2021-05-03 15:03 ` [PATCH 10/18] scsi: implement reserved command handling Hannes Reinecke
2021-05-04 3:20 ` Bart Van Assche
2021-05-04 6:17 ` Hannes Reinecke
2021-05-04 10:55 ` John Garry
2021-05-04 13:12 ` Hannes Reinecke
2021-05-04 16:59 ` Bart Van Assche
2021-05-04 18:09 ` Hannes Reinecke
2021-05-05 0:45 ` Bart Van Assche
2021-05-05 5:56 ` Hannes Reinecke
2021-05-03 15:03 ` [PATCH 11/18] hpsa: move hpsa_hba_inquiry after scsi_add_host() Hannes Reinecke
2021-05-03 15:03 ` [PATCH 12/18] hpsa: use reserved commands Hannes Reinecke
2021-05-03 15:03 ` [PATCH 13/18] hpsa: use scsi_host_busy_iter() to traverse outstanding commands Hannes Reinecke
2021-05-03 15:03 ` [PATCH 14/18] hpsa: drop refcount field from CommandList Hannes Reinecke
2021-05-03 15:03 ` [PATCH 15/18] aacraid: move scsi_add_host() Hannes Reinecke
2021-05-03 15:03 ` [PATCH 16/18] aacraid: store target id in host_scribble Hannes Reinecke
2021-05-04 3:22 ` Bart Van Assche
2021-05-04 6:18 ` Hannes Reinecke
2021-05-03 15:03 ` [PATCH 17/18] aacraid: use scsi_get_internal_cmd() Hannes Reinecke
2021-05-03 15:03 ` [PATCH 18/18] aacraid: use scsi_host_busy_iter() to traverse outstanding commands Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210503150333.130310-6-hare@suse.de \
--to=hare@suse.de \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=john.garry@huawei.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox