* [PATCH 1/1] usb: gadget: aspeed: fix stop dma register setting.
@ 2021-01-08 8:12 ` Ryan Chen
0 siblings, 0 replies; 8+ messages in thread
From: Ryan Chen @ 2021-01-08 8:12 UTC (permalink / raw)
To: BMC-SW, Felipe Balbi, Greg Kroah-Hartman, Joel Stanley,
Andrew Jeffery, linux-usb, linux-arm-kernel, linux-aspeed,
linux-kernel
Cc: Ryan Chen
The vhub engine has two dma mode, one is descriptor list, another
is single stage DMA. Each mode has different stop register setting.
Descriptor list operation (bit2) : 0 disable reset, 1: enable reset
Single mode operation (bit0) : 0 : disable, 1: enable
Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com>
---
drivers/usb/gadget/udc/aspeed-vhub/epn.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/udc/aspeed-vhub/epn.c b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
index 0bd6b20435b8..02d8bfae58fb 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/epn.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
@@ -420,7 +420,10 @@ static void ast_vhub_stop_active_req(struct ast_vhub_ep *ep,
u32 state, reg, loops;
/* Stop DMA activity */
- writel(0, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);
+ if (ep->epn.desc_mode)
+ writel(VHUB_EP_DMA_CTRL_RESET, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);
+ else
+ writel(0, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);
/* Wait for it to complete */
for (loops = 0; loops < 1000; loops++) {
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/1] usb: gadget: aspeed: fix stop dma register setting.
2021-01-08 8:12 ` Ryan Chen
@ 2021-01-08 12:21 ` Felipe Balbi
-1 siblings, 0 replies; 8+ messages in thread
From: Felipe Balbi @ 2021-01-08 12:21 UTC (permalink / raw)
To: Ryan Chen, BMC-SW, Greg Kroah-Hartman, Joel Stanley,
Andrew Jeffery, linux-usb, linux-arm-kernel, linux-aspeed,
linux-kernel
Cc: Ryan Chen
Hi,
Ryan Chen <ryan_chen@aspeedtech.com> writes:
> The vhub engine has two dma mode, one is descriptor list, another
> is single stage DMA. Each mode has different stop register setting.
> Descriptor list operation (bit2) : 0 disable reset, 1: enable reset
> Single mode operation (bit0) : 0 : disable, 1: enable
>
> Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com>
I don't have HW, but FWIW:
Acked-by: Felipe Balbi <balbi@kernel.org>
--
balbi
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] usb: gadget: aspeed: fix stop dma register setting.
@ 2021-01-08 12:21 ` Felipe Balbi
0 siblings, 0 replies; 8+ messages in thread
From: Felipe Balbi @ 2021-01-08 12:21 UTC (permalink / raw)
To: Ryan Chen, BMC-SW, Greg Kroah-Hartman, Joel Stanley,
Andrew Jeffery, linux-usb, linux-arm-kernel, linux-aspeed,
linux-kernel
Cc: Ryan Chen
Hi,
Ryan Chen <ryan_chen@aspeedtech.com> writes:
> The vhub engine has two dma mode, one is descriptor list, another
> is single stage DMA. Each mode has different stop register setting.
> Descriptor list operation (bit2) : 0 disable reset, 1: enable reset
> Single mode operation (bit0) : 0 : disable, 1: enable
>
> Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com>
I don't have HW, but FWIW:
Acked-by: Felipe Balbi <balbi@kernel.org>
--
balbi
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] usb: gadget: aspeed: fix stop dma register setting.
2021-01-08 8:12 ` Ryan Chen
@ 2021-01-11 2:24 ` Joel Stanley
-1 siblings, 0 replies; 8+ messages in thread
From: Joel Stanley @ 2021-01-11 2:24 UTC (permalink / raw)
To: Ryan Chen, Benjamin Herrenschmidt
Cc: BMC-SW, Felipe Balbi, Greg Kroah-Hartman, Andrew Jeffery,
linux-usb, Linux ARM, linux-aspeed, Linux Kernel Mailing List
On Fri, 8 Jan 2021 at 08:13, Ryan Chen <ryan_chen@aspeedtech.com> wrote:
>
> The vhub engine has two dma mode, one is descriptor list, another
> is single stage DMA. Each mode has different stop register setting.
> Descriptor list operation (bit2) : 0 disable reset, 1: enable reset
> Single mode operation (bit0) : 0 : disable, 1: enable
>
> Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com>
> ---
> drivers/usb/gadget/udc/aspeed-vhub/epn.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/udc/aspeed-vhub/epn.c b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
> index 0bd6b20435b8..02d8bfae58fb 100644
> --- a/drivers/usb/gadget/udc/aspeed-vhub/epn.c
> +++ b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
> @@ -420,7 +420,10 @@ static void ast_vhub_stop_active_req(struct ast_vhub_ep *ep,
> u32 state, reg, loops;
>
> /* Stop DMA activity */
> - writel(0, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);
> + if (ep->epn.desc_mode)
> + writel(VHUB_EP_DMA_CTRL_RESET, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);
> + else
> + writel(0, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);
This looks correct, as whenever the driver re-enables DMA it uses
ep->epn.dma_conf for the value of this register. So we're not losing
any configuration by setting it to 0.
Acked-by: Joel Stanley <joel@jms.id.au>
Fixes: 7ecca2a4080c ("usb/gadget: Add driver for Aspeed SoC virtual hub")
I've cc'd Ben for his ack too.
Cheers,
Joel
>
> /* Wait for it to complete */
> for (loops = 0; loops < 1000; loops++) {
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/1] usb: gadget: aspeed: fix stop dma register setting.
@ 2021-01-11 2:24 ` Joel Stanley
0 siblings, 0 replies; 8+ messages in thread
From: Joel Stanley @ 2021-01-11 2:24 UTC (permalink / raw)
To: Ryan Chen, Benjamin Herrenschmidt
Cc: BMC-SW, linux-aspeed, Felipe Balbi, Andrew Jeffery,
Greg Kroah-Hartman, linux-usb, Linux Kernel Mailing List,
Linux ARM
On Fri, 8 Jan 2021 at 08:13, Ryan Chen <ryan_chen@aspeedtech.com> wrote:
>
> The vhub engine has two dma mode, one is descriptor list, another
> is single stage DMA. Each mode has different stop register setting.
> Descriptor list operation (bit2) : 0 disable reset, 1: enable reset
> Single mode operation (bit0) : 0 : disable, 1: enable
>
> Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com>
> ---
> drivers/usb/gadget/udc/aspeed-vhub/epn.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/udc/aspeed-vhub/epn.c b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
> index 0bd6b20435b8..02d8bfae58fb 100644
> --- a/drivers/usb/gadget/udc/aspeed-vhub/epn.c
> +++ b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
> @@ -420,7 +420,10 @@ static void ast_vhub_stop_active_req(struct ast_vhub_ep *ep,
> u32 state, reg, loops;
>
> /* Stop DMA activity */
> - writel(0, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);
> + if (ep->epn.desc_mode)
> + writel(VHUB_EP_DMA_CTRL_RESET, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);
> + else
> + writel(0, ep->epn.regs + AST_VHUB_EP_DMA_CTLSTAT);
This looks correct, as whenever the driver re-enables DMA it uses
ep->epn.dma_conf for the value of this register. So we're not losing
any configuration by setting it to 0.
Acked-by: Joel Stanley <joel@jms.id.au>
Fixes: 7ecca2a4080c ("usb/gadget: Add driver for Aspeed SoC virtual hub")
I've cc'd Ben for his ack too.
Cheers,
Joel
>
> /* Wait for it to complete */
> for (loops = 0; loops < 1000; loops++) {
> --
> 2.17.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread