mbox series

[v16,0/9] Add multiport support for DWC3 controllers

Message ID 20240307062052.2319851-1-quic_kriskura@quicinc.com
Headers show
Series Add multiport support for DWC3 controllers | expand

Message

Krishna Kurapati March 7, 2024, 6:20 a.m. UTC
Currently the DWC3 driver supports only single port controller which
requires at most two PHYs ie HS and SS PHYs. There are SoCs that has
DWC3 controller with multiple ports that can operate in host mode.
Some of the port supports both SS+HS and other port supports only HS
mode.

This change primarily refactors the Phy logic in core driver to allow
multiport support with Generic Phy's.

Changes have been tested on  QCOM SoC SA8295P which has 4 ports (2
are HS+SS capable and 2 are HS only capable).

This series depends on removal of ACPI from DWC3 QCOM wrapper [1].

Changes in v16:
Removing ACPI has simplified the interrupt reading in wrapper. Also
the logic to find number of ports is based on dp_hs_phy interrupt check
in DT. Enabling and disabling interrupts is now done per port. Added
info on power event irq in commit message.

Changes in v15:
Added minItems property in qcom,dwc3 bindings as suggested by Rob.
Retained all RB's/ACK's got in v14.

Changes in v14:
Moved wrapper binding update to 5th patch in the series as it deals
with only wakeup and not enumeration. The first part of the series
deals with enumeration and the next part deals with wakeup.
Updated commit text for wrapper driver patches.
Added error checks in get_port_index and setup_irq call which were
missing in v13.
Added SOB and CDB tags appropriately for the patches.
Rebased code on top of latest usb next.
DT changes have been removed and will be sent as a separate series.

Changes in v13:
This series is a subset of patches in v11 as the first 3 patches in v11
have been mereged into usb-next.
Moved dr_mode property from platform specific files to common sc8280xp DT.
Fixed function call wrapping, added comments and replaced #defines with
enum in dwc3-qcom for identifying IRQ index appropriately.
Fixed nitpicks pointed out in v11 for suspend-resume handling.
Added reported-by tag for phy refactoring patch as a compile error was
found by kernel test bot [1].
Removed reviewed-by tag of maintainer for phy refactoring patch as a minor
change of increasing phy-names array size by 2-bytes was done to fix
compilation issue mentioned in [1].

Changes in v12:
Pushed as a subset of acked but no-yet-merged patches of v11 with intent
of making rebase of other patches easy. Active reviewers from community
suggested that it would be better to push the whole series in one go as it
would give good clarity and context for all the patches in the series.
So pushed v13 for the same addressing comments received in v11.

Changes in v11:
Implemented port_count calculation by reading interrupt-names from DT.
Refactored IRQ handling in dwc3-qcom.
Moving of macros to xhci-ext-caps.h made as a separate patch.
Names of interrupts to be displayed on /proc/interrupts set to the ones
present in DT.

Changes in v10:
Refactored phy init/exit/power-on/off functions in dwc3 core
Refactored dwc3-qcom irq registration and handling
Implemented wakeup for multiport irq's
Moved few macros from xhci.h to xhci-ext-caps.h
Fixed nits pointed out in v9
Fixed Co-developed by and SOB tags in patches 5 and 11

Changes in v9:
Added IRQ support for DP/DM/SS MP Irq's of SC8280
Refactored code to read port count by accessing xhci registers

Changes in v8:
Reorganised code in patch-5
Fixed nitpicks in code according to comments received on v7
Fixed indentation in DT patches
Added drive strength for pinctrl nodes in SA8295 DT

Changes in v7:
Added power event irq's for Multiport controller.
Udpated commit text for patch-9 (adding DT changes for enabling first
port of multiport controller on sa8540-ride).
Fixed check-patch warnings for driver code.
Fixed DT binding errors for changes in snps,dwc3.yaml
Reabsed code on top of usb-next

Changes in v6:
Updated comments in code after.
Updated variables names appropriately as per review comments.
Updated commit text in patch-2 and added additional info as per review
comments.
The patch header in v5 doesn't have "PATHCH v5" notation present. Corrected
it in this version.

