On 20/11/2023 19:06, Théo Lebrun wrote:
> Pass CDNS3_RESET_ON_RESUME as platform data to cdns3 host role. It will
> in turn pass it down to xHCI platform data as XHCI_RESET_ON_RESUME.
>
> Avoid this warning on resume:
>
> [ 16.017462] xhci-hcd xhci-hcd.1.auto: xHC error in resume, USBSTS 0x401, Reinit
>
> When used, remote wakeup is not expected to work.
>
> Only focus J7200 as other SoC are untested.
>
> Signed-off-by: Théo Lebrun <theo.lebrun@xxxxxxxxxxx>
> ---
> drivers/usb/cdns3/cdns3-ti.c | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
> index 84f93c2fcd5c..7d56a1acbc54 100644
> --- a/drivers/usb/cdns3/cdns3-ti.c
> +++ b/drivers/usb/cdns3/cdns3-ti.c
> @@ -16,6 +16,7 @@
> #include <linux/of_platform.h>
> #include <linux/pm_runtime.h>
> #include <linux/property.h>
> +#include "core.h"
>
> /* USB Wrapper register offsets */
> #define USBSS_PID 0x0
> @@ -128,6 +129,7 @@ static int cdns_ti_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct device_node *node = pdev->dev.of_node;
> + const struct of_dev_auxdata *auxdata;
> struct cdns_ti *data;
> unsigned long rate;
> int error, i;
> @@ -177,7 +179,8 @@ static int cdns_ti_probe(struct platform_device *pdev)
>
> cdns_ti_init_hw(data);
>
> - error = of_platform_populate(node, NULL, NULL, dev);
> + auxdata = of_device_get_match_data(dev);
> + error = of_platform_populate(node, NULL, auxdata, dev);
> if (error) {
> dev_err(dev, "failed to create children: %d\n", error);
> return error;
> @@ -222,8 +225,20 @@ static const struct dev_pm_ops cdns_ti_pm_ops = {
>
> #endif /* CONFIG_PM */
>
> +static struct cdns3_platform_data cdns_ti_j7200_pdata = {
> + .quirks = CDNS3_RESET_ON_RESUME,
> +};
We will need to introduce a new data structure "struct cdns_ti_platform_data"
and add platform specific details like "reset_on_resume" to it.
This is to address what Krzysztof pointed to in patch 4.
> +
> +static const struct of_dev_auxdata cdns_ti_j7200_auxdata[] = {
> + {
> + .compatible = "cdns,usb3",
> + .platform_data = &cdns_ti_j7200_pdata,
> + },
> + {},
> +};
> +
> static const struct of_device_id cdns_ti_of_match[] = {
> - { .compatible = "ti,j7200-usb", },
> + { .compatible = "ti,j7200-usb", .data = cdns_ti_j7200_auxdata, },
Here we should pass "struct cdns_ti_platform_data"
> { .compatible = "ti,j721e-usb", },
> { .compatible = "ti,am64-usb", },
> {},
>
--
cheers,
-roger
