@@ -1275,6 +1275,8 @@ static void dwc3_get_properties(struct dwc3 *dwc)
hird_threshold = 12;
dwc->maximum_speed = usb_get_maximum_speed(dev);
+ dwc->maximum_num_lanes = usb_get_num_lanes(dev);
+ dwc->maximum_lsm = usb_get_lsm(dev);
dwc->dr_mode = usb_get_dr_mode(dev);
dwc->hsphy_mode = of_usb_get_phy_mode(dev->of_node);
@@ -1426,6 +1428,66 @@ static void dwc3_check_params(struct dwc3 *dwc)
break;
}
+
+ /*
+ * If it's not DWC_usb32 IP or speed is less than SSP, no need to
+ * validate the number of lanes or lane speed mantissa.
+ *
+ * Currently the controller does not have visibility into the HW
+ * parameter to determine the maximum number of lanes the phy supports.
+ * If the number of lanes is not specified in the device property, then
+ * set the default to 2 for DWC_usb32 and 1 for DWC_usb31 if the device
+ * is capable of super-speed-plus.
+ */
+ if (!DWC3_IP_IS(DWC32) ||
+ dwc->maximum_speed < USB_SPEED_SUPER_PLUS) {
+ if (dwc->maximum_lsm || dwc->maximum_num_lanes)
+ dev_warn(dev, "Ignore num_lanes and LSM properties\n");
+
+ if (DWC3_IP_IS(DWC31) &&
+ dwc->maximum_speed == USB_SPEED_SUPER_PLUS) {
+ dwc->maximum_lsm = DWC3_LSM_10_GBPS;
+ dwc->maximum_num_lanes = 1;
+ } else {
+ dwc->maximum_lsm = DWC3_LSM_UNSPECIFIED;
+ dwc->maximum_num_lanes = 0;
+ }
+
+ return;
+ }
+
+ switch (dwc->maximum_lsm) {
+ case DWC3_LSM_10_GBPS:
+ case DWC3_LSM_5_GBPS:
+ break;
+ default:
+ dev_err(dev, "Invalid LSM (%dGbps)\n", dwc->maximum_lsm);
+ fallthrough;
+ case DWC3_LSM_UNSPECIFIED:
+ dwc->maximum_lsm = DWC3_LSM_10_GBPS;
+ break;
+ }
+
+ switch (dwc->maximum_num_lanes) {
+ case 2:
+ break;
+ case 1:
+ if (dwc->maximum_lsm == DWC3_LSM_5_GBPS) {
+ dev_err(dev, "Invalid num_lanes (%d) and LSM (%dGbps) for %s\n",
+ dwc->maximum_num_lanes,
+ dwc->maximum_lsm,
+ usb_speed_string(dwc->maximum_speed));
+ dwc->maximum_lsm = DWC3_LSM_10_GBPS;
+ }
+ break;
+ default:
+ dev_err(dev, "Invalid number of lanes (%d)\n",
+ dwc->maximum_num_lanes);
+ fallthrough;
+ case 0:
+ dwc->maximum_num_lanes = 2;
+ break;
+ }
}
static int dwc3_probe(struct platform_device *pdev)
@@ -40,6 +40,10 @@
#define DWC3_XHCI_RESOURCES_NUM 2
#define DWC3_ISOC_MAX_RETRIES 5
+#define DWC3_LSM_UNSPECIFIED 0
+#define DWC3_LSM_5_GBPS 5
+#define DWC3_LSM_10_GBPS 10
+
#define DWC3_SCRATCHBUF_SIZE 4096 /* each buffer is assumed to be 4KiB */
#define DWC3_EVENT_BUFFERS_SIZE 4096
#define DWC3_EVENT_TYPE_MASK 0xfe
@@ -958,6 +962,8 @@ struct dwc3_scratchpad_array {
* @nr_scratch: number of scratch buffers
* @u1u2: only used on revisions <1.83a for workaround
* @maximum_speed: maximum speed requested (mainly for testing purposes)
+ * @maximum_lsm: maximum lane speed mantissa in Gbps
+ * @maximum_num_lanes: maximum number of lanes
* @ip: controller's ID
* @revision: controller's version of an IP
* @version_type: VERSIONTYPE register contents, a sub release of a revision
@@ -988,6 +994,7 @@ struct dwc3_scratchpad_array {
* @ep0state: state of endpoint zero
* @link_state: link state
* @speed: device speed (super, high, full, low)
+ * @num_lanes: number of connected lanes
* @hwparams: copy of hwparams registers
* @root: debugfs root folder pointer
* @regset: debugfs pointer to regdump file
@@ -1119,6 +1126,8 @@ struct dwc3 {
u32 nr_scratch;
u32 u1u2;
u32 maximum_speed;
+ u16 maximum_lsm;
+ u8 maximum_num_lanes;
u32 ip;
@@ -1184,6 +1193,7 @@ struct dwc3 {
u8 u1pel;
u8 speed;
+ u8 num_lanes;
u8 num_eps;
DWC_usb32 supports dual-lane operating at different sublink speeds. Initialize and validate the maximum number of lanes and speed the controller supports captured from the dwc3 device properties. Currently the controller has no visibility into the HW parameter to determine the maximum number of lanes the phy supports. If the number of lanes is not specified, then set the default to 2 for DWC_usb32 and 1 for DWC_usb31 if operate in SSP. Signed-off-by: Thinh Nguyen <thinhn@synopsys.com> --- Changes in v2: - Use common functions to get num_lanes and lsm properties drivers/usb/dwc3/core.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/dwc3/core.h | 10 ++++++++ 2 files changed, 72 insertions(+)