Changes in v5:
Added DT support for first port of Teritiary USB controller on SA8540-Ride
Added support for reading port info from XHCI Extended Params registers.

Changes in RFC v4:
Added DT support for SA8295p.

Changes in RFC v3:
Incase any PHY init fails, then clear/exit the PHYs that
are already initialized.

Changes in RFC v2:
Changed dwc3_count_phys to return the number of PHY Phandles in the node.
This will be used now in dwc3_extract_num_phys to increment num_usb2_phy 
and num_usb3_phy.
Added new parameter "ss_idx" in dwc3_core_get_phy_ny_node and changed its
structure such that the first half is for HS-PHY and second half is for
SS-PHY.
In dwc3_core_get_phy, for multiport controller, only if SS-PHY phandle is
present, pass proper SS_IDX else pass -1.

Tests done:

a) Tested enumeration and wakeup on Tertiary controller of SA8540 Ride
/ # lsusb
Bus 001 Device 001: ID 1d6b:0002
Bus 001 Device 002: ID 03f0:134a
Bus 002 Device 001: ID 1d6b:0003

/ # dmesg | grep ports
[    0.326208] xhci-hcd xhci-hcd.0.auto: Host supports USB 3.1 Enhanced SuperSpeed
[    0.327065] hub 1-0:1.0: 4 ports detected
[    0.328289] hub 2-0:1.0: 2 ports detected

b) Tested enumeration and working of device mode on SA8450 QRD

c) Interrupts registering properly:

/ # cat /proc/interrupts  |grep phy
158:  1 0 0 0 0 0 0 0 PDC 127 Edge      dp_hs_phy_1
159:  0 0 0 0 0 0 0 0 PDC 129 Edge      dp_hs_phy_2
160:  0 0 0 0 0 0 0 0 PDC 131 Edge      dp_hs_phy_3
161:  0 0 0 0 0 0 0 0 PDC 133 Edge      dp_hs_phy_4
162:  2 0 0 0 0 0 0 0 PDC 126 Edge      dm_hs_phy_1
163:  0 0 0 0 0 0 0 0 PDC  16 Level     ss_phy_1
164:  0 0 0 0 0 0 0 0 PDC 128 Edge      dm_hs_phy_2
165:  0 0 0 0 0 0 0 0 PDC  17 Level     ss_phy_2
166:  0 0 0 0 0 0 0 0 PDC 130 Edge      dm_hs_phy_3
167:  0 0 0 0 0 0 0 0 PDC 132 Edge      dm_hs_phy_4

[1]: https://lore.kernel.org/all/20240305093216.3814787-1-quic_kriskura@quicinc.com/

Links to previous versions:
Link to v15: https://lore.kernel.org/all/20240216005756.762712-1-quic_kriskura@quicinc.com/
Link to v14: https://lore.kernel.org/all/20240206051825.1038685-1-quic_kriskura@quicinc.com/
Link to v13: https://lore.kernel.org/all/20231007154806.605-1-quic_kriskura@quicinc.com/
Link to v12: https://lore.kernel.org/all/20231004165922.25642-1-quic_kriskura@quicinc.com/
Link to v11: https://lore.kernel.org/all/20230828133033.11988-1-quic_kriskura@quicinc.com/
Link to v10: https://lore.kernel.org/all/20230727223307.8096-1-quic_kriskura@quicinc.com/
Link to v9: https://lore.kernel.org/all/20230621043628.21485-1-quic_kriskura@quicinc.com/
Link to v8: https://lore.kernel.org/all/20230514054917.21318-1-quic_kriskura@quicinc.com/
Link to v7: https://lore.kernel.org/all/20230501143445.3851-1-quic_kriskura@quicinc.com/
Link to v6: https://lore.kernel.org/all/20230405125759.4201-1-quic_kriskura@quicinc.com/
Link to v5: https://lore.kernel.org/all/20230310163420.7582-1-quic_kriskura@quicinc.com/
Link to RFC v4: https://lore.kernel.org/all/20230115114146.12628-1-quic_kriskura@quicinc.com/
Link to RFC v3: https://lore.kernel.org/all/1654709787-23686-1-git-send-email-quic_harshq@quicinc.com/#r
Link to RFC v2: https://lore.kernel.org/all/1653560029-6937-1-git-send-email-quic_harshq@quicinc.com/#r

