[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/21] pc-bios/s390-ccw: Get list of supported VPD p
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH 05/21] pc-bios/s390-ccw: Get list of supported VPD pages |
Date: |
Fri, 19 May 2017 12:55:44 +0200 |
From: Eric Farman <address@hidden>
The "Supported Pages" Inquiry EVPD page is mandatory for all SCSI devices,
and is used as a gateway for what VPD pages the device actually supports.
Let's issue this Inquiry, and dump that list with the debug facility.
Signed-off-by: Eric Farman <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
pc-bios/s390-ccw/scsi.h | 10 ++++++++++
pc-bios/s390-ccw/virtio-scsi.c | 17 +++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/pc-bios/s390-ccw/scsi.h b/pc-bios/s390-ccw/scsi.h
index 83ffaef54e..803eff8ae3 100644
--- a/pc-bios/s390-ccw/scsi.h
+++ b/pc-bios/s390-ccw/scsi.h
@@ -28,9 +28,11 @@
/* SCSI Inquiry Types */
#define SCSI_INQUIRY_STANDARD 0x00U
+#define SCSI_INQUIRY_EVPD 0x01U
/* SCSI Inquiry Pages */
#define SCSI_INQUIRY_STANDARD_NONE 0x00U
+#define SCSI_INQUIRY_EVPD_SUPPORTED_PAGES 0x00U
union ScsiLun {
uint64_t v64; /* numeric shortcut */
@@ -77,6 +79,14 @@ struct ScsiInquiryStd {
} __attribute__((packed));
typedef struct ScsiInquiryStd ScsiInquiryStd;
+struct ScsiInquiryEvpdPages {
+ uint8_t peripheral_qdt; /* b0, use (b0 & 0x1f) to get SCSI_INQ_RDT */
+ uint8_t page_code; /* b1 */
+ uint16_t page_length; /* b2..b3 length = N-3 */
+ uint8_t byte[28]; /* b4..bN Supported EVPD pages (N=31 here) */
+} __attribute__((packed));
+typedef struct ScsiInquiryEvpdPages ScsiInquiryEvpdPages;
+
struct ScsiCdbInquiry {
uint8_t command; /* b0, == 0x12 */
uint8_t b1; /* b1, |= 0x01 (evpd) */
diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c
index 9d2e14cdf0..e34755c4d4 100644
--- a/pc-bios/s390-ccw/virtio-scsi.c
+++ b/pc-bios/s390-ccw/virtio-scsi.c
@@ -19,6 +19,7 @@ static VirtioScsiCmdReq req;
static VirtioScsiCmdResp resp;
static uint8_t scsi_inquiry_std_response[256];
+static ScsiInquiryEvpdPages scsi_inquiry_evpd_pages_response;
static inline void vs_assert(bool term, const char **msgs)
{
@@ -319,6 +320,8 @@ void virtio_scsi_setup(VDev *vdev)
int retry_test_unit_ready = 3;
uint8_t data[256];
uint32_t data_size = sizeof(data);
+ ScsiInquiryEvpdPages *evpd = &scsi_inquiry_evpd_pages_response;
+ int i;
vdev->scsi_device = &default_scsi_device;
virtio_scsi_locate_device(vdev);
@@ -363,6 +366,20 @@ void virtio_scsi_setup(VDev *vdev)
vdev->scsi_block_size = VIRTIO_ISO_BLOCK_SIZE;
}
+ if (!scsi_inquiry(vdev,
+ SCSI_INQUIRY_EVPD,
+ SCSI_INQUIRY_EVPD_SUPPORTED_PAGES,
+ evpd,
+ sizeof(*evpd))) {
+ virtio_scsi_verify_response(&resp,
"virtio-scsi:setup:supported_pages");
+ }
+
+ debug_print_int("EVPD length", evpd->page_length);
+
+ for (i = 0; i <= evpd->page_length; i++) {
+ debug_print_int("supported EVPD page", evpd->byte[i]);
+ }
+
if (!scsi_read_capacity(vdev, data, data_size)) {
virtio_scsi_verify_response(&resp, "virtio-scsi:setup:read_capacity");
}
--
2.13.0
- [Qemu-devel] [PATCH 00/21] s390x changes, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 02/21] pc-bios/s390-ccw: Move SCSI block factor to outer read, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 01/21] pc-bios/s390-ccw: Remove duplicate blk_factor adjustment, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 03/21] pc-bios/s390-ccw: Break up virtio-scsi read into multiples, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 04/21] pc-bios/s390-ccw: Refactor scsi_inquiry function, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 07/21] pc-bios/s390-ccw: Build a reasonable max_sectors limit, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 06/21] pc-bios/s390-ccw: Get Block Limits VPD device data, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 05/21] pc-bios/s390-ccw: Get list of supported VPD pages,
Cornelia Huck <=
- [Qemu-devel] [PATCH 11/21] s390x/css: realize css_sch_build_schib, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 12/21] s390x/css: realize css_create_sch, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 08/21] pc-bios/s390-ccw.img: rebuild image, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 10/21] s390x/css: add s390-squash-mcss machine option, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 09/21] linux-headers: update, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 14/21] vfio/ccw: vfio based subchannel passthrough driver, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 15/21] vfio/ccw: get io region info, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 13/21] s390x/css: device support for s390-ccw passthrough, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 17/21] s390x/css: introduce and realize ccw-request callback, Cornelia Huck, 2017/05/19
- [Qemu-devel] [PATCH 18/21] s390x/css: ccw translation infrastructure, Cornelia Huck, 2017/05/19