dev, mips: Remove the unused MaltaPChip class

The MaltaPChip class is currently unused and identical (except for the
class name) to the TsunamiPChip. If someone decides to implement PCI
for Malta, they should make sure to share code with the Tsunami
implementation if they are similar.

6 files changed, 1 insertions, 447 deletions

diff --git a/src/dev/mips/Malta.py b/src/dev/mips/Malta.py
index 290dabf01..920b5fe94 100755
--- a/src/dev/mips/Malta.py
+++ b/src/dev/mips/Malta.py
@@ -31,7 +31,6 @@ from m5.proxy import *
 
 from BadDevice import BadDevice
 from Device import BasicPioDevice
-from Pci import PciConfigAll
 from Platform import Platform
 from Uart import Uart8250
 
@@ -50,11 +49,6 @@ class MaltaIO(BasicPioDevice):
     malta = Param.Malta(Parent.any, "Malta")
     frequency = Param.Frequency('1024Hz', "frequency of interrupts")
 
-class MaltaPChip(BasicPioDevice):
-    type = 'MaltaPChip'
-    cxx_header = "dev/mips/malta_pchip.hh"
-    malta = Param.Malta(Parent.any, "Malta")
-
 class Malta(Platform):
     type = 'Malta'
     cxx_header = "dev/mips/malta.hh"
diff --git a/src/dev/mips/SConscript b/src/dev/mips/SConscript
index 801b1916d..84d34aa97 100755
--- a/src/dev/mips/SConscript
+++ b/src/dev/mips/SConscript
@@ -39,4 +39,4 @@ if env['TARGET_ISA'] == 'mips':
     Source('malta.cc')
     Source('malta_cchip.cc')
     Source('malta_io.cc')
-    Source('malta_pchip.cc')
+
diff --git a/src/dev/mips/malta.cc b/src/dev/mips/malta.cc
index 0c37e2713..21dfd40bd 100755
--- a/src/dev/mips/malta.cc
+++ b/src/dev/mips/malta.cc
@@ -43,7 +43,6 @@
 #include "dev/mips/malta.hh"
 #include "dev/mips/malta_cchip.hh"
 #include "dev/mips/malta_io.hh"
-#include "dev/mips/malta_pchip.hh"
 #include "dev/terminal.hh"
 #include "params/Malta.hh"
 #include "sim/system.hh"
diff --git a/src/dev/mips/malta.hh b/src/dev/mips/malta.hh
index cbfa55703..205abce27 100755
--- a/src/dev/mips/malta.hh
+++ b/src/dev/mips/malta.hh
@@ -43,7 +43,6 @@
 
 class IdeController;
 class MaltaCChip;
-class MaltaPChip;
 class MaltaIO;
 class System;
 
@@ -72,12 +71,6 @@ class Malta : public Platform
      */
     MaltaCChip *cchip;
 
-    /** Pointer to the Malta PChip.
-     * The pchip is the interface to the PCI bus, in our case
-     * it does not have to do much.
-     */
-    MaltaPChip *pchip;
-
     int intr_sum_type[Malta::Max_CPUs];
     int ipi_pending[Malta::Max_CPUs];
 
