[permalink] [raw]

Subject: Re: [PATCH v21 8/9] usb: dwc3: qcom: Enable wakeup for applicable ports of multiport

On Sat, Apr 20, 2024, 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 <[email protected]>
> Reviewed-by: Johan Hovold <[email protected]>
> Reviewed-by: Bjorn Andersson <[email protected]>
> ---
> drivers/usb/dwc3/dwc3-qcom.c | 71 +++++++++++++++++++++---------------
> 1 file changed, 41 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index 5ddb694dd8e7..b6f13bb14e2c 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -60,6 +60,7 @@ struct dwc3_qcom_port {
> int dp_hs_phy_irq;
> int dm_hs_phy_irq;
> int ss_phy_irq;
> + enum usb_device_speed usb2_speed;
> };
>
> struct dwc3_qcom {
> @@ -71,7 +72,6 @@ struct dwc3_qcom {
> struct reset_control *resets;
> struct dwc3_qcom_port ports[DWC3_QCOM_MAX_PORTS];
> u8 num_ports;
> - enum usb_device_speed usb2_speed;
>
> struct extcon_dev *edev;
> struct extcon_dev *host_edev;
> @@ -310,7 +310,7 @@ static bool dwc3_qcom_is_host(struct dwc3_qcom *qcom)
> return dwc->xhci;
> }
>
> -static enum usb_device_speed dwc3_qcom_read_usb2_speed(struct dwc3_qcom *qcom)
> +static enum usb_device_speed dwc3_qcom_read_usb2_speed(struct dwc3_qcom *qcom, int port_index)
> {
> struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3);
> struct usb_device *udev;
> @@ -321,14 +321,8 @@ static enum usb_device_speed dwc3_qcom_read_usb2_speed(struct dwc3_qcom *qcom)
> */
> hcd = platform_get_drvdata(dwc->xhci);
>
> - /*
> - * It is possible to query the speed of all children of
> - * USB2.0 root hub via usb_hub_for_each_child(). DWC3 code
> - * currently supports only 1 port per controller. So
> - * this is sufficient.
> - */
> #ifdef CONFIG_USB
> - udev = usb_hub_find_child(hcd->self.root_hub, 1);
> + udev = usb_hub_find_child(hcd->self.root_hub, port_index + 1);
> #else
> udev = NULL;
> #endif
> @@ -359,26 +353,26 @@ static void dwc3_qcom_disable_wakeup_irq(int irq)
> disable_irq_nosync(irq);
> }
>
> -static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom)
> +static void dwc3_qcom_disable_port_interrupts(struct dwc3_qcom_port *port)
> {
> - dwc3_qcom_disable_wakeup_irq(qcom->ports[0].qusb2_phy_irq);
> + dwc3_qcom_disable_wakeup_irq(port->qusb2_phy_irq);
>
> - if (qcom->usb2_speed == USB_SPEED_LOW) {
> - dwc3_qcom_disable_wakeup_irq(qcom->ports[0].dm_hs_phy_irq);
> - } else if ((qcom->usb2_speed == USB_SPEED_HIGH) ||
> - (qcom->usb2_speed == USB_SPEED_FULL)) {
> - dwc3_qcom_disable_wakeup_irq(qcom->ports[0].dp_hs_phy_irq);
> + if (port->usb2_speed == USB_SPEED_LOW) {
> + dwc3_qcom_disable_wakeup_irq(port->dm_hs_phy_irq);
> + } else if ((port->usb2_speed == USB_SPEED_HIGH) ||
> + (port->usb2_speed == USB_SPEED_FULL)) {
> + dwc3_qcom_disable_wakeup_irq(port->dp_hs_phy_irq);
> } else {
> - dwc3_qcom_disable_wakeup_irq(qcom->ports[0].dp_hs_phy_irq);
> - dwc3_qcom_disable_wakeup_irq(qcom->ports[0].dm_hs_phy_irq);
> + dwc3_qcom_disable_wakeup_irq(port->dp_hs_phy_irq);
> + dwc3_qcom_disable_wakeup_irq(port->dm_hs_phy_irq);
> }
>
> - dwc3_qcom_disable_wakeup_irq(qcom->ports[0].ss_phy_irq);
> + dwc3_qcom_disable_wakeup_irq(port->ss_phy_irq);
> }
>
> -static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)
> +static void dwc3_qcom_enable_port_interrupts(struct dwc3_qcom_port *port)
> {
> - dwc3_qcom_enable_wakeup_irq(qcom->ports[0].qusb2_phy_irq, 0);
> + dwc3_qcom_enable_wakeup_irq(port->qusb2_phy_irq, 0);
>
> /*
> * Configure DP/DM line interrupts based on the USB2 device attached to
> @@ -389,21 +383,37 @@ static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)
> * DP and DM lines as rising edge to detect HS/HS/LS device connect scenario.
> */
>
> - if (qcom->usb2_speed == USB_SPEED_LOW) {
> - dwc3_qcom_enable_wakeup_irq(qcom->ports[0].dm_hs_phy_irq,
> + if (port->usb2_speed == USB_SPEED_LOW) {
> + dwc3_qcom_enable_wakeup_irq(port->dm_hs_phy_irq,
> IRQ_TYPE_EDGE_FALLING);
> - } else if ((qcom->usb2_speed == USB_SPEED_HIGH) ||
> - (qcom->usb2_speed == USB_SPEED_FULL)) {
> - dwc3_qcom_enable_wakeup_irq(qcom->ports[0].dp_hs_phy_irq,
> + } else if ((port->usb2_speed == USB_SPEED_HIGH) ||
> + (port->usb2_speed == USB_SPEED_FULL)) {
> + dwc3_qcom_enable_wakeup_irq(port->dp_hs_phy_irq,
> IRQ_TYPE_EDGE_FALLING);
> } else {
> - dwc3_qcom_enable_wakeup_irq(qcom->ports[0].dp_hs_phy_irq,
> + dwc3_qcom_enable_wakeup_irq(port->dp_hs_phy_irq,
> IRQ_TYPE_EDGE_RISING);
> - dwc3_qcom_enable_wakeup_irq(qcom->ports[0].dm_hs_phy_irq,
> + dwc3_qcom_enable_wakeup_irq(port->dm_hs_phy_irq,
> IRQ_TYPE_EDGE_RISING);
> }
>
> - dwc3_qcom_enable_wakeup_irq(qcom->ports[0].ss_phy_irq, 0);
> + dwc3_qcom_enable_wakeup_irq(port->ss_phy_irq, 0);
> +}
> +
> +static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom)
> +{
> + int i;
> +
> + for (i = 0; i < qcom->num_ports; i++)
> + dwc3_qcom_disable_port_interrupts(&qcom->ports[i]);
> +}
> +
> +static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)
> +{
> + int i;
> +
> + for (i = 0; i < qcom->num_ports; i++)
> + dwc3_qcom_enable_port_interrupts(&qcom->ports[i]);
> }
>
> static int dwc3_qcom_suspend(struct dwc3_qcom *qcom, bool wakeup)
> @@ -430,7 +440,8 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom, bool wakeup)
> * freezable workqueue.
> */
> if (dwc3_qcom_is_host(qcom) && wakeup) {
> - qcom->usb2_speed = dwc3_qcom_read_usb2_speed(qcom);
> + for (i = 0; i < qcom->num_ports; i++)
> + qcom->ports[i].usb2_speed = dwc3_qcom_read_usb2_speed(qcom, i);
> dwc3_qcom_enable_interrupts(qcom);
> }
>
> --
> 2.34.1
>

Acked-by: Thinh Nguyen <[email protected]>

Thanks,
Thinh

2024-04-24 01:19:56

by Thinh Nguyen

[permalink] [raw]

Subject: Re: [PATCH v21 9/9] usb: dwc3: qcom: Add multiport suspend/resume support for wrapper

On Sat, Apr 20, 2024, Krishna Kurapati wrote:
> Power event IRQ is used for wakeup either when the controller is
> SuperSpeed capable but is missing an SuperSpeed PHY interrupt, or when
> the GIC is not capable of detecting DP/DM High-Speed PHY interrupts.
>
> The Power event IRQ stat register indicates whether the High-Speed
> phy entered and exited L2 successfully during suspend and resume.
> Indicate the same for all ports of a multiport controller.
>
> Signed-off-by: Krishna Kurapati <[email protected]>
> Reviewed-by: Bjorn Andersson <[email protected]>
> ---
> drivers/usb/dwc3/dwc3-qcom.c | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index b6f13bb14e2c..88fb6706a18d 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -36,7 +36,6 @@
> #define PIPE3_PHYSTATUS_SW BIT(3)
> #define PIPE_UTMI_CLK_DIS BIT(8)
>
> -#define PWR_EVNT_IRQ_STAT_REG 0x58
> #define PWR_EVNT_LPM_IN_L2_MASK BIT(4)
> #define PWR_EVNT_LPM_OUT_L2_MASK BIT(5)
>
> @@ -55,6 +54,13 @@
> /* Qualcomm SoCs with multiport support has up to 4 ports */
> #define DWC3_QCOM_MAX_PORTS 4
>
> +static const u32 pwr_evnt_irq_stat_reg[DWC3_QCOM_MAX_PORTS] = {
> + 0x58,
> + 0x1dc,
> + 0x228,
> + 0x238,
> +};
> +
> struct dwc3_qcom_port {
> int qusb2_phy_irq;
> int dp_hs_phy_irq;
> @@ -424,9 +430,11 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom, bool wakeup)
> if (qcom->is_suspended)
> return 0;
>
> - val = readl(qcom->qscratch_base + PWR_EVNT_IRQ_STAT_REG);
> - if (!(val & PWR_EVNT_LPM_IN_L2_MASK))
> - dev_err(qcom->dev, "HS-PHY not in L2\n");
> + for (i = 0; i < qcom->num_ports; i++) {
> + val = readl(qcom->qscratch_base + pwr_evnt_irq_stat_reg[i]);
> + if (!(val & PWR_EVNT_LPM_IN_L2_MASK))
> + dev_err(qcom->dev, "port-%d HS-PHY not in L2\n", i + 1);
> + }
>
> for (i = qcom->num_clocks - 1; i >= 0; i--)
> clk_disable_unprepare(qcom->clks[i]);
> @@ -475,8 +483,11 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom, bool wakeup)
> dev_warn(qcom->dev, "failed to enable interconnect: %d\n", ret);
>
> /* Clear existing events from PHY related to L2 in/out */
> - dwc3_qcom_setbits(qcom->qscratch_base, PWR_EVNT_IRQ_STAT_REG,
> - PWR_EVNT_LPM_IN_L2_MASK | PWR_EVNT_LPM_OUT_L2_MASK);
> + for (i = 0; i < qcom->num_ports; i++) {
> + 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;
>
> --
> 2.34.1
>

Acked-by: Thinh Nguyen <[email protected]>

Thanks,
Thinh