Krishna Kurapati (9):
  dt-bindings: usb: Add bindings for multiport properties on DWC3
    controller
  usb: dwc3: core: Access XHCI address space temporarily to read port
    info
  usb: dwc3: core: Skip setting event buffers for host only controllers
  usb: dwc3: core: Refactor PHY logic to support Multiport Controller
  dt-bindings: usb: qcom,dwc3: Add bindings for SC8280 Multiport
  usb: dwc3: qcom: Add helper function to request wakeup interrupts
  usb: dwc3: qcom: Refactor IRQ handling in glue driver
  usb: dwc3: qcom: Enable wakeup for applicable ports of multiport
  usb: dwc3: qcom: Add multiport suspend/resume support for wrapper

 .../devicetree/bindings/usb/qcom,dwc3.yaml    |  34 ++
 .../devicetree/bindings/usb/snps,dwc3.yaml    |  13 +-
 drivers/usb/dwc3/core.c                       | 325 +++++++++++++-----
 drivers/usb/dwc3/core.h                       |  19 +-
 drivers/usb/dwc3/drd.c                        |  15 +-
 drivers/usb/dwc3/dwc3-qcom.c                  | 256 +++++++++-----
 6 files changed, 487 insertions(+), 175 deletions(-)

Comments

Johan Hovold March 25, 2024, 12:31 p.m. UTC | #1
On Thu, Mar 07, 2024 at 11:50:45AM +0530, Krishna Kurapati wrote:
> All DWC3 Multi Port controllers that exist today only support host mode.
> Temporarily map XHCI address space for host-only controllers and parse
> XHCI Extended Capabilities registers to read number of usb2 ports and
> usb3 ports present on multiport controller. Each USB Port is at least HS
> capable.
> 
> The port info for usb2 and usb3 phy are identified as num_usb2_ports
> and num_usb3_ports. The intention is as follows:
> 
> Wherever we need to perform phy operations like:
> 
> LOOP_OVER_NUMBER_OF_AVAILABLE_PORTS()
> {
> 	phy_set_mode(dwc->usb2_generic_phy[i], PHY_MODE_USB_HOST);
> 	phy_set_mode(dwc->usb3_generic_phy[i], PHY_MODE_USB_HOST);
> }
> 
> If number of usb2 ports is 3, loop can go from index 0-2 for
> usb2_generic_phy. If number of usb3-ports is 2, we don't know for sure,
> if the first 2 ports are SS capable or some other ports like (2 and 3)
> are SS capable. So instead, num_usb2_ports is used to loop around all
> phy's (both hs and ss) for performing phy operations. If any
> usb3_generic_phy turns out to be NULL, phy operation just bails out.
> num_usb3_ports is used to modify GUSB3PIPECTL registers while setting up
> phy's as we need to know how many SS capable ports are there for this.
> 
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>

Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Johan Hovold March 25, 2024, 12:33 p.m. UTC | #2
On Thu, Mar 07, 2024 at 11:50:47AM +0530, Krishna Kurapati wrote:
> Currently the DWC3 driver supports only single port controller
> which requires at least one HS PHY and at most one SS PHY.
> 
> But the DWC3 USB controller can be connected to multiple ports and
> each port can have their own PHYs. Each port of the multiport
> controller can either be HS+SS capable or HS only capable
> Proper quantification of them is required to modify GUSB2PHYCFG
> and GUSB3PIPECTL registers appropriately.
> 
> Add support for detecting, obtaining and configuring PHYs supported
> by a multiport controller. Limit support to multiport controllers
> with up to four ports for now (e.g. as needed for SC8280XP).
> 
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>

Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Johan Hovold March 25, 2024, 12:35 p.m. UTC | #3
On Thu, Mar 07, 2024 at 11:50:49AM +0530, Krishna Kurapati wrote:
> The logic for requesting interrupts is duplicated for each interrupt. In
> the upcoming patches that introduces support for multiport, it would be
> better to clean up the duplication before reading mulitport related
> interrupts.
> 
> Refactor interrupt setup call by adding a new helper function for
> requesting the wakeup interrupts. To simplify implementation, make
> the display name same as the interrupt name expected in DT.
> 
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>

Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Johan Hovold March 25, 2024, 12:48 p.m. UTC | #4
On Thu, Mar 07, 2024 at 11:50:50AM +0530, Krishna Kurapati wrote:
> On multiport supported controllers, each port has its own DP/DM
> and SS (if super speed capable) interrupts. As per the bindings,
> their interrupt names differ from standard ones having "_x" added
> as suffix (x indicates port number). Identify from the interrupt
> names whether the controller is a multiport controller or not.
> Refactor dwc3_qcom_setup_irq() call to parse multiport interrupts
> along with non-multiport ones accordingly..
> 
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
> ---
>  drivers/usb/dwc3/dwc3-qcom.c | 146 +++++++++++++++++++++++++++--------
>  1 file changed, 112 insertions(+), 34 deletions(-)

