[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/7] usb: add short-packet handling to usb-storage driver
From: |
Paul Zimmerman |
Subject: |
[PATCH v3 5/7] usb: add short-packet handling to usb-storage driver |
Date: |
Mon, 20 Apr 2020 18:45:49 -0700 |
The dwc-hsotg (dwc2) USB host depends on a short packet to
indicate the end of an IN transfer. The usb-storage driver
currently doesn't provide this, so fix it.
I have tested this change rather extensively using a PC
emulation with xhci, ehci, and uhci controllers, and have
not observed any regressions.
Signed-off-by: Paul Zimmerman <address@hidden>
---
hw/usb/dev-storage.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 5c4b57b06b..ae3c550042 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -229,6 +229,9 @@ static void usb_msd_copy_data(MSDState *s, USBPacket *p)
usb_packet_copy(p, scsi_req_get_buf(s->req) + s->scsi_off, len);
s->scsi_len -= len;
s->scsi_off += len;
+ if (len > s->data_len) {
+ len = s->data_len;
+ }
s->data_len -= len;
if (s->scsi_len == 0 || s->data_len == 0) {
scsi_req_continue(s->req);
@@ -303,6 +306,9 @@ static void usb_msd_command_complete(SCSIRequest *req,
uint32_t status, size_t r
if (s->data_len) {
int len = (p->iov.size - p->actual_length);
usb_packet_skip(p, len);
+ if (len > s->data_len) {
+ len = s->data_len;
+ }
s->data_len -= len;
}
if (s->data_len == 0) {
@@ -469,6 +475,9 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket
*p)
int 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;
@@ -528,13 +537,17 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket
*p)
int 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) {
+ if (p->actual_length < p->iov.size && (p->short_not_ok ||
+ s->scsi_len >= p->ep->max_packet_size)) {
DPRINTF("Deferring packet %p [wait data-in]\n", p);
s->packet = p;
p->status = USB_RET_ASYNC;
--
2.17.1
- [PATCH v3 0/7] dwc-hsotg (aka dwc2) USB host controller emulation, Paul Zimmerman, 2020/04/20
- [PATCH v3 1/7] raspi: add BCM2835 SOC MPHI emulation, Paul Zimmerman, 2020/04/20
- [PATCH v3 2/7] dwc-hsotg (dwc2) USB host controller register definitions, Paul Zimmerman, 2020/04/20
- [PATCH v3 3/7] dwc-hsotg (dwc2) USB host controller state definitions, Paul Zimmerman, 2020/04/20
- [PATCH v3 4/7] dwc-hsotg (dwc2) USB host controller emulation, Paul Zimmerman, 2020/04/20
- [PATCH v3 5/7] usb: add short-packet handling to usb-storage driver,
Paul Zimmerman <=
- [PATCH v3 6/7] wire in the dwc-hsotg (dwc2) USB host controller emulation, Paul Zimmerman, 2020/04/20
- [PATCH v3 7/7] raspi2 acceptance test: add test for dwc-hsotg (dwc2) USB host, Paul Zimmerman, 2020/04/20
- Re: [PATCH v3 0/7] dwc-hsotg (aka dwc2) USB host controller emulation, no-reply, 2020/04/20
- Re: [PATCH v3 0/7] dwc-hsotg (aka dwc2) USB host controller emulation, no-reply, 2020/04/20