* [PATCH 0/4] usb: musb: tusb6010_omap: Convert to DMAengine
@ 2017-05-03 10:54 Peter Ujfalusi
2017-05-03 10:57 ` Peter Ujfalusi
0 siblings, 1 reply; 5+ messages in thread
From: Peter Ujfalusi @ 2017-05-03 10:54 UTC (permalink / raw)
To: b-liu, tony, gregkh; +Cc: linux-usb, linux-omap, balbi, linux-kernel
Hi,
With port_window support implemented in DMAengine and the sDMA DMAengine driver,
the tusb6010_omap driver can be converted away from the custom legacy omap-dma
API to generic DMAengine.
The first two patch is to prepare the tusb6010_omap driver for the conversion.
The third one adds the needed entries for the dma_slave_map so we can request
the DMA channels. This can be reverted when the stack is converted to DT.
The last patch does the main work to move the driver to DMAengine API.
I have tested the set on top of next-20170503 on Nokia n810 with nfsroot using
CDC Ethernet (g_cdc) and copying files with scp to/form my host.
To force that the DMA is actually used I have:
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index 05aefcad40b5..a5fc2a6bdad3 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -216,8 +216,8 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
* use a timer for the callback, but it is unsafe as the XFR_SIZE
* register is corrupt, and we won't know if the DMA worked.
*/
- if (dma_addr & 0x2)
- return false;
+// if (dma_addr & 0x2)
+// return false;
/*
* Because of HW issue #10, it seems like mixing sync DMA and async
Since this condition will almost all the time was true - effectively disabling
the DMA use.
Regards.
Peter
---
Peter Ujfalusi (4):
usb: musb: tusb6010_omap: Create new struct for DMA data/parameters
usb: musb: tusb6010_omap: Allocate DMA channels upfront
ARM: OMAP2+: DMA: Add slave map entries for 24xx external request
lines
usb: musb: tusb6010_omap: Convert to dmaengine WIP
arch/arm/mach-omap2/dma.c | 24 +++
drivers/usb/musb/tusb6010_omap.c | 342 ++++++++++++++++++---------------------
2 files changed, 177 insertions(+), 189 deletions(-)
--
2.12.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/4] usb: musb: tusb6010_omap: Convert to DMAengine
2017-05-03 10:54 [PATCH 0/4] usb: musb: tusb6010_omap: Convert to DMAengine Peter Ujfalusi
@ 2017-05-03 10:57 ` Peter Ujfalusi
0 siblings, 0 replies; 5+ messages in thread
From: Peter Ujfalusi @ 2017-05-03 10:57 UTC (permalink / raw)
To: b-liu, tony, gregkh; +Cc: linux-usb, linux-omap, balbi, linux-kernel
Sorry,
I have forgot to update the commit message for the last patch.
On 2017-05-03 13:54, Peter Ujfalusi wrote:
> Hi,
>
> With port_window support implemented in DMAengine and the sDMA DMAengine driver,
> the tusb6010_omap driver can be converted away from the custom legacy omap-dma
> API to generic DMAengine.
>
> The first two patch is to prepare the tusb6010_omap driver for the conversion.
> The third one adds the needed entries for the dma_slave_map so we can request
> the DMA channels. This can be reverted when the stack is converted to DT.
>
> The last patch does the main work to move the driver to DMAengine API.
>
> I have tested the set on top of next-20170503 on Nokia n810 with nfsroot using
> CDC Ethernet (g_cdc) and copying files with scp to/form my host.
>
> To force that the DMA is actually used I have:
> diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
> index 05aefcad40b5..a5fc2a6bdad3 100644
> --- a/drivers/usb/musb/tusb6010_omap.c
> +++ b/drivers/usb/musb/tusb6010_omap.c
> @@ -216,8 +216,8 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
> * use a timer for the callback, but it is unsafe as the XFR_SIZE
> * register is corrupt, and we won't know if the DMA worked.
> */
> - if (dma_addr & 0x2)
> - return false;
> +// if (dma_addr & 0x2)
> +// return false;
>
> /*
> * Because of HW issue #10, it seems like mixing sync DMA and async
>
> Since this condition will almost all the time was true - effectively disabling
> the DMA use.
>
> Regards.
> Peter
> ---
> Peter Ujfalusi (4):
> usb: musb: tusb6010_omap: Create new struct for DMA data/parameters
> usb: musb: tusb6010_omap: Allocate DMA channels upfront
> ARM: OMAP2+: DMA: Add slave map entries for 24xx external request
> lines
> usb: musb: tusb6010_omap: Convert to dmaengine WIP
>
> arch/arm/mach-omap2/dma.c | 24 +++
> drivers/usb/musb/tusb6010_omap.c | 342 ++++++++++++++++++---------------------
> 2 files changed, 177 insertions(+), 189 deletions(-)
>
- Péter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/4] usb: musb: tusb6010_omap: Convert to DMAengine
2017-05-04 14:31 ` Tony Lindgren
@ 2017-05-05 7:28 ` Peter Ujfalusi
0 siblings, 0 replies; 5+ messages in thread
From: Peter Ujfalusi @ 2017-05-05 7:28 UTC (permalink / raw)
To: Tony Lindgren
Cc: b-liu, gregkh, linux-usb, linux-omap, balbi, linux-kernel, Aaro Koskinen
On 2017-05-04 17:31, Tony Lindgren wrote:
> * Peter Ujfalusi <peter.ujfalusi@ti.com> [170503 04:00]:
>> Hi,
>>
>> With port_window support implemented in DMAengine and the sDMA DMAengine driver,
>> the tusb6010_omap driver can be converted away from the custom legacy omap-dma
>> API to generic DMAengine.
>>
>> The first two patch is to prepare the tusb6010_omap driver for the conversion.
>> The third one adds the needed entries for the dma_slave_map so we can request
>> the DMA channels. This can be reverted when the stack is converted to DT.
>>
>> The last patch does the main work to move the driver to DMAengine API.
>>
>> I have tested the set on top of next-20170503 on Nokia n810 with nfsroot using
>> CDC Ethernet (g_cdc) and copying files with scp to/form my host.
>
> Thanks for doing this! For this series:
>
> Acked-by: Tony Lindgren <tony@atomide.com>
>
>> To force that the DMA is actually used I have:
>> diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
>> index 05aefcad40b5..a5fc2a6bdad3 100644
>> --- a/drivers/usb/musb/tusb6010_omap.c
>> +++ b/drivers/usb/musb/tusb6010_omap.c
>> @@ -216,8 +216,8 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
>> * use a timer for the callback, but it is unsafe as the XFR_SIZE
>> * register is corrupt, and we won't know if the DMA worked.
>> */
>> - if (dma_addr & 0x2)
>> - return false;
>> +// if (dma_addr & 0x2)
>> +// return false;
>>
>> /*
>> * Because of HW issue #10, it seems like mixing sync DMA and async
>>
>> Since this condition will almost all the time was true - effectively disabling
>> the DMA use.
>
> Yeah this really should have the transfers aligned to 32-bit like
> the production kernel did. For reference, the following should do
> the trick but of course would have to be done conditionally.
>
> Regards,
>
> Tony
>
> 8< ----------------------
> diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
> --- a/drivers/usb/musb/musb_gadget.c
> +++ b/drivers/usb/musb/musb_gadget.c
> @@ -2153,6 +2153,7 @@ __acquires(musb->lock)
> musb->g.a_alt_hnp_support = 0;
> musb->g.a_hnp_support = 0;
> musb->g.quirk_zlp_not_supp = 1;
> + musb->g.quirk_avoids_skb_reserve = 1;
note for myself: this only works with g_ncm. I was using g_cdc, switched
to g_ether, then to g_ncm.
However... If I revert this series and add this line, the ethernet will
not work at all, I can not ping the n810 and it will not get the nfsroot
either (next-20170503).
only f_ncm.c does:
ncm->port.no_skb_reserve =
gadget_avoids_skb_reserve(cdev->gadget);
> /* Normal reset, as B-Device;
> * or else after HNP, as A-Device
>
- Péter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/4] usb: musb: tusb6010_omap: Convert to DMAengine
2017-05-03 10:56 Peter Ujfalusi
@ 2017-05-04 14:31 ` Tony Lindgren
2017-05-05 7:28 ` Peter Ujfalusi
0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2017-05-04 14:31 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: b-liu, gregkh, linux-usb, linux-omap, balbi, linux-kernel, Aaro Koskinen
* Peter Ujfalusi <peter.ujfalusi@ti.com> [170503 04:00]:
> Hi,
>
> With port_window support implemented in DMAengine and the sDMA DMAengine driver,
> the tusb6010_omap driver can be converted away from the custom legacy omap-dma
> API to generic DMAengine.
>
> The first two patch is to prepare the tusb6010_omap driver for the conversion.
> The third one adds the needed entries for the dma_slave_map so we can request
> the DMA channels. This can be reverted when the stack is converted to DT.
>
> The last patch does the main work to move the driver to DMAengine API.
>
> I have tested the set on top of next-20170503 on Nokia n810 with nfsroot using
> CDC Ethernet (g_cdc) and copying files with scp to/form my host.
Thanks for doing this! For this series:
Acked-by: Tony Lindgren <tony@atomide.com>
> To force that the DMA is actually used I have:
> diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
> index 05aefcad40b5..a5fc2a6bdad3 100644
> --- a/drivers/usb/musb/tusb6010_omap.c
> +++ b/drivers/usb/musb/tusb6010_omap.c
> @@ -216,8 +216,8 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
> * use a timer for the callback, but it is unsafe as the XFR_SIZE
> * register is corrupt, and we won't know if the DMA worked.
> */
> - if (dma_addr & 0x2)
> - return false;
> +// if (dma_addr & 0x2)
> +// return false;
>
> /*
> * Because of HW issue #10, it seems like mixing sync DMA and async
>
> Since this condition will almost all the time was true - effectively disabling
> the DMA use.
Yeah this really should have the transfers aligned to 32-bit like
the production kernel did. For reference, the following should do
the trick but of course would have to be done conditionally.
Regards,
Tony
8< ----------------------
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -2153,6 +2153,7 @@ __acquires(musb->lock)
musb->g.a_alt_hnp_support = 0;
musb->g.a_hnp_support = 0;
musb->g.quirk_zlp_not_supp = 1;
+ musb->g.quirk_avoids_skb_reserve = 1;
/* Normal reset, as B-Device;
* or else after HNP, as A-Device
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 0/4] usb: musb: tusb6010_omap: Convert to DMAengine
@ 2017-05-03 10:56 Peter Ujfalusi
2017-05-04 14:31 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Peter Ujfalusi @ 2017-05-03 10:56 UTC (permalink / raw)
To: b-liu, tony, gregkh; +Cc: linux-usb, linux-omap, balbi, linux-kernel
Hi,
With port_window support implemented in DMAengine and the sDMA DMAengine driver,
the tusb6010_omap driver can be converted away from the custom legacy omap-dma
API to generic DMAengine.
The first two patch is to prepare the tusb6010_omap driver for the conversion.
The third one adds the needed entries for the dma_slave_map so we can request
the DMA channels. This can be reverted when the stack is converted to DT.
The last patch does the main work to move the driver to DMAengine API.
I have tested the set on top of next-20170503 on Nokia n810 with nfsroot using
CDC Ethernet (g_cdc) and copying files with scp to/form my host.
To force that the DMA is actually used I have:
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index 05aefcad40b5..a5fc2a6bdad3 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -216,8 +216,8 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz,
* use a timer for the callback, but it is unsafe as the XFR_SIZE
* register is corrupt, and we won't know if the DMA worked.
*/
- if (dma_addr & 0x2)
- return false;
+// if (dma_addr & 0x2)
+// return false;
/*
* Because of HW issue #10, it seems like mixing sync DMA and async
Since this condition will almost all the time was true - effectively disabling
the DMA use.
Regards.
Peter
---
Peter Ujfalusi (4):
usb: musb: tusb6010_omap: Create new struct for DMA data/parameters
usb: musb: tusb6010_omap: Allocate DMA channels upfront
ARM: OMAP2+: DMA: Add slave map entries for 24xx external request
lines
usb: musb: tusb6010_omap: Convert to DMAengine API
arch/arm/mach-omap2/dma.c | 24 +++
drivers/usb/musb/tusb6010_omap.c | 342 ++++++++++++++++++---------------------
2 files changed, 177 insertions(+), 189 deletions(-)
--
2.12.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-05-05 7:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-03 10:54 [PATCH 0/4] usb: musb: tusb6010_omap: Convert to DMAengine Peter Ujfalusi
2017-05-03 10:57 ` Peter Ujfalusi
2017-05-03 10:56 Peter Ujfalusi
2017-05-04 14:31 ` Tony Lindgren
2017-05-05 7:28 ` Peter Ujfalusi
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).