From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: Re: [PATCH 2/8] usb: host: xhci-plat: Add support for the Armada 38x glue code Date: Sat, 19 Apr 2014 22:20:35 -0500 Message-ID: <20140420032035.GB26893@saruman.home> References: <1397816563-9000-1-git-send-email-gregory.clement@free-electrons.com> <1397816563-9000-3-git-send-email-gregory.clement@free-electrons.com> Reply-To: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gatW/ieO32f1wygP" Return-path: Content-Disposition: inline In-Reply-To: <1397816563-9000-3-git-send-email-gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Sender: linux-usb-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Gregory CLEMENT Cc: Mathias Nyman , Greg Kroah-Hartman , linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Thomas Petazzoni , Ezequiel Garcia , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Lior Amsalem , Tawfik Bayouk , Nadav Haklai , Grant Likely , Rob Herring , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org --gatW/ieO32f1wygP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Apr 18, 2014 at 12:22:37PM +0200, Gregory CLEMENT wrote: > For the armada 38x SoCs which come with an xhci controller, specific > initialization must be done during probe, especially in relation with > the MBus windows initialization. This patch adds this support. >=20 > Signed-off-by: Gregory CLEMENT > --- > drivers/usb/host/Kconfig | 7 +++ > drivers/usb/host/Makefile | 1 + > drivers/usb/host/xhci-mvebu.c | 105 ++++++++++++++++++++++++++++++++++++= ++++++ > drivers/usb/host/xhci-mvebu.h | 21 +++++++++ > drivers/usb/host/xhci-plat.c | 10 ++++ > 5 files changed, 144 insertions(+) > create mode 100644 drivers/usb/host/xhci-mvebu.c > create mode 100644 drivers/usb/host/xhci-mvebu.h >=20 > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig > index 3d9e54062d62..e70943fac4a1 100644 > --- a/drivers/usb/host/Kconfig > +++ b/drivers/usb/host/Kconfig > @@ -29,6 +29,13 @@ if USB_XHCI_HCD > config USB_XHCI_PLATFORM > tristate > =20 > +config USB_XHCI_MVEBU > + tristate "xHCI support for Marvell Armada 38x" > + select USB_XHCI_PLATFORM > + ---help--- > + Say 'Y' to enable the support for the xHCI host controller > + found in Marvell Armada 38x ARM SOCs. > + > endif # USB_XHCI_HCD > =20 > config USB_EHCI_HCD > diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile > index 7530468c9a4f..7a8db7f7dc01 100644 > --- a/drivers/usb/host/Makefile > +++ b/drivers/usb/host/Makefile > @@ -19,6 +19,7 @@ xhci-hcd-$(CONFIG_PCI) +=3D xhci-pci.o > =20 > ifneq ($(CONFIG_USB_XHCI_PLATFORM), ) > xhci-hcd-y +=3D xhci-plat.o > + xhci-hcd-$(CONFIG_USB_XHCI_MVEBU) +=3D xhci-mvebu.o > endif > =20 > obj-$(CONFIG_USB_WHCI_HCD) +=3D whci/ > diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c > new file mode 100644 > index 000000000000..dc9c7648ab65 > --- /dev/null > +++ b/drivers/usb/host/xhci-mvebu.c > @@ -0,0 +1,105 @@ > +/* > + * Copyright (C) 2014 Marvell > + * Author: Gregory CLEMENT > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * version 2 as published by the Free Software Foundation. > + */ > + > +#include > +#include > +#include > +#include > +#include > + > +#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 __init mv_usb3_conf_mbus_windows(void __iomem *base, > + const struct mbus_dram_target_info *dram) > +{ > + int win; > + > + /* Clear all existing windows */ > + for (win =3D 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 =3D 0; win < dram->num_cs; win++) { > + const struct mbus_dram_window *cs =3D 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_probe(struct platform_device *pdev) > +{ > + struct resource *res; > + void __iomem *base; > + const struct mbus_dram_target_info *dram; > + int ret; > + struct clk *clk; > + > + res =3D 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 =3D ioremap(res->start, resource_size(res)); > + if (!base) > + return -ENODEV; > + > + clk =3D devm_clk_get(&pdev->dev, NULL); > + if (IS_ERR(clk)) { > + iounmap(base); > + return PTR_ERR(clk); > + } > + > + ret =3D clk_prepare_enable(clk); > + if (ret < 0) { > + iounmap(base); > + return ret; > + } it's best to teach generic xhci-plat about clocks, just make it optional. > + dram =3D mv_mbus_dram_info(); > + mv_usb3_conf_mbus_windows(base, dram); > + > + /* > + * This memory area was only needed to configure the MBus > + * windows, and is therefore no longer useful. > + */ > + iounmap(base); so I suppose MBus is the Marvell interconnect, am I right ? Wouldn't you be duplicating this sort of initialization for most drivers ? > + ret =3D common_xhci_plat_probe(pdev, clk); I would much rather reverse this, instead of exposing xhci-plat's probe, turn this mbus initialization into a quirk which will ioremap the extra resource, initialize some registers and iounmap it. > diff --git a/drivers/usb/host/xhci-mvebu.h b/drivers/usb/host/xhci-mvebu.h > new file mode 100644 > index 000000000000..897ef298f22f > --- /dev/null > +++ b/drivers/usb/host/xhci-mvebu.h > @@ -0,0 +1,21 @@ > +/* > + * Copyright (C) 2014 Marvell > + * > + * Gregory Clement > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any > + * warranty of any kind, whether express or implied. > + */ > + > +#ifndef __LINUX_XHCI_MVEBU_H > +#define __LINUX_XHCI_MVEBU_H > + > +#ifdef CONFIG_USB_XHCI_MVEBU > +int xhci_mvebu_probe(struct platform_device *pdev); > +int xhci_mvebu_remove(struct platform_device *pdev); > +#else > +#define xhci_mvebu_probe NULL > +#define xhci_mvebu_remove NULL > +#endif > +#endif /* __LINUX_XHCI_MVEBU_H */ > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index 8029cc82edc4..f1261d3848a9 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -19,6 +19,7 @@ > #include > =20 > #include "xhci.h" > +#include "xhci-mvebu.h" > =20 > static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci) > { > @@ -250,6 +251,11 @@ static const struct dev_pm_ops xhci_plat_pm_ops =3D { > #endif /* CONFIG_PM */ > =20 > #ifdef CONFIG_OF > +struct xhci_plat_ops xhci_plat_mvebu =3D { > + .probe =3D xhci_mvebu_probe, > + .remove =3D xhci_mvebu_remove, > +}; instead, just pass a flag such as: XHCI_PLAT_MVEBU_MBUS_INIT_QUIRK or something --=20 balbi --gatW/ieO32f1wygP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJTUz0DAAoJEIaOsuA1yqREkicQALIR2ZAXLa6GOYh6AtJLbceG JMZS8gz1MeeWkIP9hWsaiR8JUunjhhL0ozVNNtyyROEw+PopGiOe4Vz0EHl6JwFC 3nvl4J9MV4MSZMcjJiXxZTgZFCma+ebYddcE2iXbp5t4PMGhoEZQ91DuujID+vs9 YcGFOynHw6Jp8xzE35jqjfhSZPXzM9JhEMOJfoDxRfvuEyMSJGsEuRK38wIoBYX+ rDwb/UUpRaKskq6ndiWh2t38MAzPrmEnGM3MhXUVW4uZ+RDS9pRJU5f01IL9B2xT +RhpDWR00fgBTBU4n9/YZ298ajCjDTvGooiFS0wf2TcY7QGlXjk+4IV1WoDfKUYa x/hXkPWzVvB5rm369kdlAryNkYd0Tt8ElUSJvKh3EabhIDGywoMFxAW7y+TDFNr2 KAJ9r3qTipkEDAUMH+Aicw+uJstAP5ZLTPyGu41Ltt4gbey0UyRPqMj7t/pDULCb JJvUldYVDHlvIAdh+9VeCmvZUwlSLUXTz2+c8O5e04VVwqPd3NOQPiVZW3S2s9N0 dBC2TOMW6IzKFCDqBo19O3dU4rxHbNTTKmMrGlv296iLqM3fgOpn+15isbryvDWt Mww8r2nbeaivUcs6drT/qUDbUl0OMxADiMqM3fqB03Vd4ovZ4wFT+8FCdgXOuiHc xmwIoW7QdzUY4WARXwCM =KxLS -----END PGP SIGNATURE----- --gatW/ieO32f1wygP-- -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html