This is much better. Just a couple of nits below.

> +static int dwc3_qcom_find_num_ports(struct platform_device *pdev)
> +{
> +	const char *irq_name;
> +	int port_index;
> +	int irq;
> +
> +	irq = platform_get_irq_byname_optional(pdev, "qusb2_phy");
> +	if (irq > 0)
> +		return 1;
> +
> +	irq = platform_get_irq_byname_optional(pdev, "dp_hs_phy_irq");
> +	if (irq > 0)
> +		return 1;
> +
> +	for (port_index = 0; port_index < DWC3_MAX_PORTS; port_index++) {
> +		irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "dp_hs_phy_%d", port_index + 1);

Please use a stack allocated buffer for these strings as we don't need
them any more after this function returns.

> +		if (!irq_name)
> +			return -ENOMEM;
> +
> +		irq = platform_get_irq_byname_optional(pdev, irq_name);
> +		if (irq <= 0)
> +			return port_index;
> +	}
> +
> +	return port_index;

I think explicitly returning DWC3_MAX_PORTS here would be more readable.

> +}
> +
> +static int dwc3_qcom_setup_irq(struct platform_device *pdev)
> +{
> +	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
> +	bool is_multiport;
> +	int ret;
> +	int i;
> +
> +	qcom->num_ports = dwc3_qcom_find_num_ports(pdev);
> +	if (qcom->num_ports < 0)
> +		return -ENOMEM;

Just return 'ret' directly.

> +
> +	is_multiport = (qcom->num_ports > 1) ? true : false;

And no need for the ternary operator:

	is_multiport = (qcom->num_ports > 1);

> +
> +	for (i = 0; i < qcom->num_ports; i++) {
> +		ret = dwc3_qcom_setup_port_irq(pdev, i, is_multiport);
>  		if (ret)
>  			return ret;
> -		qcom->ss_phy_irq = irq;
>  	}
>  
>  	return 0;

With that fixed:

Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Johan Hovold March 25, 2024, 12:50 p.m. UTC | #5
On Thu, Mar 07, 2024 at 11:50:51AM +0530, Krishna Kurapati wrote:
> DWC3 Qcom wrapper currently supports only wakeup configuration
> for single port controllers. Read speed of each port connected
> to the controller and enable wakeup for each of them accordingly.
> 
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>

Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Johan Hovold March 25, 2024, 12:52 p.m. UTC | #6
On Thu, Mar 07, 2024 at 11:50:52AM +0530, Krishna Kurapati wrote:
> Power event IRQ is used for wakeup in cases:
> a) where the controller is super speed capable and missing an
> ss_phy interrupt.
> b) where the GIC is not capable of detecting DP/DM hs phy irq's.
> 
> Power event IRQ stat register indicates whether high speed phy
> entered and exited L2 successfully during suspend and resume.
> Indicate the same for all ports of multiport.
> 
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>

