Devices: Add support for legacy fixed IO locations in BARs.

4 files changed, 37 insertions, 2 deletions

diff --git a/src/dev/alpha/tsunami.cc b/src/dev/alpha/tsunami.cc
index 7923fc3f1..b6478fe22 100644
--- a/src/dev/alpha/tsunami.cc
+++ b/src/dev/alpha/tsunami.cc
@@ -96,11 +96,23 @@ Tsunami::pciToDma(Addr pciAddr) const
 
 
 Addr
-Tsunami::calcConfigAddr(int bus, int dev, int func)
+Tsunami::calcPciConfigAddr(int bus, int dev, int func)
 {
    return pchip->calcConfigAddr(bus, dev, func);
 }
 
+Addr
+Tsunami::calcPciIOAddr(Addr addr)
+{
+   return pchip->calcIOAddr(addr);
+}
+
+Addr
+Tsunami::calcPciMemAddr(Addr addr)
+{
+   return pchip->calcMemAddr(addr);
+}
+
 void
 Tsunami::serialize(std::ostream &os)
 {
diff --git a/src/dev/alpha/tsunami.hh b/src/dev/alpha/tsunami.hh
index 44c5d41a4..64aafe533 100644
--- a/src/dev/alpha/tsunami.hh
+++ b/src/dev/alpha/tsunami.hh
@@ -116,7 +116,17 @@ class Tsunami : public Platform
     /**
      * Calculate the configuration address given a bus/dev/func.
      */
-    virtual Addr calcConfigAddr(int bus, int dev, int func);
+    virtual Addr calcPciConfigAddr(int bus, int dev, int func);
+
+    /**
+     * Calculate the address for an IO location on the PCI bus.
+     */
+    virtual Addr calcPciIOAddr(Addr addr);
+
+    /**
+     * Calculate the address for a memory location on the PCI bus.
+     */
+    virtual Addr calcPciMemAddr(Addr addr);
 
     /**
      * Serialize this object to the given output stream.
diff --git a/src/dev/alpha/tsunami_pchip.cc b/src/dev/alpha/tsunami_pchip.cc
index 83bcf8e65..4df7d1150 100644
--- a/src/dev/alpha/tsunami_pchip.cc
+++ b/src/dev/alpha/tsunami_pchip.cc
@@ -300,6 +300,7 @@ TsunamiPChip::translatePciToDma(Addr busAddr)
     // if no match was found, then return the original address
     return busAddr;
 }
+
 Addr
 TsunamiPChip::calcConfigAddr(int bus, int dev, int func)
 {
@@ -310,7 +311,17 @@ TsunamiPChip::calcConfigAddr(int bus, int dev, int func)
     return TsunamiPciBus0Config | (func << 8) | (dev << 11);
 }
 
+Addr
+TsunamiPChip::calcIOAddr(Addr addr)
+{
+    return TSUNAMI_PCI0_IO + addr;
+}
 
+Addr
+TsunamiPChip::calcMemAddr(Addr addr)
+{
+    return TSUNAMI_PCI0_MEMORY + addr;
+}
 
 void
 TsunamiPChip::serialize(std::ostream &os)
diff --git a/src/dev/alpha/tsunami_pchip.hh b/src/dev/alpha/tsunami_pchip.hh
index 53050565f..d31a28dbe 100644
--- a/src/dev/alpha/tsunami_pchip.hh
+++ b/src/dev/alpha/tsunami_pchip.hh
@@ -84,6 +84,8 @@ class TsunamiPChip : public BasicPioDevice
     Addr translatePciToDma(Addr busAddr);
 
     Addr calcConfigAddr(int bus, int dev, int func);
+    Addr calcIOAddr(Addr addr);
+    Addr calcMemAddr(Addr addr);
 
     virtual Tick read(PacketPtr pkt);
     virtual Tick write(PacketPtr pkt);