Re: [PATCH v2] usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
On 2.2.2021 20.41, Greg Kroah-Hartman wrote:
> On Mon, Feb 01, 2021 at 04:08:03PM +0100, Pali Rohár wrote:
>> Older ATF does not provide SMC call for USB 3.0 phy power on functionality
>> and therefore initialization of xhci-hcd is failing when older version of
>> ATF is used. In this case phy_power_on() function returns -EOPNOTSUPP.
>>
>> [3.108467] mvebu-a3700-comphy d0018300.phy: unsupported SMC call, try
>> updating your firmware
>> [3.117250] phy phy-d0018300.phy.0: phy poweron failed --> -95
>> [3.123465] xhci-hcd: probe of d0058000.usb failed with error -95
>>
>> This patch introduces a new plat_setup callback for xhci platform drivers
>> which is called prior calling usb_add_hcd() function. This function at its
>> beginning skips PHY init if hcd->skip_phy_initialization is set.
>>
>> Current init_quirk callback for xhci platform drivers is called from
>> xhci_plat_setup() function which is called after chip reset completes.
>> It happens in the middle of the usb_add_hcd() function and therefore this
>> callback cannot be used for setting if PHY init should be skipped or not.
>>
>> For Armada 3720 this patch introduce a new xhci_mvebu_a3700_plat_setup()
>> function configured as a xhci platform plat_setup callback. This new
>> function calls phy_power_on() and in case it returns -EOPNOTSUPP then
>> XHCI_SKIP_PHY_INIT quirk is set to instruct xhci-plat to skip PHY
>> initialization.
>>
>> This patch fixes above failure by ignoring 'not supported' error in
>> xhci-hcd driver. In this case it is expected that phy is already power on.
>>
>> It fixes initialization of xhci-hcd on Espressobin boards where is older
>> Marvell's Arm Trusted Firmware without SMC call for USB 3.0 phy power.
>>
>> This is regression introduced in commit bd3d25b07342 ("arm64: dts: marvell:
>> armada-37xx: link USB hosts with their PHYs") where USB 3.0 phy was defined
>> and therefore xhci-hcd on Espressobin with older ATF started failing.
>>
>> Signed-off-by: Pali Rohár
>> Tested-by: Tomasz Maciej Nowak
>> Fixes: bd3d25b07342 ("arm64: dts: marvell: armada-37xx: link USB hosts with
>> their PHYs")
>> Cc: # 5.1+: ea17a0f153af: phy: marvell: comphy:
>> Convert internal SMCC firmware return codes to errno
>> Cc: # 5.1+: f768e718911e: usb: host: xhci-plat: add
>> priv quirk for skip PHY initialization
>
>
> Mathias, any objection for me taking this now to get into 5.11-final?
>
> thanks,
>
> greg k-h
>
No objections, looks good to me.
Acked-by: Mathias Nyman
Re: [PATCH v2] usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
On Mon, Feb 01, 2021 at 04:08:03PM +0100, Pali Rohár wrote:
> Older ATF does not provide SMC call for USB 3.0 phy power on functionality
> and therefore initialization of xhci-hcd is failing when older version of
> ATF is used. In this case phy_power_on() function returns -EOPNOTSUPP.
>
> [3.108467] mvebu-a3700-comphy d0018300.phy: unsupported SMC call, try
> updating your firmware
> [3.117250] phy phy-d0018300.phy.0: phy poweron failed --> -95
> [3.123465] xhci-hcd: probe of d0058000.usb failed with error -95
>
> This patch introduces a new plat_setup callback for xhci platform drivers
> which is called prior calling usb_add_hcd() function. This function at its
> beginning skips PHY init if hcd->skip_phy_initialization is set.
>
> Current init_quirk callback for xhci platform drivers is called from
> xhci_plat_setup() function which is called after chip reset completes.
> It happens in the middle of the usb_add_hcd() function and therefore this
> callback cannot be used for setting if PHY init should be skipped or not.
>
> For Armada 3720 this patch introduce a new xhci_mvebu_a3700_plat_setup()
> function configured as a xhci platform plat_setup callback. This new
> function calls phy_power_on() and in case it returns -EOPNOTSUPP then
> XHCI_SKIP_PHY_INIT quirk is set to instruct xhci-plat to skip PHY
> initialization.
>
> This patch fixes above failure by ignoring 'not supported' error in
> xhci-hcd driver. In this case it is expected that phy is already power on.
>
> It fixes initialization of xhci-hcd on Espressobin boards where is older
> Marvell's Arm Trusted Firmware without SMC call for USB 3.0 phy power.
>
> This is regression introduced in commit bd3d25b07342 ("arm64: dts: marvell:
> armada-37xx: link USB hosts with their PHYs") where USB 3.0 phy was defined
> and therefore xhci-hcd on Espressobin with older ATF started failing.
>
> Signed-off-by: Pali Rohár
> Tested-by: Tomasz Maciej Nowak
> Fixes: bd3d25b07342 ("arm64: dts: marvell: armada-37xx: link USB hosts with
> their PHYs")
> Cc: # 5.1+: ea17a0f153af: phy: marvell: comphy:
> Convert internal SMCC firmware return codes to errno
> Cc: # 5.1+: f768e718911e: usb: host: xhci-plat: add
> priv quirk for skip PHY initialization
Mathias, any objection for me taking this now to get into 5.11-final?
thanks,
greg k-h
RE: [PATCH v2] usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
Hi Pali,
> From: Pali Rohár, Sent: Tuesday, February 2, 2021 12:08 AM
>
> Older ATF does not provide SMC call for USB 3.0 phy power on functionality
> and therefore initialization of xhci-hcd is failing when older version of
> ATF is used. In this case phy_power_on() function returns -EOPNOTSUPP.
>
> [3.108467] mvebu-a3700-comphy d0018300.phy: unsupported SMC call, try
> updating your firmware
> [3.117250] phy phy-d0018300.phy.0: phy poweron failed --> -95
> [3.123465] xhci-hcd: probe of d0058000.usb failed with error -95
>
> This patch introduces a new plat_setup callback for xhci platform drivers
> which is called prior calling usb_add_hcd() function. This function at its
> beginning skips PHY init if hcd->skip_phy_initialization is set.
>
> Current init_quirk callback for xhci platform drivers is called from
> xhci_plat_setup() function which is called after chip reset completes.
> It happens in the middle of the usb_add_hcd() function and therefore this
> callback cannot be used for setting if PHY init should be skipped or not.
>
> For Armada 3720 this patch introduce a new xhci_mvebu_a3700_plat_setup()
> function configured as a xhci platform plat_setup callback. This new
> function calls phy_power_on() and in case it returns -EOPNOTSUPP then
> XHCI_SKIP_PHY_INIT quirk is set to instruct xhci-plat to skip PHY
> initialization.
>
> This patch fixes above failure by ignoring 'not supported' error in
> xhci-hcd driver. In this case it is expected that phy is already power on.
>
> It fixes initialization of xhci-hcd on Espressobin boards where is older
> Marvell's Arm Trusted Firmware without SMC call for USB 3.0 phy power.
>
> This is regression introduced in commit bd3d25b07342 ("arm64: dts: marvell:
> armada-37xx: link USB hosts with their PHYs") where USB 3.0 phy was defined
> and therefore xhci-hcd on Espressobin with older ATF started failing.
>
> Signed-off-by: Pali Rohár
> Tested-by: Tomasz Maciej Nowak
> Fixes: bd3d25b07342 ("arm64: dts: marvell: armada-37xx: link USB hosts with
> their PHYs")
> Cc: # 5.1+: ea17a0f153af: phy: marvell: comphy:
> Convert internal SMCC firmware return codes to
> errno
> Cc: # 5.1+: f768e718911e: usb: host: xhci-plat: add
> priv quirk for skip PHY initialization
Thank you for the patch!
Reviewed-by: Yoshihiro Shimoda # xhci-plat
Also, I tested on my environment and didn't cause any regression.
So,
Tested-by: Yoshihiro Shimoda # On R-Car
Best regards,
Yoshihiro Shimoda
[PATCH v2] usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
Older ATF does not provide SMC call for USB 3.0 phy power on functionality
and therefore initialization of xhci-hcd is failing when older version of
ATF is used. In this case phy_power_on() function returns -EOPNOTSUPP.
[3.108467] mvebu-a3700-comphy d0018300.phy: unsupported SMC call, try
updating your firmware
[3.117250] phy phy-d0018300.phy.0: phy poweron failed --> -95
[3.123465] xhci-hcd: probe of d0058000.usb failed with error -95
This patch introduces a new plat_setup callback for xhci platform drivers
which is called prior calling usb_add_hcd() function. This function at its
beginning skips PHY init if hcd->skip_phy_initialization is set.
Current init_quirk callback for xhci platform drivers is called from
xhci_plat_setup() function which is called after chip reset completes.
It happens in the middle of the usb_add_hcd() function and therefore this
callback cannot be used for setting if PHY init should be skipped or not.
For Armada 3720 this patch introduce a new xhci_mvebu_a3700_plat_setup()
function configured as a xhci platform plat_setup callback. This new
function calls phy_power_on() and in case it returns -EOPNOTSUPP then
XHCI_SKIP_PHY_INIT quirk is set to instruct xhci-plat to skip PHY
initialization.
This patch fixes above failure by ignoring 'not supported' error in
xhci-hcd driver. In this case it is expected that phy is already power on.
It fixes initialization of xhci-hcd on Espressobin boards where is older
Marvell's Arm Trusted Firmware without SMC call for USB 3.0 phy power.
This is regression introduced in commit bd3d25b07342 ("arm64: dts: marvell:
armada-37xx: link USB hosts with their PHYs") where USB 3.0 phy was defined
and therefore xhci-hcd on Espressobin with older ATF started failing.
Signed-off-by: Pali Rohár
Tested-by: Tomasz Maciej Nowak
Fixes: bd3d25b07342 ("arm64: dts: marvell: armada-37xx: link USB hosts with
their PHYs")
Cc: # 5.1+: ea17a0f153af: phy: marvell: comphy:
Convert internal SMCC firmware return codes to errno
Cc: # 5.1+: f768e718911e: usb: host: xhci-plat: add
priv quirk for skip PHY initialization
---
Changes in v2:
* Drop dependency on patch "usb: host: xhci-plat: fix support for
XHCI_SKIP_PHY_INIT quirk"
* Introduce a new .plat_setup callback for xhci-plat drivers in this patch (to
simplify backporting and review)
* Move implementation from xhci_mvebu_mbus_init_quirk() into
xhci_mvebu_a3700_plat_setup()
---
drivers/usb/host/xhci-mvebu.c | 42 +++
drivers/usb/host/xhci-mvebu.h | 6 +
drivers/usb/host/xhci-plat.c | 20 -
drivers/usb/host/xhci-plat.h | 1 +
4 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index 60651a50770f..8ca1a235d164 100644
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -8,6 +8,7 @@
#include
#include
#include
+#include
#include
#include
@@ -74,6 +75,47 @@ int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd)
return 0;
}
+int xhci_mvebu_a3700_plat_setup(struct usb_hcd *hcd)
+{
+ struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+ struct device *dev = hcd->self.controller;
+ struct phy *phy;
+ int ret;
+
+ /* Old bindings miss the PHY handle */
+ phy = of_phy_get(dev->of_node, "usb3-phy");
+ if (IS_ERR(phy) && PTR_ERR(phy) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ else if (IS_ERR(phy))
+ goto phy_out;
+
+ ret = phy_init(phy);
+ if (ret)
+ goto phy_put;
+
+ ret = phy_set_mode(phy, PHY_MODE_USB_HOST_SS);
+ if (ret)
+ goto phy_exit;
+
+ ret = phy_power_on(phy);
+ if (ret == -EOPNOTSUPP) {
+ /* Skip initializatin of XHCI PHY when it is unsupported by
firmware */
+ dev_warn(dev, "PHY unsupported by firmware\n");
+ xhci->quirks |= XHCI_SKIP_PHY_INIT;
+ }
+ if (ret)
+ goto phy_exit;
+
+ phy_power_off(phy);
+phy_exit:
+ phy_exit(phy);
+phy_put:
+ of_phy_put(phy);
+phy_out:
+
+ return 0;
+}
+
int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd)
{
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
diff --git a/drivers/usb/host/xhci-mvebu.h b/drivers/usb/host/xhci-mvebu.h
index 3be021793cc8..01bf3fcb3eca 100644
--- a/drivers/usb/host/xhci-mvebu.h
+++ b/drivers/usb/host/xhci-mvebu.h
@@ -12,6 +12,7 @@ struct usb_hcd;
#if IS_ENABLED(CONFIG_USB_XHCI_MVEBU)
int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd);
+int xhci_mvebu_a3700_plat_setup(struct usb_hcd *hcd);
int xhci_mvebu_a3700_init_quirk(struct usb_hcd *hcd);
#else
static inline int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd)
@@ -19,6 +20,11 @@ static inline int xhci_mvebu_mbus_init_quirk(struct usb_hcd
*hcd)
return 0;
}
+static inline int xhci_mvebu_a3700_plat_setup(struct usb_hcd *hcd)
+{
+ return 0;
+}
+
static inline int
