* [PATCH v3 0/5] aspeed-g6: enable usb support
@ 2020-02-18 3:13 rentao.bupt
2020-02-18 3:13 ` [PATCH v3 1/5] usb: gadget: aspeed: read vhub properties from device tree rentao.bupt
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: rentao.bupt @ 2020-02-18 3:13 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery,
Benjamin Herrenschmidt, Chunfeng Yun, Colin Ian King,
Stephen Boyd, Rob Herring, Mark Rutland, linux-usb,
linux-arm-kernel, linux-aspeed, devicetree, linux-kernel,
openbmc, taoren
Cc: Tao Ren
From: Tao Ren <rentao.bupt@gmail.com>
The patch series aims at enabling USB Host and Gadget support on AST2600
platforms.
Patch #1 replaces hardcoded vhub port/endpoint number with device tree
properties, so that it's more convenient to add support for ast2600-vhub
which provides more downstream ports and endpoints.
Patch #2 enables ast2600 support in aspeed-vhub usb gadget driver.
Patch #3 adds USB devices and according pin groups in aspeed-g6 dtsi.
Patch #4 and #5 add vhub port/endpoint properties into aspeed-g4 and
aspeed-g5 dtsi.
Tao Ren (5):
usb: gadget: aspeed: read vhub properties from device tree
usb: gadget: aspeed: add ast2600 vhub support
ARM: dts: aspeed-g6: add usb functions
ARM: dts: aspeed-g5: add vhub port and endpoint properties
ARM: dts: aspeed-g4: add vhub port and endpoint properties
arch/arm/boot/dts/aspeed-g4.dtsi | 2 +
arch/arm/boot/dts/aspeed-g5.dtsi | 2 +
arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 25 +++++++
arch/arm/boot/dts/aspeed-g6.dtsi | 45 ++++++++++++
drivers/usb/gadget/udc/aspeed-vhub/Kconfig | 4 +-
drivers/usb/gadget/udc/aspeed-vhub/core.c | 79 +++++++++++++++-------
drivers/usb/gadget/udc/aspeed-vhub/dev.c | 30 +++++---
drivers/usb/gadget/udc/aspeed-vhub/epn.c | 4 +-
drivers/usb/gadget/udc/aspeed-vhub/hub.c | 26 ++++---
drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 23 +++----
10 files changed, 178 insertions(+), 62 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 1/5] usb: gadget: aspeed: read vhub properties from device tree 2020-02-18 3:13 [PATCH v3 0/5] aspeed-g6: enable usb support rentao.bupt @ 2020-02-18 3:13 ` rentao.bupt 2020-02-18 3:13 ` [PATCH v3 2/5] usb: gadget: aspeed: add ast2600 vhub support rentao.bupt ` (5 subsequent siblings) 6 siblings, 0 replies; 9+ messages in thread From: rentao.bupt @ 2020-02-18 3:13 UTC (permalink / raw) To: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery, Benjamin Herrenschmidt, Chunfeng Yun, Colin Ian King, Stephen Boyd, Rob Herring, Mark Rutland, linux-usb, linux-arm-kernel, linux-aspeed, devicetree, linux-kernel, openbmc, taoren Cc: Tao Ren From: Tao Ren <rentao.bupt@gmail.com> The patch introduces 2 DT properties ("aspeed,vhub-downstream-ports" and "aspeed,vhub-generic-endpoints") which replaces hardcoded port/endpoint number. It is to make it more convenient to add support for newer vhub revisions with different number of ports and endpoints. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Reviewed-by: Joel Stanley <joel@jms.id.au> --- Changes in v3: - fall back to "default" number of ports and endpoints to avoid breaking existing ast2400/ast2500 platforms when according device tree properties are not defined. Changes in v2: - removed ast_vhub_config structure and moved vhub port/endpoint number into device tree. drivers/usb/gadget/udc/aspeed-vhub/core.c | 76 +++++++++++++++-------- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 30 ++++++--- drivers/usb/gadget/udc/aspeed-vhub/epn.c | 4 +- drivers/usb/gadget/udc/aspeed-vhub/hub.c | 26 +++++--- drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 23 +++---- 5 files changed, 99 insertions(+), 60 deletions(-) diff --git a/drivers/usb/gadget/udc/aspeed-vhub/core.c b/drivers/usb/gadget/udc/aspeed-vhub/core.c index 90b134d5dca9..e4395813df35 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/core.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/core.c @@ -32,6 +32,14 @@ #include "vhub.h" +/* + * Below "default" numbers of vhub downstream ports and generic endpoints + * are defined to avoid breaking existing ast2400 and ast2500 platforms + * when the corresponding device tree properties are not defined. + */ +#define AST_VHUB_DFT_NUM_PORTS 5 +#define AST_VHUB_DFT_NUM_ENDPOINTS 15 + void ast_vhub_done(struct ast_vhub_ep *ep, struct ast_vhub_req *req, int status) { @@ -99,7 +107,7 @@ static irqreturn_t ast_vhub_irq(int irq, void *data) { struct ast_vhub *vhub = data; irqreturn_t iret = IRQ_NONE; - u32 istat; + u32 i, istat; /* Stale interrupt while tearing down */ if (!vhub->ep0_bufs) @@ -121,10 +129,10 @@ static irqreturn_t ast_vhub_irq(int irq, void *data) /* Handle generic EPs first */ if (istat & VHUB_IRQ_EP_POOL_ACK_STALL) { - u32 i, ep_acks = readl(vhub->regs + AST_VHUB_EP_ACK_ISR); + u32 ep_acks = readl(vhub->regs + AST_VHUB_EP_ACK_ISR); writel(ep_acks, vhub->regs + AST_VHUB_EP_ACK_ISR); - for (i = 0; ep_acks && i < AST_VHUB_NUM_GEN_EPs; i++) { + for (i = 0; ep_acks && i < vhub->max_epns; i++) { u32 mask = VHUB_EP_IRQ(i); if (ep_acks & mask) { ast_vhub_epn_ack_irq(&vhub->epns[i]); @@ -134,21 +142,11 @@ static irqreturn_t ast_vhub_irq(int irq, void *data) } /* Handle device interrupts */ - if (istat & (VHUB_IRQ_DEVICE1 | - VHUB_IRQ_DEVICE2 | - VHUB_IRQ_DEVICE3 | - VHUB_IRQ_DEVICE4 | - VHUB_IRQ_DEVICE5)) { - if (istat & VHUB_IRQ_DEVICE1) - ast_vhub_dev_irq(&vhub->ports[0].dev); - if (istat & VHUB_IRQ_DEVICE2) - ast_vhub_dev_irq(&vhub->ports[1].dev); - if (istat & VHUB_IRQ_DEVICE3) - ast_vhub_dev_irq(&vhub->ports[2].dev); - if (istat & VHUB_IRQ_DEVICE4) - ast_vhub_dev_irq(&vhub->ports[3].dev); - if (istat & VHUB_IRQ_DEVICE5) - ast_vhub_dev_irq(&vhub->ports[4].dev); + for (i = 0; i < vhub->max_ports; i++) { + u32 dev_mask = VHUB_IRQ_DEVICE1 << i; + + if (istat & dev_mask) + ast_vhub_dev_irq(&vhub->ports[i].dev); } /* Handle top-level vHub EP0 interrupts */ @@ -182,7 +180,7 @@ static irqreturn_t ast_vhub_irq(int irq, void *data) void ast_vhub_init_hw(struct ast_vhub *vhub) { - u32 ctrl; + u32 ctrl, port_mask, epn_mask; UDCDBG(vhub,"(Re)Starting HW ...\n"); @@ -222,15 +220,20 @@ void ast_vhub_init_hw(struct ast_vhub *vhub) } /* Reset all devices */ - writel(VHUB_SW_RESET_ALL, vhub->regs + AST_VHUB_SW_RESET); + port_mask = GENMASK(vhub->max_ports, 1); + writel(VHUB_SW_RESET_ROOT_HUB | + VHUB_SW_RESET_DMA_CONTROLLER | + VHUB_SW_RESET_EP_POOL | + port_mask, vhub->regs + AST_VHUB_SW_RESET); udelay(1); writel(0, vhub->regs + AST_VHUB_SW_RESET); /* Disable and cleanup EP ACK/NACK interrupts */ + epn_mask = GENMASK(vhub->max_epns - 1, 0); writel(0, vhub->regs + AST_VHUB_EP_ACK_IER); writel(0, vhub->regs + AST_VHUB_EP_NACK_IER); - writel(VHUB_EP_IRQ_ALL, vhub->regs + AST_VHUB_EP_ACK_ISR); - writel(VHUB_EP_IRQ_ALL, vhub->regs + AST_VHUB_EP_NACK_ISR); + writel(epn_mask, vhub->regs + AST_VHUB_EP_ACK_ISR); + writel(epn_mask, vhub->regs + AST_VHUB_EP_NACK_ISR); /* Default settings for EP0, enable HW hub EP1 */ writel(0, vhub->regs + AST_VHUB_EP0_CTRL); @@ -273,7 +276,7 @@ static int ast_vhub_remove(struct platform_device *pdev) return 0; /* Remove devices */ - for (i = 0; i < AST_VHUB_NUM_PORTS; i++) + for (i = 0; i < vhub->max_ports; i++) ast_vhub_del_dev(&vhub->ports[i].dev); spin_lock_irqsave(&vhub->lock, flags); @@ -295,7 +298,7 @@ static int ast_vhub_remove(struct platform_device *pdev) if (vhub->ep0_bufs) dma_free_coherent(&pdev->dev, AST_VHUB_EP0_MAX_PACKET * - (AST_VHUB_NUM_PORTS + 1), + (vhub->max_ports + 1), vhub->ep0_bufs, vhub->ep0_bufs_dma); vhub->ep0_bufs = NULL; @@ -309,11 +312,32 @@ static int ast_vhub_probe(struct platform_device *pdev) struct ast_vhub *vhub; struct resource *res; int i, rc = 0; + const struct device_node *np = pdev->dev.of_node; vhub = devm_kzalloc(&pdev->dev, sizeof(*vhub), GFP_KERNEL); if (!vhub) return -ENOMEM; + rc = of_property_read_u32(np, "aspeed,vhub-downstream-ports", + &vhub->max_ports); + if (rc < 0) + vhub->max_ports = AST_VHUB_DFT_NUM_PORTS; + + vhub->ports = devm_kcalloc(&pdev->dev, vhub->max_ports, + sizeof(*vhub->ports), GFP_KERNEL); + if (!vhub->ports) + return -ENOMEM; + + rc = of_property_read_u32(np, "aspeed,vhub-generic-endpoints", + &vhub->max_epns); + if (rc < 0) + vhub->max_epns = AST_VHUB_DFT_NUM_ENDPOINTS; + + vhub->epns = devm_kcalloc(&pdev->dev, vhub->max_epns, + sizeof(*vhub->epns), GFP_KERNEL); + if (!vhub->epns) + return -ENOMEM; + spin_lock_init(&vhub->lock); vhub->pdev = pdev; @@ -366,7 +390,7 @@ static int ast_vhub_probe(struct platform_device *pdev) */ vhub->ep0_bufs = dma_alloc_coherent(&pdev->dev, AST_VHUB_EP0_MAX_PACKET * - (AST_VHUB_NUM_PORTS + 1), + (vhub->max_ports + 1), &vhub->ep0_bufs_dma, GFP_KERNEL); if (!vhub->ep0_bufs) { dev_err(&pdev->dev, "Failed to allocate EP0 DMA buffers\n"); @@ -380,7 +404,7 @@ static int ast_vhub_probe(struct platform_device *pdev) ast_vhub_init_ep0(vhub, &vhub->ep0, NULL); /* Init devices */ - for (i = 0; i < AST_VHUB_NUM_PORTS && rc == 0; i++) + for (i = 0; i < vhub->max_ports && rc == 0; i++) rc = ast_vhub_init_dev(vhub, i); if (rc) goto err; diff --git a/drivers/usb/gadget/udc/aspeed-vhub/dev.c b/drivers/usb/gadget/udc/aspeed-vhub/dev.c index 4008e7a51188..d268306a7bfe 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/dev.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/dev.c @@ -77,7 +77,7 @@ static void ast_vhub_dev_enable(struct ast_vhub_dev *d) writel(d->ep0.buf_dma, d->regs + AST_VHUB_DEV_EP0_DATA); /* Clear stall on all EPs */ - for (i = 0; i < AST_VHUB_NUM_GEN_EPs; i++) { + for (i = 0; i < d->max_epns; i++) { struct ast_vhub_ep *ep = d->epns[i]; if (ep && (ep->epn.stalled || ep->epn.wedged)) { @@ -137,7 +137,7 @@ static int ast_vhub_ep_feature(struct ast_vhub_dev *d, is_set ? "SET" : "CLEAR", ep_num, wValue); if (ep_num == 0) return std_req_complete; - if (ep_num >= AST_VHUB_NUM_GEN_EPs || !d->epns[ep_num - 1]) + if (ep_num >= d->max_epns || !d->epns[ep_num - 1]) return std_req_stall; if (wValue != USB_ENDPOINT_HALT) return std_req_driver; @@ -181,7 +181,7 @@ static int ast_vhub_ep_status(struct ast_vhub_dev *d, DDBG(d, "GET_STATUS(ep%d)\n", ep_num); - if (ep_num >= AST_VHUB_NUM_GEN_EPs) + if (ep_num >= d->max_epns) return std_req_stall; if (ep_num != 0) { ep = d->epns[ep_num - 1]; @@ -299,7 +299,7 @@ static void ast_vhub_dev_nuke(struct ast_vhub_dev *d) { unsigned int i; - for (i = 0; i < AST_VHUB_NUM_GEN_EPs; i++) { + for (i = 0; i < d->max_epns; i++) { if (!d->epns[i]) continue; ast_vhub_nuke(d->epns[i], -ESHUTDOWN); @@ -416,10 +416,10 @@ static struct usb_ep *ast_vhub_udc_match_ep(struct usb_gadget *gadget, * that will allow the generic code to use our * assigned address. */ - for (i = 0; i < AST_VHUB_NUM_GEN_EPs; i++) + for (i = 0; i < d->max_epns; i++) if (d->epns[i] == NULL) break; - if (i >= AST_VHUB_NUM_GEN_EPs) + if (i >= d->max_epns) return NULL; addr = i + 1; @@ -526,6 +526,7 @@ void ast_vhub_del_dev(struct ast_vhub_dev *d) usb_del_gadget_udc(&d->gadget); device_unregister(d->port_dev); + kfree(d->epns); } static void ast_vhub_dev_release(struct device *dev) @@ -546,14 +547,25 @@ int ast_vhub_init_dev(struct ast_vhub *vhub, unsigned int idx) ast_vhub_init_ep0(vhub, &d->ep0, d); + /* + * A USB device can have up to 30 endpoints besides control + * endpoint 0. + */ + d->max_epns = min_t(u32, vhub->max_epns, 30); + d->epns = kcalloc(d->max_epns, sizeof(*d->epns), GFP_KERNEL); + if (!d->epns) + return -ENOMEM; + /* * The UDC core really needs us to have separate and uniquely * named "parent" devices for each port so we create a sub device * here for that purpose */ d->port_dev = kzalloc(sizeof(struct device), GFP_KERNEL); - if (!d->port_dev) - return -ENOMEM; + if (!d->port_dev) { + rc = -ENOMEM; + goto fail_alloc; + } device_initialize(d->port_dev); d->port_dev->release = ast_vhub_dev_release; d->port_dev->parent = parent; @@ -584,6 +596,8 @@ int ast_vhub_init_dev(struct ast_vhub *vhub, unsigned int idx) device_del(d->port_dev); fail_add: put_device(d->port_dev); + fail_alloc: + kfree(d->epns); return rc; } diff --git a/drivers/usb/gadget/udc/aspeed-vhub/epn.c b/drivers/usb/gadget/udc/aspeed-vhub/epn.c index 7475c74aa5c5..0bd6b20435b8 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/epn.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/epn.c @@ -800,10 +800,10 @@ struct ast_vhub_ep *ast_vhub_alloc_epn(struct ast_vhub_dev *d, u8 addr) /* Find a free one (no device) */ spin_lock_irqsave(&vhub->lock, flags); - for (i = 0; i < AST_VHUB_NUM_GEN_EPs; i++) + for (i = 0; i < vhub->max_epns; i++) if (vhub->epns[i].dev == NULL) break; - if (i >= AST_VHUB_NUM_GEN_EPs) { + if (i >= vhub->max_epns) { spin_unlock_irqrestore(&vhub->lock, flags); return NULL; } diff --git a/drivers/usb/gadget/udc/aspeed-vhub/hub.c b/drivers/usb/gadget/udc/aspeed-vhub/hub.c index 19b3517e04c0..9c7e57fbd8ef 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/hub.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/hub.c @@ -133,10 +133,13 @@ static const struct ast_vhub_full_cdesc { #define AST_VHUB_HUB_DESC_SIZE (USB_DT_HUB_NONVAR_SIZE + 2) -static const struct usb_hub_descriptor ast_vhub_hub_desc = { +/* + * "bNbrPorts" field is updated in "ast_vhub_init_hub" function based on + * "max_ports" of the vhub. + */ +static struct usb_hub_descriptor ast_vhub_hub_desc = { .bDescLength = AST_VHUB_HUB_DESC_SIZE, .bDescriptorType = USB_DT_HUB, - .bNbrPorts = AST_VHUB_NUM_PORTS, .wHubCharacteristics = cpu_to_le16(HUB_CHAR_NO_LPSM), .bPwrOn2PwrGood = 10, .bHubContrCurrent = 0, @@ -504,7 +507,7 @@ static void ast_vhub_wake_work(struct work_struct *work) * we let the normal host wake path deal with it later. */ spin_lock_irqsave(&vhub->lock, flags); - for (i = 0; i < AST_VHUB_NUM_PORTS; i++) { + for (i = 0; i < vhub->max_ports; i++) { struct ast_vhub_port *p = &vhub->ports[i]; if (!(p->status & USB_PORT_STAT_SUSPEND)) @@ -587,7 +590,7 @@ static enum std_req_rc ast_vhub_set_port_feature(struct ast_vhub_ep *ep, struct ast_vhub *vhub = ep->vhub; struct ast_vhub_port *p; - if (port == 0 || port > AST_VHUB_NUM_PORTS) + if (port == 0 || port > vhub->max_ports) return std_req_stall; port--; p = &vhub->ports[port]; @@ -630,7 +633,7 @@ static enum std_req_rc ast_vhub_clr_port_feature(struct ast_vhub_ep *ep, struct ast_vhub *vhub = ep->vhub; struct ast_vhub_port *p; - if (port == 0 || port > AST_VHUB_NUM_PORTS) + if (port == 0 || port > vhub->max_ports) return std_req_stall; port--; p = &vhub->ports[port]; @@ -676,7 +679,7 @@ static enum std_req_rc ast_vhub_get_port_stat(struct ast_vhub_ep *ep, struct ast_vhub *vhub = ep->vhub; u16 stat, chg; - if (port == 0 || port > AST_VHUB_NUM_PORTS) + if (port == 0 || port > vhub->max_ports) return std_req_stall; port--; @@ -757,7 +760,7 @@ void ast_vhub_hub_suspend(struct ast_vhub *vhub) * Forward to unsuspended ports without changing * their connection status. */ - for (i = 0; i < AST_VHUB_NUM_PORTS; i++) { + for (i = 0; i < vhub->max_ports; i++) { struct ast_vhub_port *p = &vhub->ports[i]; if (!(p->status & USB_PORT_STAT_SUSPEND)) @@ -780,7 +783,7 @@ void ast_vhub_hub_resume(struct ast_vhub *vhub) * Forward to unsuspended ports without changing * their connection status. */ - for (i = 0; i < AST_VHUB_NUM_PORTS; i++) { + for (i = 0; i < vhub->max_ports; i++) { struct ast_vhub_port *p = &vhub->ports[i]; if (!(p->status & USB_PORT_STAT_SUSPEND)) @@ -814,7 +817,7 @@ void ast_vhub_hub_reset(struct ast_vhub *vhub) * Clear all port status, disable gadgets and "suspend" * them. They will be woken up by a port reset. */ - for (i = 0; i < AST_VHUB_NUM_PORTS; i++) { + for (i = 0; i < vhub->max_ports; i++) { struct ast_vhub_port *p = &vhub->ports[i]; /* Only keep the connected flag */ @@ -838,5 +841,10 @@ void ast_vhub_init_hub(struct ast_vhub *vhub) { vhub->speed = USB_SPEED_UNKNOWN; INIT_WORK(&vhub->wake_work, ast_vhub_wake_work); + + /* + * Fixup number of ports in hub descriptor. + */ + ast_vhub_hub_desc.bNbrPorts = vhub->max_ports; } diff --git a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h index 761919e220d3..e46980fe66f2 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h +++ b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h @@ -76,17 +76,9 @@ #define VHUB_SW_RESET_DEVICE2 (1 << 2) #define VHUB_SW_RESET_DEVICE1 (1 << 1) #define VHUB_SW_RESET_ROOT_HUB (1 << 0) -#define VHUB_SW_RESET_ALL (VHUB_SW_RESET_EP_POOL | \ - VHUB_SW_RESET_DMA_CONTROLLER | \ - VHUB_SW_RESET_DEVICE5 | \ - VHUB_SW_RESET_DEVICE4 | \ - VHUB_SW_RESET_DEVICE3 | \ - VHUB_SW_RESET_DEVICE2 | \ - VHUB_SW_RESET_DEVICE1 | \ - VHUB_SW_RESET_ROOT_HUB) + /* EP ACK/NACK IRQ masks */ #define VHUB_EP_IRQ(n) (1 << (n)) -#define VHUB_EP_IRQ_ALL 0x7fff /* 15 EPs */ /* USB status reg */ #define VHUB_USBSTS_HISPEED (1 << 27) @@ -210,8 +202,6 @@ * * ****************************************/ -#define AST_VHUB_NUM_GEN_EPs 15 /* Generic non-0 EPs */ -#define AST_VHUB_NUM_PORTS 5 /* vHub ports */ #define AST_VHUB_EP0_MAX_PACKET 64 /* EP0's max packet size */ #define AST_VHUB_EPn_MAX_PACKET 1024 /* Generic EPs max packet size */ #define AST_VHUB_DESCS_COUNT 256 /* Use 256 descriptor mode (valid @@ -342,7 +332,7 @@ struct ast_vhub_dev { struct ast_vhub *vhub; void __iomem *regs; - /* Device index (0...4) and name string */ + /* Device index (zero-based) and name string */ unsigned int index; const char *name; @@ -358,7 +348,8 @@ struct ast_vhub_dev { /* Endpoint structures */ struct ast_vhub_ep ep0; - struct ast_vhub_ep *epns[AST_VHUB_NUM_GEN_EPs]; + struct ast_vhub_ep **epns; + u32 max_epns; }; #define to_ast_dev(__g) container_of(__g, struct ast_vhub_dev, gadget) @@ -393,10 +384,12 @@ struct ast_vhub { bool ep1_stalled : 1; /* Per-port info */ - struct ast_vhub_port ports[AST_VHUB_NUM_PORTS]; + struct ast_vhub_port *ports; + u32 max_ports; /* Generic EP data structures */ - struct ast_vhub_ep epns[AST_VHUB_NUM_GEN_EPs]; + struct ast_vhub_ep *epns; + u32 max_epns; /* Upstream bus is suspended ? */ bool suspended : 1; -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 2/5] usb: gadget: aspeed: add ast2600 vhub support 2020-02-18 3:13 [PATCH v3 0/5] aspeed-g6: enable usb support rentao.bupt 2020-02-18 3:13 ` [PATCH v3 1/5] usb: gadget: aspeed: read vhub properties from device tree rentao.bupt @ 2020-02-18 3:13 ` rentao.bupt 2020-02-18 3:13 ` [PATCH v3 3/5] ARM: dts: aspeed-g6: add usb functions rentao.bupt ` (4 subsequent siblings) 6 siblings, 0 replies; 9+ messages in thread From: rentao.bupt @ 2020-02-18 3:13 UTC (permalink / raw) To: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery, Benjamin Herrenschmidt, Chunfeng Yun, Colin Ian King, Stephen Boyd, Rob Herring, Mark Rutland, linux-usb, linux-arm-kernel, linux-aspeed, devicetree, linux-kernel, openbmc, taoren Cc: Tao Ren From: Tao Ren <rentao.bupt@gmail.com> Add AST2600 support in aspeed-vhub driver. There are 3 major differences between AST2500 and AST2600 vhub: - AST2600 supports 7 downstream ports while AST2500 supports 5. - AST2600 supports 21 generic endpoints while AST2500 supports 15. - EP0 data buffer's 8-byte DMA alignment restriction is removed from AST2600. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> Reviewed-by: Joel Stanley <joel@jms.id.au> --- Changes in v3: - None. Changes in v2: - removed "ast_vhub_config" related logic. drivers/usb/gadget/udc/aspeed-vhub/Kconfig | 4 ++-- drivers/usb/gadget/udc/aspeed-vhub/core.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/udc/aspeed-vhub/Kconfig b/drivers/usb/gadget/udc/aspeed-vhub/Kconfig index 83ba8a2eb6af..605500b19cf3 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/Kconfig +++ b/drivers/usb/gadget/udc/aspeed-vhub/Kconfig @@ -4,5 +4,5 @@ config USB_ASPEED_VHUB depends on ARCH_ASPEED || COMPILE_TEST depends on USB_LIBCOMPOSITE help - USB peripheral controller for the Aspeed AST2500 family - SoCs supporting the "vHub" functionality and USB2.0 + USB peripheral controller for the Aspeed AST2400, AST2500 and + AST2600 family SoCs supporting the "vHub" functionality and USB2.0 diff --git a/drivers/usb/gadget/udc/aspeed-vhub/core.c b/drivers/usb/gadget/udc/aspeed-vhub/core.c index e4395813df35..442845a64660 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/core.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/core.c @@ -431,6 +431,9 @@ static const struct of_device_id ast_vhub_dt_ids[] = { { .compatible = "aspeed,ast2500-usb-vhub", }, + { + .compatible = "aspeed,ast2600-usb-vhub", + }, { } }; MODULE_DEVICE_TABLE(of, ast_vhub_dt_ids); -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 3/5] ARM: dts: aspeed-g6: add usb functions 2020-02-18 3:13 [PATCH v3 0/5] aspeed-g6: enable usb support rentao.bupt 2020-02-18 3:13 ` [PATCH v3 1/5] usb: gadget: aspeed: read vhub properties from device tree rentao.bupt 2020-02-18 3:13 ` [PATCH v3 2/5] usb: gadget: aspeed: add ast2600 vhub support rentao.bupt @ 2020-02-18 3:13 ` rentao.bupt 2020-02-18 3:13 ` [PATCH v3 4/5] ARM: dts: aspeed-g5: add vhub port and endpoint properties rentao.bupt ` (3 subsequent siblings) 6 siblings, 0 replies; 9+ messages in thread From: rentao.bupt @ 2020-02-18 3:13 UTC (permalink / raw) To: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery, Benjamin Herrenschmidt, Chunfeng Yun, Colin Ian King, Stephen Boyd, Rob Herring, Mark Rutland, linux-usb, linux-arm-kernel, linux-aspeed, devicetree, linux-kernel, openbmc, taoren Cc: Tao Ren From: Tao Ren <rentao.bupt@gmail.com> Add USB components and according pin groups in aspeed-g6 dtsi. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> --- Changes in v3: - None. Changes in v2: - added port/endpoint properties for vhub dt node. arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 25 +++++++++++++ arch/arm/boot/dts/aspeed-g6.dtsi | 45 ++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi index 045ce66ca876..7028e21bdd98 100644 --- a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi +++ b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi @@ -1112,6 +1112,31 @@ groups = "UART9"; }; + pinctrl_usb2ah_default: usb2ah_default { + function = "USB2AH"; + groups = "USBA"; + }; + + pinctrl_usb2ad_default: usb2ad_default { + function = "USB2AD"; + groups = "USBA"; + }; + + pinctrl_usb2bh_default: usb2bh_default { + function = "USB2BH"; + groups = "USBB"; + }; + + pinctrl_usb2bd_default: usb2bd_default { + function = "USB2BD"; + groups = "USBB"; + }; + + pinctrl_usb11bhid_default: usb11bhid_default { + function = "USB11BHID"; + groups = "USBB"; + }; + pinctrl_vb_default: vb_default { function = "VB"; groups = "VB"; diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index 796976d275e1..0a29b3b57a9d 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -245,6 +245,51 @@ status = "disabled"; }; + ehci0: usb@1e6a1000 { + compatible = "aspeed,ast2600-ehci", "generic-ehci"; + reg = <0x1e6a1000 0x100>; + interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2ah_default>; + status = "disabled"; + }; + + ehci1: usb@1e6a3000 { + compatible = "aspeed,ast2600-ehci", "generic-ehci"; + reg = <0x1e6a3000 0x100>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2bh_default>; + status = "disabled"; + }; + + uhci: usb@1e6b0000 { + compatible = "aspeed,ast2600-uhci", "generic-uhci"; + reg = <0x1e6b0000 0x100>; + interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; + #ports = <2>; + clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>; + status = "disabled"; + /* + * No default pinmux, it will follow EHCI, use an + * explicit pinmux override if EHCI is not enabled. + */ + }; + + vhub: usb-vhub@1e6a0000 { + compatible = "aspeed,ast2600-usb-vhub"; + reg = <0x1e6a0000 0x350>; + interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + aspeed,vhub-downstream-ports = <7>; + aspeed,vhub-generic-endpoints = <21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2ad_default>; + status = "disabled"; + }; + apb { compatible = "simple-bus"; #address-cells = <1>; -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 4/5] ARM: dts: aspeed-g5: add vhub port and endpoint properties 2020-02-18 3:13 [PATCH v3 0/5] aspeed-g6: enable usb support rentao.bupt ` (2 preceding siblings ...) 2020-02-18 3:13 ` [PATCH v3 3/5] ARM: dts: aspeed-g6: add usb functions rentao.bupt @ 2020-02-18 3:13 ` rentao.bupt 2020-02-18 3:13 ` [PATCH v3 5/5] ARM: dts: aspeed-g4: " rentao.bupt ` (2 subsequent siblings) 6 siblings, 0 replies; 9+ messages in thread From: rentao.bupt @ 2020-02-18 3:13 UTC (permalink / raw) To: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery, Benjamin Herrenschmidt, Chunfeng Yun, Colin Ian King, Stephen Boyd, Rob Herring, Mark Rutland, linux-usb, linux-arm-kernel, linux-aspeed, devicetree, linux-kernel, openbmc, taoren Cc: Tao Ren From: Tao Ren <rentao.bupt@gmail.com> Add "aspeed,vhub-downstream-ports" and "aspeed,vhub-generic-endpoints" properties to describe supported number of vhub ports and endpoints. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> --- No changes in v2/v3. - It's given v3 to align with the version of the patch series. arch/arm/boot/dts/aspeed-g5.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index ebec0fa8baa7..f12ec04d3cbc 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -195,6 +195,8 @@ reg = <0x1e6a0000 0x300>; interrupts = <5>; clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + aspeed,vhub-downstream-ports = <5>; + aspeed,vhub-generic-endpoints = <15>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb2ad_default>; status = "disabled"; -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 5/5] ARM: dts: aspeed-g4: add vhub port and endpoint properties 2020-02-18 3:13 [PATCH v3 0/5] aspeed-g6: enable usb support rentao.bupt ` (3 preceding siblings ...) 2020-02-18 3:13 ` [PATCH v3 4/5] ARM: dts: aspeed-g5: add vhub port and endpoint properties rentao.bupt @ 2020-02-18 3:13 ` rentao.bupt 2020-02-20 0:25 ` [PATCH v3 0/5] aspeed-g6: enable usb support Andrew Jeffery 2020-02-21 0:27 ` Tao Ren 6 siblings, 0 replies; 9+ messages in thread From: rentao.bupt @ 2020-02-18 3:13 UTC (permalink / raw) To: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery, Benjamin Herrenschmidt, Chunfeng Yun, Colin Ian King, Stephen Boyd, Rob Herring, Mark Rutland, linux-usb, linux-arm-kernel, linux-aspeed, devicetree, linux-kernel, openbmc, taoren Cc: Tao Ren From: Tao Ren <rentao.bupt@gmail.com> Add "aspeed,vhub-downstream-ports" and "aspeed,vhub-generic-endpoints" properties to describe supported number of vhub ports and endpoints. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> --- No changes in v2/v3. - It's given v3 to align with the version of the patch series. arch/arm/boot/dts/aspeed-g4.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 807a0fc20670..8e04303e8514 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -164,6 +164,8 @@ reg = <0x1e6a0000 0x300>; interrupts = <5>; clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; + aspeed,vhub-downstream-ports = <5>; + aspeed,vhub-generic-endpoints = <15>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb2d_default>; status = "disabled"; -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 0/5] aspeed-g6: enable usb support 2020-02-18 3:13 [PATCH v3 0/5] aspeed-g6: enable usb support rentao.bupt ` (4 preceding siblings ...) 2020-02-18 3:13 ` [PATCH v3 5/5] ARM: dts: aspeed-g4: " rentao.bupt @ 2020-02-20 0:25 ` Andrew Jeffery 2020-02-20 1:31 ` Tao Ren 2020-02-21 0:27 ` Tao Ren 6 siblings, 1 reply; 9+ messages in thread From: Andrew Jeffery @ 2020-02-20 0:25 UTC (permalink / raw) To: Tao Ren, Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Benjamin Herrenschmidt, Chunfeng Yun, Colin King, Stephen Boyd, Rob Herring, Mark Rutland, linux-usb, linux-arm-kernel, linux-aspeed, devicetree, linux-kernel, openbmc, Tao Ren On Tue, 18 Feb 2020, at 13:43, rentao.bupt@gmail.com wrote: > From: Tao Ren <rentao.bupt@gmail.com> > > The patch series aims at enabling USB Host and Gadget support on AST2600 > platforms. > > Patch #1 replaces hardcoded vhub port/endpoint number with device tree > properties, so that it's more convenient to add support for ast2600-vhub > which provides more downstream ports and endpoints. Ah, something I should have mentioned on the previous series is you'll need to update the binding documentation with the new properties. > > Patch #2 enables ast2600 support in aspeed-vhub usb gadget driver. Also need to add the 2600 support to the dt binding document. Looks good to me otherwise. Andrew ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 0/5] aspeed-g6: enable usb support 2020-02-20 0:25 ` [PATCH v3 0/5] aspeed-g6: enable usb support Andrew Jeffery @ 2020-02-20 1:31 ` Tao Ren 0 siblings, 0 replies; 9+ messages in thread From: Tao Ren @ 2020-02-20 1:31 UTC (permalink / raw) To: Andrew Jeffery Cc: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Benjamin Herrenschmidt, Chunfeng Yun, Colin King, Stephen Boyd, Rob Herring, Mark Rutland, linux-usb, linux-arm-kernel, linux-aspeed, devicetree, linux-kernel, openbmc, Tao Ren On Thu, Feb 20, 2020 at 10:55:10AM +1030, Andrew Jeffery wrote: > > > On Tue, 18 Feb 2020, at 13:43, rentao.bupt@gmail.com wrote: > > From: Tao Ren <rentao.bupt@gmail.com> > > > > The patch series aims at enabling USB Host and Gadget support on AST2600 > > platforms. > > > > Patch #1 replaces hardcoded vhub port/endpoint number with device tree > > properties, so that it's more convenient to add support for ast2600-vhub > > which provides more downstream ports and endpoints. > > Ah, something I should have mentioned on the previous series is you'll need > to update the binding documentation with the new properties. Looks like we don't have dt binding documentation for this driver. I will add the document in my 2nd patch set "allow to customize vhub device IDs/strings" so all the new dt properties are included in the doc. > > > > Patch #2 enables ast2600 support in aspeed-vhub usb gadget driver. > > Also need to add the 2600 support to the dt binding document. > > Looks good to me otherwise. > > Andrew Thanks again for the quick review, Andrew. Cheers, Tao ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 0/5] aspeed-g6: enable usb support 2020-02-18 3:13 [PATCH v3 0/5] aspeed-g6: enable usb support rentao.bupt ` (5 preceding siblings ...) 2020-02-20 0:25 ` [PATCH v3 0/5] aspeed-g6: enable usb support Andrew Jeffery @ 2020-02-21 0:27 ` Tao Ren 6 siblings, 0 replies; 9+ messages in thread From: Tao Ren @ 2020-02-21 0:27 UTC (permalink / raw) To: Felipe Balbi, Greg Kroah-Hartman, Joel Stanley, Andrew Jeffery, Benjamin Herrenschmidt, Chunfeng Yun, Colin Ian King, Stephen Boyd, Rob Herring, Mark Rutland, linux-usb, linux-arm-kernel, linux-aspeed, devicetree, linux-kernel, openbmc, taoren Hi Ben, Could you provide some comments on this patch series while I'm working on the other patch set (for vhub descriptors and DT binding document)? Cheers, Tao On Mon, Feb 17, 2020 at 07:13:10PM -0800, rentao.bupt@gmail.com wrote: > From: Tao Ren <rentao.bupt@gmail.com> > > The patch series aims at enabling USB Host and Gadget support on AST2600 > platforms. > > Patch #1 replaces hardcoded vhub port/endpoint number with device tree > properties, so that it's more convenient to add support for ast2600-vhub > which provides more downstream ports and endpoints. > > Patch #2 enables ast2600 support in aspeed-vhub usb gadget driver. > > Patch #3 adds USB devices and according pin groups in aspeed-g6 dtsi. > > Patch #4 and #5 add vhub port/endpoint properties into aspeed-g4 and > aspeed-g5 dtsi. > > Tao Ren (5): > usb: gadget: aspeed: read vhub properties from device tree > usb: gadget: aspeed: add ast2600 vhub support > ARM: dts: aspeed-g6: add usb functions > ARM: dts: aspeed-g5: add vhub port and endpoint properties > ARM: dts: aspeed-g4: add vhub port and endpoint properties > > arch/arm/boot/dts/aspeed-g4.dtsi | 2 + > arch/arm/boot/dts/aspeed-g5.dtsi | 2 + > arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 25 +++++++ > arch/arm/boot/dts/aspeed-g6.dtsi | 45 ++++++++++++ > drivers/usb/gadget/udc/aspeed-vhub/Kconfig | 4 +- > drivers/usb/gadget/udc/aspeed-vhub/core.c | 79 +++++++++++++++------- > drivers/usb/gadget/udc/aspeed-vhub/dev.c | 30 +++++--- > drivers/usb/gadget/udc/aspeed-vhub/epn.c | 4 +- > drivers/usb/gadget/udc/aspeed-vhub/hub.c | 26 ++++--- > drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 23 +++---- > 10 files changed, 178 insertions(+), 62 deletions(-) > > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-02-21 0:27 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-02-18 3:13 [PATCH v3 0/5] aspeed-g6: enable usb support rentao.bupt 2020-02-18 3:13 ` [PATCH v3 1/5] usb: gadget: aspeed: read vhub properties from device tree rentao.bupt 2020-02-18 3:13 ` [PATCH v3 2/5] usb: gadget: aspeed: add ast2600 vhub support rentao.bupt 2020-02-18 3:13 ` [PATCH v3 3/5] ARM: dts: aspeed-g6: add usb functions rentao.bupt 2020-02-18 3:13 ` [PATCH v3 4/5] ARM: dts: aspeed-g5: add vhub port and endpoint properties rentao.bupt 2020-02-18 3:13 ` [PATCH v3 5/5] ARM: dts: aspeed-g4: " rentao.bupt 2020-02-20 0:25 ` [PATCH v3 0/5] aspeed-g6: enable usb support Andrew Jeffery 2020-02-20 1:31 ` Tao Ren 2020-02-21 0:27 ` Tao Ren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).