usb/msd: Permit relaxed ordering of IN packets
PATCH v2 1/10 usb/msd: Split in and out packet handling
In reply to Nicholas PigginSplit in and out packet handling int otheir own functions, to make them a bit more managable.
--- hw/usb/dev-storage.c | 266 +++++++++++++++++++++++-------------------- 1 file changed, 145 insertions(+), 121 deletions(-)
hw/usb/dev-storage.c +145 -121
@@ -395,158 +395,182 @@ static void usb_msd_cancel_io(USBDevice *dev, USBPacket *p) } } -static void usb_msd_handle_data (USBDevice *dev,USBPacket *p) +static void usb_msd_handle_data_out (USBDevice *dev,USBPacket *p) {MSDState *s = (MSDState *)dev;uint32_t tag;struct usb_msd_cbw cbw; -uint8_t devep = p->ep->nr;SCSIDevice *scsi_dev;int len; -if (s->needs_reset) { - p->status =USB_RET_STALL ; -return ; - } +switch (s->mode) { +case USB_MSDM_CBW : +if (p->iov.size !=31 ) { +error_report ("usb-msd: Bad CBW size" ); + goto fail; + } +usb_packet_copy (p, &cbw,31 ); +if (le32_to_cpu (cbw.sig) !=0x43425355 ) { +error_report ("usb-msd: Bad signature %08x" , +le32_to_cpu (cbw.sig)); + goto fail; + } + scsi_dev =scsi_device_find (&s->bus,0 ,0 , cbw.lun); +if (scsi_dev ==NULL ) { +error_report ("usb-msd: Bad LUN %d" , cbw.lun); + goto fail; + } + tag =le32_to_cpu (cbw.tag); + s->data_len =le32_to_cpu (cbw.data_len); +if (s->data_len ==0 ) { + s->mode =USB_MSDM_CSW ; + }else if (cbw.flags &0x80 ) { + s->mode =USB_MSDM_DATAIN ; + }else { + s->mode =USB_MSDM_DATAOUT ; + } +trace_usb_msd_cmd_submit (cbw.lun, tag, cbw.flags, + cbw.cmd_len, s->data_len); +assert (le32_to_cpu (s->csw.residue) ==0 ); + s->scsi_len =0 ; + s->req =scsi_req_new (scsi_dev, tag, cbw.lun, + cbw.cmd, cbw.cmd_len,NULL ); +if (s->commandlog) { +scsi_req_print (s->req); + } + len =scsi_req_enqueue (s->req); +if (len) { +scsi_req_continue (s->req); + } +break ; -switch (p->pid) { -case USB_TOKEN_OUT : -if (devep !=2 ) +case USB_MSDM_DATAOUT : +trace_usb_msd_data_out (p->iov.size, s->data_len); +if (p->iov.size > s->data_len) { goto fail; + } -switch (s->mode) { -case USB_MSDM_CBW : -if (p->iov.size !=31 ) { -error_report ("usb-msd: Bad CBW size" ); - goto fail; - } -usb_packet_copy (p, &cbw,31 ); -if (le32_to_cpu (cbw.sig) !=0x43425355 ) { -error_report ("usb-msd: Bad signature %08x" , -le32_to_cpu (cbw.sig)); - goto fail; - } - scsi_dev =scsi_device_find (&s->bus,0 ,0 , cbw.lun); -if (scsi_dev ==NULL ) { -error_report ("usb-msd: Bad LUN %d" , cbw.lun); - goto fail; - } - tag =le32_to_cpu (cbw.tag); - s->data_len =le32_to_cpu (cbw.data_len); -if (s->data_len ==0 ) { - s->mode =USB_MSDM_CSW ; - }else if (cbw.flags &0x80 ) { - s->mode =USB_MSDM_DATAIN ; - }else { - s->mode =USB_MSDM_DATAOUT ; - } -trace_usb_msd_cmd_submit (cbw.lun, tag, cbw.flags, - cbw.cmd_len, s->data_len); -assert (le32_to_cpu (s->csw.residue) ==0 ); - s->scsi_len =0 ; - s->req =scsi_req_new (scsi_dev, tag, cbw.lun, cbw.cmd, cbw.cmd_len,NULL ); -if (s->commandlog) { -scsi_req_print (s->req); - } - len =scsi_req_enqueue (s->req); +if (s->scsi_len) { +usb_msd_copy_data (s, p); + } +if (le32_to_cpu (s->csw.residue)) { + len = p->iov.size - p->actual_length;if (len) { -scsi_req_continue (s->req); +usb_packet_skip (p, len); +if (len > s->data_len) { + len = s->data_len; + } + s->data_len -= len; +if (s->data_len ==0 ) { + s->mode =USB_MSDM_CSW ; + } } -break ; + } +if (p->actual_length < p->iov.size) { +trace_usb_msd_packet_async (); + s->packet = p; + p->status =USB_RET_ASYNC ; + } +break ; -case USB_MSDM_DATAOUT : -trace_usb_msd_data_out (p->iov.size, s->data_len); -if (p->iov.size > s->data_len) { - goto fail; - } +default : + goto fail; + } +return ; -if (s->scsi_len) { -usb_msd_copy_data (s, p); - } -if (le32_to_cpu (s->csw.residue)) { - len = p->iov.size - p->actual_length; -if (len) { -usb_packet_skip (p, len); -if (len > s->data_len) { - len = s->data_len; - } - s->data_len -= len; -if (s->data_len ==0 ) { - s->mode =USB_MSDM_CSW ; - } - } - } -if (p->actual_length < p->iov.size) { -trace_usb_msd_packet_async (); - s->packet = p; - p->status =USB_RET_ASYNC ; - } -break ; +fail: + p->status =USB_RET_STALL ; +} -default : +static void usb_msd_handle_data_in (USBDevice *dev,USBPacket *p) +{ +MSDState *s = (MSDState *)dev; +int len; + +switch (s->mode) { +case USB_MSDM_DATAOUT : +if (s->data_len !=0 || p->iov.size <13 ) { goto fail; } +/* Waiting for SCSI write to complete. */ +trace_usb_msd_packet_async (); + s->packet = p; + p->status =USB_RET_ASYNC ;break ; -case USB_TOKEN_IN : -if (devep !=1 ) +case USB_MSDM_CSW : +if (p->iov.size <13 ) { goto fail; + } -switch (s->mode) { -case USB_MSDM_DATAOUT : -if (s->data_len !=0 || p->iov.size <13 ) { - goto fail; - } -/* Waiting for SCSI write to complete. */ +if (s->req) { +/* still in flight */ trace_usb_msd_packet_async (); s->packet = p; p->status =USB_RET_ASYNC ; -break ; + }else { +usb_msd_send_status (s, p); + s->mode =USB_MSDM_CBW ; + } +break ; -case USB_MSDM_CSW : -if (p->iov.size <13 ) { - goto fail; +case USB_MSDM_DATAIN : +trace_usb_msd_data_in (p->iov.size, s->data_len, s->scsi_len); +if (s->scsi_len) { +usb_msd_copy_data (s, p); + } +if (le32_to_cpu (s->csw.residue)) { + len = p->iov.size - p->actual_length; +if (len) { +usb_packet_skip (p, len); +if (len > s->data_len) { + len = s->data_len; + } + s->data_len -= len; +if (s->data_len ==0 ) { + s->mode =USB_MSDM_CSW ; + } } + } +if (p->actual_length < p->iov.size && s->mode ==USB_MSDM_DATAIN ) { +trace_usb_msd_packet_async (); + s->packet = p; + p->status =USB_RET_ASYNC ; + } +break ; -if (s->req) { -/* still in flight */ -trace_usb_msd_packet_async (); - s->packet = p; - p->status =USB_RET_ASYNC ; - }else { -usb_msd_send_status (s, p); - s->mode =USB_MSDM_CBW ; - } -break ; +default : + goto fail; + } +return ; -case USB_MSDM_DATAIN : -trace_usb_msd_data_in (p->iov.size, s->data_len, s->scsi_len); -if (s->scsi_len) { -usb_msd_copy_data (s, p); - } -if (le32_to_cpu (s->csw.residue)) { - len = p->iov.size - p->actual_length; -if (len) { -usb_packet_skip (p, len); -if (len > s->data_len) { - len = s->data_len; - } - s->data_len -= len; -if (s->data_len ==0 ) { - s->mode =USB_MSDM_CSW ; - } - } - } -if (p->actual_length < p->iov.size && s->mode ==USB_MSDM_DATAIN ) { -trace_usb_msd_packet_async (); - s->packet = p; - p->status =USB_RET_ASYNC ; - } -break ; +fail: + p->status =USB_RET_STALL ; +} + +static void usb_msd_handle_data (USBDevice *dev,USBPacket *p) +{ +MSDState *s = (MSDState *)dev; +uint8_t devep = p->ep->nr; -default : +if (s->needs_reset) { + p->status =USB_RET_STALL ; +return ; + } + +switch (p->pid) { +case USB_TOKEN_OUT : +if (devep !=2 ) { + goto fail; + } +usb_msd_handle_data_out (dev, p); +break ; + +case USB_TOKEN_IN : +if (devep !=1 ) { goto fail; } +usb_msd_handle_data_in (dev, p);break ;default :
Signature · 1 line
2.47.1
v2 cover usb/msd: Permit relaxed ordering of IN packets
This series ultimately permits relaxed ordering of USB mass-storage packets from the host, as allowed by the usbmassbulk 1.0 spec, but not usually seen in drivers. AIX drivers do require this ordering.
Since v1:
https://lore.kernel.org/qemu-devel/[email protected]/
- Rebased on upstream with one patch from the series merged.
- Fixed a few build warnings on 32-bit hosts.
Thanks,
Nick
Nicholas Piggin (10):
usb/msd: Split in and out packet handling usb/msd: Ensure packet structure layout is correct usb/msd: Improved handling of mass storage reset usb/msd: Improve packet validation error logging usb/msd: Allow CBW packet size greater than 31 usb/msd: Split async packet tracking into data and csw usb/msd: Add some additional assertions
usb/msd: Rename mode to cbw_state, and tweak names usb/msd: Permit a DATA-IN or CSW packet before CBW packet usb/msd: Add more tracing
include/hw/usb/msd.h | 18 +- hw/usb/dev-storage.c | 510 ++++++++++++++++++++++++++++--------------- hw/usb/trace-events | 9 +- 3 files changed, 357 insertions(+), 180 deletions(-)
Signature · 1 line
2.47.1
PATCH v2 6/10 usb/msd: Split async packet tracking into data and csw
The async packet handling logic has places that infer whether the async packet is data or CSW, based on context. This is not wrong, it just makes the logic easier to follow if they are categorised when they are accepted.
--- include/hw/usb/msd.h | 5 +- hw/usb/dev-storage.c | 121 +++++++++++++++++++++++++++---------------- 2 files changed, 79 insertions(+), 47 deletions(-)
include/hw/usb/msd.h +4 -1
@@ -33,8 +33,11 @@ struct MSDState {struct usb_msd_csw csw;SCSIRequest *req;SCSIBus bus; +/* For async completion. */ -USBPacket *packet; +USBPacket *data_packet; +USBPacket *csw_in_packet; +/* usb-storage only */ BlockConf conf;bool removable;
hw/usb/dev-storage.c +75 -46
207 lines not on this page · raw message
Signature · 1 line
2.47.1
PATCH v2 3/10 usb/msd: Improved handling of mass storage reset
In reply to Nicholas PigginThe mass storage reset request handling does not reset in-flight SCSI requests or USB MSD packets. Implement this by calling the device reset handler which should take care of everything.
--- hw/usb/dev-storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/dev-storage.c +1 -1
@@ -359,7 +359,7 @@ static void usb_msd_handle_control(USBDevice *dev, USBPacket *p,/* Class specific requests. */ case ClassInterfaceOutRequest | MassStorageReset:/* Reset state ready for the next CBW. */ - s->mode =USB_MSDM_CBW ; +usb_msd_handle_reset (dev);break ;case ClassInterfaceRequest | GetMaxLun: maxlun =0 ;
Signature · 1 line
2.47.1
PATCH v2 8/10 usb/msd: Rename mode to cbw_state, and tweak names
In reply to Nicholas PigginThis reflects a little better what it does, particularly with a subsequent change to relax the order packets are seen in. This field is not the general state of the MSD state machine, rather it follows packets that are completed as part of a CBW command.
The difference is a bit subtle, so for a concrete example, the next change will permit the host to send a CSW packet before it sends the associated CBW packet. In that case the CSW packet will be tracked and the MSD state machine will move, but this mode / cbw_state field would remain unchanged (in the "expecting CBW" state), until the CBW packet arrives.
--- include/hw/usb/msd.h | 12 +++++------ hw/usb/dev-storage.c | 50 +++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 30 deletions(-)
include/hw/usb/msd.h +6 -6
@@ -10,11 +10,11 @@#include "hw/usb.h" #include "hw/scsi/scsi.h" -enum USBMSDMode { -USB_MSDM_CBW ,/* Command Block. */ -USB_MSDM_DATAOUT ,/* Transfer data to device. */ -USB_MSDM_DATAIN ,/* Transfer data from device. */ -USB_MSDM_CSW /* Command Status. */ +enum USBMSDCBWState { +USB_MSD_CBW_NONE ,/* Ready, waiting for CBW packet. */ +USB_MSD_CBW_DATAOUT ,/* Expecting DATA-OUT (to device) packet */ +USB_MSD_CBW_DATAIN ,/* Expecting DATA-IN (from device) packet */ +USB_MSD_CBW_CSW /* No more data, expecting CSW packet. */ };struct QEMU_PACKED usb_msd_csw {
@@ -26,7 +26,7 @@ struct QEMU_PACKED usb_msd_csw {struct MSDState {USBDevice dev; -enum USBMSDMode mode; +enum USBMSDCBWState cbw_state;uint32_t scsi_off;uint32_t scsi_len;uint32_t data_len;
hw/usb/dev-storage.c +26 -24
155 lines not on this page · raw message
Signature · 1 line
2.47.1
PATCH v2 4/10 usb/msd: Improve packet validation error logging
In reply to Nicholas PigginErrors in incoming USB MSD packet format or context would typically be guest software errors. Log these under guest errors.
--- hw/usb/dev-storage.c | 53 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 11 deletions(-)
hw/usb/dev-storage.c +42 -11
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/log.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/config-file.h"
@@ -395,6 +396,36 @@ static void usb_msd_cancel_io(USBDevice *dev, USBPacket *p) } } +static bool try_get_valid_cbw (USBPacket *p,struct usb_msd_cbw *cbw) +{ +uint32_t sig; + +if (p->iov.size !=31 ) { +qemu_log_mask (LOG_GUEST_ERROR ,"usb-msd: Bad CBW size %zu\n" , + p->iov.size); +return false; + } +usb_packet_copy (p, cbw,31 ); + sig =le32_to_cpu (cbw->sig); +if (sig !=0x43425355 ) { +qemu_log_mask (LOG_GUEST_ERROR ,"usb-msd: Bad CBW signature 0x%08x\n" , + sig); +return false; + } + +return true; +} + +static bool check_valid_csw (USBPacket *p) +{ +if (p->iov.size <13 ) { +qemu_log_mask (LOG_GUEST_ERROR ,"usb-msd: Bad CSW size %zu\n" , + p->iov.size); +return false; + } +return true; +} +static void usb_msd_handle_data_out (USBDevice *dev,USBPacket *p) {MSDState *s = (MSDState *)dev;
@@ -405,19 +436,13 @@ static void usb_msd_handle_data_out(USBDevice *dev, USBPacket *p)switch (s->mode) {case USB_MSDM_CBW : -if (p->iov.size !=31 ) { -error_report ("usb-msd: Bad CBW size" ); - goto fail; - } -usb_packet_copy (p, &cbw,31 ); -if (le32_to_cpu (cbw.sig) !=0x43425355 ) { -error_report ("usb-msd: Bad signature %08x" , -le32_to_cpu (cbw.sig)); +if (!try_get_valid_cbw (p, &cbw)) { goto fail; } scsi_dev =scsi_device_find (&s->bus,0 ,0 , cbw.lun);if (scsi_dev ==NULL ) { -error_report ("usb-msd: Bad LUN %d" , cbw.lun); +qemu_log_mask (LOG_GUEST_ERROR ,"usb-msd: Bad CBW LUN %d\n" , + cbw.lun); goto fail; } tag =le32_to_cpu (cbw.tag);
@@ -489,9 +514,15 @@ static void usb_msd_handle_data_in(USBDevice *dev, USBPacket *p)switch (s->mode) {case USB_MSDM_DATAOUT : -if (s->data_len !=0 || p->iov.size <13 ) { +if (!check_valid_csw (p)) { + goto fail; + } +if (s->data_len !=0 ) { +qemu_log_mask (LOG_GUEST_ERROR ,"usb-msd: CSW received before " +"all data was sent\n" ); goto fail; } +/* Waiting for SCSI write to complete. */ trace_usb_msd_packet_async (); s->packet = p;
@@ -499,7 +530,7 @@ static void usb_msd_handle_data_in(USBDevice *dev, USBPacket *p)break ;case USB_MSDM_CSW : -if (p->iov.size <13 ) { +if (!check_valid_csw (p)) { goto fail; }
Signature · 1 line
2.47.1
PATCH v2 5/10 usb/msd: Allow CBW packet size greater than 31
In reply to Nicholas PigginThe CBW structure is 31 bytes, so CBW DATAOUT packets must be at least 31 bytes. QEMU enforces exactly 31 bytes, but this is inconsistent with how it handles CSW packets (where it allows greater than or equal to 13 bytes) despite wording in the spec[*] being similar for both packet
types: "shall end as a short packet with exactly 31 bytes transferred".
[*] USB MSD Bulk-Only Transport 1.0
For consistency, and on the principle of being tolerant in accepting input, relax the CBW size check.
Alternatively, both checks could be tightened to exact. Or a message could be printed warning of possible guest error if size is not exact, but still accept the packets.
--- hw/usb/dev-storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/dev-storage.c +1 -1
@@ -400,7 +400,7 @@ static bool try_get_valid_cbw(USBPacket *p, struct usb_msd_cbw *cbw) {uint32_t sig; -if (p->iov.size !=31 ) { +if (p->iov.size <31 ) {qemu_log_mask (LOG_GUEST_ERROR ,"usb-msd: Bad CBW size %zu\n" , p->iov.size);return false;
Signature · 1 line
2.47.1
PATCH v2 2/10 usb/msd: Ensure packet structure layout is correct
In reply to Nicholas PigginThese structures are hardware interfaces, ensure the layout is correct.
--- hw/usb/dev-storage.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
hw/usb/dev-storage.c +4 -1
@@ -27,7 +27,7 @@#define MassStorageReset 0xff#define GetMaxLun 0xfe -struct usb_msd_cbw { +struct QEMU_PACKED usb_msd_cbw {uint32_t sig;uint32_t tag;uint32_t data_len;
@@ -636,6 +636,9 @@ static const TypeInfo usb_storage_dev_type_info = {static void usb_msd_register_types (void ) { +qemu_build_assert (sizeof (struct usb_msd_cbw ) ==31 ); +qemu_build_assert (sizeof (struct usb_msd_csw ) ==13 ); +type_register_static (&usb_storage_dev_type_info); }
Signature · 1 line
2.47.1
PATCH v2 9/10 usb/msd: Permit a DATA-IN or CSW packet before CBW packet
In reply to Nicholas PigginThe USB MSD protocol has 3 packets that make up a command, and only one command may be active at any time.
- CBW to start a command (that contains a SCSI request).
- DATA (IN or OUT) to request data transfer between host and SCSI layer.
- CSW to return status and complete the command.
DATA is omitted if the request has no data.
The QEMU MSD model requires these packets to arrive in this order, CBW, DATA, CSW. This is the way the state machine is generally described in the MSD spec, and this must be how most USB stacks operate. Except AIX.
Universal Serial Bus Mass Storage Class Bulk-Only Transport 1.0 contains one word in one sentence that permits the relaxed ordering:
3.3 Host/Device Packet Transfer Order
The host shall send the CBW before the associated Data-Out, and the device shall send Data-In after the associated CBW and before the associated CSW. The host may request Data-In or CSW before sending the associated CBW.
Complicating matters, DATA-IN and CSW are both input packets that arrive in the same manner, so before a CBW it is impossible to determine if an IN packet is for data or CSW.
So permit "unusually-ordered" packets by tracking them as an "unknown" packet until the CBW arrives, then they are categorized into a DATA or CSW packet.
It is not clear whether the spec permits multiple such packets before the CBW. This implementation permits only one, which seems to be enough for AIX.
--- include/hw/usb/msd.h | 1 + hw/usb/dev-storage.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+)
include/hw/usb/msd.h +1 -0
@@ -37,6 +37,7 @@ struct MSDState {/* For async completion. */ USBPacket *data_packet;USBPacket *csw_in_packet; +USBPacket *unknown_in_packet;/* usb-storage only */ BlockConf conf;
hw/usb/dev-storage.c +43 -0
80 lines not on this page · raw message
Signature · 1 line
2.47.1
PATCH v2 7/10 usb/msd: Add some additional assertions
In reply to Nicholas PigginAdd more assertions to help verify internal logic.
--- hw/usb/dev-storage.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
hw/usb/dev-storage.c +19 -4
@@ -264,13 +264,24 @@ void usb_msd_transfer_data(SCSIRequest *req, uint32_t len)MSDState *s =DO_UPCAST (MSDState, dev.qdev, req->bus->qbus.parent);USBPacket *p = s->data_packet; -if ((s->mode ==USB_MSDM_DATAOUT ) != (req->cmd.mode ==SCSI_XFER_TO_DEV )) { -usb_msd_fatal_error (s); -return ; +if (s->mode ==USB_MSDM_DATAIN ) { +if (req->cmd.mode ==SCSI_XFER_TO_DEV ) { +usb_msd_fatal_error (s); +return ; + } + }else if (s->mode ==USB_MSDM_DATAOUT ) { +if (req->cmd.mode !=SCSI_XFER_TO_DEV ) { +usb_msd_fatal_error (s); +return ; + } + }else { +g_assert_not_reached (); } +assert (s->scsi_len ==0 ); s->scsi_len = len; s->scsi_off =0 ; +if (p) {usb_msd_copy_data (s, p); p = s->data_packet;
@@ -288,6 +299,10 @@ void usb_msd_command_complete(SCSIRequest *req, size_t resid)trace_usb_msd_cmd_complete (req->status, req->tag); +g_assert (s->req); +/* The CBW is what starts the SCSI request */ +g_assert (s->mode !=USB_MSDM_CBW ); + s->csw.sig =cpu_to_le32 (0x53425355 ); s->csw.tag =cpu_to_le32 (req->tag); s->csw.residue =cpu_to_le32 (s->data_len);
@@ -486,7 +501,7 @@ static void usb_msd_handle_data_out(USBDevice *dev, USBPacket *p)trace_usb_msd_cmd_submit (cbw.lun, tag, cbw.flags, cbw.cmd_len, s->data_len);assert (le32_to_cpu (s->csw.residue) ==0 ); - s->scsi_len =0 ; +assert (s->scsi_len ==0 ); s->req =scsi_req_new (scsi_dev, tag, cbw.lun, cbw.cmd, cbw.cmd_len,NULL );if (s->commandlog) {
Signature · 1 line
2.47.1
PATCH v2 10/10 usb/msd: Add more tracing
In reply to Nicholas PigginAdd tracing for more received packet types, cbw_state changes, and some more SCSI callbacks. These were useful in debugging relaxed packet ordering support.
--- hw/usb/dev-storage.c | 23 +++++++++++++++++++++-- hw/usb/trace-events | 9 ++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)
hw/usb/dev-storage.c +21 -2
@@ -187,7 +187,7 @@ static void usb_msd_data_packet_complete(MSDState *s, int status)* because another request may be issued before usb_packet_complete * returns. */ -trace_usb_msd_packet_complete (); +trace_usb_msd_data_packet_complete (); s->data_packet =NULL ; p->status = status;usb_packet_complete (&s->dev, p);
@@ -202,7 +202,7 @@ static void usb_msd_csw_packet_complete(MSDState *s, int status)* because another request may be issued before usb_packet_complete * returns. */ -trace_usb_msd_packet_complete (); +trace_usb_msd_csw_packet_complete (); s->csw_in_packet =NULL ; p->status = status;usb_packet_complete (&s->dev, p);
@@ -231,7 +231,11 @@ static void usb_msd_fatal_error(MSDState *s)static void usb_msd_copy_data (MSDState *s,USBPacket *p) {uint32_t len; + len = p->iov.size - p->actual_length; + +trace_usb_msd_copy_data (s->req->tag, len); +if (len > s->scsi_len) len = s->scsi_len;usb_packet_copy (p,scsi_req_get_buf (s->req) + s->scsi_off, len);
@@ -264,6 +268,8 @@ void usb_msd_transfer_data(SCSIRequest *req, uint32_t len)MSDState *s =DO_UPCAST (MSDState, dev.qdev, req->bus->qbus.parent);USBPacket *p = s->data_packet; +trace_usb_msd_transfer_data (req->tag, len); +if (s->cbw_state ==USB_MSD_CBW_DATAIN ) {if (req->cmd.mode ==SCSI_XFER_TO_DEV ) {usb_msd_fatal_error (s);
@@ -324,11 +330,13 @@ void usb_msd_command_complete(SCSIRequest *req, size_t resid) }if (s->data_len ==0 ) { s->cbw_state =USB_MSD_CBW_CSW ; +trace_usb_msd_cbw_state (s->cbw_state); }/* USB_RET_SUCCESS status clears previous ASYNC status */ usb_msd_data_packet_complete (s,USB_RET_SUCCESS ); }else if (s->data_len ==0 ) { s->cbw_state =USB_MSD_CBW_CSW ; +trace_usb_msd_cbw_state (s->cbw_state); }if (s->cbw_state ==USB_MSD_CBW_CSW ) {
@@ -336,6 +344,7 @@ void usb_msd_command_complete(SCSIRequest *req, size_t resid)if (p) {usb_msd_send_status (s, p); s->cbw_state =USB_MSD_CBW_NONE ; +trace_usb_msd_cbw_state (s->cbw_state);/* USB_RET_SUCCESS status clears previous ASYNC status */ usb_msd_csw_packet_complete (s,USB_RET_SUCCESS ); }
@@ -379,6 +388,7 @@ void usb_msd_handle_reset(USBDevice *dev)memset (&s->csw,0 ,sizeof (s->csw)); s->cbw_state =USB_MSD_CBW_NONE ; +trace_usb_msd_cbw_state (s->cbw_state); s->needs_reset = false; }
@@ -429,6 +439,8 @@ static void usb_msd_cancel_io(USBDevice *dev, USBPacket *p) {MSDState *s =USB_STORAGE_DEV (dev); +trace_usb_msd_cancel_io (); +if (p == s->data_packet) { s->data_packet =NULL ;if (s->req) {
@@ -516,6 +528,7 @@ static void usb_msd_handle_data_out(USBDevice *dev, USBPacket *p) }trace_usb_msd_cmd_submit (cbw.lun, tag, cbw.flags, cbw.cmd_len, s->data_len); +trace_usb_msd_cbw_state (s->cbw_state);assert (le32_to_cpu (s->csw.residue) ==0 );assert (s->scsi_len ==0 ); s->req = scsi_req_new(scsi_dev, tag, cbw.lun,
@@ -553,6 +566,7 @@ static void usb_msd_handle_data_out(USBDevice *dev, USBPacket *p) s->data_len -= len;if (s->data_len ==0 ) { s->cbw_state =USB_MSD_CBW_CSW ; +trace_usb_msd_cbw_state (s->cbw_state); } } }
@@ -579,6 +593,7 @@ static void usb_msd_handle_data_in(USBDevice *dev, USBPacket *p)switch (s->cbw_state) {case USB_MSD_CBW_NONE : +trace_usb_msd_unknown_in (p->iov.size);if (s->unknown_in_packet) {qemu_log_mask (LOG_GUEST_ERROR ,"usb-msd: second IN packet was" "received before CBW\n" );
@@ -590,6 +605,7 @@ static void usb_msd_handle_data_in(USBDevice *dev, USBPacket *p)break ;case USB_MSD_CBW_DATAOUT : +trace_usb_msd_csw_in ();if (s->unknown_in_packet) {error_report ("usb-msd: unknown_in_packet in DATAOUT state" ); goto fail;
@@ -610,6 +626,7 @@ static void usb_msd_handle_data_in(USBDevice *dev, USBPacket *p)break ;case USB_MSD_CBW_CSW : +trace_usb_msd_csw_in ();if (s->unknown_in_packet) {error_report ("usb-msd: unknown_in_packet in DATAOUT state" ); goto fail;
@@ -626,6 +643,7 @@ static void usb_msd_handle_data_in(USBDevice *dev, USBPacket *p) }else {usb_msd_send_status (s, p); s->cbw_state =USB_MSD_CBW_NONE ; +trace_usb_msd_cbw_state (s->cbw_state); }break ;
@@ -648,6 +666,7 @@ static void usb_msd_handle_data_in(USBDevice *dev, USBPacket *p) s->data_len -= len;if (s->data_len ==0 ) { s->cbw_state =USB_MSD_CBW_CSW ; +trace_usb_msd_cbw_state (s->cbw_state); } } }
hw/usb/trace-events +8 -1
@@ -264,12 +264,19 @@ usb_msd_maxlun(unsigned maxlun) "%d" usb_msd_send_status(unsigned status, unsigned tag, size_t size) "status %d, tag 0x%x, len %zd" usb_msd_data_in(unsigned packet, unsigned remaining, unsigned total) "%d/%d (scsi %d)" usb_msd_data_out(unsigned packet, unsigned remaining) "%d/%d" +usb_msd_unknown_in(unsigned packet) "%d" +usb_msd_csw_in(void) "" usb_msd_packet_async(void) "" -usb_msd_packet_complete(void) "" +usb_msd_data_packet_complete(void) "" +usb_msd_csw_packet_complete(void) "" usb_msd_cmd_submit(unsigned lun, unsigned tag, unsigned flags, unsigned len, unsigned data_len) "lun %u, tag 0x%x, flags 0x%08x, len %d, data-len %d" usb_msd_cmd_complete(unsigned status, unsigned tag) "status %d, tag 0x%x" +usb_msd_copy_data(unsigned tag, unsigned len) "tag 0x%x len %d" +usb_msd_transfer_data(unsigned tag, unsigned len) "tag 0x%x len %d" usb_msd_cmd_cancel(unsigned tag) "tag 0x%x" +usb_msd_cancel_io(void) "" usb_msd_fatal_error(void) "" +usb_msd_cbw_state(unsigned cbw_state) "cbw-state %d" # dev-uas.c usb_uas_reset(int addr) "dev %d"
Signature · 1 line
2.47.1
Re: [PATCH v2 02/10] usb/msd: Ensure packet structure layout is correct
In reply to Nicholas PigginQuoted 7 lines · Nicholas Piggin
These structures are hardware interfaces, ensure the layout is correct.
Signed-off-by Nicholas Piggin <[email protected]>--- hw/usb/dev-storage.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Re: [PATCH v2 03/10] usb/msd: Improved handling of mass storage reset
In reply to Nicholas PigginQuoted 8 lines · Nicholas Piggin
The mass storage reset request handling does not reset in-flight SCSI requests or USB MSD packets. Implement this by calling the device reset handler which should take care of everything.
Signed-off-by Nicholas Piggin <[email protected]>--- hw/usb/dev-storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PATCH v2 02/10] usb/msd: Ensure packet structure layout is correct
In reply to Nicholas PigginQuoted 22 lines · Nicholas Piggin
These structures are hardware interfaces, ensure the layout is correct.
Signed-off-by Nicholas Piggin <[email protected]>--- hw/usb/dev-storage.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)hw/usb/dev-storage.c +1
-1@@ -27,7 +27,7 @@#define MassStorageReset 0xff#define GetMaxLun 0xfe -struct usb_msd_cbw { +struct QEMU_PACKED usb_msd_cbw {uint32_t sig;uint32_t tag;uint32_t data_len;
hw/usb/dev-storage.c static const TypeInfo usb_storage_dev_type_info = { · line 640
Quoted 5 lines
hw/usb/dev-storage.c +2
-0@@ -636,6 +636,9 @@ static const TypeInfo usb_storage_dev_type_info = {static void usb_msd_register_types (void ) { +qemu_build_assert (sizeof (struct usb_msd_cbw ) ==31 ); +qemu_build_assert (sizeof (struct usb_msd_csw ) ==13 );
Can we add definitions for these 13/31 magic values? Then we can use them in try_get_valid_cbw().
Quoted 4 lines
hw/usb/dev-storage.c +1
-0+type_register_static (&usb_storage_dev_type_info); }
Re: [PATCH v2 02/10] usb/msd: Ensure packet structure layout is correct
Quoted 21 lines · Philippe Mathieu-Daudé
Quoted 20 lines · Nicholas Piggin
These structures are hardware interfaces, ensure the layout is correct.
Signed-off-by Nicholas Piggin <[email protected]>---
hw/usb/dev-storage.c| 5 ++++-1 file changed, 4 insertions(+), 1 deletion(-)hw/usb/dev-storage.c +1
-1@@ -27,7 +27,7 @@ #define MassStorageReset 0xff #define GetMaxLun 0xfe -struct usb_msd_cbw { +struct QEMU_PACKED usb_msd_cbw { uint32_t sig; uint32_t tag; uint32_t data_len;
Quoted 8 lines
hw/usb/dev-storage.c static const TypeInfo usb_storage_dev_type_info = { · line 639
Quoted 5 lines
hw/usb/dev-storage.c +2
-0@@ -636,6 +636,9 @@ static const TypeInfo usb_storage_dev_type_info = { static void usb_msd_register_types(void) { + qemu_build_assert(sizeof(struct usb_msd_cbw) == 31); + qemu_build_assert(sizeof(struct usb_msd_csw) == 13);Can we add definitions for these 13/31 magic values? Then we can use them in
try_get_valid_cbw().
Maybe USB_MSD_CBW/CSW_MIN_SIZE?
Quoted 5 lines
Quoted 4 lines
hw/usb/dev-storage.c +1
-0+ type_register_static(&usb_storage_dev_type_info); }
Re: [PATCH v2 07/10] usb/msd: Add some additional assertions
In reply to Nicholas PigginQuoted 12 lines · Nicholas Piggin
Add more assertions to help verify internal logic.
Signed-off-by Nicholas Piggin <[email protected]>--- hw/usb/dev-storage.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)hw/usb/dev-storage.c +0
-0
hw/usb/dev-storage.c void usb_msd_transfer_data(SCSIRequest *req, uint32_t len) · line 267
Quoted 7 lines
hw/usb/dev-storage.c +1
-3@@ -264,13 +264,24 @@ void usb_msd_transfer_data(SCSIRequest *req, uint32_t len)MSDState *s =DO_UPCAST (MSDState, dev.qdev, req->bus->qbus.parent);USBPacket *p = s->data_packet; -if ((s->mode ==USB_MSDM_DATAOUT ) != (req->cmd.mode ==SCSI_XFER_TO_DEV )) { -usb_msd_fatal_error (s); -return ; +if (s->mode ==USB_MSDM_DATAIN ) {
Or switch().
Quoted 32 lines
hw/usb/dev-storage.c +17
-0+if (req->cmd.mode ==SCSI_XFER_TO_DEV ) { +usb_msd_fatal_error (s); +return ; + } + }else if (s->mode ==USB_MSDM_DATAOUT ) { +if (req->cmd.mode !=SCSI_XFER_TO_DEV ) { +usb_msd_fatal_error (s); +return ; + } + }else { +g_assert_not_reached (); } +assert (s->scsi_len ==0 ); s->scsi_len = len; s->scsi_off =0 ; +if (p) {usb_msd_copy_data (s, p); p = s->data_packet;@@ -288,6 +299,10 @@ void usb_msd_command_complete(SCSIRequest *req, size_t resid)trace_usb_msd_cmd_complete (req->status, req->tag); +g_assert (s->req); +/* The CBW is what starts the SCSI request */ +g_assert (s->mode !=USB_MSDM_CBW ); + s->csw.sig =cpu_to_le32 (0x53425355 ); s->csw.tag =cpu_to_le32 (req->tag); s->csw.residue =cpu_to_le32 (s->data_len);
hw/usb/dev-storage.c static void usb_msd_handle_data_out(USBDevice *dev, USBPacket *p) · line 504
Quoted 5 lines
hw/usb/dev-storage.c +1
-1@@ -486,7 +501,7 @@ static void usb_msd_handle_data_out(USBDevice *dev, USBPacket *p)trace_usb_msd_cmd_submit (cbw.lun, tag, cbw.flags, cbw.cmd_len, s->data_len);assert (le32_to_cpu (s->csw.residue) ==0 ); - s->scsi_len =0 ; +assert (s->scsi_len ==0 );
Preferably having scsi_len changes in a distinct patch,
Quoted 3 lines
hw/usb/dev-storage.c +0
-0s->req =scsi_req_new (scsi_dev, tag, cbw.lun, cbw.cmd, cbw.cmd_len,NULL );if (s->commandlog) {
Re: [PATCH v2 08/10] usb/msd: Rename mode to cbw_state, and tweak names
In reply to Nicholas PigginQuoted 12 lines · Nicholas Piggin
This reflects a little better what it does, particularly with a subsequent change to relax the order packets are seen in. This field is not the general state of the MSD state machine, rather it follows packets that are completed as part of a CBW command.
The difference is a bit subtle, so for a concrete example, the next change will permit the host to send a CSW packet before it sends the associated CBW packet. In that case the CSW packet will be tracked and the MSD state machine will move, but this mode /
cbw_statefield would remain unchanged (in the "expecting CBW" state), until the CBW packet arrives.
Quoted 5 lines
Signed-off-by Nicholas Piggin <[email protected]>--- include/hw/usb/msd.h | 12 +++++------ hw/usb/dev-storage.c | 50 +++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 30 deletions(-)
Re: [PATCH v2 10/10] usb/msd: Add more tracing
In reply to Nicholas PigginQuoted 33 lines · Nicholas Piggin
Add tracing for more received packet types,
cbw_statechanges, and some more SCSI callbacks. These were useful in debugging relaxed packet ordering support.Signed-off-by Nicholas Piggin <[email protected]>--- hw/usb/dev-storage.c | 23 +++++++++++++++++++++-- hw/usb/trace-events | 9 ++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)static void usb_msd_copy_data(MSDState *s, USBPacket *p) { uint32_t len;hw/usb/dev-storage.c +6
-0+ len = p->iov.size - p->actual_length; + +trace_usb_msd_copy_data (s->req->tag, len); +if (len > s->scsi_len) len = s->scsi_len;usb_packet_copy (p,scsi_req_get_buf (s->req) + s->scsi_off, len);@@ -264,6 +268,8 @@ void usb_msd_transfer_data(SCSIRequest *req, uint32_t len)MSDState *s =DO_UPCAST (MSDState, dev.qdev, req->bus->qbus.parent);USBPacket *p = s->data_packet; +trace_usb_msd_transfer_data (req->tag, len); +if (s->cbw_state ==USB_MSD_CBW_DATAIN ) {if (req->cmd.mode ==SCSI_XFER_TO_DEV ) {usb_msd_fatal_error (s);@@ -324,11 +330,13 @@ void usb_msd_command_complete(SCSIRequest *req, size_t resid) }
hw/usb/dev-storage.c void usb_msd_command_complete(SCSIRequest *req, size_t resid) · line 340
Quoted 10 lines
hw/usb/dev-storage.c +2
-0if (s->data_len ==0 ) { s->cbw_state =USB_MSD_CBW_CSW ; +trace_usb_msd_cbw_state (s->cbw_state); }/* USB_RET_SUCCESS status clears previous ASYNC status */ usb_msd_data_packet_complete (s,USB_RET_SUCCESS ); }else if (s->data_len ==0 ) { s->cbw_state =USB_MSD_CBW_CSW ; +trace_usb_msd_cbw_state (s->cbw_state); }
Maybe helpful to log state transition?
void usb_msd_cbw_change_state(MSDState *s,
enum USBMSDCBWState cbw_state)
{
if (s->cbw_state != cbw_state) {
trace_usb_msd_cbw_state(s->cbw_state, cbw_state);
s->cbw_state = cbw_state;
}
}Otherwise,
Re: [PATCH v2 08/10] usb/msd: Rename mode to cbw_state, and tweak names
In reply to Nicholas PigginQuoted 23 lines · Nicholas Piggin
This reflects a little better what it does, particularly with a subsequent change to relax the order packets are seen in. This field is not the general state of the MSD state machine, rather it follows packets that are completed as part of a CBW command.
The difference is a bit subtle, so for a concrete example, the next change will permit the host to send a CSW packet before it sends the associated CBW packet. In that case the CSW packet will be tracked and the MSD state machine will move, but this mode /
cbw_statefield would remain unchanged (in the "expecting CBW" state), until the CBW packet arrives.Signed-off-by Nicholas Piggin <[email protected]>--- include/hw/usb/msd.h | 12 +++++------ hw/usb/dev-storage.c | 50 +++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 30 deletions(-)include/hw/usb/msd.h +0
-0
include/hw/usb/msd.h line 17
Quoted 8 lines
include/hw/usb/msd.h +0
-5@@ -10,11 +10,11 @@#include "hw/usb.h" #include "hw/scsi/scsi.h" -enum USBMSDMode { -USB_MSDM_CBW ,/* Command Block. */ -USB_MSDM_DATAOUT ,/* Transfer data to device. */ -USB_MSDM_DATAIN ,/* Transfer data from device. */ -USB_MSDM_CSW /* Command Status. */
Since modifying this, please add
typedef
include/hw/usb/msd.h
Quoted 6 lines
include/hw/usb/msd.h +5
-0+enum USBMSDCBWState { +USB_MSD_CBW_NONE ,/* Ready, waiting for CBW packet. */ +USB_MSD_CBW_DATAOUT ,/* Expecting DATA-OUT (to device) packet */ +USB_MSD_CBW_DATAIN ,/* Expecting DATA-IN (from device) packet */ +USB_MSD_CBW_CSW /* No more data, expecting CSW packet. */ }
USBMSDCBWState;
include/hw/usb/msd.h struct QEMU_PACKED usb_msd_csw { · line 29
Quoted 8 lines
include/hw/usb/msd.h +1
-1struct QEMU_PACKED usb_msd_csw {@@ -26,7 +26,7 @@ struct QEMU_PACKED usb_msd_csw {struct MSDState {USBDevice dev; -enum USBMSDMode mode; +enum USBMSDCBWState cbw_state;
USBMSDCBWState cbw_state;
Quoted 3 lines
include/hw/usb/msd.h +0
-0uint32_t scsi_off;uint32_t scsi_len;uint32_t data_len;
Re: [PATCH v2 02/10] usb/msd: Ensure packet structure layout is correct
In reply to Philippe Mathieu-DaudéQuoted 24 lines · Philippe Mathieu-Daudé
Quoted 23 lines · Nicholas Piggin
These structures are hardware interfaces, ensure the layout is correct.
Signed-off-by Nicholas Piggin <[email protected]>--- hw/usb/dev-storage.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)hw/usb/dev-storage.c +1
-1@@ -27,7 +27,7 @@#define MassStorageReset 0xff#define GetMaxLun 0xfe -struct usb_msd_cbw { +struct QEMU_PACKED usb_msd_cbw {uint32_t sig;uint32_t tag;uint32_t data_len;@@ -636,6 +636,9 @@ static const TypeInfo usb_storage_dev_type_info = {
Quoted 7 lines
hw/usb/dev-storage.c static const TypeInfo usb_storage_dev_type_info = { · line 640
Quoted 4 lines
hw/usb/dev-storage.c +2
-0static void usb_msd_register_types (void ) { +qemu_build_assert (sizeof (struct usb_msd_cbw ) ==31 ); +qemu_build_assert (sizeof (struct usb_msd_csw ) ==13 );Can we add definitions for these 13/31 magic values? Then we can use them in
try_get_valid_cbw().
Good idea, I've done something to improve them.
Thanks,
Nick
Re: [PATCH v2 10/10] usb/msd: Add more tracing
In reply to Philippe Mathieu-DaudéQuoted 47 lines · Philippe Mathieu-Daudé
Quoted 33 lines · Nicholas Piggin
Add tracing for more received packet types,
cbw_statechanges, and some more SCSI callbacks. These were useful in debugging relaxed packet ordering support.Signed-off-by Nicholas Piggin <[email protected]>--- hw/usb/dev-storage.c | 23 +++++++++++++++++++++-- hw/usb/trace-events | 9 ++++++++- 2 files changed, 29 insertions(+), 3 deletions(-)static void usb_msd_copy_data(MSDState *s, USBPacket *p) { uint32_t len;hw/usb/dev-storage.c +6
-0+ len = p->iov.size - p->actual_length; + +trace_usb_msd_copy_data (s->req->tag, len); +if (len > s->scsi_len) len = s->scsi_len;usb_packet_copy (p,scsi_req_get_buf (s->req) + s->scsi_off, len);@@ -264,6 +268,8 @@ void usb_msd_transfer_data(SCSIRequest *req, uint32_t len)MSDState *s =DO_UPCAST (MSDState, dev.qdev, req->bus->qbus.parent);USBPacket *p = s->data_packet; +trace_usb_msd_transfer_data (req->tag, len); +if (s->cbw_state ==USB_MSD_CBW_DATAIN ) {if (req->cmd.mode ==SCSI_XFER_TO_DEV ) {usb_msd_fatal_error (s);@@ -324,11 +330,13 @@ void usb_msd_command_complete(SCSIRequest *req, size_t resid) }hw/usb/dev-storage.c void usb_msd_command_complete(SCSIRequest *req, size_t resid) · line 340
Quoted 10 lines
hw/usb/dev-storage.c +2
-0if (s->data_len ==0 ) { s->cbw_state =USB_MSD_CBW_CSW ; +trace_usb_msd_cbw_state (s->cbw_state); }/* USB_RET_SUCCESS status clears previous ASYNC status */ usb_msd_data_packet_complete (s,USB_RET_SUCCESS ); }else if (s->data_len ==0 ) { s->cbw_state =USB_MSD_CBW_CSW ; +trace_usb_msd_cbw_state (s->cbw_state); }Maybe helpful to log state transition?
Quoted 8 lines
void usb_msd_cbw_change_state(MSDState *s,
enum USBMSDCBWState cbw_state)
{
if (s->cbw_state != cbw_state) {
trace_usb_msd_cbw_state(s->cbw_state, cbw_state);
s->cbw_state = cbw_state;
}
}Yeah that's not a bad idea. I added that. I made a few more tweaks and added some more trace points too, but nothing major.
Quoted 3 lines
Otherwise,
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Re: [PATCH v2 08/10] usb/msd: Rename mode to cbw_state, and tweak names
In reply to Philippe Mathieu-DaudéQuoted 35 lines · Philippe Mathieu-Daudé
Quoted 23 lines · Nicholas Piggin
This reflects a little better what it does, particularly with a subsequent change to relax the order packets are seen in. This field is not the general state of the MSD state machine, rather it follows packets that are completed as part of a CBW command.
The difference is a bit subtle, so for a concrete example, the next change will permit the host to send a CSW packet before it sends the associated CBW packet. In that case the CSW packet will be tracked and the MSD state machine will move, but this mode /
cbw_statefield would remain unchanged (in the "expecting CBW" state), until the CBW packet arrives.Signed-off-by Nicholas Piggin <[email protected]>--- include/hw/usb/msd.h | 12 +++++------ hw/usb/dev-storage.c | 50 +++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 30 deletions(-)include/hw/usb/msd.h +0
-0include/hw/usb/msd.h line 17
Quoted 8 lines
include/hw/usb/msd.h +0
-5@@ -10,11 +10,11 @@#include "hw/usb.h" #include "hw/scsi/scsi.h" -enum USBMSDMode { -USB_MSDM_CBW ,/* Command Block. */ -USB_MSDM_DATAOUT ,/* Transfer data to device. */ -USB_MSDM_DATAIN ,/* Transfer data from device. */ -USB_MSDM_CSW /* Command Status. */ Since modifying this, please add
Quoted 1 line
typedef
Done.
Thanks,
Nick
Quoted 24 lines
include/hw/usb/msd.h
Quoted 7 lines
include/hw/usb/msd.h +5
-0+enum USBMSDCBWState { +USB_MSD_CBW_NONE ,/* Ready, waiting for CBW packet. */ +USB_MSD_CBW_DATAOUT ,/* Expecting DATA-OUT (to device) packet */ +USB_MSD_CBW_DATAIN ,/* Expecting DATA-IN (from device) packet */ +USB_MSD_CBW_CSW /* No more data, expecting CSW packet. */ }USBMSDCBWState;include/hw/usb/msd.h struct QEMU_PACKED usb_msd_csw { · line 29
Quoted 8 lines
include/hw/usb/msd.h +1
-1struct QEMU_PACKED usb_msd_csw {@@ -26,7 +26,7 @@ struct QEMU_PACKED usb_msd_csw {struct MSDState {USBDevice dev; -enum USBMSDMode mode; +enum USBMSDCBWState cbw_state;USBMSDCBWState cbw_state;Quoted 3 lines
include/hw/usb/msd.h +0
-0uint32_t scsi_off;uint32_t scsi_len;uint32_t data_len;