r1461 - in dev: mmc/sdhci usb2/hcd/ehci usb2/hcd/ohci usb2/hcd/uhci

Author: wmb
Date: 2009-11-06 07:36:09 +0000 (Fri, 06 Nov 2009)
New Revision: 1461

Modified:
   dev/mmc/sdhci/sdhci.fth
   dev/usb2/hcd/ehci/ehci.fth
   dev/usb2/hcd/ehci/pci.fth
   dev/usb2/hcd/ohci/ohci.fth
   dev/usb2/hcd/ohci/pci.fth
   dev/usb2/hcd/uhci/uhci.fth
Log:
SDHCI and USB host controller drivers - enable memory write and
invalidate in PCI enable register to optimize cache performance.

Modified: dev/mmc/sdhci/sdhci.fth
===================================================================
--- dev/mmc/sdhci/sdhci.fth	2009-11-06 07:34:27 UTC (rev 1460)
+++ dev/mmc/sdhci/sdhci.fth	2009-11-06 07:36:09 UTC (rev 1461)
@@ -57,7 +57,7 @@
    chip  if  exit  then
    0 0 h# 0200.0010 slot 1- 4 * + my-space +  /regs " map-in" $call-parent
    to chip
-   6 4 my-w!
+   h# 16 4 my-w!  \ Memory write and invalidate, bus mastering, memory
 ;
 : unmap-regs  ( -- )
    chip  0=  if  exit  then

Modified: dev/usb2/hcd/ehci/ehci.fth
===================================================================
--- dev/usb2/hcd/ehci/ehci.fth	2009-11-06 07:34:27 UTC (rev 1460)
+++ dev/usb2/hcd/ehci/ehci.fth	2009-11-06 07:36:09 UTC (rev 1461)
@@ -23,7 +23,7 @@
 " reg" property

: map-regs  ( -- )
-   4 my-w@  6 or  4 my-w!
+   4 my-w@  h# 16 or  4 my-w!  \ memory write and invalidate, bus master, mem
    0 0 my-space h# 0200.0010 + /regs  map-in to ehci-reg
 ;
 : unmap-regs  ( -- )

Modified: dev/usb2/hcd/ehci/pci.fth
===================================================================
--- dev/usb2/hcd/ehci/pci.fth	2009-11-06 07:34:27 UTC (rev 1460)
+++ dev/usb2/hcd/ehci/pci.fth	2009-11-06 07:36:09 UTC (rev 1461)
@@ -8,7 +8,7 @@

: my-map-in  ( len -- adr )
    >r  0 0 my-space h# 0200.0010 +  r>  " map-in" $call-parent
-   4 my-w@  6 or  4 my-w!
+   4 my-w@  h# 16 or  4 my-w!  \ Set MWI, bus mastering, and mem enable
 ;
 : my-map-out  ( adr len -- )
    4 my-w@  7 invert and  4 my-w!

Modified: dev/usb2/hcd/ohci/ohci.fth
===================================================================
--- dev/usb2/hcd/ohci/ohci.fth	2009-11-06 07:34:27 UTC (rev 1460)
+++ dev/usb2/hcd/ohci/ohci.fth	2009-11-06 07:36:09 UTC (rev 1461)
@@ -22,7 +22,7 @@
 0 value ohci-reg

: map-regs  ( -- )
-   4 my-w@  6 or  4 my-w!
+   4 my-w@  h# 16 or  4 my-w!
    0 0 my-space h# 0200.0010 + 1000  map-in to ohci-reg
 ;

Modified: dev/usb2/hcd/ohci/pci.fth
===================================================================
--- dev/usb2/hcd/ohci/pci.fth	2009-11-06 07:34:27 UTC (rev 1460)
+++ dev/usb2/hcd/ohci/pci.fth	2009-11-06 07:36:09 UTC (rev 1461)
@@ -8,7 +8,7 @@

: my-map-in  ( len -- adr )
    >r  0 0 my-space h# 0200.0010 +  r>  " map-in" $call-parent
-   4 my-w@  6 or  4 my-w!
+   4 my-w@  h# 16 or  4 my-w!
 ;
 : my-map-out  ( adr len -- )
    4 my-w@  7 invert and  4 my-w!

Modified: dev/usb2/hcd/uhci/uhci.fth
===================================================================
--- dev/usb2/hcd/uhci/uhci.fth	2009-11-06 07:34:27 UTC (rev 1460)
+++ dev/usb2/hcd/uhci/uhci.fth	2009-11-06 07:36:09 UTC (rev 1461)
@@ -21,7 +21,7 @@
 " reg" property

: map-regs  ( -- )
-   4 my-w@  7 or  4 my-w!
+   4 my-w@  h# 17 or  4 my-w!
    0 0 my-space h# 0100.0020 + /regs  map-in to uhci-reg
 ;