sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAME70: USBHS device workaround for errata; EP7 does not support DMA on some parts

Browse Source
This commit is contained in:
Frank Benkert 2016-04-20 06:22:04 -06:00 committed by Gregory Nutt
parent 65f21d0edb
commit 885cd812e6
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/samv7/Kconfig
View File

@ -1820,6 +1820,14 @@ config SAMV7_USBHS_PREALLOCATE
at start-up time with kmm_malloc(). This might be important if a larger at start-up time with kmm_malloc(). This might be important if a larger
memory pool is available after startup. memory pool is available after startup.
config SAMV7_USBHS_EP7DMA_WAR
bool "EP7 DMA errata workaround"
default n
---help---
Normally EP1..7 should support, but according an ERRATA in
"Atmel-11296D-ATARM-SAM E70-Datasheet_19-Jan-16" only the EP1..6
support the DMA transfer. This option suppresses DMA on EP7.
config SAMV7_USBHS_REGDEBUG config SAMV7_USBHS_REGDEBUG
bool "Enable low-level USBHS register debug" bool "Enable low-level USBHS register debug"
default n default n

20
arch/arm/src/samv7/sam_usbdevhs.c
View File

@ -130,10 +130,20 @@
#define EP0 (0) #define EP0 (0)
#define SAM_EPSET_ALL (0xffff) /* All endpoints */ #define SAM_EPSET_ALL (0xffff) /* All endpoints */
#define SAM_EPSET_NOTEP0 (0xfffe) /* All endpoints except EP0 */ #define SAM_EPSET_NOTEP0 (0xfffe) /* All endpoints except EP0 */
#define SAM_EPSET_DMA (0x01fe) /* All endpoints that support DMA transfers */
#define SAM_EP_BIT(ep) (1 << (ep)) #define SAM_EP_BIT(ep) (1 << (ep))
#define SAM_EP0_MAXPACKET (64) /* EP0 Max. packet size */ #define SAM_EP0_MAXPACKET (64) /* EP0 Max. packet size */
#ifdef CONFIG_SAMV7_USBHS_EP7DMA_WAR
/* Normally EP1..7 should support DMA (0x1fe), but according an ERRATA in
* "Atmel-11296D-ATARM-SAM E70-Datasheet_19-Jan-16" only the EP1..6 support
* the DMA transfer (0x7e)
*/
# define SAM_EPSET_DMA (0x007e) /* All endpoints that support DMA transfers */
#else
# define SAM_EPSET_DMA (0x01fe) /* All endpoints that support DMA transfers */
#endif
/* DMA FIFO */ /* DMA FIFO */
#define DMA_MAX_FIFO_SIZE (65536/1) /* Max size of the FMA FIFO */ #define DMA_MAX_FIFO_SIZE (65536/1) /* Max size of the FMA FIFO */
@ -517,7 +527,7 @@ static int sam_usbhs_interrupt(int irq, void *context);
static void sam_ep_reset(struct sam_usbdev_s *priv, uint8_t epno); static void sam_ep_reset(struct sam_usbdev_s *priv, uint8_t epno);
static void sam_epset_reset(struct sam_usbdev_s *priv, uint16_t epset); static void sam_epset_reset(struct sam_usbdev_s *priv, uint16_t epset);
static inline struct sam_ep_s * static inline struct sam_ep_s *
sam_ep_reserve(struct sam_usbdev_s *priv, uint8_t epset); sam_ep_reserve(struct sam_usbdev_s *priv, uint16_t epset);
static inline void static inline void
sam_ep_unreserve(struct sam_usbdev_s *priv, sam_ep_unreserve(struct sam_usbdev_s *priv,
struct sam_ep_s *privep); struct sam_ep_s *privep);
@ -3394,12 +3404,12 @@ static void sam_epset_reset(struct sam_usbdev_s *priv, uint16_t epset)
* Name: sam_ep_reserve * Name: sam_ep_reserve
* *
* Description: * Description:
* Find and un-reserved endpoint number and reserve it for the caller. * Find an un-reserved endpoint number and reserve it for the caller.
* *
****************************************************************************/ ****************************************************************************/
static inline struct sam_ep_s * static inline struct sam_ep_s *
sam_ep_reserve(struct sam_usbdev_s *priv, uint8_t epset) sam_ep_reserve(struct sam_usbdev_s *priv, uint16_t epset)
{ {
struct sam_ep_s *privep = NULL; struct sam_ep_s *privep = NULL;
irqstate_t flags; irqstate_t flags;
@ -3415,7 +3425,7 @@ sam_ep_reserve(struct sam_usbdev_s *priv, uint8_t epset)
for (epndx = 1; epndx < SAM_USBHS_NENDPOINTS; epndx++) for (epndx = 1; epndx < SAM_USBHS_NENDPOINTS; epndx++)
{ {
uint8_t bit = SAM_EP_BIT(epndx); uint16_t bit = SAM_EP_BIT(epndx);
if ((epset & bit) != 0) if ((epset & bit) != 0)
{ {
/* Mark the endpoint no longer available */ /* Mark the endpoint no longer available */