From: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
To: Felipe Balbi <balbi@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Thinh.Nguyen@synopsys.com, linux-usb@vger.kernel.org
Cc: John Youn <John.Youn@synopsys.com>
Subject: [PATCH v5 05/12] usb: composite: Properly report sublink speed
Date: Thu, 24 Sep 2020 19:42:14 -0700 [thread overview]
Message-ID: <fcf8575bdc1cbfd1b1ed1aec7ab0a75069f81db2.1601001199.git.Thinh.Nguyen@synopsys.com> (raw)
In-Reply-To: <cover.1601001199.git.Thinh.Nguyen@synopsys.com>
Use the max sublink speed attributes reported in the gadget structure
to write to the super-speed-plus BOS descriptor if available.
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
---
Changes in v5:
- Rebase on Felipe's testing/next branch
- Changed Signed-off-by email to match From: email header
Changes in v4:
- None
Changes in v3:
- None
Changes in v2:
- None
drivers/usb/gadget/composite.c | 76 +++++++++++++++++++++++-----------
1 file changed, 52 insertions(+), 24 deletions(-)
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 0aa4cb49aa53..2d0b7af4b08f 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -729,45 +729,73 @@ static int bos_desc(struct usb_composite_dev *cdev)
/* The SuperSpeedPlus USB Device Capability descriptor */
if (gadget_is_superspeed_plus(cdev->gadget)) {
struct usb_ssp_cap_descriptor *ssp_cap;
+ unsigned int ssac = 1;
+ unsigned int ssic = 0;
+ unsigned int min_ssid = 0;
+ int i;
+
+ if (cdev->gadget->ssac) {
+ ssac = cdev->gadget->ssac;
+
+ /*
+ * Paired RX and TX sublink speed attributes share
+ * the same SSID.
+ */
+ ssic = (ssac + 1) / 2 - 1;
+ min_ssid = cdev->gadget->min_speed_ssid;
+ }
ssp_cap = cdev->req->buf + le16_to_cpu(bos->wTotalLength);
bos->bNumDeviceCaps++;
- /*
- * Report typical values.
- */
-
- le16_add_cpu(&bos->wTotalLength, USB_DT_USB_SSP_CAP_SIZE(1));
- ssp_cap->bLength = USB_DT_USB_SSP_CAP_SIZE(1);
+ le16_add_cpu(&bos->wTotalLength, USB_DT_USB_SSP_CAP_SIZE(ssac));
+ ssp_cap->bLength = USB_DT_USB_SSP_CAP_SIZE(ssac);
ssp_cap->bDescriptorType = USB_DT_DEVICE_CAPABILITY;
ssp_cap->bDevCapabilityType = USB_SSP_CAP_TYPE;
ssp_cap->bReserved = 0;
ssp_cap->wReserved = 0;
ssp_cap->bmAttributes =
- cpu_to_le32(FIELD_PREP(USB_SSP_SUBLINK_SPEED_ATTRIBS, 1) |
- FIELD_PREP(USB_SSP_SUBLINK_SPEED_IDS, 0));
+ cpu_to_le32(FIELD_PREP(USB_SSP_SUBLINK_SPEED_ATTRIBS, ssac) |
+ FIELD_PREP(USB_SSP_SUBLINK_SPEED_IDS, ssic));
ssp_cap->wFunctionalitySupport =
- cpu_to_le16(FIELD_PREP(USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID, 0) |
+ cpu_to_le16(FIELD_PREP(USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID, min_ssid) |
FIELD_PREP(USB_SSP_MIN_RX_LANE_COUNT, 1) |
FIELD_PREP(USB_SSP_MIN_TX_LANE_COUNT, 1));
- ssp_cap->bmSublinkSpeedAttr[0] =
- cpu_to_le32(FIELD_PREP(USB_SSP_SUBLINK_SPEED_SSID, 0) |
- FIELD_PREP(USB_SSP_SUBLINK_SPEED_LSE, USB_LSE_GBPS) |
- FIELD_PREP(USB_SSP_SUBLINK_SPEED_ST,
- USB_ST_SYMMETRIC_RX) |
- FIELD_PREP(USB_SSP_SUBLINK_SPEED_LP, USB_LP_SSP) |
- FIELD_PREP(USB_SSP_SUBLINK_SPEED_LSM, 10));
-
- ssp_cap->bmSublinkSpeedAttr[1] =
- cpu_to_le32(FIELD_PREP(USB_SSP_SUBLINK_SPEED_SSID, 0) |
- FIELD_PREP(USB_SSP_SUBLINK_SPEED_LSE, USB_LSE_GBPS) |
- FIELD_PREP(USB_SSP_SUBLINK_SPEED_ST,
- USB_ST_SYMMETRIC_TX) |
- FIELD_PREP(USB_SSP_SUBLINK_SPEED_LP, USB_LP_SSP) |
- FIELD_PREP(USB_SSP_SUBLINK_SPEED_LSM, 10));
+ /*
+ * If the sublink speed attributes are not specified, then the
+ * default will be a pair symmetric RX/TX sublink speed
+ * attributes of 10 Gbps.
+ */
+ for (i = 0; i < ssac + 1; i++) {
+ struct usb_sublink_speed default_ssa;
+ struct usb_sublink_speed *ptr;
+
+ if (cdev->gadget->ssac) {
+ ptr = &cdev->gadget->sublink_speed[i];
+ } else {
+ default_ssa.id = i / 2;
+ default_ssa.protocol = USB_LP_SSP;
+ default_ssa.exponent = USB_LSE_GBPS;
+ default_ssa.mantissa = 10;
+
+ if (i % 2)
+ default_ssa.type = USB_ST_SYMMETRIC_TX;
+ else
+ default_ssa.type = USB_ST_SYMMETRIC_RX;
+
+ ptr = &default_ssa;
+ }
+
+ ssp_cap->bmSublinkSpeedAttr[i] =
+ cpu_to_le32(FIELD_PREP(USB_SSP_SUBLINK_SPEED_SSID, ptr->id) |
+ FIELD_PREP(USB_SSP_SUBLINK_SPEED_LSE, ptr->exponent) |
+ FIELD_PREP(USB_SSP_SUBLINK_SPEED_ST, ptr->type) |
+ FIELD_PREP(USB_SSP_SUBLINK_SPEED_LP, ptr->protocol) |
+ FIELD_PREP(USB_SSP_SUBLINK_SPEED_LSM, ptr->mantissa));
+ }
}
return le16_to_cpu(bos->wTotalLength);
--
2.28.0
next prev parent reply other threads:[~2020-09-25 2:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 2:41 [PATCH v5 00/12] usb: Handle different sublink speeds Thinh Nguyen
2020-09-25 2:41 ` [PATCH v5 01/12] usb: ch9: Add sublink speed struct Thinh Nguyen
2020-09-25 15:08 ` Greg Kroah-Hartman
2020-09-25 2:41 ` [PATCH v5 02/12] usb: gadget: composite: Avoid using magic numbers Thinh Nguyen
2020-09-25 2:42 ` [PATCH v5 03/12] usb: gadget: Expose sublink speed attributes Thinh Nguyen
2020-09-25 2:42 ` [PATCH v5 04/12] usb: gadget: Set max speed for SSP devices Thinh Nguyen
2020-09-25 2:42 ` Thinh Nguyen [this message]
2020-09-25 2:42 ` [PATCH v5 06/12] usb: devicetree: Include USB SSP Gen X x Y Thinh Nguyen
2020-09-25 2:42 ` [PATCH v5 07/12] usb: common: Add and update common functions for SSP speeds Thinh Nguyen
2020-09-25 2:42 ` [PATCH v5 08/12] usb: dwc3: Initialize lane count and sublink speed Thinh Nguyen
2020-09-25 2:42 ` [PATCH v5 09/12] usb: dwc3: gadget: Report sublink speed capability Thinh Nguyen
2020-09-25 2:42 ` [PATCH v5 10/12] usb: dwc3: gadget: Implement setting of sublink speed Thinh Nguyen
2020-09-25 2:42 ` [PATCH v5 11/12] usb: dwc3: gadget: Track connected lane and " Thinh Nguyen
2020-09-25 2:44 ` [PATCH v5 12/12] usb: dwc3: gadget: Set speed only up to the max supported Thinh Nguyen
2020-09-29 18:13 ` [PATCH v5 00/12] usb: Handle different sublink speeds Thinh Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fcf8575bdc1cbfd1b1ed1aec7ab0a75069f81db2.1601001199.git.Thinh.Nguyen@synopsys.com \
--to=thinh.nguyen@synopsys.com \
--cc=John.Youn@synopsys.com \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.