mirror of
https://github.com/projectacrn/acrn-hypervisor.git
synced 2025-05-30 10:55:27 +00:00
DM USB: introduce struct usb_native_devinfo
Current design cannot get physical USB device information without the creation of pci_xhci_dev_emu. This brings some difficulties in certain situations, hence struct usb_native_devinfo is introduced to describe neccessary information to solve this trouble. Signed-off-by: Xiaoguang Wu <xiaoguang.wu@intel.com> Reviewed-by: Liang Yang <liang3.yang@intel.com> Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Xiaoguang Wu
lijinxia
parent
363b4da4df
commit
2abec44e15
@ -469,22 +469,21 @@ pci_xhci_native_usb_dev_conn_cb(void *hci_data, void *dev_data)
|
||||
struct pci_xhci_dev_emu *de;
|
||||
struct pci_xhci_vdev *xdev;
|
||||
struct usb_devemu *ue;
|
||||
struct usb_native_devinfo *di;
|
||||
int port_start, port_end;
|
||||
int slot_start, slot_end;
|
||||
int port, slot;
|
||||
void *ud;
|
||||
uint8_t native_bus, native_pid, native_port;
|
||||
uint16_t native_vid;
|
||||
int native_speed;
|
||||
|
||||
xdev = hci_data;
|
||||
di = dev_data;
|
||||
|
||||
assert(xdev);
|
||||
assert(dev_data);
|
||||
assert(xdev->devices);
|
||||
assert(xdev->slots);
|
||||
|
||||
de = pci_xhci_dev_create(xdev, dev_data);
|
||||
de = pci_xhci_dev_create(xdev, di);
|
||||
if (!de) {
|
||||
UPRINTF(LFTL, "fail to create device\r\n");
|
||||
return -1;
|
||||
@ -498,26 +497,20 @@ pci_xhci_native_usb_dev_conn_cb(void *hci_data, void *dev_data)
|
||||
assert(ue);
|
||||
|
||||
/* print physical information about new device */
|
||||
ue->ue_info(ud, USB_INFO_BUS, &native_bus, sizeof(native_bus));
|
||||
ue->ue_info(ud, USB_INFO_PORT, &native_port, sizeof(native_port));
|
||||
ue->ue_info(ud, USB_INFO_VID, &native_vid, sizeof(native_vid));
|
||||
ue->ue_info(ud, USB_INFO_PID, &native_pid, sizeof(native_pid));
|
||||
ue->ue_info(ud, USB_INFO_SPEED, &native_speed, sizeof(native_speed));
|
||||
UPRINTF(LDBG, "%04x:%04x %d-%d connecting.\r\n",
|
||||
native_vid, native_pid, native_bus, native_port);
|
||||
di->vid, di->pid, di->bus, di->port);
|
||||
|
||||
if (!xdev->native_assign_ports[native_bus] ||
|
||||
!xdev->native_assign_ports[native_bus][native_port]) {
|
||||
if (!xdev->native_assign_ports[di->bus] ||
|
||||
!xdev->native_assign_ports[di->bus][di->port]) {
|
||||
UPRINTF(LDBG, "%04x:%04x %d-%d doesn't belong to this vm, bye."
|
||||
"\r\n", native_vid, native_pid, native_bus,
|
||||
native_port);
|
||||
"\r\n", di->vid, di->pid, di->bus, di->port);
|
||||
goto errout;
|
||||
}
|
||||
|
||||
UPRINTF(LDBG, "%04x:%04x %d-%d belong to this vm.\r\n", native_vid,
|
||||
native_pid, native_bus, native_port);
|
||||
UPRINTF(LDBG, "%04x:%04x %d-%d belong to this vm.\r\n", di->vid,
|
||||
di->pid, di->bus, di->port);
|
||||
|
||||
if (ue->ue_usbver == 2)
|
||||
if (di->bcd < 0x300)
|
||||
port_start = xdev->usb2_port_start;
|
||||
else
|
||||
port_start = xdev->usb3_port_start;
|
||||
@ -549,11 +542,11 @@ pci_xhci_native_usb_dev_conn_cb(void *hci_data, void *dev_data)
|
||||
|
||||
pci_xhci_reset_slot(xdev, slot);
|
||||
UPRINTF(LDBG, "%X:%X %d-%d locates in slot %d port %d.\r\n",
|
||||
native_vid, native_pid, native_bus, native_port,
|
||||
di->vid, di->pid, di->bus, di->port,
|
||||
slot, port);
|
||||
|
||||
/* Trigger port change event for the arriving device */
|
||||
if (pci_xhci_connect_port(xdev, port, native_speed, 1))
|
||||
if (pci_xhci_connect_port(xdev, port, di->speed, 1))
|
||||
UPRINTF(LFTL, "fail to report port event\n");
|
||||
|
||||
return 0;
|
||||
@ -588,7 +581,7 @@ pci_xhci_native_usb_dev_disconn_cb(void *hci_data, void *dev_data)
|
||||
continue;
|
||||
|
||||
udev = edev->dev_instance;
|
||||
if (udev->port == native_port)
|
||||
if (udev->info.port == native_port)
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@ -383,7 +383,7 @@ usb_dev_update_ep(struct usb_dev *udev)
|
||||
int i, j;
|
||||
|
||||
assert(udev);
|
||||
if (libusb_get_active_config_descriptor(udev->ldev, &cfg))
|
||||
if (libusb_get_active_config_descriptor(udev->info.priv_data, &cfg))
|
||||
return;
|
||||
|
||||
for (i = 0; i < cfg->bNumInterfaces; i++) {
|
||||
@ -409,13 +409,12 @@ usb_dev_native_toggle_if(struct usb_dev *udev, int claim)
|
||||
|
||||
assert(udev);
|
||||
assert(udev->handle);
|
||||
assert(udev->ldev);
|
||||
assert(claim == 1 || claim == 0);
|
||||
|
||||
b = udev->bus;
|
||||
p = udev->port;
|
||||
b = udev->info.bus;
|
||||
p = udev->info.port;
|
||||
|
||||
r = libusb_get_active_config_descriptor(udev->ldev, &config);
|
||||
r = libusb_get_active_config_descriptor(udev->info.priv_data, &config);
|
||||
if (r) {
|
||||
UPRINTF(LWRN, "%d-%d: can't get config\r\n", b, p);
|
||||
return -1;
|
||||
@ -458,13 +457,12 @@ usb_dev_native_toggle_if_drivers(struct usb_dev *udev, int attach)
|
||||
|
||||
assert(udev);
|
||||
assert(udev->handle);
|
||||
assert(udev->ldev);
|
||||
assert(attach == 1 || attach == 0);
|
||||
|
||||
b = udev->bus;
|
||||
p = udev->port;
|
||||
b = udev->info.bus;
|
||||
p = udev->info.port;
|
||||
|
||||
r = libusb_get_active_config_descriptor(udev->ldev, &config);
|
||||
r = libusb_get_active_config_descriptor(udev->info.priv_data, &config);
|
||||
if (r) {
|
||||
UPRINTF(LWRN, "%d-%d: can't get config\r\n", b, p);
|
||||
return -1;
|
||||
@ -503,7 +501,6 @@ usb_dev_set_config(struct usb_dev *udev, struct usb_data_xfer *xfer, int config)
|
||||
struct libusb_config_descriptor *cfg;
|
||||
|
||||
assert(udev);
|
||||
assert(udev->ldev);
|
||||
assert(udev->handle);
|
||||
|
||||
/*
|
||||
@ -521,7 +518,7 @@ usb_dev_set_config(struct usb_dev *udev, struct usb_data_xfer *xfer, int config)
|
||||
}
|
||||
|
||||
/* claim all the interfaces of this configuration */
|
||||
rc = libusb_get_active_config_descriptor(udev->ldev, &cfg);
|
||||
rc = libusb_get_active_config_descriptor(udev->info.priv_data, &cfg);
|
||||
if (rc) {
|
||||
UPRINTF(LWRN, "fail to get config rc %d\r\n", rc);
|
||||
goto err2;
|
||||
@ -545,7 +542,8 @@ err1:
|
||||
usb_dev_native_toggle_if(udev, 0);
|
||||
libusb_free_config_descriptor(cfg);
|
||||
err2:
|
||||
UPRINTF(LWRN, "%d-%d: fail to set config\r\n", udev->bus, udev->port);
|
||||
UPRINTF(LWRN, "%d-%d: fail to set config\r\n", udev->info.bus,
|
||||
udev->info.port);
|
||||
xfer->status = USB_ERR_STALLED;
|
||||
}
|
||||
|
||||
@ -560,8 +558,8 @@ usb_dev_set_if(struct usb_dev *udev, int iface, int alt, struct usb_data_xfer
|
||||
if (iface >= USB_NUM_INTERFACE)
|
||||
goto errout;
|
||||
|
||||
UPRINTF(LDBG, "%d-%d set if, iface %d alt %d\r\n", udev->bus,
|
||||
udev->port, iface, alt);
|
||||
UPRINTF(LDBG, "%d-%d set if, iface %d alt %d\r\n", udev->info.bus,
|
||||
udev->info.port, iface, alt);
|
||||
|
||||
if (libusb_set_interface_alt_setting(udev->handle, iface, alt))
|
||||
goto errout;
|
||||
@ -578,7 +576,7 @@ usb_dev_set_if(struct usb_dev *udev, int iface, int alt, struct usb_data_xfer
|
||||
errout:
|
||||
xfer->status = USB_ERR_STALLED;
|
||||
UPRINTF(LDBG, "%d-%d fail to set if, iface %d alt %d\r\n",
|
||||
udev->bus, udev->port, iface, alt);
|
||||
udev->info.bus, udev->info.port, iface, alt);
|
||||
}
|
||||
|
||||
static struct usb_data_xfer_block *
|
||||
@ -773,7 +771,7 @@ usb_dev_request(void *pdata, struct usb_data_xfer *xfer)
|
||||
assert(udev);
|
||||
|
||||
xfer->status = USB_ERR_NORMAL_COMPLETION;
|
||||
if (!udev->ldev || !xfer->ureq) {
|
||||
if (!udev->info.priv_data || !xfer->ureq) {
|
||||
UPRINTF(LWRN, "invalid request\r\n");
|
||||
xfer->status = USB_ERR_IOERROR;
|
||||
goto out;
|
||||
@ -861,22 +859,18 @@ void *
|
||||
usb_dev_init(void *pdata, char *opt)
|
||||
{
|
||||
struct usb_dev *udev = NULL;
|
||||
struct libusb_device *ldev;
|
||||
struct libusb_device_descriptor desc;
|
||||
uint8_t bus, port;
|
||||
int speed, ver;
|
||||
struct usb_native_devinfo *di;
|
||||
int ver;
|
||||
|
||||
assert(pdata);
|
||||
|
||||
ldev = pdata;
|
||||
speed = libusb_get_device_speed(ldev);
|
||||
port = libusb_get_port_number(ldev);
|
||||
bus = libusb_get_bus_number(ldev);
|
||||
libusb_get_device_descriptor(ldev, &desc);
|
||||
di = pdata;
|
||||
libusb_get_device_descriptor(di->priv_data, &desc);
|
||||
UPRINTF(LINF, "Found USB device: %d-%d\r\nPID(0x%X), VID(0x%X) CLASS"
|
||||
"(0x%X) SUBCLASS(0x%X) BCD(0x%X) SPEED(%d)\r\n", bus,
|
||||
port, desc.idProduct, desc.idVendor, desc.bDeviceClass,
|
||||
desc.bDeviceSubClass, desc.bcdUSB, speed);
|
||||
"(0x%X) SUBCLASS(0x%X) BCD(0x%X) SPEED(%d)\r\n",
|
||||
di->bus, di->port, di->pid, di->vid, desc.bDeviceClass,
|
||||
desc.bDeviceSubClass, di->bcd, di->speed);
|
||||
|
||||
/* allocate and populate udev */
|
||||
udev = calloc(1, sizeof(struct usb_dev));
|
||||
@ -884,7 +878,7 @@ usb_dev_init(void *pdata, char *opt)
|
||||
goto errout;
|
||||
|
||||
/* this is a root hub */
|
||||
if (port == 0)
|
||||
if (di->port == 0)
|
||||
goto errout;
|
||||
|
||||
switch (desc.bcdUSB) {
|
||||
@ -908,17 +902,12 @@ usb_dev_init(void *pdata, char *opt)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
udev->speed = speed;
|
||||
udev->ldev = ldev;
|
||||
udev->info = *di;
|
||||
udev->version = ver;
|
||||
udev->handle = NULL;
|
||||
udev->port = port;
|
||||
udev->bus = bus;
|
||||
udev->pid = desc.idProduct;
|
||||
udev->vid = desc.idVendor;
|
||||
|
||||
/* configure physical device through libusb library */
|
||||
if (libusb_open(udev->ldev, &udev->handle)) {
|
||||
if (libusb_open(udev->info.priv_data, &udev->handle)) {
|
||||
UPRINTF(LWRN, "fail to open device.\r\n");
|
||||
goto errout;
|
||||
}
|
||||
@ -973,25 +962,25 @@ usb_dev_info(void *pdata, int type, void *value, int size)
|
||||
pv = &udev->version;
|
||||
break;
|
||||
case USB_INFO_SPEED:
|
||||
sz = sizeof(udev->speed);
|
||||
udev->speed = libusb_speed_to_usb_speed(udev->speed);
|
||||
pv = &udev->speed;
|
||||
sz = sizeof(udev->info.speed);
|
||||
udev->info.speed = libusb_speed_to_usb_speed(udev->info.speed);
|
||||
pv = &udev->info.speed;
|
||||
break;
|
||||
case USB_INFO_BUS:
|
||||
sz = sizeof(udev->bus);
|
||||
pv = &udev->bus;
|
||||
sz = sizeof(udev->info.bus);
|
||||
pv = &udev->info.bus;
|
||||
break;
|
||||
case USB_INFO_PORT:
|
||||
sz = sizeof(udev->port);
|
||||
pv = &udev->port;
|
||||
sz = sizeof(udev->info.port);
|
||||
pv = &udev->info.port;
|
||||
break;
|
||||
case USB_INFO_VID:
|
||||
sz = sizeof(udev->vid);
|
||||
pv = &udev->vid;
|
||||
sz = sizeof(udev->info.vid);
|
||||
pv = &udev->info.vid;
|
||||
break;
|
||||
case USB_INFO_PID:
|
||||
sz = sizeof(udev->pid);
|
||||
pv = &udev->pid;
|
||||
sz = sizeof(udev->info.pid);
|
||||
pv = &udev->info.pid;
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
@ -1020,6 +1009,9 @@ static int
|
||||
usb_dev_native_sys_conn_cb(struct libusb_context *ctx, struct libusb_device
|
||||
*ldev, libusb_hotplug_event event, void *pdata)
|
||||
{
|
||||
struct libusb_device_descriptor d;
|
||||
struct usb_native_devinfo di;
|
||||
|
||||
UPRINTF(LDBG, "connect event\r\n");
|
||||
|
||||
if (!ctx || !ldev) {
|
||||
@ -1027,8 +1019,17 @@ usb_dev_native_sys_conn_cb(struct libusb_context *ctx, struct libusb_device
|
||||
return -1;
|
||||
}
|
||||
|
||||
libusb_get_device_descriptor(ldev, &d);
|
||||
di.bus = libusb_get_bus_number(ldev);
|
||||
di.speed = libusb_get_device_speed(ldev);
|
||||
di.port = libusb_get_port_number(ldev);
|
||||
di.pid = d.idProduct;
|
||||
di.vid = d.idVendor;
|
||||
di.bcd = d.bcdUSB;
|
||||
di.priv_data = ldev;
|
||||
|
||||
if (g_ctx.conn_cb)
|
||||
g_ctx.conn_cb(g_ctx.hci_data, ldev);
|
||||
g_ctx.conn_cb(g_ctx.hci_data, &di);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -163,6 +163,16 @@ struct usb_data_xfer {
|
||||
pthread_mutex_t mtx;
|
||||
};
|
||||
|
||||
struct usb_native_devinfo {
|
||||
int speed;
|
||||
uint8_t bus;
|
||||
uint8_t port;
|
||||
uint16_t bcd;
|
||||
uint16_t pid;
|
||||
uint16_t vid;
|
||||
void *priv_data;
|
||||
};
|
||||
|
||||
enum USB_ERRCODE {
|
||||
USB_ACK,
|
||||
USB_NAK,
|
||||
|
||||
@ -36,14 +36,10 @@ struct usb_dev_ep {
|
||||
|
||||
struct usb_dev {
|
||||
/* physical device info */
|
||||
struct usb_native_devinfo info;
|
||||
int addr;
|
||||
int version;
|
||||
int speed;
|
||||
int configuration;
|
||||
uint8_t port;
|
||||
uint8_t bus;
|
||||
uint8_t pid;
|
||||
uint16_t vid;
|
||||
|
||||
/* interface info */
|
||||
int if_num;
|
||||
@ -55,8 +51,7 @@ struct usb_dev {
|
||||
struct usb_dev_ep epo[USB_NUM_ENDPOINT];
|
||||
|
||||
/* libusb data */
|
||||
libusb_device *ldev;
|
||||
libusb_device_handle *handle;
|
||||
libusb_device_handle *handle;
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user