| Message ID | 20230727223307.8096-7-quic_kriskura@quicinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add multiport support for DWC3 controllers | expand |
On Fri, Jul 28, 2023 at 04:03:02AM +0530, Krishna Kurapati wrote: > Refactor setup_irq call to facilitate reading multiport IRQ's along > with non mulitport ones. For SA8295, there are 4-DP/4-DM and 2-SS > IRQ's. Check whether device is multiport capable or not and read all > interrupts for DP/DM/SS on each port accordingly. > > Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > --- > drivers/usb/dwc3/dwc3-qcom.c | 277 ++++++++++++++++++++++++----------- > 1 file changed, 190 insertions(+), 87 deletions(-) > > diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c > index 3de43df6bbe8..ad89ded116d3 100644 > --- a/drivers/usb/dwc3/dwc3-qcom.c > +++ b/drivers/usb/dwc3/dwc3-qcom.c > @@ -64,33 +64,61 @@ struct dwc3_acpi_pdata { > bool is_urs; > }; > > +struct dwc3_qcom_of_match_data { > + u8 num_ports; > +}; > + > struct dwc3_qcom { > - struct device *dev; > - void __iomem *qscratch_base; > - struct platform_device *dwc3; > - struct platform_device *urs_usb; > - struct clk **clks; > - int num_clocks; > - struct reset_control *resets; > - > - int hs_phy_irq; > - int dp_hs_phy_irq; > - int dm_hs_phy_irq; > - int ss_phy_irq; > - enum usb_device_speed usb2_speed; > - > - struct extcon_dev *edev; > - struct extcon_dev *host_edev; > - struct notifier_block vbus_nb; > - struct notifier_block host_nb; > + struct device *dev; > + void __iomem *qscratch_base; > + struct platform_device *dwc3; > + struct platform_device *urs_usb; > + struct clk **clks; > + int num_clocks; > + struct reset_control *resets; > + > + int hs_phy_irq; > + int dp_hs_phy_irq[DWC3_MAX_PORTS]; > + int dm_hs_phy_irq[DWC3_MAX_PORTS]; > + int ss_phy_irq[DWC3_MAX_PORTS]; > + enum usb_device_speed usb2_speed; > + > + struct extcon_dev *edev; > + struct extcon_dev *host_edev; > + struct notifier_block vbus_nb; > + struct notifier_block host_nb; > + > + const struct dwc3_acpi_pdata *acpi_pdata; > + > + enum usb_dr_mode mode; > + bool is_suspended; > + bool pm_suspended; > + struct icc_path *icc_path_ddr; > + struct icc_path *icc_path_apps; > + const struct dwc3_qcom_of_match_data *data; Please don't adjust indentation of unrelated code, it makes it hard to see what actually changed. > +}; > + > +static const struct dwc3_qcom_of_match_data qcom_dwc3 = { > + .num_ports = 1, > +}; > > - const struct dwc3_acpi_pdata *acpi_pdata; > +static const struct dwc3_qcom_of_match_data sx8280xp_qcom_dwc3 = { > + .num_ports = 4, > +}; > > - enum usb_dr_mode mode; > - bool is_suspended; > - bool pm_suspended; > - struct icc_path *icc_path_ddr; > - struct icc_path *icc_path_apps; > +/* > + * Driver needs to read HS/DP_HS/DM_HS/SS IRQ's. Currently, for > + * SA8295 which supports mutliport, thre are 4 DP/ 4 DM/ 2 SS IRQ's > + * and 1 HS IRQ present. So avoid trying to read HS_PHY_IRQ for 4 > + * ports of SA8295. > + */ The last part here is relevant information, but it doesn't seem to relate to this define. Also, does all platforms have this configuration of interrupts? > +#define MAX_PHY_IRQ 4 > + > +enum dwc3_qcom_phy_irq_identifier { > + HS_PHY_IRQ = 0, > + DP_HS_PHY_IRQ, > + DM_HS_PHY_IRQ, > + SS_PHY_IRQ, > }; This enum is unused. > [..] > +static int dwc3_get_acpi_index(const struct dwc3_acpi_pdata *pdata, int irq_index) > +{ > + int acpi_index = -1; > + > + if (!pdata) > + return -1; > + > + if (irq_index == DP_HS_PHY_IRQ) > + acpi_index = pdata->dp_hs_phy_irq_index; > + else if (irq_index == DM_HS_PHY_IRQ) > + acpi_index = pdata->dm_hs_phy_irq_index; > + else if (irq_index == SS_PHY_IRQ) > + acpi_index = pdata->ss_phy_irq_index; It looks favourable to put these in an array, instead of having to pull them out of 4 different variables conditionally. > + > + return acpi_index; > +} > + > +static int dwc3_get_port_irq(struct platform_device *pdev, u8 port_index) > +{ > + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); > + bool is_mp_supported = (qcom->data->num_ports > 1) ? true : false; > + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; > + char *disp_name; > + int acpi_index; > + char *dt_name; > + int ret; > + int irq; > + int i; > + > + /* > + * We need to read only DP/DM/SS IRQ's here. > + * So loop over from 1->3 and accordingly modify respective phy_irq[]. > + */ > + for (i = 1; i < MAX_PHY_IRQ; i++) { > + > + if (!is_mp_supported && (port_index == 0)) { > + if (i == DP_HS_PHY_IRQ) { > + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "dp_hs_phy_irq"); > + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "qcom_dwc3 DP_HS"); > + } else if (i == DM_HS_PHY_IRQ) { > + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "dm_hs_phy_irq"); > + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "qcom_dwc3 DM_HS"); > + } else if (i == SS_PHY_IRQ) { > + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "ss_phy_irq"); > + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "qcom_dwc3 SS"); > + } > + } else { > + if (i == DP_HS_PHY_IRQ) { > + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "dp_hs_phy_%d", port_index + 1); > + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "qcom_dwc3 DP_HS%d", port_index + 1); > + } else if (i == DM_HS_PHY_IRQ) { > + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "dm_hs_phy_%d", port_index + 1); > + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "qcom_dwc3 DM_HS%d", port_index + 1); > + } else if (i == SS_PHY_IRQ) { > + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "ss_phy_%d", port_index + 1); > + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, > + "qcom_dwc3 SS%d", port_index + 1); > + } There is too much repetition in this for my liking. > } > - qcom->hs_phy_irq = irq; > - } > > - irq = dwc3_qcom_get_irq(pdev, "dp_hs_phy_irq", > - pdata ? pdata->dp_hs_phy_irq_index : -1); > - if (irq > 0) { > - irq_set_status_flags(irq, IRQ_NOAUTOEN); > - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, > - qcom_dwc3_resume_irq, > - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, > - "qcom_dwc3 DP_HS", qcom); > - if (ret) { > - dev_err(qcom->dev, "dp_hs_phy_irq failed: %d\n", ret); > - return ret; > + if (!dt_name || !disp_name) > + return -ENOMEM; > + > + acpi_index = !is_mp_supported ? dwc3_get_acpi_index(pdata, i) : -1; > + > + irq = dwc3_qcom_get_irq(pdev, dt_name, acpi_index); > + if (irq > 0) { > + ret = dwc3_qcom_prep_irq(qcom, dt_name, disp_name, irq); > + if (ret) > + return ret; > + > + if (i == DP_HS_PHY_IRQ) > + qcom->dp_hs_phy_irq[port_index] = irq; > + else if (i == DM_HS_PHY_IRQ) > + qcom->dm_hs_phy_irq[port_index] = irq; > + else if (i == SS_PHY_IRQ) > + qcom->ss_phy_irq[port_index] = irq; > } > - qcom->dp_hs_phy_irq = irq; > } > > - irq = dwc3_qcom_get_irq(pdev, "dm_hs_phy_irq", > - pdata ? pdata->dm_hs_phy_irq_index : -1); > + return 0; > +} > + > +static int dwc3_qcom_setup_irq(struct platform_device *pdev) > +{ > + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); > + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; > + int irq; > + int ret; > + int i; > + > + irq = dwc3_qcom_get_irq(pdev, "hs_phy_irq", > + pdata ? pdata->hs_phy_irq_index : -1); > if (irq > 0) { > - irq_set_status_flags(irq, IRQ_NOAUTOEN); > - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, > - qcom_dwc3_resume_irq, > - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, > - "qcom_dwc3 DM_HS", qcom); > - if (ret) { > - dev_err(qcom->dev, "dm_hs_phy_irq failed: %d\n", ret); > + ret = dwc3_qcom_prep_irq(qcom, "hs_phy_irq", "qcom_dwc3 HS",irq); > + if (ret) It would be nice to have this refactored out in a separate commit. > return ret; > - } > - qcom->dm_hs_phy_irq = irq; > + qcom->hs_phy_irq = irq; > } > > - irq = dwc3_qcom_get_irq(pdev, "ss_phy_irq", > - pdata ? pdata->ss_phy_irq_index : -1); > - if (irq > 0) { > - irq_set_status_flags(irq, IRQ_NOAUTOEN); > - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, > - qcom_dwc3_resume_irq, > - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, > - "qcom_dwc3 SS", qcom); > - if (ret) { > - dev_err(qcom->dev, "ss_phy_irq failed: %d\n", ret); > + for (i = 0; i < qcom->data->num_ports; i++) { > + ret = dwc3_get_port_irq(pdev, i); > + if (ret) > return ret; > - } > - qcom->ss_phy_irq = irq; > } > > return 0; > @@ -811,6 +905,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev) > platform_set_drvdata(pdev, qcom); > qcom->dev = &pdev->dev; > > + qcom->data = of_device_get_match_data(qcom->dev); > + > if (has_acpi_companion(dev)) { > qcom->acpi_pdata = acpi_device_get_match_data(dev); > if (!qcom->acpi_pdata) { > @@ -1023,8 +1119,15 @@ static const struct dev_pm_ops dwc3_qcom_dev_pm_ops = { > }; > > static const struct of_device_id dwc3_qcom_of_match[] = { > - { .compatible = "qcom,dwc3" }, > - { } > + { > + .compatible = "qcom,dwc3", > + .data = &qcom_dwc3, > + }, > + { > + .compatible = "qcom,sc8280xp-dwc3-mp", > + .data = &sx8280xp_qcom_dwc3, > + }, I would prefer that we don't add a separate compatible, but rather just try to parse the interrupts for multiport and fall back to single port. If/when we figure out how to peak into the dwc3 core, we could potentially introduce a check to aid the developer. Regards, Bjorn > + { }, > }; > MODULE_DEVICE_TABLE(of, dwc3_qcom_of_match); > > -- > 2.40.0 >
On 8/6/2023 10:41 AM, Bjorn Andersson wrote: > On Fri, Jul 28, 2023 at 04:03:02AM +0530, Krishna Kurapati wrote: >> Refactor setup_irq call to facilitate reading multiport IRQ's along >> with non mulitport ones. For SA8295, there are 4-DP/4-DM and 2-SS >> IRQ's. Check whether device is multiport capable or not and read all >> interrupts for DP/DM/SS on each port accordingly. >> +/* >> + * Driver needs to read HS/DP_HS/DM_HS/SS IRQ's. Currently, for >> + * SA8295 which supports mutliport, thre are 4 DP/ 4 DM/ 2 SS IRQ's >> + * and 1 HS IRQ present. So avoid trying to read HS_PHY_IRQ for 4 >> + * ports of SA8295. >> + */ > > The last part here is relevant information, but it doesn't seem to > relate to this define. > > Also, does all platforms have this configuration of interrupts? > Hi Bjorn, Yes, all targets have the same IRQ's. Just that MP one's have multiple IRQ's of each type. But hs-phy_irq is only one in SC8280 as well. >> +#define MAX_PHY_IRQ 4 >> + >> +enum dwc3_qcom_phy_irq_identifier { >> + HS_PHY_IRQ = 0, >> + DP_HS_PHY_IRQ, >> + DM_HS_PHY_IRQ, >> + SS_PHY_IRQ, >> }; > > This enum is unused. > >> > [..] >> +static int dwc3_get_acpi_index(const struct dwc3_acpi_pdata *pdata, int irq_index) >> +{ >> + int acpi_index = -1; >> + >> + if (!pdata) >> + return -1; >> + >> + if (irq_index == DP_HS_PHY_IRQ) >> + acpi_index = pdata->dp_hs_phy_irq_index; >> + else if (irq_index == DM_HS_PHY_IRQ) >> + acpi_index = pdata->dm_hs_phy_irq_index; >> + else if (irq_index == SS_PHY_IRQ) >> + acpi_index = pdata->ss_phy_irq_index; > > It looks favourable to put these in an array, instead of having to pull > them out of 4 different variables conditionally. > Sure, will move them to an array to remove this if-else stuff. >> + >> + return acpi_index; >> + } else { >> + if (i == DP_HS_PHY_IRQ) { >> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "dp_hs_phy_%d", port_index + 1); >> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "qcom_dwc3 DP_HS%d", port_index + 1); >> + } else if (i == DM_HS_PHY_IRQ) { >> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "dm_hs_phy_%d", port_index + 1); >> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "qcom_dwc3 DM_HS%d", port_index + 1); >> + } else if (i == SS_PHY_IRQ) { >> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "ss_phy_%d", port_index + 1); >> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "qcom_dwc3 SS%d", port_index + 1); >> + } > > There is too much repetition in this for my liking. Will try to put dp/dm/ss too in an array in dwc3_qcom structure and merge these 3 loops into '1'. But that would mean I need to add a global structure to avoid adding if else statements to do proper kasprintf stuff. If its fine to add a global array with all names and use them here, then it would be easy to merge the loops into one for loop. But if we are not supposed to add global array of names, then I would keep these 3 repetitive code blocks as is. > >> } >> - qcom->hs_phy_irq = irq; >> - } >> >> - irq = dwc3_qcom_get_irq(pdev, "dp_hs_phy_irq", >> - pdata ? pdata->dp_hs_phy_irq_index : -1); >> - if (irq > 0) { >> - irq_set_status_flags(irq, IRQ_NOAUTOEN); >> - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, >> - qcom_dwc3_resume_irq, >> - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, >> - "qcom_dwc3 DP_HS", qcom); >> - if (ret) { >> - dev_err(qcom->dev, "dp_hs_phy_irq failed: %d\n", ret); >> - return ret; >> + if (!dt_name || !disp_name) >> + return -ENOMEM; >> + >> + acpi_index = !is_mp_supported ? dwc3_get_acpi_index(pdata, i) : -1; >> + >> + irq = dwc3_qcom_get_irq(pdev, dt_name, acpi_index); >> + if (irq > 0) { >> + ret = dwc3_qcom_prep_irq(qcom, dt_name, disp_name, irq); >> + if (ret) >> + return ret; >> + >> + if (i == DP_HS_PHY_IRQ) >> + qcom->dp_hs_phy_irq[port_index] = irq; >> + else if (i == DM_HS_PHY_IRQ) >> + qcom->dm_hs_phy_irq[port_index] = irq; >> + else if (i == SS_PHY_IRQ) >> + qcom->ss_phy_irq[port_index] = irq; >> } >> - qcom->dp_hs_phy_irq = irq; >> } >> >> - irq = dwc3_qcom_get_irq(pdev, "dm_hs_phy_irq", >> - pdata ? pdata->dm_hs_phy_irq_index : -1); >> + return 0; >> +} >> + >> +static int dwc3_qcom_setup_irq(struct platform_device *pdev) >> +{ >> + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); >> + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; >> + int irq; >> + int ret; >> + int i; >> + >> + irq = dwc3_qcom_get_irq(pdev, "hs_phy_irq", >> + pdata ? pdata->hs_phy_irq_index : -1); >> if (irq > 0) { >> - irq_set_status_flags(irq, IRQ_NOAUTOEN); >> - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, >> - qcom_dwc3_resume_irq, >> - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, >> - "qcom_dwc3 DM_HS", qcom); >> - if (ret) { >> - dev_err(qcom->dev, "dm_hs_phy_irq failed: %d\n", ret); >> + ret = dwc3_qcom_prep_irq(qcom, "hs_phy_irq", "qcom_dwc3 HS",irq); >> + if (ret) > > It would be nice to have this refactored out in a separate commit. > Sure, will add the prep irq in a seperate commit before we read the MP IRQ's. >> return ret; >> - } >> - qcom->dm_hs_phy_irq = irq; >> + qcom->hs_phy_irq = irq; >> } >> >> - irq = dwc3_qcom_get_irq(pdev, "ss_phy_irq", >> - pdata ? pdata->ss_phy_irq_index : -1); >> - if (irq > 0) { >> - irq_set_status_flags(irq, IRQ_NOAUTOEN); >> - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, >> - qcom_dwc3_resume_irq, >> - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, >> - "qcom_dwc3 SS", qcom); >> - if (ret) { >> - dev_err(qcom->dev, "ss_phy_irq failed: %d\n", ret); >> + for (i = 0; i < qcom->data->num_ports; i++) { >> + ret = dwc3_get_port_irq(pdev, i); >> + if (ret) >> return ret; >> - } >> - qcom->ss_phy_irq = irq; >> } >> >> return 0; >> @@ -811,6 +905,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev) >> platform_set_drvdata(pdev, qcom); >> qcom->dev = &pdev->dev; >> >> + qcom->data = of_device_get_match_data(qcom->dev); >> + >> if (has_acpi_companion(dev)) { >> qcom->acpi_pdata = acpi_device_get_match_data(dev); >> if (!qcom->acpi_pdata) { >> @@ -1023,8 +1119,15 @@ static const struct dev_pm_ops dwc3_qcom_dev_pm_ops = { >> }; >> >> static const struct of_device_id dwc3_qcom_of_match[] = { >> - { .compatible = "qcom,dwc3" }, >> - { } >> + { >> + .compatible = "qcom,dwc3", >> + .data = &qcom_dwc3, >> + }, >> + { >> + .compatible = "qcom,sc8280xp-dwc3-mp", >> + .data = &sx8280xp_qcom_dwc3, >> + }, > > I would prefer that we don't add a separate compatible, but rather just > try to parse the interrupts for multiport and fall back to single port. > > If/when we figure out how to peak into the dwc3 core, we could > potentially introduce a check to aid the developer. > Only reason I chose this path is it is unabiguous. With this path, we don't need to worry about whether the user skipped any irq's in the DT or not. If we rely on the IRQ parsing from DT, then we might need to calculate effective port count while parsing the irq loop making it ambigous and prone to error I believe. I would like to keep this compatible as it and use this in the file wherever needed. And since peeking into dwc3-core before we call of_platform_populate is not possible and we need port_count, I kept a compatible here. I could move the setup_irq call to after completion of of_platform_populate, but still there is risk of dwc3 probe getting deferred or failing and we end up not being able to peek into dwc3. Request you to reconsider and accept adding a compatible here. Regards, Krishna,
+ >> +enum dwc3_qcom_phy_irq_identifier { >> + HS_PHY_IRQ = 0, >> + DP_HS_PHY_IRQ, >> + DM_HS_PHY_IRQ, >> + SS_PHY_IRQ, >> }; > > This enum is unused. > Hi Bjorn, I didn't use the enum directly, but used its members in the get_port_irq call below. > [..] >> +static int dwc3_get_acpi_index(const struct dwc3_acpi_pdata *pdata, int irq_index) >> +{ >> + int acpi_index = -1; >> + >> + if (!pdata) >> + return -1; >> + >> + if (irq_index == DP_HS_PHY_IRQ) >> + acpi_index = pdata->dp_hs_phy_irq_index; >> + else if (irq_index == DM_HS_PHY_IRQ) >> + acpi_index = pdata->dm_hs_phy_irq_index; >> + else if (irq_index == SS_PHY_IRQ) >> + acpi_index = pdata->ss_phy_irq_index; > > It looks favourable to put these in an array, instead of having to pull > them out of 4 different variables conditionally. > >> + >> + return acpi_index; >> +} >> + >> +static int dwc3_get_port_irq(struct platform_device *pdev, u8 port_index) >> +{ >> + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); >> + bool is_mp_supported = (qcom->data->num_ports > 1) ? true : false; >> + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; >> + char *disp_name; >> + int acpi_index; >> + char *dt_name; >> + int ret; >> + int irq; >> + int i; >> + >> + /* >> + * We need to read only DP/DM/SS IRQ's here. >> + * So loop over from 1->3 and accordingly modify respective phy_irq[]. >> + */ >> + for (i = 1; i < MAX_PHY_IRQ; i++) { >> + >> + if (!is_mp_supported && (port_index == 0)) { >> + if (i == DP_HS_PHY_IRQ) { >> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "dp_hs_phy_irq"); >> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "qcom_dwc3 DP_HS"); >> + } else if (i == DM_HS_PHY_IRQ) { >> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "dm_hs_phy_irq"); >> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "qcom_dwc3 DM_HS"); >> + } else if (i == SS_PHY_IRQ) { >> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "ss_phy_irq"); >> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >> + "qcom_dwc3 SS"); Bjorn, Konrad, If we are to remove this repetitive loops, we might need to make a 2D array for all of Dp/Dm/Ss interrutps and make a global array of names to be used for irq lookup and use them to reduce the if-else-if stuff here. If that is fine, I can make those changes, else I would like to stick to this approach for now because if we don't add the global array of names, prepping them seperately for dp/dm/ss would again lead us to making if-else loops like above. Please let me know your thoughts on this. Regards, Krishna,
On 8.08.2023 10:32, Krishna Kurapati PSSNV wrote: > + >>> +enum dwc3_qcom_phy_irq_identifier { >>> + HS_PHY_IRQ = 0, >>> + DP_HS_PHY_IRQ, >>> + DM_HS_PHY_IRQ, >>> + SS_PHY_IRQ, >>> }; >> >> This enum is unused. >> > > Hi Bjorn, > > I didn't use the enum directly, but used its members in the get_port_irq call below. > >> [..] >>> +static int dwc3_get_acpi_index(const struct dwc3_acpi_pdata *pdata, int irq_index) >>> +{ >>> + int acpi_index = -1; >>> + >>> + if (!pdata) >>> + return -1; >>> + >>> + if (irq_index == DP_HS_PHY_IRQ) >>> + acpi_index = pdata->dp_hs_phy_irq_index; >>> + else if (irq_index == DM_HS_PHY_IRQ) >>> + acpi_index = pdata->dm_hs_phy_irq_index; >>> + else if (irq_index == SS_PHY_IRQ) >>> + acpi_index = pdata->ss_phy_irq_index; >> >> It looks favourable to put these in an array, instead of having to pull >> them out of 4 different variables conditionally. >> >>> + >>> + return acpi_index; >>> +} >>> + >>> +static int dwc3_get_port_irq(struct platform_device *pdev, u8 port_index) >>> +{ >>> + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); >>> + bool is_mp_supported = (qcom->data->num_ports > 1) ? true : false; >>> + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; >>> + char *disp_name; >>> + int acpi_index; >>> + char *dt_name; >>> + int ret; >>> + int irq; >>> + int i; >>> + >>> + /* >>> + * We need to read only DP/DM/SS IRQ's here. >>> + * So loop over from 1->3 and accordingly modify respective phy_irq[]. >>> + */ >>> + for (i = 1; i < MAX_PHY_IRQ; i++) { >>> + >>> + if (!is_mp_supported && (port_index == 0)) { >>> + if (i == DP_HS_PHY_IRQ) { >>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>> + "dp_hs_phy_irq"); >>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>> + "qcom_dwc3 DP_HS"); >>> + } else if (i == DM_HS_PHY_IRQ) { >>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>> + "dm_hs_phy_irq"); >>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>> + "qcom_dwc3 DM_HS"); >>> + } else if (i == SS_PHY_IRQ) { >>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>> + "ss_phy_irq"); >>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>> + "qcom_dwc3 SS"); > Bjorn, Konrad, > > If we are to remove this repetitive loops, we might need to make a 2D array for all of Dp/Dm/Ss interrutps and make a global array of names to be used for irq lookup and use them to reduce the if-else-if stuff here. If that is fine, I can make those changes, else I would like to stick to this approach for now because if we don't add the global array of names, prepping them seperately for dp/dm/ss would again lead us to making if-else loops like above. > > Please let me know your thoughts on this. Can we not just reuse the associated interrupt-names from the devicetree if present? Konrad
On 8/8/2023 5:20 PM, Konrad Dybcio wrote: > On 8.08.2023 10:32, Krishna Kurapati PSSNV wrote: >> + >>>> +enum dwc3_qcom_phy_irq_identifier { >>>> + HS_PHY_IRQ = 0, >>>> + DP_HS_PHY_IRQ, >>>> + DM_HS_PHY_IRQ, >>>> + SS_PHY_IRQ, >>>> }; >>> >>> This enum is unused. >>> >> >> Hi Bjorn, >> >> I didn't use the enum directly, but used its members in the get_port_irq call below. >> >>> [..] >>>> +static int dwc3_get_acpi_index(const struct dwc3_acpi_pdata *pdata, int irq_index) >>>> +{ >>>> + int acpi_index = -1; >>>> + >>>> + if (!pdata) >>>> + return -1; >>>> + >>>> + if (irq_index == DP_HS_PHY_IRQ) >>>> + acpi_index = pdata->dp_hs_phy_irq_index; >>>> + else if (irq_index == DM_HS_PHY_IRQ) >>>> + acpi_index = pdata->dm_hs_phy_irq_index; >>>> + else if (irq_index == SS_PHY_IRQ) >>>> + acpi_index = pdata->ss_phy_irq_index; >>> >>> It looks favourable to put these in an array, instead of having to pull >>> them out of 4 different variables conditionally. >>> >>>> + >>>> + return acpi_index; >>>> +} >>>> + >>>> +static int dwc3_get_port_irq(struct platform_device *pdev, u8 port_index) >>>> +{ >>>> + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); >>>> + bool is_mp_supported = (qcom->data->num_ports > 1) ? true : false; >>>> + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; >>>> + char *disp_name; >>>> + int acpi_index; >>>> + char *dt_name; >>>> + int ret; >>>> + int irq; >>>> + int i; >>>> + >>>> + /* >>>> + * We need to read only DP/DM/SS IRQ's here. >>>> + * So loop over from 1->3 and accordingly modify respective phy_irq[]. >>>> + */ >>>> + for (i = 1; i < MAX_PHY_IRQ; i++) { >>>> + >>>> + if (!is_mp_supported && (port_index == 0)) { >>>> + if (i == DP_HS_PHY_IRQ) { >>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>> + "dp_hs_phy_irq"); >>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>> + "qcom_dwc3 DP_HS"); >>>> + } else if (i == DM_HS_PHY_IRQ) { >>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>> + "dm_hs_phy_irq"); >>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>> + "qcom_dwc3 DM_HS"); >>>> + } else if (i == SS_PHY_IRQ) { >>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>> + "ss_phy_irq"); >>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>> + "qcom_dwc3 SS"); >> Bjorn, Konrad, >> >> If we are to remove this repetitive loops, we might need to make a 2D array for all of Dp/Dm/Ss interrutps and make a global array of names to be used for irq lookup and use them to reduce the if-else-if stuff here. If that is fine, I can make those changes, else I would like to stick to this approach for now because if we don't add the global array of names, prepping them seperately for dp/dm/ss would again lead us to making if-else loops like above. >> >> Please let me know your thoughts on this. > Can we not just reuse the associated interrupt-names from the devicetree > if present? > Hi Konrad, Thanks for the comments but one more confirmation. We can read the interrupts from DT but I believe the compatible would still need to stay. We need the num_ports information not just for registering interrupts but for modifying the pwr_event_irq registers during suspend/resume. If we rely on the interrupts to find the number of ports, the user is free to remove any IRQ and we might end up in a situation where glue and core are not having same view of how many number of ports present. So I believe its best to keep the compatible and get num_ports info from there and rely on reading interrupt-names to get interrupts cleanly. Can you let me know your view on the same. Regards, Krishna,
On 9.08.2023 08:06, Krishna Kurapati PSSNV wrote: > > > On 8/8/2023 5:20 PM, Konrad Dybcio wrote: >> On 8.08.2023 10:32, Krishna Kurapati PSSNV wrote: >>> + >>>>> +enum dwc3_qcom_phy_irq_identifier { >>>>> + HS_PHY_IRQ = 0, >>>>> + DP_HS_PHY_IRQ, >>>>> + DM_HS_PHY_IRQ, >>>>> + SS_PHY_IRQ, >>>>> }; >>>> >>>> This enum is unused. >>>> >>> >>> Hi Bjorn, >>> >>> I didn't use the enum directly, but used its members in the get_port_irq call below. >>> >>>> [..] >>>>> +static int dwc3_get_acpi_index(const struct dwc3_acpi_pdata *pdata, int irq_index) >>>>> +{ >>>>> + int acpi_index = -1; >>>>> + >>>>> + if (!pdata) >>>>> + return -1; >>>>> + >>>>> + if (irq_index == DP_HS_PHY_IRQ) >>>>> + acpi_index = pdata->dp_hs_phy_irq_index; >>>>> + else if (irq_index == DM_HS_PHY_IRQ) >>>>> + acpi_index = pdata->dm_hs_phy_irq_index; >>>>> + else if (irq_index == SS_PHY_IRQ) >>>>> + acpi_index = pdata->ss_phy_irq_index; >>>> >>>> It looks favourable to put these in an array, instead of having to pull >>>> them out of 4 different variables conditionally. >>>> >>>>> + >>>>> + return acpi_index; >>>>> +} >>>>> + >>>>> +static int dwc3_get_port_irq(struct platform_device *pdev, u8 port_index) >>>>> +{ >>>>> + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); >>>>> + bool is_mp_supported = (qcom->data->num_ports > 1) ? true : false; >>>>> + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; >>>>> + char *disp_name; >>>>> + int acpi_index; >>>>> + char *dt_name; >>>>> + int ret; >>>>> + int irq; >>>>> + int i; >>>>> + >>>>> + /* >>>>> + * We need to read only DP/DM/SS IRQ's here. >>>>> + * So loop over from 1->3 and accordingly modify respective phy_irq[]. >>>>> + */ >>>>> + for (i = 1; i < MAX_PHY_IRQ; i++) { >>>>> + >>>>> + if (!is_mp_supported && (port_index == 0)) { >>>>> + if (i == DP_HS_PHY_IRQ) { >>>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>> + "dp_hs_phy_irq"); >>>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>> + "qcom_dwc3 DP_HS"); >>>>> + } else if (i == DM_HS_PHY_IRQ) { >>>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>> + "dm_hs_phy_irq"); >>>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>> + "qcom_dwc3 DM_HS"); >>>>> + } else if (i == SS_PHY_IRQ) { >>>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>> + "ss_phy_irq"); >>>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>> + "qcom_dwc3 SS"); >>> Bjorn, Konrad, >>> >>> If we are to remove this repetitive loops, we might need to make a 2D array for all of Dp/Dm/Ss interrutps and make a global array of names to be used for irq lookup and use them to reduce the if-else-if stuff here. If that is fine, I can make those changes, else I would like to stick to this approach for now because if we don't add the global array of names, prepping them seperately for dp/dm/ss would again lead us to making if-else loops like above. >>> >>> Please let me know your thoughts on this. >> Can we not just reuse the associated interrupt-names from the devicetree >> if present? >> > Hi Konrad, > > Thanks for the comments but one more confirmation. > We can read the interrupts from DT but I believe the compatible would still need to stay. We need the num_ports information not just for registering interrupts but for modifying the pwr_event_irq registers during suspend/resume. If we rely on the interrupts to find the number of ports, the user is free to remove any IRQ and we might end up in a situation where glue and core are not having same view of how many number of ports present. So I believe its best to keep the compatible and get num_ports info from there and rely on reading interrupt-names to get interrupts cleanly. Can you let me know your view on the same. So is "is it okay to add SoC-specific compatibles and add the port number in match data" what you're asking? If so, that doesn't seem right. The user should not "feel free to remove any IRQ", modifying the devicetree to depict a subset of the hardware is not something we want to support. The driver has to work with the "full" description in accordance with the bindings. Konrad
On 8/11/2023 10:35 PM, Konrad Dybcio wrote: >>>>>> +static int dwc3_get_port_irq(struct platform_device *pdev, u8 port_index) >>>>>> +{ >>>>>> + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); >>>>>> + bool is_mp_supported = (qcom->data->num_ports > 1) ? true : false; >>>>>> + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; >>>>>> + char *disp_name; >>>>>> + int acpi_index; >>>>>> + char *dt_name; >>>>>> + int ret; >>>>>> + int irq; >>>>>> + int i; >>>>>> + >>>>>> + /* >>>>>> + * We need to read only DP/DM/SS IRQ's here. >>>>>> + * So loop over from 1->3 and accordingly modify respective phy_irq[]. >>>>>> + */ >>>>>> + for (i = 1; i < MAX_PHY_IRQ; i++) { >>>>>> + >>>>>> + if (!is_mp_supported && (port_index == 0)) { >>>>>> + if (i == DP_HS_PHY_IRQ) { >>>>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "dp_hs_phy_irq"); >>>>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "qcom_dwc3 DP_HS"); >>>>>> + } else if (i == DM_HS_PHY_IRQ) { >>>>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "dm_hs_phy_irq"); >>>>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "qcom_dwc3 DM_HS"); >>>>>> + } else if (i == SS_PHY_IRQ) { >>>>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "ss_phy_irq"); >>>>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "qcom_dwc3 SS"); >>>> Bjorn, Konrad, >>>> >>>> If we are to remove this repetitive loops, we might need to make a 2D array for all of Dp/Dm/Ss interrutps and make a global array of names to be used for irq lookup and use them to reduce the if-else-if stuff here. If that is fine, I can make those changes, else I would like to stick to this approach for now because if we don't add the global array of names, prepping them seperately for dp/dm/ss would again lead us to making if-else loops like above. >>>> >>>> Please let me know your thoughts on this. >>> Can we not just reuse the associated interrupt-names from the devicetree >>> if present? >>> >> Hi Konrad, >> >> Thanks for the comments but one more confirmation. >> We can read the interrupts from DT but I believe the compatible would still need to stay. We need the num_ports information not just for registering interrupts but for modifying the pwr_event_irq registers during suspend/resume. If we rely on the interrupts to find the number of ports, the user is free to remove any IRQ and we might end up in a situation where glue and core are not having same view of how many number of ports present. So I believe its best to keep the compatible and get num_ports info from there and rely on reading interrupt-names to get interrupts cleanly. Can you let me know your view on the same. > So is "is it okay to add SoC-specific compatibles and add the port number in > match data" what you're asking? > > If so, that doesn't seem right. > > The user should not "feel free to remove any IRQ", modifying the devicetree to > depict a subset of the hardware is not something we want to support. The driver > has to work with the "full" description in accordance with the bindings. > Hi Konrad, Thanks for the review. While I agree with you that we must not skip any hw specifics in DT, there is nothing stopping the user from doing so right ? And whatever be the case, we must be a fool-proof and fail safe system able to handle all such situations. While we can read interrupt IRQ prefixes to get port count in one way or other, adding a compatible would be the least ambiguous path. Is there any other concern you see in adding a compatible ? I might be missing something because even Bjorn's suggestion too was to try and avoid a new compatible addition and to add it only if we have no other way of reliably reading the port count (which I believe would be an issue if we need to rely on interrupt name reading). Regards, Krishna,
On 8/12/2023 2:14 PM, Krishna Kurapati PSSNV wrote: >> So is "is it okay to add SoC-specific compatibles and add the port >> number in >> match data" what you're asking? >> >> If so, that doesn't seem right. >> >> The user should not "feel free to remove any IRQ", modifying the >> devicetree to >> depict a subset of the hardware is not something we want to support. >> The driver >> has to work with the "full" description in accordance with the bindings. >> > > Hi Konrad, > > Thanks for the review. > > While I agree with you that we must not skip any hw specifics in DT, > there is nothing stopping the user from doing so right ? > > And whatever be the case, we must be a fool-proof and fail safe system > able to handle all such situations. While we can read interrupt IRQ > prefixes to get port count in one way or other, adding a compatible > would be the least ambiguous path. Is there any other concern you see in > adding a compatible ? I might be missing something because even Bjorn's > suggestion too was to try and avoid a new compatible addition and to add > it only if we have no other way of reliably reading the port count > (which I believe would be an issue if we need to rely on interrupt name > reading). > Hi Konrad. Came up with an implementation of reading the interrupt names and parsing for port count and added them as attachments. I still feel adding a compatible is a better option. Let me know which one is the better path. The one in v10, or something similar to the attached patch. (I tested it on sc7280/sc8280 and interrupts are registered properly) Regards, Krishna, From 60d5d0a678b864756a18ff17337ecddc257c9b44 Mon Sep 17 00:00:00 2001 From: Krishna Kurapati <quic_kriskura@quicinc.com> Date: Tue, 22 Aug 2023 09:42:59 +0530 Subject: [PATCH 1/2] usb: dwc3: qcom: Add helper function to request threaded IRQ Cleanup setup irq call by implementing a new prep_irq helper function and using it to request threaded IRQ's. Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> Change-Id: Ic136d1cdbf72602a0b8b0bf7ec4d6a7a723431de --- drivers/usb/dwc3/dwc3-qcom.c | 63 +++++++++++++++++------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c index 3de43df6bbe8..f14ddc9c541d 100644 --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c @@ -535,6 +535,24 @@ static int dwc3_qcom_get_irq(struct platform_device *pdev, return ret; } +static int dwc3_qcom_prep_irq(struct dwc3_qcom *qcom, char *irq_name, + char *disp_name, int irq) +{ + int ret; + + /* Keep wakeup interrupts disabled until suspend */ + irq_set_status_flags(irq, IRQ_NOAUTOEN); + ret = devm_request_threaded_irq(qcom->dev, irq, NULL, + qcom_dwc3_resume_irq, + IRQF_TRIGGER_HIGH | IRQF_ONESHOT, + disp_name, qcom); + + if (ret) + dev_err(qcom->dev, "%s failed: %d\n", irq_name, ret); + + return ret; +} + static int dwc3_qcom_setup_irq(struct platform_device *pdev) { struct dwc3_qcom *qcom = platform_get_drvdata(pdev); @@ -545,61 +563,40 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev) irq = dwc3_qcom_get_irq(pdev, "hs_phy_irq", pdata ? pdata->hs_phy_irq_index : -1); if (irq > 0) { - /* Keep wakeup interrupts disabled until suspend */ - irq_set_status_flags(irq, IRQ_NOAUTOEN); - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, - qcom_dwc3_resume_irq, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, - "qcom_dwc3 HS", qcom); - if (ret) { - dev_err(qcom->dev, "hs_phy_irq failed: %d\n", ret); + ret = dwc3_qcom_prep_irq(qcom, "hs_phy_irq", + "qcom_dwc3 HS", irq); + if (ret) return ret; - } qcom->hs_phy_irq = irq; } irq = dwc3_qcom_get_irq(pdev, "dp_hs_phy_irq", pdata ? pdata->dp_hs_phy_irq_index : -1); if (irq > 0) { - irq_set_status_flags(irq, IRQ_NOAUTOEN); - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, - qcom_dwc3_resume_irq, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, - "qcom_dwc3 DP_HS", qcom); - if (ret) { - dev_err(qcom->dev, "dp_hs_phy_irq failed: %d\n", ret); + ret = dwc3_qcom_prep_irq(qcom, "dp_hs_phy_irq", + "qcom_dwc3 DP_HS", irq); + if (ret) return ret; - } qcom->dp_hs_phy_irq = irq; } irq = dwc3_qcom_get_irq(pdev, "dm_hs_phy_irq", pdata ? pdata->dm_hs_phy_irq_index : -1); if (irq > 0) { - irq_set_status_flags(irq, IRQ_NOAUTOEN); - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, - qcom_dwc3_resume_irq, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, - "qcom_dwc3 DM_HS", qcom); - if (ret) { - dev_err(qcom->dev, "dm_hs_phy_irq failed: %d\n", ret); + ret = dwc3_qcom_prep_irq(qcom, "dm_hs_phy_irq", + "qcom_dwc3 DM_HS", irq); + if (ret) return ret; - } qcom->dm_hs_phy_irq = irq; } irq = dwc3_qcom_get_irq(pdev, "ss_phy_irq", pdata ? pdata->ss_phy_irq_index : -1); if (irq > 0) { - irq_set_status_flags(irq, IRQ_NOAUTOEN); - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, - qcom_dwc3_resume_irq, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, - "qcom_dwc3 SS", qcom); - if (ret) { - dev_err(qcom->dev, "ss_phy_irq failed: %d\n", ret); + ret = dwc3_qcom_prep_irq(qcom, "ss_phy_irq", + "qcom_dwc3 SS", irq); + if (ret) return ret; - } qcom->ss_phy_irq = irq; }
On 8/11/2023 10:35 PM, Konrad Dybcio wrote: >>>>>> + >>>>>> +static int dwc3_get_port_irq(struct platform_device *pdev, u8 port_index) >>>>>> +{ >>>>>> + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); >>>>>> + bool is_mp_supported = (qcom->data->num_ports > 1) ? true : false; >>>>>> + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; >>>>>> + char *disp_name; >>>>>> + int acpi_index; >>>>>> + char *dt_name; >>>>>> + int ret; >>>>>> + int irq; >>>>>> + int i; >>>>>> + >>>>>> + /* >>>>>> + * We need to read only DP/DM/SS IRQ's here. >>>>>> + * So loop over from 1->3 and accordingly modify respective phy_irq[]. >>>>>> + */ >>>>>> + for (i = 1; i < MAX_PHY_IRQ; i++) { >>>>>> + >>>>>> + if (!is_mp_supported && (port_index == 0)) { >>>>>> + if (i == DP_HS_PHY_IRQ) { >>>>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "dp_hs_phy_irq"); >>>>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "qcom_dwc3 DP_HS"); >>>>>> + } else if (i == DM_HS_PHY_IRQ) { >>>>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "dm_hs_phy_irq"); >>>>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "qcom_dwc3 DM_HS"); >>>>>> + } else if (i == SS_PHY_IRQ) { >>>>>> + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "ss_phy_irq"); >>>>>> + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, >>>>>> + "qcom_dwc3 SS"); >>>> Bjorn, Konrad, >>>> >>>> If we are to remove this repetitive loops, we might need to make a 2D array for all of Dp/Dm/Ss interrutps and make a global array of names to be used for irq lookup and use them to reduce the if-else-if stuff here. If that is fine, I can make those changes, else I would like to stick to this approach for now because if we don't add the global array of names, prepping them seperately for dp/dm/ss would again lead us to making if-else loops like above. >>>> >>>> Please let me know your thoughts on this. >>> Can we not just reuse the associated interrupt-names from the devicetree >>> if present? >>> >> Hi Konrad, >> >> Thanks for the comments but one more confirmation. >> We can read the interrupts from DT but I believe the compatible would still need to stay. We need the num_ports information not just for registering interrupts but for modifying the pwr_event_irq registers during suspend/resume. If we rely on the interrupts to find the number of ports, the user is free to remove any IRQ and we might end up in a situation where glue and core are not having same view of how many number of ports present. So I believe its best to keep the compatible and get num_ports info from there and rely on reading interrupt-names to get interrupts cleanly. Can you let me know your view on the same. > So is "is it okay to add SoC-specific compatibles and add the port number in > match data" what you're asking? > > If so, that doesn't seem right. > > The user should not "feel free to remove any IRQ", modifying the devicetree to > depict a subset of the hardware is not something we want to support. The driver > has to work with the "full" description in accordance with the bindings. > Hi Konrad, Johan, Thanks for the suggestions / review comments and taking the time out for reviewing them. Pushed v11 implementing the above suggestion of identifying port_count by reading through the interrupt-names. Please help let know your review on the same. Regards, Krishna,
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c index 3de43df6bbe8..ad89ded116d3 100644 --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c @@ -64,33 +64,61 @@ struct dwc3_acpi_pdata { bool is_urs; }; +struct dwc3_qcom_of_match_data { + u8 num_ports; +}; + struct dwc3_qcom { - struct device *dev; - void __iomem *qscratch_base; - struct platform_device *dwc3; - struct platform_device *urs_usb; - struct clk **clks; - int num_clocks; - struct reset_control *resets; - - int hs_phy_irq; - int dp_hs_phy_irq; - int dm_hs_phy_irq; - int ss_phy_irq; - enum usb_device_speed usb2_speed; - - struct extcon_dev *edev; - struct extcon_dev *host_edev; - struct notifier_block vbus_nb; - struct notifier_block host_nb; + struct device *dev; + void __iomem *qscratch_base; + struct platform_device *dwc3; + struct platform_device *urs_usb; + struct clk **clks; + int num_clocks; + struct reset_control *resets; + + int hs_phy_irq; + int dp_hs_phy_irq[DWC3_MAX_PORTS]; + int dm_hs_phy_irq[DWC3_MAX_PORTS]; + int ss_phy_irq[DWC3_MAX_PORTS]; + enum usb_device_speed usb2_speed; + + struct extcon_dev *edev; + struct extcon_dev *host_edev; + struct notifier_block vbus_nb; + struct notifier_block host_nb; + + const struct dwc3_acpi_pdata *acpi_pdata; + + enum usb_dr_mode mode; + bool is_suspended; + bool pm_suspended; + struct icc_path *icc_path_ddr; + struct icc_path *icc_path_apps; + const struct dwc3_qcom_of_match_data *data; +}; + +static const struct dwc3_qcom_of_match_data qcom_dwc3 = { + .num_ports = 1, +}; - const struct dwc3_acpi_pdata *acpi_pdata; +static const struct dwc3_qcom_of_match_data sx8280xp_qcom_dwc3 = { + .num_ports = 4, +}; - enum usb_dr_mode mode; - bool is_suspended; - bool pm_suspended; - struct icc_path *icc_path_ddr; - struct icc_path *icc_path_apps; +/* + * Driver needs to read HS/DP_HS/DM_HS/SS IRQ's. Currently, for + * SA8295 which supports mutliport, thre are 4 DP/ 4 DM/ 2 SS IRQ's + * and 1 HS IRQ present. So avoid trying to read HS_PHY_IRQ for 4 + * ports of SA8295. + */ +#define MAX_PHY_IRQ 4 + +enum dwc3_qcom_phy_irq_identifier { + HS_PHY_IRQ = 0, + DP_HS_PHY_IRQ, + DM_HS_PHY_IRQ, + SS_PHY_IRQ, }; static inline void dwc3_qcom_setbits(void __iomem *base, u32 offset, u32 val) @@ -375,16 +403,16 @@ static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom) dwc3_qcom_disable_wakeup_irq(qcom->hs_phy_irq); if (qcom->usb2_speed == USB_SPEED_LOW) { - dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq); + dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq[0]); } else if ((qcom->usb2_speed == USB_SPEED_HIGH) || (qcom->usb2_speed == USB_SPEED_FULL)) { - dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq); + dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq[0]); } else { - dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq); - dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq); + dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq[0]); + dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq[0]); } - dwc3_qcom_disable_wakeup_irq(qcom->ss_phy_irq); + dwc3_qcom_disable_wakeup_irq(qcom->ss_phy_irq[0]); } static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom) @@ -401,20 +429,20 @@ static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom) */ if (qcom->usb2_speed == USB_SPEED_LOW) { - dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq, + dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq[0], IRQ_TYPE_EDGE_FALLING); } else if ((qcom->usb2_speed == USB_SPEED_HIGH) || (qcom->usb2_speed == USB_SPEED_FULL)) { - dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq, + dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq[0], IRQ_TYPE_EDGE_FALLING); } else { - dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq, + dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq[0], IRQ_TYPE_EDGE_RISING); - dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq, + dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq[0], IRQ_TYPE_EDGE_RISING); } - dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq, 0); + dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq[0], 0); } static int dwc3_qcom_suspend(struct dwc3_qcom *qcom, bool wakeup) @@ -535,72 +563,138 @@ static int dwc3_qcom_get_irq(struct platform_device *pdev, return ret; } -static int dwc3_qcom_setup_irq(struct platform_device *pdev) +static int dwc3_qcom_prep_irq(struct dwc3_qcom *qcom, char *irq_name, + char *disp_name, int irq) { - struct dwc3_qcom *qcom = platform_get_drvdata(pdev); - const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; - int irq; int ret; - irq = dwc3_qcom_get_irq(pdev, "hs_phy_irq", - pdata ? pdata->hs_phy_irq_index : -1); - if (irq > 0) { - /* Keep wakeup interrupts disabled until suspend */ - irq_set_status_flags(irq, IRQ_NOAUTOEN); - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, + /* Keep wakeup interrupts disabled until suspend */ + irq_set_status_flags(irq, IRQ_NOAUTOEN); + ret = devm_request_threaded_irq(qcom->dev, irq, NULL, qcom_dwc3_resume_irq, IRQF_TRIGGER_HIGH | IRQF_ONESHOT, - "qcom_dwc3 HS", qcom); - if (ret) { - dev_err(qcom->dev, "hs_phy_irq failed: %d\n", ret); - return ret; + disp_name, qcom); + if (ret) + dev_err(qcom->dev, "%s failed: %d\n", irq_name, ret); + + return ret; +} + +static int dwc3_get_acpi_index(const struct dwc3_acpi_pdata *pdata, int irq_index) +{ + int acpi_index = -1; + + if (!pdata) + return -1; + + if (irq_index == DP_HS_PHY_IRQ) + acpi_index = pdata->dp_hs_phy_irq_index; + else if (irq_index == DM_HS_PHY_IRQ) + acpi_index = pdata->dm_hs_phy_irq_index; + else if (irq_index == SS_PHY_IRQ) + acpi_index = pdata->ss_phy_irq_index; + + return acpi_index; +} + +static int dwc3_get_port_irq(struct platform_device *pdev, u8 port_index) +{ + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); + bool is_mp_supported = (qcom->data->num_ports > 1) ? true : false; + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; + char *disp_name; + int acpi_index; + char *dt_name; + int ret; + int irq; + int i; + + /* + * We need to read only DP/DM/SS IRQ's here. + * So loop over from 1->3 and accordingly modify respective phy_irq[]. + */ + for (i = 1; i < MAX_PHY_IRQ; i++) { + + if (!is_mp_supported && (port_index == 0)) { + if (i == DP_HS_PHY_IRQ) { + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "dp_hs_phy_irq"); + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "qcom_dwc3 DP_HS"); + } else if (i == DM_HS_PHY_IRQ) { + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "dm_hs_phy_irq"); + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "qcom_dwc3 DM_HS"); + } else if (i == SS_PHY_IRQ) { + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "ss_phy_irq"); + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "qcom_dwc3 SS"); + } + } else { + if (i == DP_HS_PHY_IRQ) { + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "dp_hs_phy_%d", port_index + 1); + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "qcom_dwc3 DP_HS%d", port_index + 1); + } else if (i == DM_HS_PHY_IRQ) { + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "dm_hs_phy_%d", port_index + 1); + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "qcom_dwc3 DM_HS%d", port_index + 1); + } else if (i == SS_PHY_IRQ) { + dt_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "ss_phy_%d", port_index + 1); + disp_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "qcom_dwc3 SS%d", port_index + 1); + } } - qcom->hs_phy_irq = irq; - } - irq = dwc3_qcom_get_irq(pdev, "dp_hs_phy_irq", - pdata ? pdata->dp_hs_phy_irq_index : -1); - if (irq > 0) { - irq_set_status_flags(irq, IRQ_NOAUTOEN); - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, - qcom_dwc3_resume_irq, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, - "qcom_dwc3 DP_HS", qcom); - if (ret) { - dev_err(qcom->dev, "dp_hs_phy_irq failed: %d\n", ret); - return ret; + if (!dt_name || !disp_name) + return -ENOMEM; + + acpi_index = !is_mp_supported ? dwc3_get_acpi_index(pdata, i) : -1; + + irq = dwc3_qcom_get_irq(pdev, dt_name, acpi_index); + if (irq > 0) { + ret = dwc3_qcom_prep_irq(qcom, dt_name, disp_name, irq); + if (ret) + return ret; + + if (i == DP_HS_PHY_IRQ) + qcom->dp_hs_phy_irq[port_index] = irq; + else if (i == DM_HS_PHY_IRQ) + qcom->dm_hs_phy_irq[port_index] = irq; + else if (i == SS_PHY_IRQ) + qcom->ss_phy_irq[port_index] = irq; } - qcom->dp_hs_phy_irq = irq; } - irq = dwc3_qcom_get_irq(pdev, "dm_hs_phy_irq", - pdata ? pdata->dm_hs_phy_irq_index : -1); + return 0; +} + +static int dwc3_qcom_setup_irq(struct platform_device *pdev) +{ + struct dwc3_qcom *qcom = platform_get_drvdata(pdev); + const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata; + int irq; + int ret; + int i; + + irq = dwc3_qcom_get_irq(pdev, "hs_phy_irq", + pdata ? pdata->hs_phy_irq_index : -1); if (irq > 0) { - irq_set_status_flags(irq, IRQ_NOAUTOEN); - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, - qcom_dwc3_resume_irq, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, - "qcom_dwc3 DM_HS", qcom); - if (ret) { - dev_err(qcom->dev, "dm_hs_phy_irq failed: %d\n", ret); + ret = dwc3_qcom_prep_irq(qcom, "hs_phy_irq", "qcom_dwc3 HS",irq); + if (ret) return ret; - } - qcom->dm_hs_phy_irq = irq; + qcom->hs_phy_irq = irq; } - irq = dwc3_qcom_get_irq(pdev, "ss_phy_irq", - pdata ? pdata->ss_phy_irq_index : -1); - if (irq > 0) { - irq_set_status_flags(irq, IRQ_NOAUTOEN); - ret = devm_request_threaded_irq(qcom->dev, irq, NULL, - qcom_dwc3_resume_irq, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, - "qcom_dwc3 SS", qcom); - if (ret) { - dev_err(qcom->dev, "ss_phy_irq failed: %d\n", ret); + for (i = 0; i < qcom->data->num_ports; i++) { + ret = dwc3_get_port_irq(pdev, i); + if (ret) return ret; - } - qcom->ss_phy_irq = irq; } return 0; @@ -811,6 +905,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev) platform_set_drvdata(pdev, qcom); qcom->dev = &pdev->dev; + qcom->data = of_device_get_match_data(qcom->dev); + if (has_acpi_companion(dev)) { qcom->acpi_pdata = acpi_device_get_match_data(dev); if (!qcom->acpi_pdata) { @@ -1023,8 +1119,15 @@ static const struct dev_pm_ops dwc3_qcom_dev_pm_ops = { }; static const struct of_device_id dwc3_qcom_of_match[] = { - { .compatible = "qcom,dwc3" }, - { } + { + .compatible = "qcom,dwc3", + .data = &qcom_dwc3, + }, + { + .compatible = "qcom,sc8280xp-dwc3-mp", + .data = &sx8280xp_qcom_dwc3, + }, + { }, }; MODULE_DEVICE_TABLE(of, dwc3_qcom_of_match);
Refactor setup_irq call to facilitate reading multiport IRQ's along with non mulitport ones. For SA8295, there are 4-DP/4-DM and 2-SS IRQ's. Check whether device is multiport capable or not and read all interrupts for DP/DM/SS on each port accordingly. Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> --- drivers/usb/dwc3/dwc3-qcom.c | 277 ++++++++++++++++++++++++----------- 1 file changed, 190 insertions(+), 87 deletions(-)