Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kmB9t-0004XJ-3i for mharc-grub-devel@gnu.org; Mon, 07 Dec 2020 02:42:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmB9r-0004UO-2s for grub-devel@gnu.org; Mon, 07 Dec 2020 02:42:07 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:36640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmB9o-0007lL-7z for grub-devel@gnu.org; Mon, 07 Dec 2020 02:42:06 -0500 Received: by mail-wr1-x442.google.com with SMTP id z7so11757409wrn.3 for ; Sun, 06 Dec 2020 23:42:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SKRqplLWe4N5c7g5PQw1W+XHYuhwLgEqHIrqfdnMsa8=; b=Yp3lkgTnqFmcJQOXwNmX7gvbkcLRbB0Pk+dpJnxjrHEzXF89jOyVL5xThK3wypcgnt XpDRJ0aquzA8VDpsV+93kP5+/StGB2Z6nEUml8tTuwf0f6dKUD5XB6Nzo0StjAFlzdHv T+QcapNjHV9qaNeUDyyDqb2mSgVkP+Ozh9yv7KcQV5r+cdx5s8GqTGxQr32Avvm11dFM JU3L5BsGGT/cciSmDx0MNQqq+O0fPRhT84vsk5LdW+H7peGIo5qkLJqoy97LVto6oSHV ky+sqMBhlRe1F9vJcp1aTcMFdAz5T64otu3IFxjxI36d+bG1sZ2RqhebXvmbwMQUkivd a5og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SKRqplLWe4N5c7g5PQw1W+XHYuhwLgEqHIrqfdnMsa8=; b=MSJKLILZPQ7WD8FknuZxRNBbJSx29wRqU7pSZNcuvVxkwQ24lsPOIx4uNBIdgiKr8D UJPUr7MpAaGJJofZuEltUFAn5HdE8meYWkhboND7zWP4IOvzRilSXIbzUkUKm8zarpmx k1ACiCsAYrHNAjrjayxG+fJsffkSDpScLcylQ5q03jR6qqfxzTDug6HPRz3FK+7KTr+J 3CChpTKj+6Row4vufs/Ap326PL8++MPr6NCtPl9el3n9x18e0RfF3oVqh5jKQAR6kzpv fpGQ/e3sUvcAOVZy1ujdpNQufs6qI45FXuJxjxI4LdidXk5y1Wy7iKC0lsQz2lVkJlK1 4YtA== X-Gm-Message-State: AOAM5318hix8GweHQgFU1lar/dZKXbufx/Rl8xwSu5vB3/yODydJIGyK 2ZLdhLgZ36VjnombdlPqYAfkkOhCYHfi/TAF X-Google-Smtp-Source: ABdhPJziChWMDgKEUCJXkD75KDk1wA2KlKLN/0WEC06Gh83f8mScscrhdwTLCr04BK6YD3HZzOjj6g== X-Received: by 2002:adf:fd52:: with SMTP id h18mr17844560wrs.90.1607326918716; Sun, 06 Dec 2020 23:41:58 -0800 (PST) Received: from rudolphp-notebook.9e.network (b2b-78-94-0-50.unitymedia.biz. [78.94.0.50]) by smtp.gmail.com with ESMTPSA id h83sm13979687wmf.9.2020.12.06.23.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 23:41:58 -0800 (PST) From: Patrick Rudolph To: grub-devel@gnu.org Cc: Patrick Rudolph Subject: [PATCH v2 1/7] grub-core/bus/usb: Parse SuperSpeed companion descriptors Date: Mon, 7 Dec 2020 08:41:21 +0100 Message-Id: <20201207074127.59286-2-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201207074127.59286-1-patrick.rudolph@9elements.com> References: <20201207074127.59286-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=patrick.rudolph@9elements.com; helo=mail-wr1-x442.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2020 07:42:07 -0000 Parse the SS_ENDPOINT_COMPANION descriptor, which is only present on USB 3.0 capable devices and xHCI controllers. Make the descendp an array of pointers to the endpoint descriptor as it's no longer an continous array. Signed-off-by: Patrick Rudolph --- grub-core/bus/usb/serial/common.c | 2 +- grub-core/bus/usb/usb.c | 44 +++++++++++++++++++------------ grub-core/bus/usb/usbhub.c | 22 ++++++++++++---- grub-core/commands/usbtest.c | 2 +- grub-core/disk/usbms.c | 2 +- grub-core/term/usb_keyboard.c | 2 +- include/grub/usb.h | 2 +- include/grub/usbdesc.h | 11 +++++++- 8 files changed, 59 insertions(+), 28 deletions(-) diff --git a/grub-core/bus/usb/serial/common.c b/grub-core/bus/usb/serial/common.c index 8e94c7dc0..63e64cc0a 100644 --- a/grub-core/bus/usb/serial/common.c +++ b/grub-core/bus/usb/serial/common.c @@ -72,7 +72,7 @@ grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno, for (j = 0; j < interf->endpointcnt; j++) { struct grub_usb_desc_endp *endp; - endp = &usbdev->config[0].interf[interfno].descendp[j]; + endp = usbdev->config[0].interf[interfno].descendp[j]; if ((endp->endp_addr & 128) && (endp->attrib & 3) == 2 && (in_endp == GRUB_USB_SERIAL_ENDPOINT_LAST_MATCHING diff --git a/grub-core/bus/usb/usb.c b/grub-core/bus/usb/usb.c index 8da5e4c74..6b32bbd93 100644 --- a/grub-core/bus/usb/usb.c +++ b/grub-core/bus/usb/usb.c @@ -115,7 +115,7 @@ grub_usb_device_initialize (grub_usb_device_t dev) struct grub_usb_desc_device *descdev; struct grub_usb_desc_config config; grub_usb_err_t err; - int i; + int i, j; /* First we have to read first 8 bytes only and determine * max. size of packet */ @@ -149,6 +149,7 @@ grub_usb_device_initialize (grub_usb_device_t dev) int currif; char *data; struct grub_usb_desc *desc; + struct grub_usb_desc_endp *endp; /* First just read the first 4 bytes of the configuration descriptor, after that it is known how many bytes really have @@ -192,24 +193,27 @@ grub_usb_device_initialize (grub_usb_device_t dev) = (struct grub_usb_desc_if *) &data[pos]; pos += dev->config[i].interf[currif].descif->length; + dev->config[i].interf[currif].descendp = grub_malloc ( + dev->config[i].interf[currif].descif->endpointcnt * + sizeof(struct grub_usb_desc_endp)); + + j = 0; while (pos < config.totallen) { desc = (struct grub_usb_desc *)&data[pos]; - if (desc->type == GRUB_USB_DESCRIPTOR_ENDPOINT) - break; - if (!desc->length) - { - err = GRUB_USB_ERR_BADDEVICE; - goto fail; - } - pos += desc->length; - } - - /* Point to the first endpoint. */ - dev->config[i].interf[currif].descendp - = (struct grub_usb_desc_endp *) &data[pos]; - pos += (sizeof (struct grub_usb_desc_endp) - * dev->config[i].interf[currif].descif->endpointcnt); + if (desc->type == GRUB_USB_DESCRIPTOR_ENDPOINT) { + endp = (struct grub_usb_desc_endp *) &data[pos]; + dev->config[i].interf[currif].descendp[j++] = endp; + pos += desc->length; + } else { + if (!desc->length) + { + err = GRUB_USB_ERR_BADDEVICE; + goto fail; + } + pos += desc->length; + } + } } } @@ -217,8 +221,14 @@ grub_usb_device_initialize (grub_usb_device_t dev) fail: - for (i = 0; i < 8; i++) + for (i = 0; i < 8; i++) { + int currif; + + for (currif = 0; currif < dev->config[i].descconf->numif; currif++) + grub_free (dev->config[i].interf[currif].descendp); + grub_free (dev->config[i].descconf); + } return err; } diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c index a06cce302..136bf6ee4 100644 --- a/grub-core/bus/usb/usbhub.c +++ b/grub-core/bus/usb/usbhub.c @@ -82,8 +82,14 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, if (i == GRUB_USBHUB_MAX_DEVICES) { grub_error (GRUB_ERR_IO, "can't assign address to USB device"); - for (i = 0; i < 8; i++) - grub_free (dev->config[i].descconf); + for (i = 0; i < 8; i++) { + int currif; + + for (currif = 0; currif < dev->config[i].descconf->numif; currif++) + grub_free (dev->config[i].interf[currif].descendp); + + grub_free (dev->config[i].descconf); + } grub_free (dev); return NULL; } @@ -96,8 +102,14 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, i, 0, 0, NULL); if (err) { - for (i = 0; i < 8; i++) - grub_free (dev->config[i].descconf); + for (i = 0; i < 8; i++) { + int currif; + + for (currif = 0; currif < dev->config[i].descconf->numif; currif++) + grub_free (dev->config[i].interf[currif].descendp); + + grub_free (dev->config[i].descconf); + } grub_free (dev); return NULL; } @@ -176,7 +188,7 @@ grub_usb_add_hub (grub_usb_device_t dev) i++) { struct grub_usb_desc_endp *endp = NULL; - endp = &dev->config[0].interf[0].descendp[i]; + endp = dev->config[0].interf[0].descendp[i]; if ((endp->endp_addr & 128) && grub_usb_get_ep_type(endp) == GRUB_USB_EP_INTERRUPT) diff --git a/grub-core/commands/usbtest.c b/grub-core/commands/usbtest.c index 2c6d93fe6..55a657635 100644 --- a/grub-core/commands/usbtest.c +++ b/grub-core/commands/usbtest.c @@ -185,7 +185,7 @@ usb_iterate (grub_usb_device_t dev, void *data __attribute__ ((unused))) for (j = 0; j < interf->endpointcnt; j++) { struct grub_usb_desc_endp *endp; - endp = &dev->config[0].interf[i].descendp[j]; + endp = dev->config[0].interf[i].descendp[j]; grub_printf ("Endpoint #%d: %s, max packed size: %d, transfer type: %s, latency: %d\n", endp->endp_addr & 15, diff --git a/grub-core/disk/usbms.c b/grub-core/disk/usbms.c index 380ca4c4c..64e1be8ff 100644 --- a/grub-core/disk/usbms.c +++ b/grub-core/disk/usbms.c @@ -184,7 +184,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno) for (j = 0; j < interf->endpointcnt; j++) { struct grub_usb_desc_endp *endp; - endp = &usbdev->config[0].interf[interfno].descendp[j]; + endp = usbdev->config[0].interf[interfno].descendp[j]; if ((endp->endp_addr & 128) && (endp->attrib & 3) == 2) /* Bulk IN endpoint. */ diff --git a/grub-core/term/usb_keyboard.c b/grub-core/term/usb_keyboard.c index e67b8f785..d65e3474d 100644 --- a/grub-core/term/usb_keyboard.c +++ b/grub-core/term/usb_keyboard.c @@ -175,7 +175,7 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno) for (j = 0; j < usbdev->config[configno].interf[interfno].descif->endpointcnt; j++) { - endp = &usbdev->config[configno].interf[interfno].descendp[j]; + endp = usbdev->config[configno].interf[interfno].descendp[j]; if ((endp->endp_addr & 128) && grub_usb_get_ep_type(endp) == GRUB_USB_EP_INTERRUPT) diff --git a/include/grub/usb.h b/include/grub/usb.h index 512ae1dd0..0527a3e2b 100644 --- a/include/grub/usb.h +++ b/include/grub/usb.h @@ -149,7 +149,7 @@ struct grub_usb_interface { struct grub_usb_desc_if *descif; - struct grub_usb_desc_endp *descendp; + struct grub_usb_desc_endp **descendp; /* A driver is handling this interface. Do we need to support multiple drivers for single interface? diff --git a/include/grub/usbdesc.h b/include/grub/usbdesc.h index aac5ab05a..bb2ab2e27 100644 --- a/include/grub/usbdesc.h +++ b/include/grub/usbdesc.h @@ -29,7 +29,8 @@ typedef enum { GRUB_USB_DESCRIPTOR_INTERFACE, GRUB_USB_DESCRIPTOR_ENDPOINT, GRUB_USB_DESCRIPTOR_DEBUG = 10, - GRUB_USB_DESCRIPTOR_HUB = 0x29 + GRUB_USB_DESCRIPTOR_HUB = 0x29, + GRUB_USB_DESCRIPTOR_SS_ENDPOINT_COMPANION = 0x30 } grub_usb_descriptor_t; struct grub_usb_desc @@ -105,6 +106,14 @@ struct grub_usb_desc_endp grub_uint8_t interval; } GRUB_PACKED; +struct grub_usb_desc_ssep { + grub_uint8_t length; + grub_uint8_t type; + grub_uint8_t maxburst; + grub_uint8_t attrib; + grub_uint16_t interval; +} GRUB_PACKED; + struct grub_usb_desc_str { grub_uint8_t length; -- 2.26.2