* [Qemu-devel] [PATCH v2 1/5] usb-hub: tweak feature names
2019-05-24 7:03 [Qemu-devel] [PATCH v2 0/5] usb-hub: cleanups, configurable port count, per-port power switching emulation Gerd Hoffmann
@ 2019-05-24 7:03 ` Gerd Hoffmann
2019-05-24 7:45 ` Philippe Mathieu-Daudé
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 2/5] usb-hub: make number of ports runtime-configurable Gerd Hoffmann
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Gerd Hoffmann @ 2019-05-24 7:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Add dashes, so they don't look like two separate things when printed.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/dev-hub.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 7e9339b8a83d..9b04b6a6ec2d 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -287,11 +287,11 @@ static const char *feature_name(int feature)
[PORT_POWER] = "power",
[PORT_LOWSPEED] = "lowspeed",
[PORT_HIGHSPEED] = "highspeed",
- [PORT_C_CONNECTION] = "change connection",
- [PORT_C_ENABLE] = "change enable",
- [PORT_C_SUSPEND] = "change suspend",
- [PORT_C_OVERCURRENT] = "change overcurrent",
- [PORT_C_RESET] = "change reset",
+ [PORT_C_CONNECTION] = "change-connection",
+ [PORT_C_ENABLE] = "change-enable",
+ [PORT_C_SUSPEND] = "change-suspend",
+ [PORT_C_OVERCURRENT] = "change-overcurrent",
+ [PORT_C_RESET] = "change-reset",
[PORT_TEST] = "test",
[PORT_INDICATOR] = "indicator",
};
--
2.18.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2 1/5] usb-hub: tweak feature names
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 1/5] usb-hub: tweak feature names Gerd Hoffmann
@ 2019-05-24 7:45 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-24 7:45 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel
On 5/24/19 9:03 AM, Gerd Hoffmann wrote:
> Add dashes, so they don't look like two separate things when printed.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> hw/usb/dev-hub.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
> index 7e9339b8a83d..9b04b6a6ec2d 100644
> --- a/hw/usb/dev-hub.c
> +++ b/hw/usb/dev-hub.c
> @@ -287,11 +287,11 @@ static const char *feature_name(int feature)
> [PORT_POWER] = "power",
> [PORT_LOWSPEED] = "lowspeed",
> [PORT_HIGHSPEED] = "highspeed",
> - [PORT_C_CONNECTION] = "change connection",
> - [PORT_C_ENABLE] = "change enable",
> - [PORT_C_SUSPEND] = "change suspend",
> - [PORT_C_OVERCURRENT] = "change overcurrent",
> - [PORT_C_RESET] = "change reset",
> + [PORT_C_CONNECTION] = "change-connection",
> + [PORT_C_ENABLE] = "change-enable",
> + [PORT_C_SUSPEND] = "change-suspend",
> + [PORT_C_OVERCURRENT] = "change-overcurrent",
> + [PORT_C_RESET] = "change-reset",
> [PORT_TEST] = "test",
> [PORT_INDICATOR] = "indicator",
> };
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH v2 2/5] usb-hub: make number of ports runtime-configurable
2019-05-24 7:03 [Qemu-devel] [PATCH v2 0/5] usb-hub: cleanups, configurable port count, per-port power switching emulation Gerd Hoffmann
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 1/5] usb-hub: tweak feature names Gerd Hoffmann
@ 2019-05-24 7:03 ` Gerd Hoffmann
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 3/5] usb-hub: add helpers to update port state Gerd Hoffmann
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2019-05-24 7:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Add num_ports property which allows configure the number of downstream
ports. Valid range is 1-8, default is 8.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/dev-hub.c | 45 +++++++++++++++++++++++++++++----------------
1 file changed, 29 insertions(+), 16 deletions(-)
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 9b04b6a6ec2d..4f700c8f92b5 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -29,7 +29,7 @@
#include "desc.h"
#include "qemu/error-report.h"
-#define NUM_PORTS 8
+#define MAX_PORTS 8
typedef struct USBHubPort {
USBPort port;
@@ -40,7 +40,8 @@ typedef struct USBHubPort {
typedef struct USBHubState {
USBDevice dev;
USBEndpoint *intr;
- USBHubPort ports[NUM_PORTS];
+ uint32_t num_ports;
+ USBHubPort ports[MAX_PORTS];
} USBHubState;
#define TYPE_USB_HUB "usb-hub"
@@ -109,7 +110,7 @@ static const USBDescIface desc_iface_hub = {
{
.bEndpointAddress = USB_DIR_IN | 0x01,
.bmAttributes = USB_ENDPOINT_XFER_INT,
- .wMaxPacketSize = 1 + DIV_ROUND_UP(NUM_PORTS, 8),
+ .wMaxPacketSize = 1 + DIV_ROUND_UP(MAX_PORTS, 8),
.bInterval = 0xff,
},
}
@@ -242,7 +243,7 @@ static USBDevice *usb_hub_find_device(USBDevice *dev, uint8_t addr)
USBDevice *downstream;
int i;
- for (i = 0; i < NUM_PORTS; i++) {
+ for (i = 0; i < s->num_ports; i++) {
port = &s->ports[i];
if (!(port->wPortStatus & PORT_STAT_ENABLE)) {
continue;
@@ -262,7 +263,7 @@ static void usb_hub_handle_reset(USBDevice *dev)
int i;
trace_usb_hub_reset(s->dev.addr);
- for (i = 0; i < NUM_PORTS; i++) {
+ for (i = 0; i < s->num_ports; i++) {
port = s->ports + i;
port->wPortStatus = PORT_STAT_POWER;
port->wPortChange = 0;
@@ -332,7 +333,7 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
{
unsigned int n = index - 1;
USBHubPort *port;
- if (n >= NUM_PORTS) {
+ if (n >= s->num_ports) {
goto fail;
}
port = &s->ports[n];
@@ -361,7 +362,7 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
trace_usb_hub_set_port_feature(s->dev.addr, index,
feature_name(value));
- if (n >= NUM_PORTS) {
+ if (n >= s->num_ports) {
goto fail;
}
port = &s->ports[n];
@@ -394,7 +395,7 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
trace_usb_hub_clear_port_feature(s->dev.addr, index,
feature_name(value));
- if (n >= NUM_PORTS) {
+ if (n >= s->num_ports) {
goto fail;
}
port = &s->ports[n];
@@ -443,17 +444,17 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
unsigned int n, limit, var_hub_size = 0;
memcpy(data, qemu_hub_hub_descriptor,
sizeof(qemu_hub_hub_descriptor));
- data[2] = NUM_PORTS;
+ data[2] = s->num_ports;
/* fill DeviceRemovable bits */
- limit = DIV_ROUND_UP(NUM_PORTS + 1, 8) + 7;
+ limit = DIV_ROUND_UP(s->num_ports + 1, 8) + 7;
for (n = 7; n < limit; n++) {
data[n] = 0x00;
var_hub_size++;
}
/* fill PortPwrCtrlMask bits */
- limit = limit + DIV_ROUND_UP(NUM_PORTS, 8);
+ limit = limit + DIV_ROUND_UP(s->num_ports, 8);
for (;n < limit; n++) {
data[n] = 0xff;
var_hub_size++;
@@ -481,7 +482,7 @@ static void usb_hub_handle_data(USBDevice *dev, USBPacket *p)
unsigned int status;
uint8_t buf[4];
int i, n;
- n = DIV_ROUND_UP(NUM_PORTS + 1, 8);
+ n = DIV_ROUND_UP(s->num_ports + 1, 8);
if (p->iov.size == 1) { /* FreeBSD workaround */
n = 1;
} else if (n > p->iov.size) {
@@ -489,7 +490,7 @@ static void usb_hub_handle_data(USBDevice *dev, USBPacket *p)
return;
}
status = 0;
- for(i = 0; i < NUM_PORTS; i++) {
+ for (i = 0; i < s->num_ports; i++) {
port = &s->ports[i];
if (port->wPortChange)
status |= (1 << (i + 1));
@@ -520,7 +521,7 @@ static void usb_hub_unrealize(USBDevice *dev, Error **errp)
USBHubState *s = (USBHubState *)dev;
int i;
- for (i = 0; i < NUM_PORTS; i++) {
+ for (i = 0; i < s->num_ports; i++) {
usb_unregister_port(usb_bus_from_device(dev),
&s->ports[i].port);
}
@@ -540,6 +541,12 @@ static void usb_hub_realize(USBDevice *dev, Error **errp)
USBHubPort *port;
int i;
+ if (s->num_ports < 1 || s->num_ports > MAX_PORTS) {
+ error_setg(errp, "num_ports (%d) out of range (1..%d)",
+ s->num_ports, MAX_PORTS);
+ return;
+ }
+
if (dev->port->hubcount == 5) {
error_setg(errp, "usb hub chain too deep");
return;
@@ -548,7 +555,7 @@ static void usb_hub_realize(USBDevice *dev, Error **errp)
usb_desc_create_serial(dev);
usb_desc_init(dev);
s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
- for (i = 0; i < NUM_PORTS; i++) {
+ for (i = 0; i < s->num_ports; i++) {
port = &s->ports[i];
usb_register_port(usb_bus_from_device(dev),
&port->port, s, i, &usb_hub_port_ops,
@@ -575,12 +582,17 @@ static const VMStateDescription vmstate_usb_hub = {
.minimum_version_id = 1,
.fields = (VMStateField[]) {
VMSTATE_USB_DEVICE(dev, USBHubState),
- VMSTATE_STRUCT_ARRAY(ports, USBHubState, NUM_PORTS, 0,
+ VMSTATE_STRUCT_ARRAY(ports, USBHubState, MAX_PORTS, 0,
vmstate_usb_hub_port, USBHubPort),
VMSTATE_END_OF_LIST()
}
};
+static Property usb_hub_properties[] = {
+ DEFINE_PROP_UINT32("ports", USBHubState, num_ports, 8),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
static void usb_hub_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -597,6 +609,7 @@ static void usb_hub_class_initfn(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->fw_name = "hub";
dc->vmsd = &vmstate_usb_hub;
+ dc->props = usb_hub_properties;
}
static const TypeInfo hub_info = {
--
2.18.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PATCH v2 3/5] usb-hub: add helpers to update port state
2019-05-24 7:03 [Qemu-devel] [PATCH v2 0/5] usb-hub: cleanups, configurable port count, per-port power switching emulation Gerd Hoffmann
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 1/5] usb-hub: tweak feature names Gerd Hoffmann
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 2/5] usb-hub: make number of ports runtime-configurable Gerd Hoffmann
@ 2019-05-24 7:03 ` Gerd Hoffmann
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 4/5] usb-hub: add usb_hub_port_update() Gerd Hoffmann
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 5/5] usb-hub: emulate per port power switching Gerd Hoffmann
4 siblings, 0 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2019-05-24 7:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Add usb_hub_port_set() and usb_hub_port_clear() helpers which care about
updating the change bits (port->wPortChange) properly, so we don't need
to have that logic sprinkled all over the place ;)
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/dev-hub.c | 84 ++++++++++++++++++++++++++----------------------
1 file changed, 45 insertions(+), 39 deletions(-)
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 4f700c8f92b5..1cc92a5f9abe 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -159,18 +159,46 @@ static const uint8_t qemu_hub_hub_descriptor[] =
/* DeviceRemovable and PortPwrCtrlMask patched in later */
};
+static bool usb_hub_port_change(USBHubPort *port, uint16_t status)
+{
+ bool notify = false;
+
+ if (status & 0x1f) {
+ port->wPortChange |= status;
+ notify = true;
+ }
+ return notify;
+}
+
+static bool usb_hub_port_set(USBHubPort *port, uint16_t status)
+{
+ if (port->wPortStatus & status) {
+ return false;
+ }
+ port->wPortStatus |= status;
+ return usb_hub_port_change(port, status);
+}
+
+static bool usb_hub_port_clear(USBHubPort *port, uint16_t status)
+{
+ if (!(port->wPortStatus & status)) {
+ return false;
+ }
+ port->wPortStatus &= ~status;
+ return usb_hub_port_change(port, status);
+}
+
static void usb_hub_attach(USBPort *port1)
{
USBHubState *s = port1->opaque;
USBHubPort *port = &s->ports[port1->index];
trace_usb_hub_attach(s->dev.addr, port1->index + 1);
- port->wPortStatus |= PORT_STAT_CONNECTION;
- port->wPortChange |= PORT_STAT_C_CONNECTION;
+ usb_hub_port_set(port, PORT_STAT_CONNECTION);
if (port->port.dev->speed == USB_SPEED_LOW) {
- port->wPortStatus |= PORT_STAT_LOW_SPEED;
+ usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
} else {
- port->wPortStatus &= ~PORT_STAT_LOW_SPEED;
+ usb_hub_port_clear(port, PORT_STAT_LOW_SPEED);
}
usb_wakeup(s->intr, 0);
}
@@ -186,16 +214,9 @@ static void usb_hub_detach(USBPort *port1)
/* Let upstream know the device on this port is gone */
s->dev.port->ops->child_detach(s->dev.port, port1->dev);
- port->wPortStatus &= ~PORT_STAT_CONNECTION;
- port->wPortChange |= PORT_STAT_C_CONNECTION;
- if (port->wPortStatus & PORT_STAT_ENABLE) {
- port->wPortStatus &= ~PORT_STAT_ENABLE;
- port->wPortChange |= PORT_STAT_C_ENABLE;
- }
- if (port->wPortStatus & PORT_STAT_SUSPEND) {
- port->wPortStatus &= ~PORT_STAT_SUSPEND;
- port->wPortChange |= PORT_STAT_C_SUSPEND;
- }
+ usb_hub_port_clear(port, PORT_STAT_CONNECTION);
+ usb_hub_port_clear(port, PORT_STAT_ENABLE);
+ usb_hub_port_clear(port, PORT_STAT_SUSPEND);
usb_wakeup(s->intr, 0);
}
@@ -212,9 +233,7 @@ static void usb_hub_wakeup(USBPort *port1)
USBHubState *s = port1->opaque;
USBHubPort *port = &s->ports[port1->index];
- if (port->wPortStatus & PORT_STAT_SUSPEND) {
- port->wPortStatus &= ~PORT_STAT_SUSPEND;
- port->wPortChange |= PORT_STAT_C_SUSPEND;
+ if (usb_hub_port_clear(port, PORT_STAT_SUSPEND)) {
usb_wakeup(s->intr, 0);
}
}
@@ -265,13 +284,13 @@ static void usb_hub_handle_reset(USBDevice *dev)
trace_usb_hub_reset(s->dev.addr);
for (i = 0; i < s->num_ports; i++) {
port = s->ports + i;
- port->wPortStatus = PORT_STAT_POWER;
+ port->wPortStatus = 0;
port->wPortChange = 0;
+ usb_hub_port_set(port, PORT_STAT_POWER);
if (port->port.dev && port->port.dev->attached) {
- port->wPortStatus |= PORT_STAT_CONNECTION;
- port->wPortChange |= PORT_STAT_C_CONNECTION;
+ usb_hub_port_set(port, PORT_STAT_CONNECTION);
if (port->port.dev->speed == USB_SPEED_LOW) {
- port->wPortStatus |= PORT_STAT_LOW_SPEED;
+ usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
}
}
}
@@ -372,13 +391,13 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
port->wPortStatus |= PORT_STAT_SUSPEND;
break;
case PORT_RESET:
+ usb_hub_port_set(port, PORT_STAT_RESET);
+ usb_hub_port_clear(port, PORT_STAT_RESET);
if (dev && dev->attached) {
usb_device_reset(dev);
- port->wPortChange |= PORT_STAT_C_RESET;
- /* set enable bit */
- port->wPortStatus |= PORT_STAT_ENABLE;
- usb_wakeup(s->intr, 0);
+ usb_hub_port_set(port, PORT_STAT_ENABLE);
}
+ usb_wakeup(s->intr, 0);
break;
case PORT_POWER:
break;
@@ -407,20 +426,7 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
port->wPortChange &= ~PORT_STAT_C_ENABLE;
break;
case PORT_SUSPEND:
- if (port->wPortStatus & PORT_STAT_SUSPEND) {
- port->wPortStatus &= ~PORT_STAT_SUSPEND;
-
- /*
- * USB Spec rev2.0 11.24.2.7.2.3 C_PORT_SUSPEND
- * "This bit is set on the following transitions:
- * - On transition from the Resuming state to the
- * SendEOP [sic] state"
- *
- * Note that this includes both remote wake-up and
- * explicit ClearPortFeature(PORT_SUSPEND).
- */
- port->wPortChange |= PORT_STAT_C_SUSPEND;
- }
+ usb_hub_port_clear(port, PORT_STAT_SUSPEND);
break;
case PORT_C_SUSPEND:
port->wPortChange &= ~PORT_STAT_C_SUSPEND;
--
2.18.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PATCH v2 4/5] usb-hub: add usb_hub_port_update()
2019-05-24 7:03 [Qemu-devel] [PATCH v2 0/5] usb-hub: cleanups, configurable port count, per-port power switching emulation Gerd Hoffmann
` (2 preceding siblings ...)
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 3/5] usb-hub: add helpers to update port state Gerd Hoffmann
@ 2019-05-24 7:03 ` Gerd Hoffmann
2019-05-24 7:45 ` Philippe Mathieu-Daudé
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 5/5] usb-hub: emulate per port power switching Gerd Hoffmann
4 siblings, 1 reply; 8+ messages in thread
From: Gerd Hoffmann @ 2019-05-24 7:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Helper function to update port status bits which depends on the
connected device. We need the same logic for device attach and
port reset, so factor it out.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/dev-hub.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 1cc92a5f9abe..29f4d6723e26 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -188,18 +188,28 @@ static bool usb_hub_port_clear(USBHubPort *port, uint16_t status)
return usb_hub_port_change(port, status);
}
+static bool usb_hub_port_update(USBHubPort *port)
+{
+ bool notify = false;
+
+ if (port->port.dev && port->port.dev->attached) {
+ notify = usb_hub_port_set(port, PORT_STAT_CONNECTION);
+ if (port->port.dev->speed == USB_SPEED_LOW) {
+ usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
+ } else {
+ usb_hub_port_clear(port, PORT_STAT_LOW_SPEED);
+ }
+ }
+ return notify;
+}
+
static void usb_hub_attach(USBPort *port1)
{
USBHubState *s = port1->opaque;
USBHubPort *port = &s->ports[port1->index];
trace_usb_hub_attach(s->dev.addr, port1->index + 1);
- usb_hub_port_set(port, PORT_STAT_CONNECTION);
- if (port->port.dev->speed == USB_SPEED_LOW) {
- usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
- } else {
- usb_hub_port_clear(port, PORT_STAT_LOW_SPEED);
- }
+ usb_hub_port_update(port);
usb_wakeup(s->intr, 0);
}
@@ -287,12 +297,7 @@ static void usb_hub_handle_reset(USBDevice *dev)
port->wPortStatus = 0;
port->wPortChange = 0;
usb_hub_port_set(port, PORT_STAT_POWER);
- if (port->port.dev && port->port.dev->attached) {
- usb_hub_port_set(port, PORT_STAT_CONNECTION);
- if (port->port.dev->speed == USB_SPEED_LOW) {
- usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
- }
- }
+ usb_hub_port_update(port);
}
}
--
2.18.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2 4/5] usb-hub: add usb_hub_port_update()
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 4/5] usb-hub: add usb_hub_port_update() Gerd Hoffmann
@ 2019-05-24 7:45 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-24 7:45 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel
On 5/24/19 9:03 AM, Gerd Hoffmann wrote:
> Helper function to update port status bits which depends on the
> connected device. We need the same logic for device attach and
> port reset, so factor it out.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> hw/usb/dev-hub.c | 29 +++++++++++++++++------------
> 1 file changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
> index 1cc92a5f9abe..29f4d6723e26 100644
> --- a/hw/usb/dev-hub.c
> +++ b/hw/usb/dev-hub.c
> @@ -188,18 +188,28 @@ static bool usb_hub_port_clear(USBHubPort *port, uint16_t status)
> return usb_hub_port_change(port, status);
> }
>
> +static bool usb_hub_port_update(USBHubPort *port)
> +{
> + bool notify = false;
> +
> + if (port->port.dev && port->port.dev->attached) {
> + notify = usb_hub_port_set(port, PORT_STAT_CONNECTION);
> + if (port->port.dev->speed == USB_SPEED_LOW) {
> + usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
> + } else {
> + usb_hub_port_clear(port, PORT_STAT_LOW_SPEED);
> + }
> + }
> + return notify;
> +}
> +
> static void usb_hub_attach(USBPort *port1)
> {
> USBHubState *s = port1->opaque;
> USBHubPort *port = &s->ports[port1->index];
>
> trace_usb_hub_attach(s->dev.addr, port1->index + 1);
> - usb_hub_port_set(port, PORT_STAT_CONNECTION);
> - if (port->port.dev->speed == USB_SPEED_LOW) {
> - usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
> - } else {
> - usb_hub_port_clear(port, PORT_STAT_LOW_SPEED);
> - }
> + usb_hub_port_update(port);
> usb_wakeup(s->intr, 0);
> }
>
> @@ -287,12 +297,7 @@ static void usb_hub_handle_reset(USBDevice *dev)
> port->wPortStatus = 0;
> port->wPortChange = 0;
> usb_hub_port_set(port, PORT_STAT_POWER);
> - if (port->port.dev && port->port.dev->attached) {
> - usb_hub_port_set(port, PORT_STAT_CONNECTION);
> - if (port->port.dev->speed == USB_SPEED_LOW) {
> - usb_hub_port_set(port, PORT_STAT_LOW_SPEED);
> - }
> - }
> + usb_hub_port_update(port);
> }
> }
>
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH v2 5/5] usb-hub: emulate per port power switching
2019-05-24 7:03 [Qemu-devel] [PATCH v2 0/5] usb-hub: cleanups, configurable port count, per-port power switching emulation Gerd Hoffmann
` (3 preceding siblings ...)
2019-05-24 7:03 ` [Qemu-devel] [PATCH v2 4/5] usb-hub: add usb_hub_port_update() Gerd Hoffmann
@ 2019-05-24 7:03 ` Gerd Hoffmann
4 siblings, 0 replies; 8+ messages in thread
From: Gerd Hoffmann @ 2019-05-24 7:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Add support for per port power switching.
Virtual power of course ;)
Use port-power=on property to enable this.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/dev-hub.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 29f4d6723e26..2b64d6ef0349 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
+#include "qemu/timer.h"
#include "trace.h"
#include "hw/usb.h"
#include "desc.h"
@@ -41,6 +42,8 @@ typedef struct USBHubState {
USBDevice dev;
USBEndpoint *intr;
uint32_t num_ports;
+ bool port_power;
+ QEMUTimer *port_timer;
USBHubPort ports[MAX_PORTS];
} USBHubState;
@@ -203,6 +206,20 @@ static bool usb_hub_port_update(USBHubPort *port)
return notify;
}
+static void usb_hub_port_update_timer(void *opaque)
+{
+ USBHubState *s = opaque;
+ bool notify = false;
+ int i;
+
+ for (i = 0; i < s->num_ports; i++) {
+ notify |= usb_hub_port_update(&s->ports[i]);
+ }
+ if (notify) {
+ usb_wakeup(s->intr, 0);
+ }
+}
+
static void usb_hub_attach(USBPort *port1)
{
USBHubState *s = port1->opaque;
@@ -405,6 +422,11 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
usb_wakeup(s->intr, 0);
break;
case PORT_POWER:
+ if (s->port_power) {
+ int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+ usb_hub_port_set(port, PORT_STAT_POWER);
+ timer_mod(s->port_timer, now + 5000000); /* 5 ms */
+ }
break;
default:
goto fail;
@@ -445,6 +467,14 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
case PORT_C_RESET:
port->wPortChange &= ~PORT_STAT_C_RESET;
break;
+ case PORT_POWER:
+ if (s->port_power) {
+ usb_hub_port_clear(port, PORT_STAT_POWER);
+ usb_hub_port_clear(port, PORT_STAT_CONNECTION);
+ usb_hub_port_clear(port, PORT_STAT_ENABLE);
+ usb_hub_port_clear(port, PORT_STAT_SUSPEND);
+ port->wPortChange = 0;
+ }
default:
goto fail;
}
@@ -457,6 +487,11 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
sizeof(qemu_hub_hub_descriptor));
data[2] = s->num_ports;
+ if (s->port_power) {
+ data[3] &= ~0x03;
+ data[3] |= 0x01;
+ }
+
/* fill DeviceRemovable bits */
limit = DIV_ROUND_UP(s->num_ports + 1, 8) + 7;
for (n = 7; n < limit; n++) {
@@ -536,6 +571,9 @@ static void usb_hub_unrealize(USBDevice *dev, Error **errp)
usb_unregister_port(usb_bus_from_device(dev),
&s->ports[i].port);
}
+
+ timer_del(s->port_timer);
+ timer_free(s->port_timer);
}
static USBPortOps usb_hub_port_ops = {
@@ -565,6 +603,8 @@ static void usb_hub_realize(USBDevice *dev, Error **errp)
usb_desc_create_serial(dev);
usb_desc_init(dev);
+ s->port_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
+ usb_hub_port_update_timer, s);
s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
for (i = 0; i < s->num_ports; i++) {
port = &s->ports[i];
@@ -587,6 +627,24 @@ static const VMStateDescription vmstate_usb_hub_port = {
}
};
+static bool usb_hub_port_timer_needed(void *opaque)
+{
+ USBHubState *s = opaque;
+
+ return s->port_power;
+}
+
+static const VMStateDescription vmstate_usb_hub_port_timer = {
+ .name = "usb-hub/port-timer",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = usb_hub_port_timer_needed,
+ .fields = (VMStateField[]) {
+ VMSTATE_TIMER_PTR(port_timer, USBHubState),
+ VMSTATE_END_OF_LIST()
+ },
+};
+
static const VMStateDescription vmstate_usb_hub = {
.name = "usb-hub",
.version_id = 1,
@@ -596,11 +654,16 @@ static const VMStateDescription vmstate_usb_hub = {
VMSTATE_STRUCT_ARRAY(ports, USBHubState, MAX_PORTS, 0,
vmstate_usb_hub_port, USBHubPort),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (const VMStateDescription * []) {
+ &vmstate_usb_hub_port_timer,
+ NULL
}
};
static Property usb_hub_properties[] = {
DEFINE_PROP_UINT32("ports", USBHubState, num_ports, 8),
+ DEFINE_PROP_BOOL("port-power", USBHubState, port_power, false),
DEFINE_PROP_END_OF_LIST(),
};
--
2.18.1
^ permalink raw reply related [flat|nested] 8+ messages in thread