From patchwork Tue Jun 28 17:42:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Miguel Silva X-Patchwork-Id: 585583 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp993943mab; Tue, 28 Jun 2022 10:42:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s65RAE8kd4B3ayfp2WyTr8pMOJGVlz7TtK1TzFd00kbfMMLx666vRZZvYblxU19bw+2fbm X-Received: by 2002:a05:6512:3486:b0:47f:8790:85b with SMTP id v6-20020a056512348600b0047f8790085bmr13342802lfr.551.1656438156756; Tue, 28 Jun 2022 10:42:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656438156; cv=none; d=google.com; s=arc-20160816; b=hfOoYJrhK6cfiaT8M2eSz3Sjgcv5IOdYUBxsS96h8Lb6YzZWlagNBHDTKdl30md6Wk ITZrbswCt2tGx9KpO3oZf4LO1BmlfR1/3xBeYAW2fOkgA1aW0QF4dohVww82enlj/EaP vYqPVMwuWlXRPdlpn9fpScx7rM1F0uOwG22CIba2jKTi+InLCxo/SJlCiWyW6YlPYsob ynG6pHI49q4YcOmkvxmewO6it1H/muX/hSjBMeBIPdXK1vC3Jisxx0IhxPrbQTzITlDK opT3hOygk1NE9W/3RiHaxNrKgGLP+svPVq9Ls/dM57guwVduhe2IKucXyE14ZgG0uXbV 9bxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=B51x/lY/bCejt7xCpyvQWBsJLe3uQmRGu17UkKeevPM=; b=e2t4uNIvEzKmTu4c7FZj1cCGTHOR//1/5AsRd41yVbtl78LYsbk4EYcue2Y/4LITuT ffn/1fcGZVW50quwLRuSh0CotIm4SYVsjL2XNOkqhZPGxoXG+UWtrOViqZuK33Ss0ceG sH6ETOdf9XEIWBYqFGPv1ek+qc+KwpfeRPN7Yhfh2JmxSJuePtlEkpFvPKiuwjy+We6M 2nlLpspXmZ6DpJK8/DoVULrYqKkEAkqvXvXD3dvDKBeeWDsr52yj+kKNLQl+b9bUvY7q DgkjkGypAFh1WHZ4KdNyzj6SztYhlUHgT9PokXv4gkVoAFXSBd5hfYtH9JHSSgjm5+yw WUKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="B5Lk94/e"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id z5-20020ac24f85000000b0047f9fa28147si11749760lfs.15.2022.06.28.10.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jun 2022 10:42:36 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="B5Lk94/e"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A7DB88446C; Tue, 28 Jun 2022 19:42:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="B5Lk94/e"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2879484465; Tue, 28 Jun 2022 19:42:34 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A53918440C for ; Tue, 28 Jun 2022 19:42:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rui.silva@linaro.org Received: by mail-wm1-x336.google.com with SMTP id k129so6410932wme.0 for ; Tue, 28 Jun 2022 10:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B51x/lY/bCejt7xCpyvQWBsJLe3uQmRGu17UkKeevPM=; b=B5Lk94/eD8MU/hlZ6BeW+5a3O+OHuig6d6Fd7irLGmMrRWdfYNJQ4vSnr4MCSQi8VI EDuGA5o1DPMAM3TvDcncBfh3usdk3m3qxuWsioGvSIN7baZBOP19WGjFd7x3Y+JFr//X GTVgSjfPoWjmQmt9oCQss5xRzFadfWz3LQ6Xx4sf8Mey33ypkU1QTR6YCMsFA3bXg/+Z K3hXWuCOmdkbuWZCe1K4byOthrXbebYb7PqVuGhNbEHeRFB8XQXtQBFtbhcLAQUSiBoc 7T+BhmlbDsEXuZc40XlDdmlXxPk9EBb55kQaleJ1xSHZN9qHpeRTsFQ8YTHWLBXxiwAz wQjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B51x/lY/bCejt7xCpyvQWBsJLe3uQmRGu17UkKeevPM=; b=nOFCnR5n5wLra5Ia/BbxAMzqV0KspnVHxq6IiGZr2A2yzy/NTV5tJh6xcFCB7T8GmX YXvzIGlWp5wMrf+5bcRBzW/PdoZs0oPZsNCTnzTge+NamIg+k6RNpExUOKpHmqlRfotW rU41twztwsanXIhzTFbO3nO2SLROQEFZMFqKHbLwesjmoIzyHhBWUfJpGlfmJOlnEfXl ub2LMeA5x09rSz93RZvZdPeRRkQxpJjeuf7wUWiQzKcCfqyS9dpGLPkZfqqj9FjYAy3X RA2ysX/rGE2fmElnef7zpLCmvMp29AGSbRyHpwZ5phDbRC896ld/exwy8WStz6CmB09P enKQ== X-Gm-Message-State: AJIora/4lFr/X59WBhzFh2BRUfSg8oWL85o3B1xaFb+hjFNxELe8BT7o /TSdKKA/jBqHNWCdDgv+pExeMIWeh5Ju9A== X-Received: by 2002:a1c:4b12:0:b0:3a0:4b1f:e944 with SMTP id y18-20020a1c4b12000000b003a04b1fe944mr883941wma.166.1656438142742; Tue, 28 Jun 2022 10:42:22 -0700 (PDT) Received: from arch-thunder.local (a109-49-33-111.cpe.netcabo.pt. [109.49.33.111]) by smtp.gmail.com with ESMTPSA id j19-20020a5d6e53000000b002102b16b9a4sm14219914wrz.110.2022.06.28.10.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jun 2022 10:42:22 -0700 (PDT) From: Rui Miguel Silva To: u-boot@lists.denx.de, Marek Vasut Cc: Tom Rini , Rui Miguel Silva Subject: [PATCH v4 1/3] usb: common: move urb code to common Date: Tue, 28 Jun 2022 18:42:12 +0100 Message-Id: <20220628174214.2496-2-rui.silva@linaro.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220628174214.2496-1-rui.silva@linaro.org> References: <20220628174214.2496-1-rui.silva@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Move urb code from musb only use to a more common scope, so other drivers in the future can use the handling of urb in usb. Signed-off-by: Rui Miguel Silva --- drivers/usb/common/Makefile | 2 + drivers/usb/common/usb_urb.c | 160 ++++++++++++++++++ drivers/usb/host/r8a66597-hcd.c | 30 +--- drivers/usb/musb-new/musb_core.c | 2 +- drivers/usb/musb-new/musb_host.c | 2 +- drivers/usb/musb-new/musb_host.h | 2 +- drivers/usb/musb-new/musb_uboot.c | 38 +---- drivers/usb/musb-new/musb_uboot.h | 2 +- .../linux/usb/usb_urb_compat.h | 47 ++++- include/usb_defs.h | 32 ++++ 10 files changed, 241 insertions(+), 76 deletions(-) create mode 100644 drivers/usb/common/usb_urb.c rename drivers/usb/musb-new/usb-compat.h => include/linux/usb/usb_urb_compat.h (59%) diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile index 3bedbf213f47..dc05cb0a5077 100644 --- a/drivers/usb/common/Makefile +++ b/drivers/usb/common/Makefile @@ -4,5 +4,7 @@ # obj-$(CONFIG_$(SPL_)DM_USB) += common.o +obj-$(CONFIG_USB_MUSB_HCD) += usb_urb.o +obj-$(CONFIG_USB_MUSB_UDC) += usb_urb.o obj-$(CONFIG_USB_EHCI_FSL) += fsl-dt-fixup.o fsl-errata.o obj-$(CONFIG_USB_XHCI_FSL) += fsl-dt-fixup.o fsl-errata.o diff --git a/drivers/usb/common/usb_urb.c b/drivers/usb/common/usb_urb.c new file mode 100644 index 000000000000..be3b6b9f32e8 --- /dev/null +++ b/drivers/usb/common/usb_urb.c @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Common code for usb urb handling, based on the musb-new code + * + * Copyright 2021 Linaro, Rui Miguel Silva + * + */ + +#include +#include +#include + +#include +#include + +#if CONFIG_IS_ENABLED(DM_USB) +struct usb_device *usb_dev_get_parent(struct usb_device *udev) +{ + struct udevice *parent = udev->dev->parent; + + /* + * When called from usb-uclass.c: usb_scan_device() udev->dev points + * to the parent udevice, not the actual udevice belonging to the + * udev as the device is not instantiated yet. + * + * If dev is an usb-bus, then we are called from usb_scan_device() for + * an usb-device plugged directly into the root port, return NULL. + */ + if (device_get_uclass_id(udev->dev) == UCLASS_USB) + return NULL; + + /* + * If these 2 are not the same we are being called from + * usb_scan_device() and udev itself is the parent. + */ + if (dev_get_parent_priv(udev->dev) != udev) + return udev; + + /* We are being called normally, use the parent pointer */ + if (device_get_uclass_id(parent) == UCLASS_USB_HUB) + return dev_get_parent_priv(parent); + + return NULL; +} +#else +struct usb_device *usb_dev_get_parent(struct usb_device *udev) +{ + return udev->parent; +} +#endif + +static void usb_urb_complete(struct urb *urb) +{ + urb->dev->status &= ~USB_ST_NOT_PROC; + urb->dev->act_len = urb->actual_length; + + if (urb->status == -EINPROGRESS) + urb->status = 0; +} + +void usb_urb_fill(struct urb *urb, struct usb_host_endpoint *hep, + struct usb_device *dev, int endpoint_type, + unsigned long pipe, void *buffer, int len, + struct devrequest *setup, int interval) +{ + int epnum = usb_pipeendpoint(pipe); + int is_in = usb_pipein(pipe); + u16 maxpacketsize = is_in ? dev->epmaxpacketin[epnum] : + dev->epmaxpacketout[epnum]; + + memset(urb, 0, sizeof(struct urb)); + memset(hep, 0, sizeof(struct usb_host_endpoint)); + INIT_LIST_HEAD(&hep->urb_list); + INIT_LIST_HEAD(&urb->urb_list); + urb->ep = hep; + urb->complete = usb_urb_complete; + urb->status = -EINPROGRESS; + urb->dev = dev; + urb->pipe = pipe; + urb->transfer_buffer = buffer; + urb->transfer_dma = (unsigned long)buffer; + urb->transfer_buffer_length = len; + urb->setup_packet = (unsigned char *)setup; + + urb->ep->desc.wMaxPacketSize = __cpu_to_le16(maxpacketsize); + urb->ep->desc.bmAttributes = endpoint_type; + urb->ep->desc.bEndpointAddress = ((is_in ? USB_DIR_IN : USB_DIR_OUT) | + epnum); + urb->ep->desc.bInterval = interval; +} + +int usb_urb_submit(struct usb_hcd *hcd, struct urb *urb) +{ + const struct usb_urb_ops *ops = hcd->urb_ops; + unsigned long timeout; + int ret; + + if (!ops) + return -EINVAL; + + ret = ops->urb_enqueue(hcd, urb, 0); + if (ret < 0) { + printf("Failed to enqueue URB to controller\n"); + return ret; + } + + timeout = get_timer(0) + USB_TIMEOUT_MS(urb->pipe); + do { + if (ctrlc()) + return -EIO; + ops->isr(0, hcd); + } while (urb->status == -EINPROGRESS && get_timer(0) < timeout); + + if (urb->status == -EINPROGRESS) + ops->urb_dequeue(hcd, urb, -ETIME); + + return urb->status; +} + +int usb_urb_submit_control(struct usb_hcd *hcd, struct urb *urb, + struct usb_host_endpoint *hep, + struct usb_device *dev, unsigned long pipe, + void *buffer, int len, struct devrequest *setup, + int interval, enum usb_device_speed speed) +{ + const struct usb_urb_ops *ops = hcd->urb_ops; + + usb_urb_fill(urb, hep, dev, USB_ENDPOINT_XFER_CONTROL, pipe, buffer, + len, setup, 0); + + /* Fix speed for non hub-attached devices */ + if (!usb_dev_get_parent(dev)) { + dev->speed = speed; + if (ops->hub_control) + return ops->hub_control(hcd, dev, pipe, buffer, len, + setup); + } + + return usb_urb_submit(hcd, urb); +} + +int usb_urb_submit_bulk(struct usb_hcd *hcd, struct urb *urb, + struct usb_host_endpoint *hep, struct usb_device *dev, + unsigned long pipe, void *buffer, int len) +{ + usb_urb_fill(urb, hep, dev, USB_ENDPOINT_XFER_BULK, pipe, buffer, len, + NULL, 0); + + return usb_urb_submit(hcd, urb); +} + +int usb_urb_submit_irq(struct usb_hcd *hcd, struct urb *urb, + struct usb_host_endpoint *hep, struct usb_device *dev, + unsigned long pipe, void *buffer, int len, int interval) +{ + usb_urb_fill(urb, hep, dev, USB_ENDPOINT_XFER_INT, pipe, buffer, len, + NULL, interval); + + return usb_urb_submit(hcd, urb); +} diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index f1fc93f3d403..3ccbc16da379 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "r8a66597.h" @@ -24,35 +25,6 @@ #define R8A66597_DPRINT(...) #endif -static inline struct usb_device *usb_dev_get_parent(struct usb_device *udev) -{ - struct udevice *parent = udev->dev->parent; - - /* - * When called from usb-uclass.c: usb_scan_device() udev->dev points - * to the parent udevice, not the actual udevice belonging to the - * udev as the device is not instantiated yet. - * - * If dev is an usb-bus, then we are called from usb_scan_device() for - * an usb-device plugged directly into the root port, return NULL. - */ - if (device_get_uclass_id(udev->dev) == UCLASS_USB) - return NULL; - - /* - * If these 2 are not the same we are being called from - * usb_scan_device() and udev itself is the parent. - */ - if (dev_get_parent_priv(udev->dev) != udev) - return udev; - - /* We are being called normally, use the parent pointer */ - if (device_get_uclass_id(parent) == UCLASS_USB_HUB) - return dev_get_parent_priv(parent); - - return NULL; -} - static void get_hub_data(struct usb_device *dev, u16 *hub_devnum, u16 *hubport) { struct usb_device *parent = usb_dev_get_parent(dev); diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index 18d9bc805f8a..fc7af7484e4c 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -89,9 +89,9 @@ #include #include #include +#include #include #include "linux-compat.h" -#include "usb-compat.h" #endif #include "musb_core.h" diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c index acb2d40f3b5a..e5905d90d66f 100644 --- a/drivers/usb/musb-new/musb_host.c +++ b/drivers/usb/musb-new/musb_host.c @@ -26,8 +26,8 @@ #include #include #include +#include #include "linux-compat.h" -#include "usb-compat.h" #endif #include "musb_core.h" diff --git a/drivers/usb/musb-new/musb_host.h b/drivers/usb/musb-new/musb_host.h index afc8fa35a738..5a604bdb0cf2 100644 --- a/drivers/usb/musb-new/musb_host.h +++ b/drivers/usb/musb-new/musb_host.h @@ -10,7 +10,7 @@ #ifndef _MUSB_HOST_H #define _MUSB_HOST_H #ifdef __UBOOT__ -#include "usb-compat.h" +#include #endif static inline struct usb_hcd *musb_to_hcd(struct musb *musb) diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index 61ff68def2fa..d186facc7e02 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -8,10 +8,10 @@ #include #include #include +#include #include #include "linux-compat.h" -#include "usb-compat.h" #include "musb_core.h" #include "musb_host.h" #include "musb_gadget.h" @@ -453,39 +453,3 @@ struct musb *musb_register(struct musb_hdrc_platform_data *plat, void *bdata, return *musbp; } - -#if CONFIG_IS_ENABLED(DM_USB) -struct usb_device *usb_dev_get_parent(struct usb_device *udev) -{ - struct udevice *parent = udev->dev->parent; - - /* - * When called from usb-uclass.c: usb_scan_device() udev->dev points - * to the parent udevice, not the actual udevice belonging to the - * udev as the device is not instantiated yet. - * - * If dev is an usb-bus, then we are called from usb_scan_device() for - * an usb-device plugged directly into the root port, return NULL. - */ - if (device_get_uclass_id(udev->dev) == UCLASS_USB) - return NULL; - - /* - * If these 2 are not the same we are being called from - * usb_scan_device() and udev itself is the parent. - */ - if (dev_get_parent_priv(udev->dev) != udev) - return udev; - - /* We are being called normally, use the parent pointer */ - if (device_get_uclass_id(parent) == UCLASS_USB_HUB) - return dev_get_parent_priv(parent); - - return NULL; -} -#else -struct usb_device *usb_dev_get_parent(struct usb_device *udev) -{ - return udev->parent; -} -#endif diff --git a/drivers/usb/musb-new/musb_uboot.h b/drivers/usb/musb-new/musb_uboot.h index 18282efccc9d..6b162f03b19e 100644 --- a/drivers/usb/musb-new/musb_uboot.h +++ b/drivers/usb/musb-new/musb_uboot.h @@ -8,8 +8,8 @@ #define __MUSB_UBOOT_H__ #include +#include #include "linux-compat.h" -#include "usb-compat.h" #include "musb_core.h" struct musb_host_data { diff --git a/drivers/usb/musb-new/usb-compat.h b/include/linux/usb/usb_urb_compat.h similarity index 59% rename from drivers/usb/musb-new/usb-compat.h rename to include/linux/usb/usb_urb_compat.h index df68c9220a7a..2e8c9d8db79a 100644 --- a/drivers/usb/musb-new/usb-compat.h +++ b/include/linux/usb/usb_urb_compat.h @@ -1,16 +1,32 @@ -#ifndef __USB_COMPAT_H__ -#define __USB_COMPAT_H__ +/* SPDX-License-Identifier: GPL-2.0+ */ -#include "usb.h" +#ifndef __USB_URB_COMPAT_H__ +#define __USB_URB_COMPAT_H__ + +#include +#include struct udevice; +struct urb; +struct usb_hcd; + +struct usb_urb_ops { + int (*urb_enqueue)(struct usb_hcd *hcd, struct urb *urb, + gfp_t mem_flags); + int (*urb_dequeue)(struct usb_hcd *hcd, struct urb *urb, int status); + int (*hub_control)(struct usb_hcd *hcd, struct usb_device *dev, + unsigned long pipe, void *buffer, int len, + struct devrequest *setup); + irqreturn_t (*isr)(int irq, void *priv); +}; struct usb_hcd { void *hcd_priv; + const struct usb_urb_ops *urb_ops; }; struct usb_host_endpoint { - struct usb_endpoint_descriptor desc; + struct usb_endpoint_descriptor desc; struct list_head urb_list; void *hcpriv; }; @@ -23,8 +39,6 @@ struct usb_host_endpoint { #define URB_SHORT_NOT_OK 0x0001 /* report short reads as errors */ #define URB_ZERO_PACKET 0x0040 /* Finish bulk OUT with short packet */ -struct urb; - typedef void (*usb_complete_t)(struct urb *); struct urb { @@ -76,4 +90,25 @@ static inline int usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd, */ struct usb_device *usb_dev_get_parent(struct usb_device *udev); +int usb_urb_submit_control(struct usb_hcd *hcd, struct urb *urb, + struct usb_host_endpoint *hep, + struct usb_device *dev, unsigned long pipe, + void *buffer, int len, struct devrequest *setup, + int interval, enum usb_device_speed speed); + +int usb_urb_submit_bulk(struct usb_hcd *hcd, struct urb *urb, + struct usb_host_endpoint *hep, struct usb_device *dev, + unsigned long pipe, void *buffer, int len); + +int usb_urb_submit_irq(struct usb_hcd *hcd, struct urb *urb, + struct usb_host_endpoint *hep, struct usb_device *dev, + unsigned long pipe, void *buffer, int len, int interval); + +void usb_urb_fill(struct urb *urb, struct usb_host_endpoint *hep, + struct usb_device *dev, int endpoint_type, + unsigned long pipe, void *buffer, int len, + struct devrequest *setup, int interval); + +int usb_urb_submit(struct usb_hcd *hcd, struct urb *urb); + #endif /* __USB_COMPAT_H__ */ diff --git a/include/usb_defs.h b/include/usb_defs.h index 6dd2c997f9b3..ec00161710a5 100644 --- a/include/usb_defs.h +++ b/include/usb_defs.h @@ -81,6 +81,32 @@ #define EndpointOutRequest \ ((USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_INTERFACE) << 8) +/* class requests from the USB 2.0 hub spec, table 11-15 */ +#define HUB_CLASS_REQ(dir, type, request) ((((dir) | (type)) << 8) | (request)) +/* GetBusState and SetHubDescriptor are optional, omitted */ +#define ClearHubFeature HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_HUB, \ + USB_REQ_CLEAR_FEATURE) +#define ClearPortFeature HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_PORT, \ + USB_REQ_CLEAR_FEATURE) +#define GetHubDescriptor HUB_CLASS_REQ(USB_DIR_IN, USB_RT_HUB, \ + USB_REQ_GET_DESCRIPTOR) +#define GetHubStatus HUB_CLASS_REQ(USB_DIR_IN, USB_RT_HUB, \ + USB_REQ_GET_STATUS) +#define GetPortStatus HUB_CLASS_REQ(USB_DIR_IN, USB_RT_PORT, \ + USB_REQ_GET_STATUS) +#define SetHubFeature HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_HUB, \ + USB_REQ_SET_FEATURE) +#define SetPortFeature HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_PORT, \ + USB_REQ_SET_FEATURE) +#define ClearTTBuffer HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_PORT, \ + HUB_CLEAR_TT_BUFFER) +#define ResetTT HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_PORT, \ + HUB_RESET_TT) +#define GetTTState HUB_CLASS_REQ(USB_DIR_IN, USB_RT_PORT, \ + HUB_GET_TT_STATE) +#define StopTT HUB_CLASS_REQ(USB_DIR_OUT, USB_RT_PORT, \ + HUB_STOP_TT) + /* Descriptor types */ #define USB_DT_DEVICE 0x01 #define USB_DT_CONFIG 0x02 @@ -289,10 +315,16 @@ #define USB_SS_PORT_STAT_C_CONFIG_ERROR 0x0080 /* wHubCharacteristics (masks) */ +#define HUB_CHAR_COMMON_OCPM 0x0000 /* All ports Over-Current reporting */ +#define HUB_CHAR_INDV_PORT_LPSM 0x0001 /* per-port power control */ +#define HUB_CHAR_NO_LPSM 0x0002 /* no power switching */ #define HUB_CHAR_LPSM 0x0003 #define HUB_CHAR_COMPOUND 0x0004 +#define HUB_CHAR_INDV_PORT_OCPM 0x0008 /* per-port Over-current reporting */ +#define HUB_CHAR_NO_OCPM 0x0010 /* No Over-current Protection support */ #define HUB_CHAR_OCPM 0x0018 #define HUB_CHAR_TTTT 0x0060 /* TT Think Time mask */ +#define HUB_CHAR_PORTIND 0x0080 /* per-port indicators (LEDs) */ /* * Hub Status & Hub Change bit masks