[PATCH] USB: add support for SuperH OHCI

Discussion:

Yoshihiro Shimoda

2008-01-10 12:07:16 UTC

add support for SuperH OHCI.

supported CPU are:
- SH7720
- SH7721
- SH7763

Signed-off-by: Yoshihiro Shimoda <***@renesas.com>
---
drivers/usb/Kconfig | 4
drivers/usb/host/ohci-hcd.c | 7 +
drivers/usb/host/ohci-sh.c | 160 ++++++++++++++++++++++++++++++++++
3 files changed, 171 insertions(+)

diff -uprN a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
--- a/drivers/usb/host/ohci-hcd.c 2008-01-08 20:46:19.000000000 +0900
+++ b/drivers/usb/host/ohci-hcd.c 2008-01-10 20:45:18.000000000 +0900
@@ -1029,6 +1029,13 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER usb_hcd_pnx4008_driver
#endif

+#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
+ defined(CONFIG_CPU_SUBTYPE_SH7721) || \
+ defined(CONFIG_CPU_SUBTYPE_SH7763)
+#include "ohci-sh.c"
+#define PLATFORM_DRIVER ohci_hcd_sh_driver
+#endif
+

#ifdef CONFIG_USB_OHCI_HCD_PPC_OF
#include "ohci-ppc-of.c"
diff -uprN a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c
--- a/drivers/usb/host/ohci-sh.c 1970-01-01 09:00:00.000000000 +0900
+++ b/drivers/usb/host/ohci-sh.c 2008-01-10 20:45:18.000000000 +0900
@@ -0,0 +1,160 @@
+/*
+ * OHCI HCD (Host Controller Driver) for USB.
+ *
+ * Copyright (C) 2008 Renesas Solutions Corp.
+ *
+ * Author : Yoshihiro Shimoda <***@renesas.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include <linux/platform_device.h>
+
+#define resource_len(r) (((r)->end - (r)->start) + 1)
+static int usb_ohci_sh_probe(const struct hc_driver *driver,
+ struct platform_device *pdev)
+{
+ struct resource *res = NULL;
+ int irq = -1;
+ struct usb_hcd *hcd = NULL;
+ int ret = 0;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ ret = -ENODEV;
+ err("platform_get_resource_byname error.");
+ goto clean_up;
+ }
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+ ret = -ENODEV;
+ err("platform_get_irq error.");
+ goto clean_up;
+ }
+
+ /* initialize hcd */
+ hcd = usb_create_hcd(driver, &pdev->dev, (char *)hcd_name);
+ if (!hcd) {
+ ret = -ENOMEM;
+ err("Failed to create hcd");
+ goto clean_up;
+ }
+
+ hcd->regs = (void __iomem *)res->start;
+ hcd->rsrc_start = res->start;
+ hcd->rsrc_len = resource_len(res);
+ ret = usb_add_hcd(hcd, irq, 0);
+ if (ret != 0) {
+ err("Failed to add hcd");
+ goto clean_up;
+ }
+
+clean_up:
+ return ret;
+}
+
+static void usb_ohci_sh_remove(struct usb_hcd *hcd,
+ struct platform_device *dev)
+{
+ usb_remove_hcd(hcd);
+ usb_put_hcd(hcd);
+}
+
+static int ohci_sh_start(struct usb_hcd *hcd)
+{
+ struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+
+ ohci_hcd_init(ohci);
+ ohci_init(ohci);
+ ohci_run(ohci);
+ hcd->state = HC_STATE_RUNNING;
+ return 0;
+}
+
+static const struct hc_driver ohci_sh_hc_driver = {
+ .description = hcd_name,
+ .product_desc = "SuperH OHCI",
+ .hcd_priv_size = sizeof(struct ohci_hcd),
+
+ /*
+ * generic hardware linkage
+ */
+ .irq = ohci_irq,
+ .flags = HCD_USB11 | HCD_MEMORY,
+
+ /*
+ * basic lifecycle operations
+ */
+ .start = ohci_sh_start,
+ .stop = ohci_stop,
+ .shutdown = ohci_shutdown,
+
+ /*
+ * managing i/o requests and associated device resources
+ */
+ .urb_enqueue = ohci_urb_enqueue,
+ .urb_dequeue = ohci_urb_dequeue,
+ .endpoint_disable = ohci_endpoint_disable,
+
+ /*
+ * scheduling support
+ */
+ .get_frame_number = ohci_get_frame,
+
+ /*
+ * root hub support
+ */
+ .hub_status_data = ohci_hub_status_data,
+ .hub_control = ohci_hub_control,
+ .hub_irq_enable = ohci_rhsc_enable,
+#ifdef CONFIG_PM
+ .bus_suspend = ohci_bus_suspend,
+ .bus_resume = ohci_bus_resume,
+#endif
+ .start_port_reset = ohci_start_port_reset,
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int ohci_hcd_sh_probe(struct platform_device *pdev)
+{
+ int ret;
+
+ if (usb_disabled())
+ return -ENODEV;
+
+ ret = usb_ohci_sh_probe(&ohci_sh_hc_driver, pdev);
+ return ret;
+}
+
+static int ohci_hcd_sh_remove(struct platform_device *pdev)
+{
+ struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+ usb_ohci_sh_remove(hcd, pdev);
+ return 0;
+}
+
+static struct platform_driver ohci_hcd_sh_driver = {
+ .probe = ohci_hcd_sh_probe,
+ .remove = ohci_hcd_sh_remove,
+ .shutdown = usb_hcd_platform_shutdown,
+ .driver = {
+ .name = "sh_ohci",
+ .owner = THIS_MODULE,
+ },
+};
+
diff -uprN a/drivers/usb/Kconfig b/drivers/usb/Kconfig
--- a/drivers/usb/Kconfig 2008-01-08 20:45:16.000000000 +0900
+++ b/drivers/usb/Kconfig 2008-01-10 20:45:18.000000000 +0900
@@ -41,6 +41,10 @@ config USB_ARCH_HAS_OHCI
default y if PPC_MPC52xx
# MIPS:
default y if SOC_AU1X00
+ # SH:
+ default y if CPU_SUBTYPE_SH7720
+ default y if CPU_SUBTYPE_SH7721
+ default y if CPU_SUBTYPE_SH7763
# more:
default PCI

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
linux-usb-***@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

vichy

2008-01-10 12:27:11 UTC

Permalink

Dear all:
I know there are different classes defined in usb driver, like HID, mass
storage, etc.
Where can I get the full lists and documents that outline the command
formats, such as reduced block command, scsi block command, etc.?
Appreciate your help,
vichy

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
linux-usb-***@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Oliver Neukum

2008-01-10 12:37:11 UTC

Permalink

Post by vichy
I know there are different classes defined in usb driver, like HID, mass
storage, etc.
Where can I get the full lists and documents that outline the command
formats, such as reduced block command, scsi block command, etc.?
Appreciate your help,

http://www.usb.org
in the developers' section. The storage specification makes a lot of
references to the scsi spec though, to be found:
http://www.t10.org

HTH
Oliver

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
linux-usb-***@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Matthew Dharm

2008-01-10 15:04:07 UTC

Permalink

Post by Oliver Neukum

http://www.usb.org
in the developers' section. The storage specification makes a lot of
http://www.t10.org

Furthermore, "Transparent SCSI" is deliberately not defined anywhere.

Matt

--
Matthew Dharm Home: mdharm-***@one-eyed-alien.net
Maintainer, Linux USB Mass Storage Driver

You were using cheat codes too. You guys suck.
-- Greg to General Studebaker
User Friendly, 12/16/1997

Alan Stern

2008-01-10 15:46:46 UTC

Permalink

Post by Yoshihiro Shimoda
add support for SuperH OHCI.
+static int usb_ohci_sh_probe(const struct hc_driver *driver,
+ struct platform_device *pdev)
+{
+ struct resource *res = NULL;
+ int irq = -1;
+ struct usb_hcd *hcd = NULL;
+ int ret = 0;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ ret = -ENODEV;
+ err("platform_get_resource_byname error.");
+ goto clean_up;
+ }
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+ ret = -ENODEV;
+ err("platform_get_irq error.");
+ goto clean_up;
+ }
+
+ /* initialize hcd */
+ hcd = usb_create_hcd(driver, &pdev->dev, (char *)hcd_name);
+ if (!hcd) {
+ ret = -ENOMEM;
+ err("Failed to create hcd");
+ goto clean_up;
+ }
+
+ hcd->regs = (void __iomem *)res->start;
+ hcd->rsrc_start = res->start;
+ hcd->rsrc_len = resource_len(res);
+ ret = usb_add_hcd(hcd, irq, 0);