diff --git a/src/dev/mips/malta_pchip.cc b/src/dev/mips/malta_pchip.cc
deleted file mode 100755
index d0ae3daaa..000000000
--- a/src/dev/mips/malta_pchip.cc
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Ali Saidi
- *          Andrew Schultz
- */
-
-/** @file
- * Malta PChip (pci)
- */
-
-#include <deque>
-#include <string>
-#include <vector>
-
-#include "base/trace.hh"
-#include "config/the_isa.hh"
-#include "debug/Malta.hh"
-#include "dev/mips/malta.hh"
-#include "dev/mips/malta_pchip.hh"
-#include "dev/mips/maltareg.h"
-#include "mem/packet.hh"
-#include "mem/packet_access.hh"
-#include "sim/system.hh"
-
-using namespace std;
-using namespace TheISA;
-
-MaltaPChip::MaltaPChip(const Params *p)
-    : BasicPioDevice(p, 0x1000)
-{
-    for (int i = 0; i < 4; i++) {
-        wsba[i] = 0;
-        wsm[i] = 0;
-        tba[i] = 0;
-    }
-
-    // initialize pchip control register
-    pctl = (ULL(0x1) << 20) | (ULL(0x1) << 32) | (ULL(0x2) << 36);
-
-    //Set back pointer in malta
-    p->malta->pchip = this;
-}
-
-Tick
-MaltaPChip::read(PacketPtr pkt)
-{
-    assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
-
-    Addr daddr = (pkt->getAddr() - pioAddr) >> 6;;
-    assert(pkt->getSize() == sizeof(uint64_t));
-
-
-    DPRINTF(Malta, "read  va=%#x size=%d\n", pkt->getAddr(), pkt->getSize());
-
-    switch(daddr) {
-      case TSDEV_PC_WSBA0:
-            pkt->set(wsba[0]);
-            break;
-      case TSDEV_PC_WSBA1:
-            pkt->set(wsba[1]);
-            break;
-      case TSDEV_PC_WSBA2:
-            pkt->set(wsba[2]);
-            break;
-      case TSDEV_PC_WSBA3:
-            pkt->set(wsba[3]);
-            break;
-      case TSDEV_PC_WSM0:
-            pkt->set(wsm[0]);
-            break;
-      case TSDEV_PC_WSM1:
-            pkt->set(wsm[1]);
-            break;
-      case TSDEV_PC_WSM2:
-            pkt->set(wsm[2]);
-            break;
-      case TSDEV_PC_WSM3:
-            pkt->set(wsm[3]);
-            break;
-      case TSDEV_PC_TBA0:
-            pkt->set(tba[0]);
-            break;
-      case TSDEV_PC_TBA1:
-            pkt->set(tba[1]);
-            break;
-      case TSDEV_PC_TBA2:
-            pkt->set(tba[2]);
-            break;
-      case TSDEV_PC_TBA3:
-            pkt->set(tba[3]);
-            break;
-      case TSDEV_PC_PCTL:
-            pkt->set(pctl);
-            break;
-      case TSDEV_PC_PLAT:
-            panic("PC_PLAT not implemented\n");
-      case TSDEV_PC_RES:
-            panic("PC_RES not implemented\n");
-      case TSDEV_PC_PERROR:
-            pkt->set((uint64_t)0x00);
-            break;
-      case TSDEV_PC_PERRMASK:
-            pkt->set((uint64_t)0x00);
-            break;
-      case TSDEV_PC_PERRSET:
-            panic("PC_PERRSET not implemented\n");
-      case TSDEV_PC_TLBIV:
-            panic("PC_TLBIV not implemented\n");
-      case TSDEV_PC_TLBIA:
-            pkt->set((uint64_t)0x00); // shouldn't be readable, but linux
-            break;
-      case TSDEV_PC_PMONCTL:
-            panic("PC_PMONCTL not implemented\n");
-      case TSDEV_PC_PMONCNT:
-            panic("PC_PMONCTN not implemented\n");
-      default:
-          panic("Default in PChip Read reached reading 0x%x\n", daddr);
-    }
-    pkt->makeAtomicResponse();
-    return pioDelay;
-
-}
-
-Tick
-MaltaPChip::write(PacketPtr pkt)
-{
-    assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize);
-    Addr daddr = (pkt->getAddr() - pioAddr) >> 6;
-
-    assert(pkt->getSize() == sizeof(uint64_t));
-
-    DPRINTF(Malta, "write - va=%#x size=%d \n", pkt->getAddr(), pkt->getSize());
-
-    switch(daddr) {
-        case TSDEV_PC_WSBA0:
-              wsba[0] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_WSBA1:
-              wsba[1] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_WSBA2:
-              wsba[2] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_WSBA3:
-              wsba[3] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_WSM0:
-              wsm[0] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_WSM1:
-              wsm[1] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_WSM2:
-              wsm[2] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_WSM3:
-              wsm[3] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_TBA0:
-              tba[0] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_TBA1:
-              tba[1] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_TBA2:
-              tba[2] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_TBA3:
-              tba[3] = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_PCTL:
-              pctl = pkt->get<uint64_t>();
-              break;
-        case TSDEV_PC_PLAT:
-              panic("PC_PLAT not implemented\n");
-        case TSDEV_PC_RES:
-              panic("PC_RES not implemented\n");
-        case TSDEV_PC_PERROR:
-              break;
-        case TSDEV_PC_PERRMASK:
-              panic("PC_PERRMASK not implemented\n");
-        case TSDEV_PC_PERRSET:
-              panic("PC_PERRSET not implemented\n");
-        case TSDEV_PC_TLBIV:
-              panic("PC_TLBIV not implemented\n");
-        case TSDEV_PC_TLBIA:
-              break; // value ignored, supposted to invalidate SG TLB
-        case TSDEV_PC_PMONCTL:
-              panic("PC_PMONCTL not implemented\n");
-        case TSDEV_PC_PMONCNT:
-              panic("PC_PMONCTN not implemented\n");
-        default:
-            panic("Default in PChip write reached reading 0x%x\n", daddr);
-
-    } // uint64_t
-
-    pkt->makeAtomicResponse();
-    return pioDelay;
-}
-
-#define DMA_ADDR_MASK ULL(0x3ffffffff)
-
-Addr
-MaltaPChip::translatePciToDma(Addr busAddr)
-{
-    // compare the address to the window base registers
-    uint64_t tbaMask = 0;
-    uint64_t baMask = 0;
-
-    uint64_t windowMask = 0;
-    uint64_t windowBase = 0;
-
-    uint64_t pteEntry = 0;
-
-    Addr pteAddr;
-    Addr dmaAddr;
-
-#if 0
-    DPRINTF(IdeDisk, "Translation for bus address: %#x\n", busAddr);
-    for (int i = 0; i < 4; i++) {
-        DPRINTF(IdeDisk, "(%d) base:%#x mask:%#x\n",
-                i, wsba[i], wsm[i]);
-
-        windowBase = wsba[i];
-        windowMask = ~wsm[i] & (ULL(0xfff) << 20);
-
-        if ((busAddr & windowMask) == (windowBase & windowMask)) {
-            DPRINTF(IdeDisk, "Would have matched %d (wb:%#x wm:%#x --> ba&wm:%#x wb&wm:%#x)\n",
-                    i, windowBase, windowMask, (busAddr & windowMask),
-                    (windowBase & windowMask));
-        }
-    }
-#endif
-
-    for (int i = 0; i < 4; i++) {
-
-        windowBase = wsba[i];
-        windowMask = ~wsm[i] & (ULL(0xfff) << 20);
-
-        if ((busAddr & windowMask) == (windowBase & windowMask)) {
-
-            if (wsba[i] & 0x1) {   // see if enabled
-                if (wsba[i] & 0x2) { // see if SG bit is set
-                    /** @todo
-                        This currently is faked by just doing a direct
-                        read from memory, however, to be realistic, this
-                        needs to actually do a bus transaction.  The process
-                        is explained in the malta documentation on page
-                        10-12 and basically munges the address to look up a
-                        PTE from a table in memory and then uses that mapping
-                        to create an address for the SG page
-                    */
-
-                    tbaMask = ~(((wsm[i] & (ULL(0xfff) << 20)) >> 10) | ULL(0x3ff));
-                    baMask = (wsm[i] & (ULL(0xfff) << 20)) | (ULL(0x7f) << 13);
-                    pteAddr = (tba[i] & tbaMask) | ((busAddr & baMask) >> 10);
-
-                    sys->physProxy.readBlob(pteAddr, (uint8_t*)&pteEntry,
-                                            sizeof(uint64_t));
-
-                    dmaAddr = ((pteEntry & ~ULL(0x1)) << 12) | (busAddr & ULL(0x1fff));
-
-                } else {
-                    baMask = (wsm[i] & (ULL(0xfff) << 20)) | ULL(0xfffff);
-                    tbaMask = ~baMask;
-                    dmaAddr = (tba[i] & tbaMask) | (busAddr & baMask);
-                }
-
-                return (dmaAddr & DMA_ADDR_MASK);
-            }
-        }
-    }
-
-    // if no match was found, then return the original address
-    return busAddr;
-}
-Addr
-MaltaPChip::calcConfigAddr(int bus, int dev, int func)
-{
-    assert(func < 8);
-    assert(dev < 32);
-    assert(bus == 0);
-
-    return MaltaPciBus0Config | (func << 8) | (dev << 11);
-}
-
-
-
-void
-MaltaPChip::serialize(CheckpointOut &cp) const
-{
-    SERIALIZE_SCALAR(pctl);
-    SERIALIZE_ARRAY(wsba, 4);
-    SERIALIZE_ARRAY(wsm, 4);
-    SERIALIZE_ARRAY(tba, 4);
-}
-
-void
-MaltaPChip::unserialize(CheckpointIn &cp)
-{
-    UNSERIALIZE_SCALAR(pctl);
-    UNSERIALIZE_ARRAY(wsba, 4);
-    UNSERIALIZE_ARRAY(wsm, 4);
-    UNSERIALIZE_ARRAY(tba, 4);
-}
-
-
-MaltaPChip *
-MaltaPChipParams::create()
-{
-    return new MaltaPChip(this);
-}
diff --git a/src/dev/mips/malta_pchip.hh b/src/dev/mips/malta_pchip.hh
deleted file mode 100755
index b1303c9c7..000000000
--- a/src/dev/mips/malta_pchip.hh
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Ali Saidi
- */
-
-/** @file
- * Malta PCI interface CSRs
- */
-
-#ifndef __MALTA_PCHIP_HH__
-#define __MALTA_PCHIP_HH__
-
-#include "dev/mips/malta.hh"
-#include "dev/io_device.hh"
-#include "params/MaltaPChip.hh"
-
-/**
- * A very simple implementation of the Malta PCI interface chips.
- */
-class MaltaPChip : public BasicPioDevice
-{
-  protected:
-
-    static const Addr MaltaPciBus0Config = ULL(0x801fe000000);
-
-    /** Pchip control register */
-    uint64_t pctl;
-
-    /** Window Base addresses */
-    uint64_t wsba[4];
-
-    /** Window masks */
-    uint64_t wsm[4];
-
-    /** Translated Base Addresses */
-    uint64_t tba[4];
-
-  public:
-    typedef MaltaPChipParams Params;
-
-    const Params *
-    params() const
-    {
-        return dynamic_cast<const Params *>(_params);
-    }
-  public:
-    /**
-     * Register the PChip with the mmu and init all wsba, wsm, and tba to 0
-     * @param p pointer to the parameters struct
-     */
-    MaltaPChip(const Params *p);
-
-    /**
-     * Translate a PCI bus address to a memory address for DMA.
-     * @todo Andrew says this needs to be fixed. What's wrong with it?
-     * @param busAddr PCI address to translate.
-     * @return memory system address
-     */
-    Addr translatePciToDma(Addr busAddr);
-
-    Addr calcConfigAddr(int bus, int dev, int func);
-
-    virtual Tick read(PacketPtr pkt);
-    virtual Tick write(PacketPtr pkt);
-
-    void serialize(CheckpointOut &cp) const override;
-    void unserialize(CheckpointIn &cp) override;
-};
-
-#endif // __TSUNAMI_PCHIP_HH__