Patchwork [U-Boot,v3] usb: gadget: Fix data aborts during USB ethernet boot

login
register
mail settings
Submitter Joel Fernandes
Date Sept. 4, 2013, 11:55 p.m.
Message ID <1378338914-11000-1-git-send-email-joelf@ti.com>
Download mbox | patch
Permalink /patch/272773/
State Awaiting Upstream
Delegated to: Marek Vasut
Headers show

Comments

Joel Fernandes - Sept. 4, 2013, 11:55 p.m.
As seen on GCC 4.6 Linaro compiler, control_req buffer is not aligned
on 4 byte boundaray causing data aborts in eth_setup -> conf_buf
during dhcp boot over usb_ether. Fix the issue my aligning control_req
buffer using DEFINE_CACHE_ALIGN_BUFFER.

Tested on am335x_evm platform (beaglebone).
Applies on 2013.10-rc1 branch.

Cc: Tom Rini <trini@ti.com>
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
v2 changes:
 - Using DEFINE_CACHE_ALIGN_BUFFER macro for the alignment.
 - Also fixed alignment for status_req.

v3 changes:
 - Adjusted commit message for v2 change.

 drivers/usb/gadget/ether.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Bo Shen - Sept. 5, 2013, 1:31 a.m.
Hi Joel Fernandes,

On 09/05/2013 07:55 AM, Joel Fernandes wrote:
> As seen on GCC 4.6 Linaro compiler, control_req buffer is not aligned
> on 4 byte boundaray causing data aborts in eth_setup -> conf_buf
> during dhcp boot over usb_ether. Fix the issue my aligning control_req
> buffer using DEFINE_CACHE_ALIGN_BUFFER.
>
> Tested on am335x_evm platform (beaglebone).
> Applies on 2013.10-rc1 branch.
>
> Cc: Tom Rini <trini@ti.com>
> Cc: Marek Vasut <marex@denx.de>
> Signed-off-by: Joel Fernandes <joelf@ti.com>
> ---
> v2 changes:
>   - Using DEFINE_CACHE_ALIGN_BUFFER macro for the alignment.
>   - Also fixed alignment for status_req.
>
> v3 changes:
>   - Adjusted commit message for v2 change.
>
>   drivers/usb/gadget/ether.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)

Test on sama5d3xek board with RNDIS gadget, it still has the unaligned 
access issue.

However, I test with this patch "usb: gadget: config: fix unaligned 
access issues" from: Troy Kisky <troy.kisky@boundarydevices.com> really 
fix the unaligned access issue.

more information at: http://patchwork.ozlabs.org/patch/264151/

> diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
> index 579893c..700d5fb 100644
> --- a/drivers/usb/gadget/ether.c
> +++ b/drivers/usb/gadget/ether.c
> @@ -849,9 +849,10 @@ static struct usb_gadget_strings	stringtab = {
>   };
>
>   /*============================================================================*/
> -static u8 control_req[USB_BUFSIZ];
> +DEFINE_CACHE_ALIGN_BUFFER(u8, control_req, USB_BUFSIZ);
> +
>   #if defined(CONFIG_USB_ETH_CDC) || defined(CONFIG_USB_ETH_RNDIS)
> -static u8 status_req[STATUS_BYTECOUNT] __attribute__ ((aligned(4)));
> +DEFINE_CACHE_ALIGN_BUFFER(u8, status_req, STATUS_BYTECOUNT);
>   #endif

Best Regards,
Bo Shen
Marek Vasut - Sept. 5, 2013, 1:46 p.m.
Dear Bo Shen,

> Hi Joel Fernandes,
> 
> On 09/05/2013 07:55 AM, Joel Fernandes wrote:
> > As seen on GCC 4.6 Linaro compiler, control_req buffer is not aligned
> > on 4 byte boundaray causing data aborts in eth_setup -> conf_buf
> > during dhcp boot over usb_ether. Fix the issue my aligning control_req
> > buffer using DEFINE_CACHE_ALIGN_BUFFER.
> > 
> > Tested on am335x_evm platform (beaglebone).
> > Applies on 2013.10-rc1 branch.
> > 
> > Cc: Tom Rini <trini@ti.com>
> > Cc: Marek Vasut <marex@denx.de>
> > Signed-off-by: Joel Fernandes <joelf@ti.com>
> > ---
> > 
> > v2 changes:
> >   - Using DEFINE_CACHE_ALIGN_BUFFER macro for the alignment.
> >   - Also fixed alignment for status_req.
> > 
> > v3 changes:
> >   - Adjusted commit message for v2 change.
> >   
> >   drivers/usb/gadget/ether.c | 5 +++--
> >   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> Test on sama5d3xek board with RNDIS gadget, it still has the unaligned
> access issue.
> 
> However, I test with this patch "usb: gadget: config: fix unaligned
> access issues" from: Troy Kisky <troy.kisky@boundarydevices.com> really
> fix the unaligned access issue.
> 
> more information at: http://patchwork.ozlabs.org/patch/264151/

Troy, care to fix up the patch's commit log so I can try and understand it?

Best regards,
Marek Vasut
Marek Vasut - Sept. 5, 2013, 3:02 p.m.
Dear Joel Fernandes,

> As seen on GCC 4.6 Linaro compiler, control_req buffer is not aligned
> on 4 byte boundaray causing data aborts in eth_setup -> conf_buf
> during dhcp boot over usb_ether. Fix the issue my aligning control_req
> buffer using DEFINE_CACHE_ALIGN_BUFFER.
> 
> Tested on am335x_evm platform (beaglebone).
> Applies on 2013.10-rc1 branch.
> 
> Cc: Tom Rini <trini@ti.com>
> Cc: Marek Vasut <marex@denx.de>
> Signed-off-by: Joel Fernandes <joelf@ti.com>
> ---
> v2 changes:
>  - Using DEFINE_CACHE_ALIGN_BUFFER macro for the alignment.
>  - Also fixed alignment for status_req.
> 
> v3 changes:
>  - Adjusted commit message for v2 change.
> 
>  drivers/usb/gadget/ether.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
> index 579893c..700d5fb 100644
> --- a/drivers/usb/gadget/ether.c
> +++ b/drivers/usb/gadget/ether.c
> @@ -849,9 +849,10 @@ static struct usb_gadget_strings	stringtab = {
>  };
> 
>  /*========================================================================
> ====*/ -static u8 control_req[USB_BUFSIZ];
> +DEFINE_CACHE_ALIGN_BUFFER(u8, control_req, USB_BUFSIZ);
> +
>  #if defined(CONFIG_USB_ETH_CDC) || defined(CONFIG_USB_ETH_RNDIS)
> -static u8 status_req[STATUS_BYTECOUNT] __attribute__ ((aligned(4)));
> +DEFINE_CACHE_ALIGN_BUFFER(u8, status_req, STATUS_BYTECOUNT);
>  #endif

Applied, thanks

Best regards,
Marek Vasut

Patch

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 579893c..700d5fb 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -849,9 +849,10 @@  static struct usb_gadget_strings	stringtab = {
 };
 
 /*============================================================================*/
-static u8 control_req[USB_BUFSIZ];
+DEFINE_CACHE_ALIGN_BUFFER(u8, control_req, USB_BUFSIZ);
+
 #if defined(CONFIG_USB_ETH_CDC) || defined(CONFIG_USB_ETH_RNDIS)
-static u8 status_req[STATUS_BYTECOUNT] __attribute__ ((aligned(4)));
+DEFINE_CACHE_ALIGN_BUFFER(u8, status_req, STATUS_BYTECOUNT);
 #endif