The last argument should be IRQF_DISABLED, not 0.

Post by Yoshihiro Shimoda
+ if (ret != 0) {
+ err("Failed to add hcd");
+ goto clean_up;

This line should be "usb_put_hcd(hcd);" instead of "goto clean_up;".

Post by Yoshihiro Shimoda
+ }
+
+ return ret;
+}

"clean_up" isn't a very good label, because the code doesn't
actually clean up anything. It just returns.

Alan Stern

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
linux-usb-***@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Yoshihiro Shimoda

2008-01-11 07:52:21 UTC

Permalink

Post by Alan Stern

The last argument should be IRQF_DISABLED, not 0.

Post by Yoshihiro Shimoda
+ if (ret != 0) {
+ err("Failed to add hcd");
+ goto clean_up;

This line should be "usb_put_hcd(hcd);" instead of "goto clean_up;".

Post by Yoshihiro Shimoda
+ }
+
+ return ret;
+}

"clean_up" isn't a very good label, because the code doesn't
actually clean up anything. It just returns.

Thank you for your comments. I will modify driver code.

Tanks,
Yoshihiro Shimoda

Post by Alan Stern
Alan Stern

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
linux-usb-***@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

David Brownell

2008-01-10 22:22:23 UTC

Permalink

Post by Yoshihiro Shimoda
+static int ohci_hcd_sh_probe(struct platform_device *pdev)
+{
+       int ret;
+
+       if (usb_disabled())
+               return -ENODEV;
+
+       ret = usb_ohci_sh_probe(&ohci_sh_hc_driver, pdev);

Could you have just one probe() routine ...

Post by Yoshihiro Shimoda
+       return ret;
+}
+
+static int ohci_hcd_sh_remove(struct platform_device *pdev)
+{
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+       usb_ohci_sh_remove(hcd, pdev);

... and one remove() routine, instead?

Splitting it up like that is an old idiom I'd rather see disappear.

- Dave

Post by Yoshihiro Shimoda
+ return 0;
+}
+

Yoshihiro Shimoda

2008-01-11 08:39:10 UTC

Permalink

Post by David Brownell

Post by Yoshihiro Shimoda
+static int ohci_hcd_sh_probe(struct platform_device *pdev)
+{
+ int ret;
+
+ if (usb_disabled())
+ return -ENODEV;
+
+ ret = usb_ohci_sh_probe(&ohci_sh_hc_driver, pdev);

Could you have just one probe() routine ...

Post by Yoshihiro Shimoda
+ return ret;
+}
+
+static int ohci_hcd_sh_remove(struct platform_device *pdev)
+{
+ struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+ usb_ohci_sh_remove(hcd, pdev);

... and one remove() routine, instead?
Splitting it up like that is an old idiom I'd rather see disappear.

Thank you for your comment.
I will modify probe() and remove() routine.

Thanks,
Yoshihiro Shimoda

Post by David Brownell
- Dave

Post by Yoshihiro Shimoda
+ return 0;
+}
+