[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/24] usbnet: Report link-up via interrupt endpoint in CDC-ECM mo
From: |
Gerd Hoffmann |
Subject: |
[PULL 19/24] usbnet: Report link-up via interrupt endpoint in CDC-ECM mode |
Date: |
Tue, 27 Sep 2022 10:19:07 +0200 |
From: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Message-Id: <20220906183053.3625472-5-mcb30@ipxe.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/dev-network.c | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 9d83974ec9f0..ac1adca54355 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -91,6 +91,8 @@ enum usbstring_idx {
#define USB_CDC_SET_ETHERNET_PACKET_FILTER 0x43
#define USB_CDC_GET_ETHERNET_STATISTIC 0x44
+#define USB_CDC_NETWORK_CONNECTION 0x00
+
#define LOG2_STATUS_INTERVAL_MSEC 5 /* 1 << 5 == 32 msec */
#define STATUS_BYTECOUNT 16 /* 8 byte header + data */
@@ -640,6 +642,8 @@ struct USBNetState {
uint16_t filter;
uint32_t vendorid;
+ uint16_t connection;
+
unsigned int out_ptr;
uint8_t out_buf[2048];
@@ -1140,18 +1144,28 @@ static void usb_net_handle_control(USBDevice *dev,
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) {
p->status = USB_RET_STALL;
return;
}
- buf[0] = cpu_to_le32(1);
- buf[1] = cpu_to_le32(0);
- usb_packet_copy(p, buf, 8);
- if (!s->rndis_resp.tqh_first) {
- p->status = USB_RET_NAK;
+ if (is_rndis(s)) {
+ rbuf[0] = cpu_to_le32(1);
+ rbuf[1] = cpu_to_le32(0);
+ usb_packet_copy(p, rbuf, 8);
+ if (!s->rndis_resp.tqh_first) {
+ 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
@@ -1366,6 +1380,7 @@ static void usb_net_realize(USBDevice *dev, Error **errp)
s->media_state = 0; /* NDIS_MEDIA_STATE_CONNECTED */;
s->filter = 0;
s->vendorid = 0x1234;
+ s->connection = 1; /* Connected */
s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
s->bulk_in = usb_ep_get(dev, USB_TOKEN_IN, 2);
--
2.37.3
- [PULL 03/24] Revert "main-loop: Disable block backend global state assertion on Cocoa", (continued)
- [PULL 03/24] Revert "main-loop: Disable block backend global state assertion on Cocoa", Gerd Hoffmann, 2022/09/27
- [PULL 02/24] ui/cocoa: Run qemu_init in the main thread, Gerd Hoffmann, 2022/09/27
- [PULL 06/24] ui/clipboard: fix serial priority, Gerd Hoffmann, 2022/09/27
- [PULL 11/24] hw/usb/hcd-xhci: Check whether DMA accesses fail, Gerd Hoffmann, 2022/09/27
- [PULL 04/24] meson: Allow to enable gtk and sdl while cocoa is enabled, Gerd Hoffmann, 2022/09/27
- [PULL 16/24] usbnet: Add missing usb_wakeup() call in usbnet_receive(), Gerd Hoffmann, 2022/09/27
- [PULL 14/24] usb/msd: add usb_msd_fatal_error() and fix guest-triggerable assert, Gerd Hoffmann, 2022/09/27
- [PULL 15/24] hcd-xhci: drop operation with secondary stream arrays enabled, Gerd Hoffmann, 2022/09/27
- [PULL 12/24] hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero, Gerd Hoffmann, 2022/09/27
- [PULL 13/24] usb/msd: move usb_msd_packet_complete(), Gerd Hoffmann, 2022/09/27
- [PULL 19/24] usbnet: Report link-up via interrupt endpoint in CDC-ECM mode,
Gerd Hoffmann <=
- [PULL 18/24] usbnet: Detect short packets as sent by the xHCI controller, Gerd Hoffmann, 2022/09/27
- [PULL 17/24] usbnet: Accept mandatory USB_CDC_SET_ETHERNET_PACKET_FILTER request, Gerd Hoffmann, 2022/09/27
- [PULL 24/24] virtio-gpu: update scanout if there is any area covered by the rect, Gerd Hoffmann, 2022/09/27
- [PULL 21/24] Revert "audio: Log context for audio bug", Gerd Hoffmann, 2022/09/27
- [PULL 20/24] audio: Add sndio backend, Gerd Hoffmann, 2022/09/27
- [PULL 22/24] audio: remove abort() in audio_bug(), Gerd Hoffmann, 2022/09/27
- [PULL 23/24] hw/display/ati_2d: Fix buffer overflow in ati_2d_blt (CVE-2021-3638), Gerd Hoffmann, 2022/09/27
- Re: [PULL 00/24] Kraxel 20220927 patches, Stefan Hajnoczi, 2022/09/27