ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc-bios/s390-ccw: Get list of supported VPD pages 

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 <farman@linux.vnet.ibm.com>
Message-Id: <20170510155359.32727-6-farman@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Eric Farman 2017-05-10 17:53:56 +02:00 committed by Cornelia Huck
parent 9c12359c57
commit 8edfe85bef
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pc-bios/s390-ccw/scsi.h
View File

@ -28,9 +28,11 @@
/* SCSI Inquiry Types */ /* SCSI Inquiry Types */
#define SCSI_INQUIRY_STANDARD 0x00U #define SCSI_INQUIRY_STANDARD 0x00U
#define SCSI_INQUIRY_EVPD 0x01U
/* SCSI Inquiry Pages */ /* SCSI Inquiry Pages */
#define SCSI_INQUIRY_STANDARD_NONE 0x00U #define SCSI_INQUIRY_STANDARD_NONE 0x00U
#define SCSI_INQUIRY_EVPD_SUPPORTED_PAGES 0x00U
union ScsiLun { union ScsiLun {
uint64_t v64; /* numeric shortcut */ uint64_t v64; /* numeric shortcut */
@ -77,6 +79,14 @@ struct ScsiInquiryStd {
} __attribute__((packed)); } __attribute__((packed));
typedef struct ScsiInquiryStd ScsiInquiryStd; 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 { struct ScsiCdbInquiry {
uint8_t command; /* b0, == 0x12 */ uint8_t command; /* b0, == 0x12 */
uint8_t b1; /* b1, |= 0x01 (evpd) */ uint8_t b1; /* b1, |= 0x01 (evpd) */

17
pc-bios/s390-ccw/virtio-scsi.c
View File

@ -19,6 +19,7 @@ static VirtioScsiCmdReq req;
static VirtioScsiCmdResp resp; static VirtioScsiCmdResp resp;
static uint8_t scsi_inquiry_std_response[256]; 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) 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; int retry_test_unit_ready = 3;
uint8_t data[256]; uint8_t data[256];
uint32_t data_size = sizeof(data); uint32_t data_size = sizeof(data);
ScsiInquiryEvpdPages *evpd = &scsi_inquiry_evpd_pages_response;
int i;
vdev->scsi_device = &default_scsi_device; vdev->scsi_device = &default_scsi_device;
virtio_scsi_locate_device(vdev); virtio_scsi_locate_device(vdev);
@ -363,6 +366,20 @@ void virtio_scsi_setup(VDev *vdev)
vdev->scsi_block_size = VIRTIO_ISO_BLOCK_SIZE; 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)) { if (!scsi_read_capacity(vdev, data, data_size)) {
virtio_scsi_verify_response(&resp, "virtio-scsi:setup:read_capacity"); virtio_scsi_verify_response(&resp, "virtio-scsi:setup:read_capacity");
} }