From: Johan Hovold <johan@kernel.org>
To: Krishna Kurapati <quic_kriskura@quicinc.com>
Cc: Thinh Nguyen <Thinh.Nguyen@synopsys.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Felipe Balbi <balbi@kernel.org>,
Wesley Cheng <quic_wcheng@quicinc.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
quic_pkondeti@quicinc.com, quic_ppratap@quicinc.com,
quic_jackp@quicinc.com, quic_harshq@quicinc.com,
ahalaney@redhat.com, quic_shazhuss@quicinc.com
Subject: Re: [PATCH v9 07/10] usb: dwc3: qcom: Add multiport suspend/resume support for wrapper
Date: Tue, 27 Jun 2023 17:05:19 +0200 [thread overview]
Message-ID: <ZJr6r-cdDCFDc89R@hovoldconsulting.com> (raw)
In-Reply-To: <20230621043628.21485-8-quic_kriskura@quicinc.com>
On Wed, Jun 21, 2023 at 10:06:25AM +0530, Krishna Kurapati wrote:
> QCOM SoC SA8295P's tertiary quad port controller supports 2 HS+SS
> ports and 2 HS only ports. Add support for configuring PWR_EVENT_IRQ's
> for all the ports during suspend/resume.
Please be more specific here. You don't seem to be configuring anything.
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
> ---
> drivers/usb/dwc3/dwc3-qcom.c | 48 +++++++++++++++++++++++++++++++-----
> 1 file changed, 42 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index 3ab48a6925fe..699485a85233 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -37,7 +37,11 @@
> #define PIPE3_PHYSTATUS_SW BIT(3)
> #define PIPE_UTMI_CLK_DIS BIT(8)
>
> -#define PWR_EVNT_IRQ_STAT_REG 0x58
> +#define PWR_EVNT_IRQ1_STAT_REG 0x58
> +#define PWR_EVNT_IRQ2_STAT_REG 0x1dc
> +#define PWR_EVNT_IRQ3_STAT_REG 0x228
> +#define PWR_EVNT_IRQ4_STAT_REG 0x238
> +
> #define PWR_EVNT_LPM_IN_L2_MASK BIT(4)
> #define PWR_EVNT_LPM_OUT_L2_MASK BIT(5)
>
> @@ -93,6 +97,13 @@ struct dwc3_qcom {
> struct icc_path *icc_path_apps;
> };
>
> +static u32 pwr_evnt_irq_stat_reg_offset[4] = {
> + PWR_EVNT_IRQ1_STAT_REG,
> + PWR_EVNT_IRQ2_STAT_REG,
> + PWR_EVNT_IRQ3_STAT_REG,
> + PWR_EVNT_IRQ4_STAT_REG,
> +};
> +
> static inline void dwc3_qcom_setbits(void __iomem *base, u32 offset, u32 val)
> {
> u32 reg;
> @@ -417,17 +428,37 @@ static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)
> dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq[0], 0);
> }
>
> +static u8 dwc3_qcom_get_port_info(struct dwc3_qcom *qcom)
"port_info" is not very specific, call it get_num_ports() or similar.
> +{
> + struct dwc3 __maybe_unused *dwc = platform_get_drvdata(qcom->dwc3);
__maybe unused makes no sense here.
> +
> + if (dwc3_qcom_is_host(qcom))
> + return dwc->num_usb2_ports;
Here you're accessing the core driver data again, which we want to
avoid going forward so this at least warrants a FIXME to rework this as
well.
> +
> + /*
> + * If not in host mode, either dwc was not probed
> + * or we are in device mode, either case checking for
> + * only first pwr event irq would suffice.
Rewrap comment at 80 columns.
> + */
> +
> + return 1;
> +}
> +
> static int dwc3_qcom_suspend(struct dwc3_qcom *qcom, bool wakeup)
> {
> u32 val;
> int i, ret;
> + u8 num_ports;
Move first.
> if (qcom->is_suspended)
> return 0;
>
> - val = readl(qcom->qscratch_base + PWR_EVNT_IRQ_STAT_REG);
> - if (!(val & PWR_EVNT_LPM_IN_L2_MASK))
> + num_ports = dwc3_qcom_get_port_info(qcom);
> + for (i = 0; i < num_ports; i++) {
> + val = readl(qcom->qscratch_base + pwr_evnt_irq_stat_reg_offset[i]);
> + if (!(val & PWR_EVNT_LPM_IN_L2_MASK))
> dev_err(qcom->dev, "HS-PHY not in L2\n");
This line is not indented properly.
Make sure to run checkpatch before submitting so that I don't have to
point out things like this again.
> + }
>
> for (i = qcom->num_clocks - 1; i >= 0; i--)
> clk_disable_unprepare(qcom->clks[i]);
> @@ -452,12 +483,14 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom, bool wakeup)
>
> static int dwc3_qcom_resume(struct dwc3_qcom *qcom, bool wakeup)
> {
> + int num_ports;
> int ret;
> int i;
>
> if (!qcom->is_suspended)
> return 0;
>
> + num_ports = dwc3_qcom_get_port_info(qcom);
Move below to where you use num_ports.
> if (dwc3_qcom_is_host(qcom) && wakeup)
> dwc3_qcom_disable_interrupts(qcom);
>
> @@ -474,9 +507,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);
>
> - /* Clear existing events from PHY related to L2 in/out */
No need to move the comment.
> - 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 < num_ports; i++) {
> + /* Clear existing events from PHY related to L2 in/out */
> + dwc3_qcom_setbits(qcom->qscratch_base,
> + pwr_evnt_irq_stat_reg_offset[i],
> + PWR_EVNT_LPM_IN_L2_MASK | PWR_EVNT_LPM_OUT_L2_MASK);
Indent continuation lines at least two tabs further than the previous
line.
> + }
>
> qcom->is_suspended = false;
Johan
next prev parent reply other threads:[~2023-06-27 15:05 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-21 4:36 [PATCH v9 00/10] Add multiport support for DWC3 controllers Krishna Kurapati
2023-06-21 4:36 ` [PATCH v9 01/10] dt-bindings: usb: qcom,dwc3: Add bindings for SC8280 Multiport Krishna Kurapati
2023-06-23 20:41 ` Rob Herring
2023-06-27 11:20 ` Johan Hovold
2023-06-27 15:38 ` Johan Hovold
2023-07-02 19:11 ` Krishna Kurapati PSSNV
2023-07-21 8:10 ` Johan Hovold
2023-06-21 4:36 ` [PATCH v9 02/10] dt-bindings: usb: Add bindings for multiport properties on DWC3 controller Krishna Kurapati
2023-06-23 20:41 ` Rob Herring
2023-06-27 11:24 ` Johan Hovold
2023-06-21 4:36 ` [PATCH v9 03/10] usb: dwc3: core: Access XHCI address space temporarily to read port info Krishna Kurapati
2023-06-23 22:14 ` Thinh Nguyen
2023-06-27 11:45 ` Johan Hovold
2023-07-02 18:48 ` Krishna Kurapati PSSNV
2023-07-21 7:44 ` Johan Hovold
2023-07-23 14:59 ` Krishna Kurapati PSSNV
2023-07-24 15:41 ` Johan Hovold
2023-07-25 5:39 ` Krishna Kurapati PSSNV
2023-06-21 4:36 ` [PATCH v9 04/10] usb: dwc3: core: Skip setting event buffers for host only controllers Krishna Kurapati
2023-06-23 22:27 ` Thinh Nguyen
2023-06-24 7:20 ` Krishna Kurapati PSSNV
2023-06-26 23:34 ` Thinh Nguyen
2023-06-26 23:46 ` Thinh Nguyen
2023-07-02 18:45 ` Krishna Kurapati PSSNV
2023-07-05 22:40 ` Thinh Nguyen
2023-06-21 4:36 ` [PATCH v9 05/10] usb: dwc3: core: Refactor PHY logic to support Multiport Controller Krishna Kurapati
2023-06-23 22:55 ` Thinh Nguyen
2023-06-24 7:15 ` Krishna Kurapati PSSNV
2023-06-27 12:09 ` Johan Hovold
2023-07-02 18:56 ` Krishna Kurapati PSSNV
2023-07-21 7:56 ` Johan Hovold
2023-08-01 1:30 ` Thinh Nguyen
2023-10-19 13:20 ` Johan Hovold
2023-06-21 4:36 ` [PATCH v9 06/10] usb: dwc3: qcom: Add support to read IRQ's related to multiport Krishna Kurapati
2023-06-21 10:05 ` Konrad Dybcio
2023-06-21 10:08 ` Krishna Kurapati PSSNV
2023-06-27 14:31 ` Johan Hovold
2023-07-02 18:59 ` Krishna Kurapati PSSNV
2023-07-11 6:42 ` Krishna Kurapati PSSNV
2023-07-21 8:14 ` Johan Hovold
2023-07-21 8:19 ` Krishna Kurapati PSSNV
2023-07-21 9:21 ` Johan Hovold
2023-07-21 9:35 ` Krishna Kurapati PSSNV
2023-07-21 11:11 ` Johan Hovold
2023-07-12 12:12 ` Johan Hovold
2023-07-12 18:26 ` Krishna Kurapati PSSNV
2023-07-14 9:05 ` Johan Hovold
2023-07-14 10:40 ` Krishna Kurapati PSSNV
2023-07-15 19:01 ` Krishna Kurapati PSSNV
2023-07-17 15:15 ` Krishna Kurapati PSSNV
2023-07-21 8:35 ` Johan Hovold
2023-07-21 8:45 ` Krishna Kurapati PSSNV
2023-06-21 4:36 ` [PATCH v9 07/10] usb: dwc3: qcom: Add multiport suspend/resume support for wrapper Krishna Kurapati
2023-06-27 15:05 ` Johan Hovold [this message]
2023-07-02 19:02 ` Krishna Kurapati PSSNV
2023-06-21 4:36 ` [PATCH v9 08/10] arm64: dts: qcom: sc8280xp: Add multiport controller node for SC8280 Krishna Kurapati
2023-06-23 22:39 ` Konrad Dybcio
2023-06-24 7:13 ` Krishna Kurapati PSSNV
2023-06-27 15:16 ` Johan Hovold
2023-07-02 19:10 ` Krishna Kurapati PSSNV
2023-07-21 8:08 ` Johan Hovold
2023-06-27 15:11 ` Johan Hovold
2023-06-21 4:36 ` [PATCH v9 09/10] arm64: dts: qcom: sa8295p: Enable tertiary controller and its 4 USB ports Krishna Kurapati
2023-06-23 22:40 ` Konrad Dybcio
2023-06-21 4:36 ` [PATCH v9 10/10] arm64: dts: qcom: sa8540-ride: Enable first port of tertiary usb controller Krishna Kurapati
2023-06-23 22:42 ` Konrad Dybcio
2023-06-24 7:11 ` Krishna Kurapati PSSNV
2023-06-27 15:19 ` [PATCH v9 00/10] Add multiport support for DWC3 controllers Johan Hovold
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=ZJr6r-cdDCFDc89R@hovoldconsulting.com \
--to=johan@kernel.org \
--cc=Thinh.Nguyen@synopsys.com \
--cc=agross@kernel.org \
--cc=ahalaney@redhat.com \
--cc=andersson@kernel.org \
--cc=balbi@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=quic_harshq@quicinc.com \
--cc=quic_jackp@quicinc.com \
--cc=quic_kriskura@quicinc.com \
--cc=quic_pkondeti@quicinc.com \
--cc=quic_ppratap@quicinc.com \
--cc=quic_shazhuss@quicinc.com \
--cc=quic_wcheng@quicinc.com \
--cc=robh+dt@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).