RE: [PATCH] [V2] USB: Add support for Xilinx USB host controller
Hi, Greg K-H,
I think we have put in all the suggested changes. Are you planning to
put it into your tree? Or is there something we need to do?
Thank you,
Julie.
> > -Original Message-
> > From: Julie Zhu [mailto:julie@xilinx.com]
> > Sent: Monday, September 21, 2009 4:08 PM
> > To: John Linn; jwbo...@linux.vnet.ibm.com; g...@kroah.com; linuxppc-
> d...@ozlabs.org; linux-
> > u...@vger.kernel.org; grant.lik...@secretlab.ca;
b...@kernel.crashing.org
> > Cc: Julie Zhu
> > Subject: [PATCH] [V2] USB: Add support for Xilinx USB host
controller
> >
> > Add bus glue driver for Xilinx USB host controller. The controller
can
> be
> > configured as HS only or HS/FS hybrid. The driver uses the device
tree
> file
> > to configure the driver according to the setting in the hardware
system.
> >
> > This driver has been tested with usbtest using the NET2280 PCI card.
> >
> > Signed-off-by: Julie Zhu
> > Signed-off-by: John Linn
> > Acked-by: Grant Likely
> >
> > ---
> >
> > V1 - Updated per comments from Benjamin Herrenschmidt
> > and Grant Likely
>
> > V2 - Updated per comments from Benjamin Herrenschmidt and Grant
Likely:
> > removed repetitive compatible lists, and removed
> irq_dispose_mapping call
> > upon failure.
> > ---
> > Documentation/powerpc/dts-bindings/xilinx.txt | 11 +
> > drivers/usb/host/Kconfig | 15 +-
> > drivers/usb/host/ehci-hcd.c |5 +
> > drivers/usb/host/ehci-xilinx-of.c | 300
> +
> > 4 files changed, 329 insertions(+), 2 deletions(-)
> > create mode 100644 drivers/usb/host/ehci-xilinx-of.c
> >
> > diff --git a/Documentation/powerpc/dts-bindings/xilinx.txt
> b/Documentation/powerpc/dts-
> > bindings/xilinx.txt
> > index 80339fe..ea68046 100644
> > --- a/Documentation/powerpc/dts-bindings/xilinx.txt
> > +++ b/Documentation/powerpc/dts-bindings/xilinx.txt
> > @@ -292,4 +292,15 @@
> > - reg-offset : A value of 3 is required
> > - reg-shift : A value of 2 is required
> >
> > + vii) Xilinx USB Host controller
> > +
> > + The Xilinx USB host controller is EHCI compatible but with a
> different
> > + base address for the EHCI registers, and it is always a big-
> endian
> > + USB Host controller. The hardware can be configured as high
speed
> only,
> > + or high speed/full speed hybrid.
> > +
> > + Required properties:
> > + - xlnx,support-usb-fs: A value 0 means the core is built as
high
> speed
> > + only. A value 1 means the core also
> supports
> > + full speed devices.
> >
> > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> > index 1a920c7..95e4689 100644
> > --- a/drivers/usb/host/Kconfig
> > +++ b/drivers/usb/host/Kconfig
> > @@ -90,14 +90,25 @@ config USB_EHCI_TT_NEWSCHED
> >
> > config USB_EHCI_BIG_ENDIAN_MMIO
> > bool
> > - depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX ||
> ARCH_IXP4XX)
> > + depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX ||
> ARCH_IXP4XX ||
> > XPS_USB_HCD_XILINX)
> > default y
> >
> > config USB_EHCI_BIG_ENDIAN_DESC
> > bool
> > - depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
> > + depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX ||
> XPS_USB_HCD_XILINX)
> > default y
> >
> > +config XPS_USB_HCD_XILINX
> > + bool "Use Xilinx usb host EHCI controller core"
> > + depends on USB_EHCI_HCD && (PPC32 || MICROBLAZE)
> > + select USB_EHCI_BIG_ENDIAN_DESC
> > + select USB_EHCI_BIG_ENDIAN_MMIO
> > + ---help---
> > + Xilinx xps USB host controller core is EHCI compilant
and has
> > + transaction translator built-in. It can be configured to
> either
> > + support both high speed and full speed devices, or high
speed
> > + devices only.
> > +
> > config USB_EHCI_FSL
> > bool "Support for Freescale on-chip EHCI USB controller"
> > depends on USB_EHCI_HCD && FSL_SOC
> > diff --git a/drivers/usb/host/ehci-hcd.c
b/drivers/usb/host/ehci-hcd.c
> > index 11c627c..7672624 100644
> > --- a/drivers/usb/host/ehci-hcd.c
> > +++ b/drivers/usb/host/ehci-hcd.c
> > @@ -1107,6 +1107,11 @@ MODULE_LICENSE ("GPL");
> > #define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_dri
[PATCH] [V2] USB: Add support for Xilinx USB host controller
Add bus glue driver for Xilinx USB host controller. The controller can be
configured as HS only or HS/FS hybrid. The driver uses the device tree file
to configure the driver according to the setting in the hardware system.
This driver has been tested with usbtest using the NET2280 PCI card.
Signed-off-by: Julie Zhu
Signed-off-by: John Linn
---
V1 - Updated per comments from Benjamin Herrenschmidt
and Grant Likely
V2 - Updated per comments from Benjamin Herrenschmidt and Grant Likely:
removed repetitive compatible lists, and removed irq_dispose_mapping call
upon failure.
---
Documentation/powerpc/dts-bindings/xilinx.txt | 11 +
drivers/usb/host/Kconfig | 15 +-
drivers/usb/host/ehci-hcd.c |5 +
drivers/usb/host/ehci-xilinx-of.c | 300 +
4 files changed, 329 insertions(+), 2 deletions(-)
create mode 100644 drivers/usb/host/ehci-xilinx-of.c
diff --git a/Documentation/powerpc/dts-bindings/xilinx.txt
b/Documentation/powerpc/dts-bindings/xilinx.txt
index 80339fe..ea68046 100644
--- a/Documentation/powerpc/dts-bindings/xilinx.txt
+++ b/Documentation/powerpc/dts-bindings/xilinx.txt
@@ -292,4 +292,15 @@
- reg-offset : A value of 3 is required
- reg-shift : A value of 2 is required
+ vii) Xilinx USB Host controller
+
+ The Xilinx USB host controller is EHCI compatible but with a different
+ base address for the EHCI registers, and it is always a big-endian
+ USB Host controller. The hardware can be configured as high speed only,
+ or high speed/full speed hybrid.
+
+ Required properties:
+ - xlnx,support-usb-fs: A value 0 means the core is built as high speed
+ only. A value 1 means the core also supports
+ full speed devices.
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 1a920c7..95e4689 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -90,14 +90,25 @@ config USB_EHCI_TT_NEWSCHED
config USB_EHCI_BIG_ENDIAN_MMIO
bool
- depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX ||
ARCH_IXP4XX)
+ depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX ||
ARCH_IXP4XX || XPS_USB_HCD_XILINX)
default y
config USB_EHCI_BIG_ENDIAN_DESC
bool
- depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
+ depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX)
default y
+config XPS_USB_HCD_XILINX
+ bool "Use Xilinx usb host EHCI controller core"
+ depends on USB_EHCI_HCD && (PPC32 || MICROBLAZE)
+ select USB_EHCI_BIG_ENDIAN_DESC
+ select USB_EHCI_BIG_ENDIAN_MMIO
+ ---help---
+ Xilinx xps USB host controller core is EHCI compilant and has
+ transaction translator built-in. It can be configured to either
+ support both high speed and full speed devices, or high speed
+ devices only.
+
config USB_EHCI_FSL
bool "Support for Freescale on-chip EHCI USB controller"
depends on USB_EHCI_HCD && FSL_SOC
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 11c627c..7672624 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1107,6 +1107,11 @@ MODULE_LICENSE ("GPL");
#define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver
#endif
+#ifdef CONFIG_XPS_USB_HCD_XILINX
+#include "ehci-xilinx-of.c"
+#define OF_PLATFORM_DRIVER ehci_hcd_xilinx_of_driver
+#endif
+
#ifdef CONFIG_PLAT_ORION
#include "ehci-orion.c"
#definePLATFORM_DRIVER ehci_orion_driver
diff --git a/drivers/usb/host/ehci-xilinx-of.c
b/drivers/usb/host/ehci-xilinx-of.c
new file mode 100644
index 000..a586153
--- /dev/null
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -0,0 +1,300 @@
+/*
+ * EHCI HCD (Host Controller Driver) for USB.
+ *
+ * Bus Glue for Xilinx EHCI core on the of_platform bus
+ *
+ * Copyright (c) 2009 Xilinx, Inc.
+ *
+ * Based on "ehci-ppc-of.c" by Valentine Barshak
+ * and "ehci-ppc-soc.c" by Stefan Roese
+ * and "ohci-ppc-of.c" by Sylvain Munaut
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 675 Ma
[PATCH] [V1] USB: Add support for Xilinx USB host controller
Add bus glue driver for Xilinx USB host controller. The controller can be
configured as HS only or HS/FS hybrid. The driver uses the device tree file
to configure the driver according to the setting in the hardware system.
This driver has been tested with usbtest using the NET2280 PCI card.
Signed-off-by: Julie Zhu
Signed-off-by: John Linn
---
V1 - Updated per comments from Benjamin Herrenschmidt
and Grant Likely .
---
Documentation/powerpc/dts-bindings/xilinx.txt | 11 +
drivers/usb/host/Kconfig | 15 +-
drivers/usb/host/ehci-hcd.c |5 +
drivers/usb/host/ehci-xilinx-of.c | 302 +
4 files changed, 331 insertions(+), 2 deletions(-)
create mode 100644 drivers/usb/host/ehci-xilinx-of.c
diff --git a/Documentation/powerpc/dts-bindings/xilinx.txt
b/Documentation/powerpc/dts-bindings/xilinx.txt
index 80339fe..ea68046 100644
--- a/Documentation/powerpc/dts-bindings/xilinx.txt
+++ b/Documentation/powerpc/dts-bindings/xilinx.txt
@@ -292,4 +292,15 @@
- reg-offset : A value of 3 is required
- reg-shift : A value of 2 is required
+ vii) Xilinx USB Host controller
+
+ The Xilinx USB host controller is EHCI compatible but with a different
+ base address for the EHCI registers, and it is always a big-endian
+ USB Host controller. The hardware can be configured as high speed only,
+ or high speed/full speed hybrid.
+
+ Required properties:
+ - xlnx,support-usb-fs: A value 0 means the core is built as high speed
+ only. A value 1 means the core also supports
+ full speed devices.
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 1a920c7..95e4689 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -90,14 +90,25 @@ config USB_EHCI_TT_NEWSCHED
config USB_EHCI_BIG_ENDIAN_MMIO
bool
- depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX ||
ARCH_IXP4XX)
+ depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX ||
ARCH_IXP4XX || XPS_USB_HCD_XILINX)
default y
config USB_EHCI_BIG_ENDIAN_DESC
bool
- depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
+ depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX)
default y
+config XPS_USB_HCD_XILINX
+ bool "Use Xilinx usb host EHCI controller core"
+ depends on USB_EHCI_HCD && (PPC32 || MICROBLAZE)
+ select USB_EHCI_BIG_ENDIAN_DESC
+ select USB_EHCI_BIG_ENDIAN_MMIO
+ ---help---
+ Xilinx xps USB host controller core is EHCI compilant and has
+ transaction translator built-in. It can be configured to either
+ support both high speed and full speed devices, or high speed
+ devices only.
+
config USB_EHCI_FSL
bool "Support for Freescale on-chip EHCI USB controller"
depends on USB_EHCI_HCD && FSL_SOC
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 11c627c..7672624 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1107,6 +1107,11 @@ MODULE_LICENSE ("GPL");
#define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver
#endif
+#ifdef CONFIG_XPS_USB_HCD_XILINX
+#include "ehci-xilinx-of.c"
+#define OF_PLATFORM_DRIVER ehci_hcd_xilinx_of_driver
+#endif
+
#ifdef CONFIG_PLAT_ORION
#include "ehci-orion.c"
#definePLATFORM_DRIVER ehci_orion_driver
diff --git a/drivers/usb/host/ehci-xilinx-of.c
b/drivers/usb/host/ehci-xilinx-of.c
new file mode 100644
index 000..f1ae855
--- /dev/null
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -0,0 +1,302 @@
+/*
+ * EHCI HCD (Host Controller Driver) for USB.
+ *
+ * Bus Glue for Xilinx EHCI core on the of_platform bus
+ *
+ * Copyright (c) 2009 Xilinx, Inc.
+ *
+ * Based on "ehci-ppc-of.c" by Valentine Barshak
+ * and "ehci-ppc-soc.c" by Stefan Roese
+ * and "ohci-ppc-of.c" by Sylvain Munaut
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include
+
+#include
+#include
+
+/**
+ * ehci_xilinx_of_setup - Initialize the device for ehci_reset()
+ * @hcd:
RE: [PATCH] USB: Add support for Xilinx USB host controller
Thanks, Grant and Ben,
> > Add bus glue driver for Xilinx USB host controller. The controller can
> be
> > configured as HS only or HS/FS hybrid. The driver uses the device tree
> file
> > to configure the driver according to the setting in the hardware system.
> >
> > This driver has been tested with usbtest using the NET2280 PCI card.
> >
> > Signed-off-by: Julie Zhu
>
> As Ben said, this is nice tight code. Two comments below.
>
> > +/**
> > + * ehci_xilinx_port_handed_over - hand the port out if failed to enable
> it
> > + * @hcd: Pointer to the usb_hcd device to which the host
> controller bound
> > + * @portnum:Port number to which the device is attached.
> > + *
> > + * This function is used as a place to tell the user that the Xilinx
> USB host
> > + * controller does support LS devices. And in an HS only configuration,
> it
> > + * does not support FS devices neither. It is hoped that this can help
> a
>
> s/neither/either
>
> [...]
> > +static struct of_device_id ehci_hcd_xilinx_of_match[] = {
> > + {
> > + .compatible = "usb-ehci",
> > + },
>
> This looks wrong. Since this driver only works with Xilinx USB
> controllers,
> it should be binding against "xlnx,xps-usb-host-1.00.a", and the meaning
> of
> that binding needs to be documented in Documentation/powerpc/dts-bindings.
>
I have changed the compatible to "xlnx,xps-usb-host-1.00.a", thanks for
catching this.
Where should I put the binding for Xilinx USB host controller? usb-ehci.txt or
xilinx.txt?
Thanks,
Julie.
> Having this driver bind against the generic "usb-ehci" will cause
> conflicts
> with the ehci-ppc-of driver.
>
> Cheers,
> g.
>
> --
> Grant Likely, B.Sc., P.Eng.
> Secret Lab Technologies Ltd.
This email and any attachments are intended for the sole use of the named
recipient(s) and contain(s) confidential information that may be proprietary,
privileged or copyrighted under applicable law. If you are not the intended
recipient, do not read, copy, or forward this email message or any attachments.
Delete this email message and any attachments immediately.
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH] USB: Add support for Xilinx USB host controller
Add bus glue driver for Xilinx USB host controller. The controller can be
configured as HS only or HS/FS hybrid. The driver uses the device tree file
to configure the driver according to the setting in the hardware system.
This driver has been tested with usbtest using the NET2280 PCI card.
Signed-off-by: Julie Zhu
---
drivers/usb/host/Kconfig | 15 ++-
drivers/usb/host/ehci-hcd.c |5 +
drivers/usb/host/ehci-xilinx-of.c | 303 +
3 files changed, 321 insertions(+), 2 deletions(-)
create mode 100644 drivers/usb/host/ehci-xilinx-of.c
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 1a920c7..95e4689 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -90,14 +90,25 @@ config USB_EHCI_TT_NEWSCHED
config USB_EHCI_BIG_ENDIAN_MMIO
bool
- depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX ||
ARCH_IXP4XX)
+ depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX ||
ARCH_IXP4XX || XPS_USB_HCD_XILINX)
default y
config USB_EHCI_BIG_ENDIAN_DESC
bool
- depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
+ depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX)
default y
+config XPS_USB_HCD_XILINX
+ bool "Use Xilinx usb host EHCI controller core"
+ depends on USB_EHCI_HCD && (PPC32 || MICROBLAZE)
+ select USB_EHCI_BIG_ENDIAN_DESC
+ select USB_EHCI_BIG_ENDIAN_MMIO
+ ---help---
+ Xilinx xps USB host controller core is EHCI compilant and has
+ transaction translator built-in. It can be configured to either
+ support both high speed and full speed devices, or high speed
+ devices only.
+
config USB_EHCI_FSL
bool "Support for Freescale on-chip EHCI USB controller"
depends on USB_EHCI_HCD && FSL_SOC
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 11c627c..7672624 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1107,6 +1107,11 @@ MODULE_LICENSE ("GPL");
#define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver
#endif
+#ifdef CONFIG_XPS_USB_HCD_XILINX
+#include "ehci-xilinx-of.c"
+#define OF_PLATFORM_DRIVER ehci_hcd_xilinx_of_driver
+#endif
+
#ifdef CONFIG_PLAT_ORION
#include "ehci-orion.c"
#definePLATFORM_DRIVER ehci_orion_driver
diff --git a/drivers/usb/host/ehci-xilinx-of.c
b/drivers/usb/host/ehci-xilinx-of.c
new file mode 100644
index 000..58e1f14
--- /dev/null
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -0,0 +1,303 @@
+/*
+ * EHCI HCD (Host Controller Driver) for USB.
+ *
+ * Bus Glue for Xilinx EHCI core on the of_platform bus
+ *
+ * Copyright (c) 2009 Xilinx, Inc.
+ *
+ * Based on "ehci-ppc-of.c" by Valentine Barshak
+ * and "ehci-ppc-soc.c" by Stefan Roese
+ * and "ohci-ppc-of.c" by Sylvain Munaut
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include
+
+#include
+#include
+
+/**
+ * ehci_xilinx_of_setup - Initialize the device for ehci_reset()
+ * @hcd: Pointer to the usb_hcd device to which the host controller bound
+ *
+ * called during probe() after chip reset completes.
+ */
+static int ehci_xilinx_of_setup(struct usb_hcd *hcd)
+{
+ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+ int retval;
+
+ retval = ehci_halt(ehci);
+ if (retval)
+ return retval;
+
+ retval = ehci_init(hcd);
+ if (retval)
+ return retval;
+
+ ehci->sbrn = 0x20;
+
+ return ehci_reset(ehci);
+}
+
+/**
+ * ehci_xilinx_port_handed_over - hand the port out if failed to enable it
+ * @hcd: Pointer to the usb_hcd device to which the host controller bound
+ * @portnum:Port number to which the device is attached.
+ *
+ * This function is used as a place to tell the user that the Xilinx USB host
+ * controller does support LS devices. And in an HS only configuration, it
+ * does not support FS devices neither. It is hoped that this can help a
+ * confused user.
+ *
+ * There are cases when the host controller fails to enable the port due to,
+ * for example, insufficient pow