> @@ -471,9 +480,12 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom, bool wakeup)
>  	if (ret)
>  		dev_warn(qcom->dev, "failed to enable interconnect: %d\n", ret);
>  
> +	for (i = 0; i < qcom->num_ports; i++) {
>  	/* Clear existing events from PHY related to L2 in/out */

This comment either needs to be moved above the for-loop or be indented
one level in.

> -	dwc3_qcom_setbits(qcom->qscratch_base, PWR_EVNT_IRQ_STAT_REG,
> -			  PWR_EVNT_LPM_IN_L2_MASK | PWR_EVNT_LPM_OUT_L2_MASK);
> +		dwc3_qcom_setbits(qcom->qscratch_base,
> +				  pwr_evnt_irq_stat_reg[i],
> +				  PWR_EVNT_LPM_IN_L2_MASK | PWR_EVNT_LPM_OUT_L2_MASK);
> +	}
>  
>  	qcom->is_suspended = false;

With the above fixed:

Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Krishna Kurapati March 25, 2024, 1:15 p.m. UTC | #7
On 3/25/2024 6:18 PM, Johan Hovold wrote:
> On Thu, Mar 07, 2024 at 11:50:50AM +0530, Krishna Kurapati wrote:
>> On multiport supported controllers, each port has its own DP/DM
>> and SS (if super speed capable) interrupts. As per the bindings,
>> their interrupt names differ from standard ones having "_x" added
>> as suffix (x indicates port number). Identify from the interrupt
>> names whether the controller is a multiport controller or not.
>> Refactor dwc3_qcom_setup_irq() call to parse multiport interrupts
>> along with non-multiport ones accordingly..
>>
>> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
>> ---
>>   drivers/usb/dwc3/dwc3-qcom.c | 146 +++++++++++++++++++++++++++--------
>>   1 file changed, 112 insertions(+), 34 deletions(-)
> 
> This is much better. Just a couple of nits below.
> 
>> +static int dwc3_qcom_find_num_ports(struct platform_device *pdev)
>> +{
>> +	const char *irq_name;
>> +	int port_index;
>> +	int irq;
>> +
>> +	irq = platform_get_irq_byname_optional(pdev, "qusb2_phy");
>> +	if (irq > 0)
>> +		return 1;
>> +
>> +	irq = platform_get_irq_byname_optional(pdev, "dp_hs_phy_irq");
>> +	if (irq > 0)
>> +		return 1;
>> +
>> +	for (port_index = 0; port_index < DWC3_MAX_PORTS; port_index++) {
>> +		irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "dp_hs_phy_%d", port_index + 1);
> 
> Please use a stack allocated buffer for these strings as we don't need
> them any more after this function returns.
> 

Sure. Will replace this with "char irq_name[14]".

>> +		if (!irq_name)
>> +			return -ENOMEM;
>> +
>> +		irq = platform_get_irq_byname_optional(pdev, irq_name);
>> +		if (irq <= 0)
>> +			return port_index;
>> +	}
>> +
>> +	return port_index;
> 
> I think explicitly returning DWC3_MAX_PORTS here would be more readable.
> 

Will make this change.

