scsi: core: target: Add INQUIRY-related constants to scsi_common.h

Move three constants from target/target_core_base.h into
scsi/scsi_common.h. Add three new constants in the scsi_common.h header
file. This patch prepares for using these constants in the SCSI core.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Tested-by: Brian Bunker <brian@purestorage.com>
Link: https://patch.msgid.link/20260515205222.1754621-2-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/include/scsi/scsi_common.h b/include/scsi/scsi_common.h
index fb58715fac869b2b4cc8c01393fef7fc0137395c..00c8a16d3cd24bcd4f12a1807e55993ebf4977df 100644 (file)
--- a/include/scsi/scsi_common.h
+++ b/include/scsi/scsi_common.h
@@ -10,6 +10,14 @@
 #include <uapi/linux/pr.h>
 #include <scsi/scsi_proto.h>
 
+/* From the standard INQUIRY data description in SPC-6. */
+#define INQUIRY_VENDOR_OFFSET  8
+#define INQUIRY_VENDOR_LEN     8
+#define INQUIRY_MODEL_OFFSET   16
+#define INQUIRY_MODEL_LEN      16
+#define INQUIRY_REVISION_OFFSET        32
+#define INQUIRY_REVISION_LEN   4
+
 enum scsi_pr_type {
        SCSI_PR_WRITE_EXCLUSIVE                 = 0x01,
        SCSI_PR_EXCLUSIVE_ACCESS                = 0x03,

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 9a0e9f9e1ec4478d8d32c27318a0230ff2c1a9a5..002b0fc57587659004d3b746608fc3ce7b4743ce 100644 (file)
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -8,6 +8,7 @@
 #include <linux/percpu-refcount.h>
 #include <linux/semaphore.h>     /* struct semaphore */
 #include <linux/completion.h>
+#include <scsi/scsi_common.h>
 
 #define TARGET_CORE_VERSION            "v5.0"
 
@@ -46,10 +47,6 @@
 /* Used by transport_get_inquiry_vpd_device_ident() */
 #define INQUIRY_VPD_DEVICE_IDENTIFIER_LEN      254
 
-#define INQUIRY_VENDOR_LEN                     8
-#define INQUIRY_MODEL_LEN                      16
-#define INQUIRY_REVISION_LEN                   4
-
 /* Attempts before moving from SHORT to LONG */
 #define PYX_TRANSPORT_WINDOW_CLOSED_THRESHOLD  3
 #define PYX_TRANSPORT_WINDOW_CLOSED_WAIT_SHORT 3  /* In milliseconds */