From: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
To: Felipe Balbi <balbi@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Thinh Nguyen <Thinh.Nguyen@synopsys.com>,
linux-usb@vger.kernel.org
Cc: John Youn <John.Youn@synopsys.com>
Subject: [PATCH v4 02/12] usb: gadget: composite: Avoid using magic numbers
Date: Sat, 25 Jul 2020 18:36:05 -0700 [thread overview]
Message-ID: <dd116fb1325d369c8c6f3c30ae6f785827fa0a22.1595727196.git.thinhn@synopsys.com> (raw)
In-Reply-To: <cover.1595727196.git.thinhn@synopsys.com>
Magic numbers are difficult to read. Use macros for super-speed-plus BOS
descriptor attributes in the composite driver. They're self-documented.
So there's no need to provide comments as we did previously for the
magic numbers.
Signed-off-by: Thinh Nguyen <thinhn@synopsys.com>
---
Changes in v4:
- None
Changes in v3:
- None
Changes in v2:
- None
drivers/usb/gadget/composite.c | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 05b176c82cc5..0aa4cb49aa53 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/device.h>
#include <linux/utsname.h>
+#include <linux/bitfield.h>
#include <linux/usb/composite.h>
#include <linux/usb/otg.h>
@@ -743,32 +744,30 @@ static int bos_desc(struct usb_composite_dev *cdev)
ssp_cap->bReserved = 0;
ssp_cap->wReserved = 0;
- /* SSAC = 1 (2 attributes) */
- ssp_cap->bmAttributes = cpu_to_le32(1);
+ ssp_cap->bmAttributes =
+ cpu_to_le32(FIELD_PREP(USB_SSP_SUBLINK_SPEED_ATTRIBS, 1) |
+ FIELD_PREP(USB_SSP_SUBLINK_SPEED_IDS, 0));
- /* Min RX/TX Lane Count = 1 */
ssp_cap->wFunctionalitySupport =
- cpu_to_le16((1 << 8) | (1 << 12));
+ cpu_to_le16(FIELD_PREP(USB_SSP_MIN_SUBLINK_SPEED_ATTRIBUTE_ID, 0) |
+ FIELD_PREP(USB_SSP_MIN_RX_LANE_COUNT, 1) |
+ FIELD_PREP(USB_SSP_MIN_TX_LANE_COUNT, 1));
- /*
- * bmSublinkSpeedAttr[0]:
- * ST = Symmetric, RX
- * LSE = 3 (Gbps)
- * LP = 1 (SuperSpeedPlus)
- * LSM = 10 (10 Gbps)
- */
ssp_cap->bmSublinkSpeedAttr[0] =
- cpu_to_le32((3 << 4) | (1 << 14) | (0xa << 16));
- /*
- * bmSublinkSpeedAttr[1] =
- * ST = Symmetric, TX
- * LSE = 3 (Gbps)
- * LP = 1 (SuperSpeedPlus)
- * LSM = 10 (10 Gbps)
- */
+ 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((3 << 4) | (1 << 14) |
- (0xa << 16) | (1 << 7));
+ 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));
}
return le16_to_cpu(bos->wTotalLength);
--
2.11.0
next prev parent reply other threads:[~2020-07-26 1:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-26 1:35 [PATCH v4 00/12] usb: Handle different sublink speeds Thinh Nguyen
2020-07-26 1:35 ` [PATCH v4 01/12] usb: ch9: Add sublink speed struct Thinh Nguyen
2020-07-26 1:36 ` Thinh Nguyen [this message]
2020-07-26 1:36 ` [PATCH v4 03/12] usb: gadget: Expose sublink speed attributes Thinh Nguyen
2020-07-26 1:36 ` [PATCH v4 04/12] usb: gadget: Set max speed for SSP devices Thinh Nguyen
2020-07-26 1:36 ` [PATCH v4 05/12] usb: composite: Properly report sublink speed Thinh Nguyen
2020-07-26 1:36 ` [PATCH v4 06/12] usb: devicetree: Include USB SSP Gen X x Y Thinh Nguyen
2020-07-31 20:21 ` Rob Herring
2020-08-01 2:36 ` Thinh Nguyen
2020-07-26 1:36 ` [PATCH v4 07/12] usb: common: Add and update common functions for SSP speeds Thinh Nguyen
2020-07-26 1:36 ` [PATCH v4 08/12] usb: dwc3: Initialize lane count and sublink speed Thinh Nguyen
2020-07-26 1:36 ` [PATCH v4 09/12] usb: dwc3: gadget: Report sublink speed capability Thinh Nguyen
2020-07-26 1:36 ` [PATCH v4 10/12] usb: dwc3: gadget: Implement setting of sublink speed Thinh Nguyen
2020-07-26 1:37 ` [PATCH v4 11/12] usb: dwc3: gadget: Track connected lane and " Thinh Nguyen
2020-07-26 1:37 ` [PATCH v4 12/12] usb: dwc3: gadget: Set speed only up to the max supported Thinh Nguyen
2020-09-05 0:53 ` [PATCH v4 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=dd116fb1325d369c8c6f3c30ae6f785827fa0a22.1595727196.git.thinhn@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).