>> +}
>> +
>> +static int dwc3_qcom_setup_irq(struct platform_device *pdev)
>> +{
>> +	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
>> +	bool is_multiport;
>> +	int ret;
>> +	int i;
>> +
>> +	qcom->num_ports = dwc3_qcom_find_num_ports(pdev);
>> +	if (qcom->num_ports < 0)
>> +		return -ENOMEM;
> 
> Just return 'ret' directly.

Sure, will init ret to -ENOMEM and return ret here.

> 
>> +
>> +	is_multiport = (qcom->num_ports > 1) ? true : false;
> 
> And no need for the ternary operator:
ACK.

> 
> 	is_multiport = (qcom->num_ports > 1);
> 
>> +
>> +	for (i = 0; i < qcom->num_ports; i++) {
>> +		ret = dwc3_qcom_setup_port_irq(pdev, i, is_multiport);
>>   		if (ret)
>>   			return ret;
>> -		qcom->ss_phy_irq = irq;
>>   	}
>>   
>>   	return 0;
> 
> With that fixed:
> 
> Reviewed-by: Johan Hovold <johan+linaro@kernel.org>

Thanks for the review

Regards,
Krishna,
Krishna Kurapati March 25, 2024, 1:15 p.m. UTC | #8
On 3/25/2024 6:22 PM, Johan Hovold wrote:
> On Thu, Mar 07, 2024 at 11:50:52AM +0530, Krishna Kurapati wrote:
>> Power event IRQ is used for wakeup in cases:
>> a) where the controller is super speed capable and missing an
>> ss_phy interrupt.
>> b) where the GIC is not capable of detecting DP/DM hs phy irq's.
>>
>> Power event IRQ stat register indicates whether high speed phy
>> entered and exited L2 successfully during suspend and resume.
>> Indicate the same for all ports of multiport.
>>
>> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
> 
>> @@ -471,9 +480,12 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom, bool wakeup)
>>   	if (ret)
>>   		dev_warn(qcom->dev, "failed to enable interconnect: %d\n", ret);
>>   
>> +	for (i = 0; i < qcom->num_ports; i++) {
>>   	/* Clear existing events from PHY related to L2 in/out */
> 
> This comment either needs to be moved above the for-loop or be indented
> one level in.

Ah yes, missed it.
Will move it out of the loop.

> 
>> -	dwc3_qcom_setbits(qcom->qscratch_base, PWR_EVNT_IRQ_STAT_REG,
>> -			  PWR_EVNT_LPM_IN_L2_MASK | PWR_EVNT_LPM_OUT_L2_MASK);
>> +		dwc3_qcom_setbits(qcom->qscratch_base,
>> +				  pwr_evnt_irq_stat_reg[i],
>> +				  PWR_EVNT_LPM_IN_L2_MASK | PWR_EVNT_LPM_OUT_L2_MASK);
>> +	}
>>   
>>   	qcom->is_suspended = false;
> 
> With the above fixed:
> 
> Reviewed-by: Johan Hovold <johan+linaro@kernel.org>

Thanks for the review.

