* [2/6] usb: host: xhci-tegra: Selectively program IPFS
@ 2019-01-25 11:30 Thierry Reding
0 siblings, 0 replies; 2+ messages in thread
From: Thierry Reding @ 2019-01-25 11:30 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Mathias Nyman, Jon Hunter, JC Kuo, linux-usb, linux-tegra,
linux-kernel
From: JC Kuo <jckuo@nvidia.com>
Starting with Tegra186, the XUSB controller no longer has the IPFS
wrapper. This commit adds a "has_ipfs" field to struct tegra_xusb_soc
that can be used to declare the existence of the IPFS wrapper.
For the existing chips (i.e. Tegra124 and Tegra210), the new field is
set to true. A future patch adding support for Tegra186 will set it to
false.
Signed-off-by: JC Kuo <jckuo@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
drivers/usb/host/xhci-tegra.c | 43 +++++++++++++++++++++--------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index 938ff06c0349..49e033f953a2 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -161,6 +161,7 @@ struct tegra_xusb_soc {
} ports;
bool scale_ss_clock;
+ bool has_ipfs;
};
struct tegra_xusb {
@@ -637,16 +638,18 @@ static irqreturn_t tegra_xusb_mbox_thread(int irq, void *data)
return IRQ_HANDLED;
}
-static void tegra_xusb_ipfs_config(struct tegra_xusb *tegra,
- struct resource *regs)
+static void tegra_xusb_config(struct tegra_xusb *tegra,
+ struct resource *regs)
{
u32 value;
- value = ipfs_readl(tegra, IPFS_XUSB_HOST_CONFIGURATION_0);
- value |= IPFS_EN_FPCI;
- ipfs_writel(tegra, value, IPFS_XUSB_HOST_CONFIGURATION_0);
+ if (tegra->soc->has_ipfs) {
+ value = ipfs_readl(tegra, IPFS_XUSB_HOST_CONFIGURATION_0);
+ value |= IPFS_EN_FPCI;
+ ipfs_writel(tegra, value, IPFS_XUSB_HOST_CONFIGURATION_0);
- usleep_range(10, 20);
+ usleep_range(10, 20);
+ }
/* Program BAR0 space */
value = fpci_readl(tegra, XUSB_CFG_4);
@@ -661,13 +664,15 @@ static void tegra_xusb_ipfs_config(struct tegra_xusb *tegra,
value |= XUSB_IO_SPACE_EN | XUSB_MEM_SPACE_EN | XUSB_BUS_MASTER_EN;
fpci_writel(tegra, value, XUSB_CFG_1);
- /* Enable interrupt assertion */
- value = ipfs_readl(tegra, IPFS_XUSB_HOST_INTR_MASK_0);
- value |= IPFS_IP_INT_MASK;
- ipfs_writel(tegra, value, IPFS_XUSB_HOST_INTR_MASK_0);
+ if (tegra->soc->has_ipfs) {
+ /* Enable interrupt assertion */
+ value = ipfs_readl(tegra, IPFS_XUSB_HOST_INTR_MASK_0);
+ value |= IPFS_IP_INT_MASK;
+ ipfs_writel(tegra, value, IPFS_XUSB_HOST_INTR_MASK_0);
- /* Set hysteresis */
- ipfs_writel(tegra, 0x80, IPFS_XUSB_HOST_CLKGATE_HYSTERESIS_0);
+ /* Set hysteresis */
+ ipfs_writel(tegra, 0x80, IPFS_XUSB_HOST_CLKGATE_HYSTERESIS_0);
+ }
}
static int tegra_xusb_clk_enable(struct tegra_xusb *tegra)
@@ -1015,10 +1020,12 @@ static int tegra_xusb_probe(struct platform_device *pdev)
if (IS_ERR(tegra->fpci_base))
return PTR_ERR(tegra->fpci_base);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
- tegra->ipfs_base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(tegra->ipfs_base))
- return PTR_ERR(tegra->ipfs_base);
+ if (tegra->soc->has_ipfs) {
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+ tegra->ipfs_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(tegra->ipfs_base))
+ return PTR_ERR(tegra->ipfs_base);
+ }
tegra->xhci_irq = platform_get_irq(pdev, 0);
if (tegra->xhci_irq < 0)
@@ -1208,7 +1215,7 @@ static int tegra_xusb_probe(struct platform_device *pdev)
goto disable_rpm;
}
- tegra_xusb_ipfs_config(tegra, regs);
+ tegra_xusb_config(tegra, regs);
err = tegra_xusb_load_firmware(tegra);
if (err < 0) {
@@ -1380,6 +1387,7 @@ static const struct tegra_xusb_soc tegra124_soc = {
.usb3 = { .offset = 0, .count = 2, },
},
.scale_ss_clock = true,
+ .has_ipfs = true,
};
MODULE_FIRMWARE("nvidia/tegra124/xusb.bin");
@@ -1411,6 +1419,7 @@ static const struct tegra_xusb_soc tegra210_soc = {
.usb3 = { .offset = 0, .count = 4, },
},
.scale_ss_clock = false,
+ .has_ipfs = true,
};
MODULE_FIRMWARE("nvidia/tegra210/xusb.bin");
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [2/6] usb: host: xhci-tegra: Selectively program IPFS
@ 2019-01-28 7:54 jckuo
0 siblings, 0 replies; 2+ messages in thread
From: jckuo @ 2019-01-28 7:54 UTC (permalink / raw)
To: Thierry Reding, Greg Kroah-Hartman
Cc: Mathias Nyman, Jon Hunter, linux-usb, linux-tegra, linux-kernel
Reviewed-by: JC Kuo <jckuo@nvidia.com>
On 1/25/19 7:30 PM, Thierry Reding wrote:
> From: JC Kuo <jckuo@nvidia.com>
>
> Starting with Tegra186, the XUSB controller no longer has the IPFS
> wrapper. This commit adds a "has_ipfs" field to struct tegra_xusb_soc
> that can be used to declare the existence of the IPFS wrapper.
>
> For the existing chips (i.e. Tegra124 and Tegra210), the new field is
> set to true. A future patch adding support for Tegra186 will set it to
> false.
>
> Signed-off-by: JC Kuo <jckuo@nvidia.com>
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
> drivers/usb/host/xhci-tegra.c | 43 +++++++++++++++++++++--------------
> 1 file changed, 26 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
> index 938ff06c0349..49e033f953a2 100644
> --- a/drivers/usb/host/xhci-tegra.c
> +++ b/drivers/usb/host/xhci-tegra.c
> @@ -161,6 +161,7 @@ struct tegra_xusb_soc {
> } ports;
>
> bool scale_ss_clock;
> + bool has_ipfs;
> };
>
> struct tegra_xusb {
> @@ -637,16 +638,18 @@ static irqreturn_t tegra_xusb_mbox_thread(int irq, void *data)
> return IRQ_HANDLED;
> }
>
> -static void tegra_xusb_ipfs_config(struct tegra_xusb *tegra,
> - struct resource *regs)
> +static void tegra_xusb_config(struct tegra_xusb *tegra,
> + struct resource *regs)
> {
> u32 value;
>
> - value = ipfs_readl(tegra, IPFS_XUSB_HOST_CONFIGURATION_0);
> - value |= IPFS_EN_FPCI;
> - ipfs_writel(tegra, value, IPFS_XUSB_HOST_CONFIGURATION_0);
> + if (tegra->soc->has_ipfs) {
> + value = ipfs_readl(tegra, IPFS_XUSB_HOST_CONFIGURATION_0);
> + value |= IPFS_EN_FPCI;
> + ipfs_writel(tegra, value, IPFS_XUSB_HOST_CONFIGURATION_0);
>
> - usleep_range(10, 20);
> + usleep_range(10, 20);
> + }
>
> /* Program BAR0 space */
> value = fpci_readl(tegra, XUSB_CFG_4);
> @@ -661,13 +664,15 @@ static void tegra_xusb_ipfs_config(struct tegra_xusb *tegra,
> value |= XUSB_IO_SPACE_EN | XUSB_MEM_SPACE_EN | XUSB_BUS_MASTER_EN;
> fpci_writel(tegra, value, XUSB_CFG_1);
>
> - /* Enable interrupt assertion */
> - value = ipfs_readl(tegra, IPFS_XUSB_HOST_INTR_MASK_0);
> - value |= IPFS_IP_INT_MASK;
> - ipfs_writel(tegra, value, IPFS_XUSB_HOST_INTR_MASK_0);
> + if (tegra->soc->has_ipfs) {
> + /* Enable interrupt assertion */
> + value = ipfs_readl(tegra, IPFS_XUSB_HOST_INTR_MASK_0);
> + value |= IPFS_IP_INT_MASK;
> + ipfs_writel(tegra, value, IPFS_XUSB_HOST_INTR_MASK_0);
>
> - /* Set hysteresis */
> - ipfs_writel(tegra, 0x80, IPFS_XUSB_HOST_CLKGATE_HYSTERESIS_0);
> + /* Set hysteresis */
> + ipfs_writel(tegra, 0x80, IPFS_XUSB_HOST_CLKGATE_HYSTERESIS_0);
> + }
> }
>
> static int tegra_xusb_clk_enable(struct tegra_xusb *tegra)
> @@ -1015,10 +1020,12 @@ static int tegra_xusb_probe(struct platform_device *pdev)
> if (IS_ERR(tegra->fpci_base))
> return PTR_ERR(tegra->fpci_base);
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
> - tegra->ipfs_base = devm_ioremap_resource(&pdev->dev, res);
> - if (IS_ERR(tegra->ipfs_base))
> - return PTR_ERR(tegra->ipfs_base);
> + if (tegra->soc->has_ipfs) {
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
> + tegra->ipfs_base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(tegra->ipfs_base))
> + return PTR_ERR(tegra->ipfs_base);
> + }
>
> tegra->xhci_irq = platform_get_irq(pdev, 0);
> if (tegra->xhci_irq < 0)
> @@ -1208,7 +1215,7 @@ static int tegra_xusb_probe(struct platform_device *pdev)
> goto disable_rpm;
> }
>
> - tegra_xusb_ipfs_config(tegra, regs);
> + tegra_xusb_config(tegra, regs);
>
> err = tegra_xusb_load_firmware(tegra);
> if (err < 0) {
> @@ -1380,6 +1387,7 @@ static const struct tegra_xusb_soc tegra124_soc = {
> .usb3 = { .offset = 0, .count = 2, },
> },
> .scale_ss_clock = true,
> + .has_ipfs = true,
> };
> MODULE_FIRMWARE("nvidia/tegra124/xusb.bin");
>
> @@ -1411,6 +1419,7 @@ static const struct tegra_xusb_soc tegra210_soc = {
> .usb3 = { .offset = 0, .count = 4, },
> },
> .scale_ss_clock = false,
> + .has_ipfs = true,
> };
> MODULE_FIRMWARE("nvidia/tegra210/xusb.bin");
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-28 7:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-25 11:30 [2/6] usb: host: xhci-tegra: Selectively program IPFS Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2019-01-28 7:54 jckuo
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).