Skip to contentSkip to conversation

Add initial support for USB ehci pci

PATCH Superseded Michael Trimarchi 2 participants 4 messages Dec 31, 2008 – Jan 4, 2009 USB

lore
Share & tools
lore
#0 lore raw

v2 cover Add initial support for USB ehci pci

Add USB ehci pci support. This patch doesn't include any pci_ids and it is not tested on real hardware.

---
 drivers/usb/Makefile       |    1 +
 drivers/usb/usb_ehci_pci.c |   64 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 0 deletions(-)
 create mode 100644 drivers/usb/usb_ehci_pci.c
drivers/usb/Makefile +1 -0
index 6ba154b..26189b6 100644
@@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
 COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
 COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o
 COBJS-$(CONFIG_USB_EHCI_FSL) += usb_ehci_fsl.o
+COBJS-$(CONFIG_USB_EHCI_PCI) += usb_ehci_pci.o
 
 # device
 ifdef CONFIG_USB_DEVICE
drivers/usb/usb_ehci_pci.c new file +64 -0

64 lines not on this page · raw message

Signature · 1 line
1.5.6.5
#1 lore raw

v2 cover Add initial support for USB ehci pci

Hello Michael,

Is this path 1/3, or 0/2 (file number 0 usually only contains some comments on the series to follow, and is thus not part of the patch series itself...)

Kind Regards,

Remy

2008/12/31 Michael Trimarchi <[email protected]>:

Quoted 97 lines

Add USB ehci pci support. This patch doesn't include any pci_ids and it is not tested on real hardware.

---
 drivers/usb/Makefile       |    1 +
 drivers/usb/usb_ehci_pci.c |   64 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 0 deletions(-)
 create mode 100644 drivers/usb/usb_ehci_pci.c
drivers/usb/Makefile +1 -0
index 6ba154b..26189b6 100644
@@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
 COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
 COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o
 COBJS-$(CONFIG_USB_EHCI_FSL) += usb_ehci_fsl.o
+COBJS-$(CONFIG_USB_EHCI_PCI) += usb_ehci_pci.o
 
 # device
 ifdef CONFIG_USB_DEVICE
drivers/usb/usb_ehci_pci.c new file +64 -1
new file mode 100644
index 0000000..3e7143c
@@ -0,0 +1,64 @@
+/*-
+ * Copyright (c) 2007-2008, Juniper Networks, Inc.
+ * All rights reserved.
+ *
+ * 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 version 2 of
+ * the License.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <pci.h>
+#include <usb.h>
+#include "usb_ehci.h"
+#include "usb_ehci_core.h"
+
+#ifdef CONFIG_PCI_EHCI_DEVICE
+static struct pci_device_id ehci_pci_ids[] = {
+       /* Please add supported PCI EHCI controller ids here */
+       {0, 0}
+};
+#endif
+
+/*
+ * Create the appropriate control structures to manage
+ * a new EHCI host controller.
+ */
+int ehci_hcd_init(void)
+{
+       pci_dev_t pdev;
+       uint32_t addr;
+
+       pdev = pci_find_devices(ehci_pci_ids, CONFIG_PCI_EHCI_DEVICE);
+       if (pdev == -1) {
+               printf("EHCI host controller not found\n");
+               return -1;
+       }
+
+       pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &addr);
+       hccr = (struct ehci_hccr *)addr;
+       hcor = (struct ehci_hcor *)((uint32_t) hccr +
+                       HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+
+       return 0;
+}
+
+/*
+ * Destroy the appropriate control structures corresponding
+ * the the EHCI host controller.
+ */
+int ehci_hcd_stop(void)
+{
+       return 0;
+}
--

1.5.6.5

author
#2 lore raw

v2 cover Add initial support for USB ehci pci

Hi,

Quoted 6 lines · Remy Bohmer

Hello Michael,

Is this path 1/3, or 0/2 (file number 0 usually only contains some comments on the series to follow, and is thus not part of the patch series itself...)

It is a mistake. I will pay attention in the feauture.

Quoted 8 lines

Kind Regards,

Remy

Regards Michael

#3 lore raw

v2 cover Add initial support for USB ehci pci

In reply to Michael Trimarchi

Hello Michael,

2008/12/31 Michael Trimarchi <[email protected]>:

Quoted 4 lines

Add USB ehci pci support. This patch doesn't include any pci_ids and it is not tested on real hardware.

I applied this series to the u-boot-usb 'testing' branch. When it compiles properly, I move it to the 'next' branch for the next U-boot release.

Thanks.

Remy

Quoted 93 lines
---
 drivers/usb/Makefile       |    1 +
 drivers/usb/usb_ehci_pci.c |   64 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 0 deletions(-)
 create mode 100644 drivers/usb/usb_ehci_pci.c
drivers/usb/Makefile +1 -0
index 6ba154b..26189b6 100644
@@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
 COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
 COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o
 COBJS-$(CONFIG_USB_EHCI_FSL) += usb_ehci_fsl.o
+COBJS-$(CONFIG_USB_EHCI_PCI) += usb_ehci_pci.o
 
 # device
 ifdef CONFIG_USB_DEVICE
drivers/usb/usb_ehci_pci.c new file +64 -1
new file mode 100644
index 0000000..3e7143c
@@ -0,0 +1,64 @@
+/*-
+ * Copyright (c) 2007-2008, Juniper Networks, Inc.
+ * All rights reserved.
+ *
+ * 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 version 2 of
+ * the License.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <pci.h>
+#include <usb.h>
+#include "usb_ehci.h"
+#include "usb_ehci_core.h"
+
+#ifdef CONFIG_PCI_EHCI_DEVICE
+static struct pci_device_id ehci_pci_ids[] = {
+       /* Please add supported PCI EHCI controller ids here */
+       {0, 0}
+};
+#endif
+
+/*
+ * Create the appropriate control structures to manage
+ * a new EHCI host controller.
+ */
+int ehci_hcd_init(void)
+{
+       pci_dev_t pdev;
+       uint32_t addr;
+
+       pdev = pci_find_devices(ehci_pci_ids, CONFIG_PCI_EHCI_DEVICE);
+       if (pdev == -1) {
+               printf("EHCI host controller not found\n");
+               return -1;
+       }
+
+       pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &addr);
+       hccr = (struct ehci_hccr *)addr;
+       hcor = (struct ehci_hcor *)((uint32_t) hccr +
+                       HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+
+       return 0;
+}
+
+/*
+ * Destroy the appropriate control structures corresponding
+ * the the EHCI host controller.
+ */
+int ehci_hcd_stop(void)
+{
+       return 0;
+}
--

1.5.6.5