Regards,
Krishna,
Johan Hovold March 25, 2024, 1:23 p.m. UTC | #9
On Mon, Mar 25, 2024 at 06:45:07PM +0530, Krishna Kurapati PSSNV wrote:
> >> +static int dwc3_qcom_setup_irq(struct platform_device *pdev)
> >> +{
> >> +	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
> >> +	bool is_multiport;
> >> +	int ret;
> >> +	int i;
> >> +
> >> +	qcom->num_ports = dwc3_qcom_find_num_ports(pdev);
> >> +	if (qcom->num_ports < 0)
> >> +		return -ENOMEM;
> > 
> > Just return 'ret' directly.
> 
> Sure, will init ret to -ENOMEM and return ret here.

I meant that you should return whatever error dwc3_qcom_find_num_ports()
returns, so perhaps something like:

	
	ret = dwc3_qcom_find_num_ports(pdev);
	if (ret < 0)
		return ret;

	qcom->num_ports = ret;

It looks like dwc3_qcom_find_num_ports() can also return 0 (e.g. on
malformed DT), which also needs to be handled somehow. I missed that
earlier.

Johan
Krishna Kurapati March 25, 2024, 5:29 p.m. UTC | #10
On 3/25/2024 6:53 PM, Johan Hovold wrote:
> On Mon, Mar 25, 2024 at 06:45:07PM +0530, Krishna Kurapati PSSNV wrote:
>>>> +static int dwc3_qcom_setup_irq(struct platform_device *pdev)
>>>> +{
>>>> +	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
>>>> +	bool is_multiport;
>>>> +	int ret;
>>>> +	int i;
>>>> +
>>>> +	qcom->num_ports = dwc3_qcom_find_num_ports(pdev);
>>>> +	if (qcom->num_ports < 0)
>>>> +		return -ENOMEM;
>>>
>>> Just return 'ret' directly.
>>
>> Sure, will init ret to -ENOMEM and return ret here. >
Hi Johan,

> I meant that you should return whatever error dwc3_qcom_find_num_ports()
> returns, so perhaps something like:
> 

Got it. Any error that might come up in interrupt reading as well.
> 	
> 	ret = dwc3_qcom_find_num_ports(pdev);
> 	if (ret < 0)
> 		return ret;
> 
> 	qcom->num_ports = ret;
> 
> It looks like dwc3_qcom_find_num_ports() can also return 0 (e.g. on
> malformed DT), which also needs to be handled somehow. I missed that
> earlier.
> 

 From what I remember, Konrad mentioned that we might not need to 
support incomplete or improper DT [1]. Also since this is close to 
getting merged, can we take up any changes for Malformed DT handling 
later given that only one or two devices are present and less likely to 
be given a malformed DT.

[1]: 
https://lore.kernel.org/all/c8d77d4f-6696-4dc9-8030-daf1d10b114b@linaro.org/

Regards,
Krishna,
Johan Hovold March 25, 2024, 7:45 p.m. UTC | #11
On Mon, Mar 25, 2024 at 10:59:49PM +0530, Krishna Kurapati PSSNV wrote:
> On 3/25/2024 6:53 PM, Johan Hovold wrote:

> > 	ret = dwc3_qcom_find_num_ports(pdev);
> > 	if (ret < 0)
> > 		return ret;
> > 
> > 	qcom->num_ports = ret;
> > 
> > It looks like dwc3_qcom_find_num_ports() can also return 0 (e.g. on
> > malformed DT), which also needs to be handled somehow. I missed that
> > earlier.
> 
>  From what I remember, Konrad mentioned that we might not need to 
> support incomplete or improper DT [1]. 

You still need to make sure that the driver doesn't misbehave on
malformed input.

> Also since this is close to getting merged, can we take up any changes
> for Malformed DT handling later given that only one or two devices are
> present and less likely to be given a malformed DT.

No, and I'm a bit disappointed that you're still trying to take short
cuts to getting these patches merged after I've told you repeatedly that
that is not how upstream works.

Fortunately, this is easily fixed and would both simplify the code
further and reduce the risk of breaking backwards compatibility.

Just change the logic in dwc3_qcom_find_num_ports() so that it returns 1
if "dp_hs_phy_1" is missing, and otherwise you determine the number of
ports by iterating from 2 to DWC3_MAX_PORTS - 1.

Johan
Krishna Kurapati March 26, 2024, 8:11 a.m. UTC | #12
On 3/26/2024 1:15 AM, Johan Hovold wrote:

> Just change the logic in dwc3_qcom_find_num_ports() so that it returns 1
> if "dp_hs_phy_1" is missing, and otherwise you determine the number of
> ports by iterating from 2 to DWC3_MAX_PORTS - 1.

Hi Johan,

I made this change and it works. Removed any return value check for the 
find_num_ports call as it can return only 1/2/3/4 now.

---
     irq = platform_get_irq_byname_optional(pdev, "qusb2_phy");
         if (irq > 0)
                 return 1;

         irq = platform_get_irq_byname_optional(pdev, "dp_hs_phy_irq");
         if (irq > 0)
                 return 1;

         irq = platform_get_irq_byname_optional(pdev, "dp_hs_phy_1");
         if (irq <= 0)
                 return 1;

         for (port_index = 1; port_index < DWC3_MAX_PORTS - 1; 
port_index++) {
                 sprintf(irq_name, "dp_hs_phy_%d", port_index + 1);

                 irq = platform_get_irq_byname_optional(pdev, irq_name);
                 if (irq <= 0)
                         return port_index;
         }

         return DWC3_MAX_PORTS;

---

Let me know if this is fine and I can push out v17.

Regards,
Krishna,
Johan Hovold March 26, 2024, 8:28 a.m. UTC | #13
On Tue, Mar 26, 2024 at 01:41:52PM +0530, Krishna Kurapati PSSNV wrote:
> On 3/26/2024 1:15 AM, Johan Hovold wrote:
> 
> > Just change the logic in dwc3_qcom_find_num_ports() so that it returns 1
> > if "dp_hs_phy_1" is missing, and otherwise you determine the number of
> > ports by iterating from 2 to DWC3_MAX_PORTS - 1.

> I made this change and it works. Removed any return value check for the 
> find_num_ports call as it can return only 1/2/3/4 now.
> 
> ---
>      irq = platform_get_irq_byname_optional(pdev, "qusb2_phy");
>          if (irq > 0)
>                  return 1;
> 
>          irq = platform_get_irq_byname_optional(pdev, "dp_hs_phy_irq");
>          if (irq > 0)
>                  return 1;

As I mentioned above, these two lookups are no longer needed and should
be removed.
 
>          irq = platform_get_irq_byname_optional(pdev, "dp_hs_phy_1");
>          if (irq <= 0)
>                  return 1;

Just assume it's a single port controller unless "dp_hs_phy_1" is
present.
 
>          for (port_index = 1; port_index < DWC3_MAX_PORTS - 1; 
> port_index++) {

I think this would be more readable if you use port (num) as iterator
(2..DWC3_MAX_PORTS) as you're returning a number of ports.

>                  sprintf(irq_name, "dp_hs_phy_%d", port_index + 1);

Then this would use just "port";

> 
>                  irq = platform_get_irq_byname_optional(pdev, irq_name);
>                  if (irq <= 0)
>                          return port_index;

And return "port - 1" here.

>          }
> 
>          return DWC3_MAX_PORTS;

Johan
Krishna Kurapati March 26, 2024, 10:06 a.m. UTC | #14
On 3/26/2024 1:58 PM, Johan Hovold wrote:
> On Tue, Mar 26, 2024 at 01:41:52PM +0530, Krishna Kurapati PSSNV wrote:
>> On 3/26/2024 1:15 AM, Johan Hovold wrote:
>>
>>> Just change the logic in dwc3_qcom_find_num_ports() so that it returns 1
>>> if "dp_hs_phy_1" is missing, and otherwise you determine the number of
>>> ports by iterating from 2 to DWC3_MAX_PORTS - 1.
> 
>> I made this change and it works. Removed any return value check for the
>> find_num_ports call as it can return only 1/2/3/4 now.
>>
>> ---
>>       irq = platform_get_irq_byname_optional(pdev, "qusb2_phy");
>>           if (irq > 0)
>>                   return 1;
>>
>>           irq = platform_get_irq_byname_optional(pdev, "dp_hs_phy_irq");
>>           if (irq > 0)
>>                   return 1;
> 
> As I mentioned above, these two lookups are no longer needed and should
> be removed.
>   
>>           irq = platform_get_irq_byname_optional(pdev, "dp_hs_phy_1");
>>           if (irq <= 0)
>>                   return 1;
> 
> Just assume it's a single port controller unless "dp_hs_phy_1" is
> present.
>   
>>           for (port_index = 1; port_index < DWC3_MAX_PORTS - 1;
>> port_index++) {
> 
> I think this would be more readable if you use port (num) as iterator
> (2..DWC3_MAX_PORTS) as you're returning a number of ports.
> 
>>                   sprintf(irq_name, "dp_hs_phy_%d", port_index + 1);
> 
> Then this would use just "port";
> 
>>
>>                   irq = platform_get_irq_byname_optional(pdev, irq_name);
>>                   if (irq <= 0)
>>                           return port_index;
> 
> And return "port - 1" here.
> 
>>           }
>>
>>           return DWC3_MAX_PORTS;

Ok,Thanks.

With the above fixed, can I put your RB tag given on [1] or will you be 
providing another one. Asking because when you gave that RB, this 
malformed DT thing wasn't there. So wanted to check with you before 
pushing the code.

[1]: https://lore.kernel.org/all/ZgFyukBXIIwZo7v-@hovoldconsulting.com/

Regards,
Krishna,
Johan Hovold March 26, 2024, 10:14 a.m. UTC | #15
On Tue, Mar 26, 2024 at 03:36:27PM +0530, Krishna Kurapati PSSNV wrote:
> On 3/26/2024 1:58 PM, Johan Hovold wrote:
> > On Tue, Mar 26, 2024 at 01:41:52PM +0530, Krishna Kurapati PSSNV wrote:
> >> On 3/26/2024 1:15 AM, Johan Hovold wrote:
> >>
> >>> Just change the logic in dwc3_qcom_find_num_ports() so that it returns 1
> >>> if "dp_hs_phy_1" is missing, and otherwise you determine the number of
> >>> ports by iterating from 2 to DWC3_MAX_PORTS - 1.

> With the above fixed, can I put your RB tag given on [1] or will you be 
> providing another one. Asking because when you gave that RB, this 
> malformed DT thing wasn't there. So wanted to check with you before 
> pushing the code.

Thanks for checking. I'm fine with you adding the tag after fixing the
above now that we've discussed it.

Johan