summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-09-22 07:53:51 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-09-22 07:53:51 -0600
commit0595ed4c314c04db3faf4519e191d431dd03a459 (patch)
tree66c113905af02d2eae4056827bf369f3bdfcde8a
parented5182498e0f7e99c65763c8993ae0a6588fde99 (diff)
downloadnuttx-0595ed4c314c04db3faf4519e191d431dd03a459.tar.gz
nuttx-0595ed4c314c04db3faf4519e191d431dd03a459.tar.bz2
nuttx-0595ed4c314c04db3faf4519e191d431dd03a459.zip
SAMA5 OHCI: Back out a change, the real root cause was a bug in the cache logic so the hack is no longer necessary
-rw-r--r--nuttx/ChangeLog2
-rw-r--r--nuttx/arch/arm/src/sama5/sam_ohci.c8
2 files changed, 1 insertions, 9 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index a674d064f..d6e022deb 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5607,7 +5607,7 @@
descriptive task names when starting the EHCI and OHCI monitor tasks
(2013-9-20).
* arch/arm/src/sama5/sam_ohci.c: Fix a place where DMA-related data
- needed to be flushed to data cache; Fix another where a virual address
+ needed to be flushed to data cache; Fix another where a virtual address
was being used in a register where a physical address was required
(2013-9-20).
* arch/arm/src/armv7-a/cp15_clean_dcache.S and cp15_flush_dcache.S:
diff --git a/nuttx/arch/arm/src/sama5/sam_ohci.c b/nuttx/arch/arm/src/sama5/sam_ohci.c
index ca69a5934..b72774da0 100644
--- a/nuttx/arch/arm/src/sama5/sam_ohci.c
+++ b/nuttx/arch/arm/src/sama5/sam_ohci.c
@@ -1337,14 +1337,6 @@ static int sam_enqueuetd(struct sam_rhport_s *rhport, struct sam_ed_s *ed,
{
cp15_clean_dcache((uintptr_t)buffer,
(uintptr_t)buffer + buflen);
-
- /* REVISIT: This cache invalidation solves some transfer
- * problems... but I don't understand why? Without this,
- * the above clean seems to fail to flush all of the buffer.
- */
-
- cp15_invalidate_dcache((uintptr_t)buffer,
- (uintptr_t)buffer + buflen);
}
cp15_clean_dcache((uintptr_t)tdtail,