mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
3241929b67
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 commitbd3d25b073("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. Fixes:bd3d25b073("arm64: dts: marvell: armada-37xx: link USB hosts with their PHYs") Cc: <stable@vger.kernel.org> # 5.1+:ea17a0f153: phy: marvell: comphy: Convert internal SMCC firmware return codes to errno Cc: <stable@vger.kernel.org> # 5.1+:f768e71891: usb: host: xhci-plat: add priv quirk for skip PHY initialization Tested-by: Tomasz Maciej Nowak <tmn505@gmail.com> Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> # On R-Car Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> # xhci-plat Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Pali Rohár <pali@kernel.org> Link: https://lore.kernel.org/r/20210201150803.7305-1-pali@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
127 lines
2.8 KiB
C
127 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (C) 2014 Marvell
|
|
* Author: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
*/
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/mbus.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/phy/phy.h>
|
|
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/hcd.h>
|
|
|
|
#include "xhci-mvebu.h"
|
|
#include "xhci.h"
|
|
|
|
#define USB3_MAX_WINDOWS 4
|
|
#define USB3_WIN_CTRL(w) (0x0 + ((w) * 8))
|
|
#define USB3_WIN_BASE(w) (0x4 + ((w) * 8))
|
|
|
|
static void xhci_mvebu_mbus_config(void __iomem *base,
|
|
const struct mbus_dram_target_info *dram)
|
|
{
|
|
int win;
|
|
|
|
/* Clear all existing windows */
|
|
for (win = 0; win < USB3_MAX_WINDOWS; win++) {
|
|
writel(0, base + USB3_WIN_CTRL(win));
|
|
writel(0, base + USB3_WIN_BASE(win));
|
|
}
|
|
|
|
/* Program each DRAM CS in a seperate window */
|
|
for (win = 0; win < dram->num_cs; win++) {
|
|
const struct mbus_dram_window *cs = dram->cs + win;
|
|
|
|
writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) |
|
|
(dram->mbus_dram_target_id << 4) | 1,
|
|
base + USB3_WIN_CTRL(win));
|
|
|
|
writel((cs->base & 0xffff0000), base + USB3_WIN_BASE(win));
|
|
}
|
|
}
|
|
|
|
int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd)
|
|
{
|
|
struct device *dev = hcd->self.controller;
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
struct resource *res;
|
|
void __iomem *base;
|
|
const struct mbus_dram_target_info *dram;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
|
if (!res)
|
|
return -ENODEV;
|
|
|
|
/*
|
|
* We don't use devm_ioremap() because this mapping should
|
|
* only exists for the duration of this probe function.
|
|
*/
|
|
base = ioremap(res->start, resource_size(res));
|
|
if (!base)
|
|
return -ENODEV;
|
|
|
|
dram = mv_mbus_dram_info();
|
|
xhci_mvebu_mbus_config(base, dram);
|
|
|
|
/*
|
|
* This memory area was only needed to configure the MBus
|
|
* windows, and is therefore no longer useful.
|
|
*/
|
|
iounmap(base);
|
|
|
|
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);
|
|
|
|
/* Without reset on resume, the HC won't work at all */
|
|
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
|
|
|
return 0;
|
|
}
|