X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=dev%2Fpciconfigall.cc;h=740a9b4acd7685070107806ed27c877d82f461d4;hb=f1f85c5470c67adc5071296c53e69abb0b47b09c;hp=1b19ec368f0b86b3a05d08a85c4cdc7cb680cf38;hpb=22f78a6d03fbc390eca538b906aedea9121ab9bb;p=gem5.git

diff --git a/dev/pciconfigall.cc b/dev/pciconfigall.cc
index 1b19ec368..740a9b4ac 100644
--- a/dev/pciconfigall.cc
+++ b/dev/pciconfigall.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,24 +35,29 @@
 #include <vector>
 
 #include "base/trace.hh"
-#include "cpu/exec_context.hh"
-#include "dev/scsi_ctrl.hh"
 #include "dev/pciconfigall.hh"
 #include "dev/pcidev.hh"
-#include "dev/tsunamireg.h"
-#include "dev/tsunami.hh"
+#include "mem/bus/bus.hh"
+#include "mem/bus/pio_interface.hh"
+#include "mem/bus/pio_interface_impl.hh"
 #include "mem/functional_mem/memory_control.hh"
 #include "sim/builder.hh"
 #include "sim/system.hh"
 
 using namespace std;
 
-PCIConfigAll::PCIConfigAll(const string &name, Tsunami *t,
-                           Addr addr, Addr mask, MemoryController *mmu)
-    : MmapDevice(name, addr, mask, mmu), tsunami(t)
+PciConfigAll::PciConfigAll(const string &name, Addr a, MemoryController *mmu,
+                           HierParams *hier, Bus *bus, Tick pio_latency)
+    : PioDevice(name), addr(a)
 {
-    // Put back pointer in tsunami
-    tsunami->pciconfig = this;
+    mmu->add_child(this, Range<Addr>(addr, addr + size));
+
+    if (bus) {
+        pioInterface = newPioInterface(name, hier, bus, this,
+                                      &PciConfigAll::cacheAccess);
+        pioInterface->addAddrRange(addr, addr + size - 1);
+        pioLatency = pio_latency * bus->clockRatio;
+    }
 
     // Make all the pointers to devices null
     for(int x=0; x < MAX_PCI_DEV; x++)
@@ -61,12 +66,12 @@ PCIConfigAll::PCIConfigAll(const string &name, Tsunami *t,
 }
 
 Fault
-PCIConfigAll::read(MemReqPtr &req, uint8_t *data)
+PciConfigAll::read(MemReqPtr &req, uint8_t *data)
 {
-    DPRINTF(PCIConfigAll, "read  va=%#x size=%d\n",
+    DPRINTF(PciConfigAll, "read  va=%#x size=%d\n",
             req->vaddr, req->size);
 
-    Addr daddr = (req->paddr & addr_mask);
+    Addr daddr = (req->paddr - (addr & PA_IMPL_MASK));
 
     int device = (daddr >> 11) & 0x1F;
     int func = (daddr >> 8) & 0x7;
@@ -101,16 +106,16 @@ PCIConfigAll::read(MemReqPtr &req, uint8_t *data)
         }
     }
 
-    DPRINTFN("Tsunami PCI Configspace  ERROR: read  daddr=%#x size=%d\n",
+    DPRINTFN("PCI Configspace  ERROR: read  daddr=%#x size=%d\n",
              daddr, req->size);
 
     return No_Fault;
 }
 
 Fault
-PCIConfigAll::write(MemReqPtr &req, const uint8_t *data)
+PciConfigAll::write(MemReqPtr &req, const uint8_t *data)
 {
-    Addr daddr = (req->paddr & addr_mask);
+    Addr daddr = (req->paddr - (addr & PA_IMPL_MASK));
 
     int device = (daddr >> 11) & 0x1F;
     int func = (daddr >> 8) & 0x7;
@@ -140,7 +145,7 @@ PCIConfigAll::write(MemReqPtr &req, const uint8_t *data)
             }
     }
 
-    DPRINTF(PCIConfigAll, "write - va=%#x size=%d data=%#x\n",
+    DPRINTF(PciConfigAll, "write - va=%#x size=%d data=%#x\n",
             req->vaddr, req->size, word_value);
 
     devices[device][func]->WriteConfig(reg, req->size, word_value);
@@ -149,42 +154,61 @@ PCIConfigAll::write(MemReqPtr &req, const uint8_t *data)
 }
 
 void
-PCIConfigAll::serialize(std::ostream &os)
+PciConfigAll::serialize(std::ostream &os)
 {
-    // code should be written
+    /*
+     * There is no state associated with this object that requires
+     * serialization.  The only real state are the device pointers
+     * which are all setup by the constructor of the PciDev class
+     */
 }
 
 void
-PCIConfigAll::unserialize(Checkpoint *cp, const std::string &section)
+PciConfigAll::unserialize(Checkpoint *cp, const std::string &section)
+{
+    /*
+     * There is no state associated with this object that requires
+     * serialization.  The only real state are the device pointers
+     * which are all setup by the constructor of the PciDev class
+     */
+}
+
+Tick
+PciConfigAll::cacheAccess(MemReqPtr &req)
 {
-    //code should be written
+    return curTick + pioLatency;
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-BEGIN_DECLARE_SIM_OBJECT_PARAMS(PCIConfigAll)
+BEGIN_DECLARE_SIM_OBJECT_PARAMS(PciConfigAll)
 
-    SimObjectParam<Tsunami *> tsunami;
     SimObjectParam<MemoryController *> mmu;
     Param<Addr> addr;
     Param<Addr> mask;
+    SimObjectParam<Bus*> io_bus;
+    Param<Tick> pio_latency;
+    SimObjectParam<HierParams *> hier;
 
-END_DECLARE_SIM_OBJECT_PARAMS(PCIConfigAll)
+END_DECLARE_SIM_OBJECT_PARAMS(PciConfigAll)
 
-BEGIN_INIT_SIM_OBJECT_PARAMS(PCIConfigAll)
+BEGIN_INIT_SIM_OBJECT_PARAMS(PciConfigAll)
 
-    INIT_PARAM(tsunami, "Tsunami"),
     INIT_PARAM(mmu, "Memory Controller"),
     INIT_PARAM(addr, "Device Address"),
-    INIT_PARAM(mask, "Address Mask")
+    INIT_PARAM(mask, "Address Mask"),
+    INIT_PARAM_DFLT(io_bus, "The IO Bus to attach to", NULL),
+    INIT_PARAM_DFLT(pio_latency, "Programmed IO latency in bus cycles", 1),
+    INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams)
 
-END_INIT_SIM_OBJECT_PARAMS(PCIConfigAll)
+END_INIT_SIM_OBJECT_PARAMS(PciConfigAll)
 
-CREATE_SIM_OBJECT(PCIConfigAll)
+CREATE_SIM_OBJECT(PciConfigAll)
 {
-    return new PCIConfigAll(getInstanceName(), tsunami, addr, mask, mmu);
+    return new PciConfigAll(getInstanceName(), addr, mmu, hier, io_bus,
+                            pio_latency);
 }
 
-REGISTER_SIM_OBJECT("PCIConfigAll", PCIConfigAll)
+REGISTER_SIM_OBJECT("PciConfigAll", PciConfigAll)
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS