OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

usbnet: Report link-up via interrupt endpoint in CDC-ECM mode 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
Message-Id: <20220906183053.3625472-5-mcb30@ipxe.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Michael Brown 2022-09-06 19:30:53 +01:00 committed by Gerd Hoffmann
parent 2423ee2338
commit f3def4dd42
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/usb/dev-network.c
View File

@ -91,6 +91,8 @@ enum usbstring_idx {
#define USB_CDC_SET_ETHERNET_PACKET_FILTER 0x43 #define USB_CDC_SET_ETHERNET_PACKET_FILTER 0x43
#define USB_CDC_GET_ETHERNET_STATISTIC 0x44 #define USB_CDC_GET_ETHERNET_STATISTIC 0x44
#define USB_CDC_NETWORK_CONNECTION 0x00
#define LOG2_STATUS_INTERVAL_MSEC 5 /* 1 << 5 == 32 msec */ #define LOG2_STATUS_INTERVAL_MSEC 5 /* 1 << 5 == 32 msec */
#define STATUS_BYTECOUNT 16 /* 8 byte header + data */ #define STATUS_BYTECOUNT 16 /* 8 byte header + data */
@ -640,6 +642,8 @@ struct USBNetState {
uint16_t filter; uint16_t filter;
uint32_t vendorid; uint32_t vendorid;
uint16_t connection;
unsigned int out_ptr; unsigned int out_ptr;
uint8_t out_buf[2048]; uint8_t out_buf[2048];
@ -1140,19 +1144,29 @@ static void usb_net_handle_control(USBDevice *dev, USBPacket *p,
static void usb_net_handle_statusin(USBNetState *s, USBPacket *p) static void usb_net_handle_statusin(USBNetState *s, USBPacket *p)
{ {
le32 buf[2]; le32 rbuf[2];
uint16_t ebuf[4];
if (p->iov.size < 8) { if (p->iov.size < 8) {
p->status = USB_RET_STALL; p->status = USB_RET_STALL;
return; return;
} }
buf[0] = cpu_to_le32(1); if (is_rndis(s)) {
buf[1] = cpu_to_le32(0); rbuf[0] = cpu_to_le32(1);
usb_packet_copy(p, buf, 8); rbuf[1] = cpu_to_le32(0);
usb_packet_copy(p, rbuf, 8);
if (!s->rndis_resp.tqh_first) { if (!s->rndis_resp.tqh_first) {
p->status = USB_RET_NAK; p->status = USB_RET_NAK;
} }
} else {
ebuf[0] =
cpu_to_be16(ClassInterfaceRequest | USB_CDC_NETWORK_CONNECTION);
ebuf[1] = cpu_to_le16(s->connection);
ebuf[2] = cpu_to_le16(1);
ebuf[3] = cpu_to_le16(0);
usb_packet_copy(p, ebuf, 8);
}
#ifdef TRAFFIC_DEBUG #ifdef TRAFFIC_DEBUG
fprintf(stderr, "usbnet: interrupt poll len %zu return %d", fprintf(stderr, "usbnet: interrupt poll len %zu return %d",
@ -1366,6 +1380,7 @@ static void usb_net_realize(USBDevice *dev, Error **errp)
s->media_state = 0; /* NDIS_MEDIA_STATE_CONNECTED */; s->media_state = 0; /* NDIS_MEDIA_STATE_CONNECTED */;
s->filter = 0; s->filter = 0;
s->vendorid = 0x1234; s->vendorid = 0x1234;
s->connection = 1; /* Connected */
s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1); s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
s->bulk_in = usb_ep_get(dev, USB_TOKEN_IN, 2); s->bulk_in = usb_ep_get(dev, USB_TOKEN_IN, 2);