2004-03-23 23:10:07 +01:00
|
|
|
/*
|
2005-06-05 11:16:00 +02:00
|
|
|
* Copyright (c) 2004-2005 The Regents of The University of Michigan
|
2004-03-23 23:10:07 +01:00
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <cstddef>
|
|
|
|
#include <cstdlib>
|
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
#include "base/trace.hh"
|
|
|
|
#include "cpu/intr_control.hh"
|
|
|
|
#include "dev/ide_ctrl.hh"
|
2004-11-13 20:01:38 +01:00
|
|
|
#include "dev/ide_disk.hh"
|
|
|
|
#include "dev/pciconfigall.hh"
|
|
|
|
#include "dev/pcireg.h"
|
|
|
|
#include "dev/platform.hh"
|
2004-03-23 23:10:07 +01:00
|
|
|
#include "mem/bus/bus.hh"
|
2004-11-13 20:01:38 +01:00
|
|
|
#include "mem/bus/dma_interface.hh"
|
2004-03-23 23:10:07 +01:00
|
|
|
#include "mem/bus/pio_interface.hh"
|
|
|
|
#include "mem/bus/pio_interface_impl.hh"
|
2005-06-05 02:50:10 +02:00
|
|
|
#include "mem/functional/memory_control.hh"
|
|
|
|
#include "mem/functional/physical.hh"
|
2004-03-23 23:10:07 +01:00
|
|
|
#include "sim/builder.hh"
|
|
|
|
#include "sim/sim_object.hh"
|
|
|
|
|
|
|
|
using namespace std;
|
Changes to untemplate StaticInst and StaticInstPtr, change the isa to a namespace instead of a class, an improvement to the architecture specific header file selection system, and fixed up a few include paths.
arch/alpha/alpha_linux_process.cc:
Added using directive for AlphaISA namespace
arch/alpha/alpha_memory.hh:
arch/alpha/isa/branch.isa:
cpu/pc_event.hh:
Added typedefs for Addr
arch/alpha/alpha_tru64_process.cc:
arch/alpha/arguments.cc:
Added using directive for AlphaISA
arch/alpha/ev5.hh:
Added an include of arch/alpha/isa_traits.hh, and a using directive for the AlphaISA namespace.
arch/alpha/faults.hh:
Added a typedef for the Addr type, and changed the formatting of the faults slightly.
arch/alpha/isa/main.isa:
Untemplatized StaticInst, added a using for namespace AlphaISA to show up in decoder.cc and the exec.ccs, relocated makeNop to decoder.hh
arch/alpha/isa/mem.isa:
Untemplatized StaticInst and StaticInstPtr
arch/alpha/isa/pal.isa:
cpu/base_dyn_inst.cc:
Untemplatized StaticInstPtr
arch/alpha/isa_traits.hh:
Changed variables to be externs instead of static since they are part of a namespace and not a class.
arch/alpha/stacktrace.cc:
Untemplatized StaticInstPtr, and added a using directive for AlphaISA.
arch/alpha/stacktrace.hh:
Added some typedefs for Addr and MachInst, and untemplatized StaticInstPtr
arch/alpha/vtophys.cc:
Added a using directive for AlphaISA
arch/alpha/vtophys.hh:
Added the AlphaISA namespace specifier where needed
arch/isa_parser.py:
Changed the placement of the definition of the decodeInst function to be outside the namespaceInst namespace.
base/loader/object_file.hh:
cpu/o3/bpred_unit.hh:
Added a typedef for Addr
base/loader/symtab.hh:
Added a typedef for Addr, and added a TheISA to Addr in another typedef
base/remote_gdb.cc:
Added a using namespace TheISA, and untemplatized StaticInstPtr
base/remote_gdb.hh:
Added typedefs for Addr and MachInst
cpu/base.cc:
Added TheISA specifier to some variables exported from the isa.
cpu/base.hh:
Added a typedef for Addr, and TheISA to some variables from the ISA
cpu/base_dyn_inst.hh:
Untemplatized StaticInstPtr, and added TheISA specifier to some variables from the ISA.
cpu/exec_context.hh:
Added some typedefs for types from the isa, and added TheISA specifier to some variables from the isa
cpu/exetrace.hh:
Added typedefs for some types from the ISA, and untemplatized StaticInstPtr
cpu/memtest/memtest.cc:
cpu/o3/btb.cc:
dev/baddev.cc:
dev/ide_ctrl.cc:
dev/ide_disk.cc:
dev/isa_fake.cc:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/platform.cc:
dev/sinic.cc:
dev/uart8250.cc:
kern/freebsd/freebsd_system.cc:
kern/linux/linux_system.cc:
kern/system_events.cc:
kern/tru64/dump_mbuf.cc:
kern/tru64/tru64_events.cc:
sim/process.cc:
sim/pseudo_inst.cc:
sim/system.cc:
Added using namespace TheISA
cpu/memtest/memtest.hh:
cpu/trace/opt_cpu.hh:
cpu/trace/reader/itx_reader.hh:
dev/ide_disk.hh:
dev/pcidev.hh:
dev/platform.hh:
dev/tsunami.hh:
sim/system.hh:
sim/vptr.hh:
Added typedef for Addr
cpu/o3/2bit_local_pred.hh:
Changed the include to use arch/isa_traits.hh instead of arch/alpha/isa_traits.hh. Added typedef for Addr
cpu/o3/alpha_cpu.hh:
Added typedefs for Addr and IntReg
cpu/o3/alpha_cpu_impl.hh:
Added this-> to setNextPC to fix a problem since it didn't depend on template parameters any more. Removed "typename" where it was no longer needed.
cpu/o3/alpha_dyn_inst.hh:
Cleaned up some typedefs, and untemplatized StaticInst
cpu/o3/alpha_dyn_inst_impl.hh:
untemplatized StaticInstPtr
cpu/o3/alpha_impl.hh:
Fixed up a typedef of MachInst
cpu/o3/bpred_unit_impl.hh:
Added a using TheISA::MachInst to a function
cpu/o3/btb.hh:
Changed an include from arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef for Addr
cpu/o3/commit.hh:
Removed a typedef of Impl::ISA as ISA, since TheISA takes care of this now.
cpu/o3/cpu.cc:
Cleaned up namespace issues
cpu/o3/cpu.hh:
Cleaned up namespace usage
cpu/o3/decode.hh:
Removed typedef of ISA, and changed it to TheISA
cpu/o3/fetch.hh:
Fized up typedefs, and changed ISA to TheISA
cpu/o3/free_list.hh:
Changed include of arch/alpha/isa_traits.hh to arch/isa_traits.hh
cpu/o3/iew.hh:
Removed typedef of ISA
cpu/o3/iew_impl.hh:
Added TheISA namespace specifier to MachInst
cpu/o3/ras.hh:
Changed include from arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef for Addr.
cpu/o3/regfile.hh:
Changed ISA to TheISA, and added some typedefs for Addr, IntReg, FloatReg, and MiscRegFile
cpu/o3/rename.hh:
Changed ISA to TheISA, and added a typedef for RegIndex
cpu/o3/rename_map.hh:
Added an include for arch/isa_traits.hh, and a typedef for RegIndex
cpu/o3/rob.hh:
Added a typedef for RegIndex
cpu/o3/store_set.hh:
cpu/o3/tournament_pred.hh:
Changed an include of arch/alpha/isa_traits.hh to arch/isa_traits.hh, and added a typedef of Addr
cpu/ozone/cpu.hh:
Changed ISA into TheISA, and untemplatized StaticInst
cpu/pc_event.cc:
Added namespace specifier TheISA to Addr types
cpu/profile.hh:
kern/kernel_stats.hh:
Added typedef for Addr, and untemplatized StaticInstPtr
cpu/simple/cpu.cc:
Changed using directive from LittleEndianGuest to AlphaISA, which will contain both namespaces. Added TheISA where needed, and untemplatized StaticInst
cpu/simple/cpu.hh:
Added a typedef for MachInst, and untemplatized StaticInst
cpu/static_inst.cc:
Untemplatized StaticInst
cpu/static_inst.hh:
Untemplatized StaticInst by using the TheISA namespace
dev/alpha_console.cc:
Added using namespace AlphaISA
dev/simple_disk.hh:
Added typedef for Addr and fixed up some formatting
dev/sinicreg.hh:
Added TheISA namespace specifier where needed
dev/tsunami.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Added using namespace TheISA. It might be better for it to be AlphaISA
dev/tsunami_cchip.cc:
Added typedef for TheISA. It might be better for it to be AlphaISA
kern/linux/aligned.hh:
sim/pseudo_inst.hh:
Added TheISA namespace specifier to Addr
kern/linux/linux_threadinfo.hh:
Added typedef for Addr, and TheISA namespace specifier to StackPointerReg
kern/tru64/mbuf.hh:
Added TheISA to Addr type in structs
sim/process.hh:
Added typedefs of Addr, RegFile, and MachInst
sim/syscall_emul.cc:
Added using namespace TheISA, and a cast of VMPageSize to the int type
sim/syscall_emul.hh:
Added typecast for Addr, and TheISA namespace specifier for where needed
--HG--
extra : convert_revision : 91d4f6ca33a73b21c1f1771d74bfdea3b80eff45
2006-02-19 08:34:37 +01:00
|
|
|
using namespace TheISA;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
|
|
|
////
|
|
|
|
// Initialization and destruction
|
|
|
|
////
|
|
|
|
|
2004-11-13 21:45:22 +01:00
|
|
|
IdeController::IdeController(Params *p)
|
|
|
|
: PciDev(p)
|
2004-03-23 23:10:07 +01:00
|
|
|
{
|
|
|
|
// initialize the PIO interface addresses
|
|
|
|
pri_cmd_addr = 0;
|
|
|
|
pri_cmd_size = BARSize[0];
|
|
|
|
|
|
|
|
pri_ctrl_addr = 0;
|
|
|
|
pri_ctrl_size = BARSize[1];
|
|
|
|
|
|
|
|
sec_cmd_addr = 0;
|
|
|
|
sec_cmd_size = BARSize[2];
|
|
|
|
|
|
|
|
sec_ctrl_addr = 0;
|
|
|
|
sec_ctrl_size = BARSize[3];
|
|
|
|
|
|
|
|
// initialize the bus master interface (BMI) address to be configured
|
|
|
|
// via PCI
|
|
|
|
bmi_addr = 0;
|
|
|
|
bmi_size = BARSize[4];
|
|
|
|
|
|
|
|
// zero out all of the registers
|
2005-08-15 22:59:58 +02:00
|
|
|
memset(bmi_regs.data, 0, sizeof(bmi_regs));
|
|
|
|
memset(config_regs.data, 0, sizeof(config_regs.data));
|
2004-03-23 23:10:07 +01:00
|
|
|
|
|
|
|
// setup initial values
|
2005-08-15 22:59:58 +02:00
|
|
|
// enable both channels
|
|
|
|
config_regs.idetim0 = htole((uint16_t)IDETIM_DECODE_EN);
|
|
|
|
config_regs.idetim1 = htole((uint16_t)IDETIM_DECODE_EN);
|
|
|
|
bmi_regs.bmis0 = DMA1CAP | DMA0CAP;
|
|
|
|
bmi_regs.bmis1 = DMA1CAP | DMA0CAP;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
|
|
|
// reset all internal variables
|
|
|
|
io_enabled = false;
|
|
|
|
bm_enabled = false;
|
|
|
|
memset(cmd_in_progress, 0, sizeof(cmd_in_progress));
|
|
|
|
|
2005-11-20 22:57:53 +01:00
|
|
|
pioInterface = NULL;
|
|
|
|
dmaInterface = NULL;
|
2004-03-23 23:10:07 +01:00
|
|
|
// create the PIO and DMA interfaces
|
2005-11-20 22:57:53 +01:00
|
|
|
if (params()->pio_bus) {
|
2005-08-23 17:45:52 +02:00
|
|
|
pioInterface = newPioInterface(name() + ".pio", params()->hier,
|
2005-11-20 22:57:53 +01:00
|
|
|
params()->pio_bus, this,
|
2004-03-23 23:10:07 +01:00
|
|
|
&IdeController::cacheAccess);
|
2005-11-20 22:57:53 +01:00
|
|
|
pioLatency = params()->pio_latency * params()->pio_bus->clockRate;
|
|
|
|
}
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-11-20 22:57:53 +01:00
|
|
|
if (params()->dma_bus) {
|
2004-11-13 21:45:22 +01:00
|
|
|
dmaInterface = new DMAInterface<Bus>(name() + ".dma",
|
2005-11-20 22:57:53 +01:00
|
|
|
params()->dma_bus,
|
|
|
|
params()->dma_bus, 1, true);
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// setup the disks attached to controller
|
2005-08-23 17:45:52 +02:00
|
|
|
memset(disks, 0, sizeof(disks));
|
2005-06-30 04:16:40 +02:00
|
|
|
dev[0] = 0;
|
|
|
|
dev[1] = 0;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-11-13 21:45:22 +01:00
|
|
|
if (params()->disks.size() > 3)
|
2004-03-23 23:10:07 +01:00
|
|
|
panic("IDE controllers support a maximum of 4 devices attached!\n");
|
|
|
|
|
2004-11-13 21:45:22 +01:00
|
|
|
for (int i = 0; i < params()->disks.size(); i++) {
|
|
|
|
disks[i] = params()->disks[i];
|
2004-05-03 17:47:52 +02:00
|
|
|
disks[i]->setController(this, dmaInterface);
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
IdeController::~IdeController()
|
|
|
|
{
|
|
|
|
for (int i = 0; i < 4; i++)
|
|
|
|
if (disks[i])
|
|
|
|
delete disks[i];
|
|
|
|
}
|
|
|
|
|
2004-05-12 22:55:49 +02:00
|
|
|
////
|
|
|
|
// Utility functions
|
|
|
|
///
|
|
|
|
|
|
|
|
void
|
2005-08-15 22:59:58 +02:00
|
|
|
IdeController::parseAddr(const Addr &addr, Addr &offset, IdeChannel &channel,
|
|
|
|
IdeRegType ®_type)
|
2004-05-12 22:55:49 +02:00
|
|
|
{
|
|
|
|
offset = addr;
|
|
|
|
|
|
|
|
if (addr >= pri_cmd_addr && addr < (pri_cmd_addr + pri_cmd_size)) {
|
|
|
|
offset -= pri_cmd_addr;
|
2005-08-15 22:59:58 +02:00
|
|
|
reg_type = COMMAND_BLOCK;
|
|
|
|
channel = PRIMARY;
|
2004-05-12 22:55:49 +02:00
|
|
|
} else if (addr >= pri_ctrl_addr &&
|
|
|
|
addr < (pri_ctrl_addr + pri_ctrl_size)) {
|
|
|
|
offset -= pri_ctrl_addr;
|
2005-08-15 22:59:58 +02:00
|
|
|
reg_type = CONTROL_BLOCK;
|
|
|
|
channel = PRIMARY;
|
2004-05-12 22:55:49 +02:00
|
|
|
} else if (addr >= sec_cmd_addr &&
|
|
|
|
addr < (sec_cmd_addr + sec_cmd_size)) {
|
|
|
|
offset -= sec_cmd_addr;
|
2005-08-15 22:59:58 +02:00
|
|
|
reg_type = COMMAND_BLOCK;
|
|
|
|
channel = SECONDARY;
|
2004-05-12 22:55:49 +02:00
|
|
|
} else if (addr >= sec_ctrl_addr &&
|
|
|
|
addr < (sec_ctrl_addr + sec_ctrl_size)) {
|
|
|
|
offset -= sec_ctrl_addr;
|
2005-08-15 22:59:58 +02:00
|
|
|
reg_type = CONTROL_BLOCK;
|
|
|
|
channel = SECONDARY;
|
2004-05-12 22:55:49 +02:00
|
|
|
} else if (addr >= bmi_addr && addr < (bmi_addr + bmi_size)) {
|
|
|
|
offset -= bmi_addr;
|
2005-08-15 22:59:58 +02:00
|
|
|
reg_type = BMI_BLOCK;
|
|
|
|
channel = (offset < BMIC1) ? PRIMARY : SECONDARY;
|
2004-05-12 22:55:49 +02:00
|
|
|
} else {
|
|
|
|
panic("IDE controller access to invalid address: %#x\n", addr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2005-08-15 22:59:58 +02:00
|
|
|
IdeController::getDisk(IdeChannel channel)
|
2004-05-12 22:55:49 +02:00
|
|
|
{
|
|
|
|
int disk = 0;
|
|
|
|
uint8_t *devBit = &dev[0];
|
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
if (channel == SECONDARY) {
|
2004-05-12 22:55:49 +02:00
|
|
|
disk += 2;
|
|
|
|
devBit = &dev[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
disk += *devBit;
|
|
|
|
|
|
|
|
assert(*devBit == 0 || *devBit == 1);
|
|
|
|
|
|
|
|
return disk;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
IdeController::getDisk(IdeDisk *diskPtr)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < 4; i++) {
|
|
|
|
if ((long)diskPtr == (long)disks[i])
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-06-23 21:37:05 +02:00
|
|
|
bool
|
|
|
|
IdeController::isDiskSelected(IdeDisk *diskPtr)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < 4; i++) {
|
|
|
|
if ((long)diskPtr == (long)disks[i]) {
|
|
|
|
// is disk is on primary or secondary channel
|
|
|
|
int channel = i/2;
|
|
|
|
// is disk the master or slave
|
|
|
|
int devID = i%2;
|
|
|
|
|
|
|
|
return (dev[channel] == devID);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
panic("Unable to find disk by pointer!!\n");
|
|
|
|
}
|
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
////
|
|
|
|
// Command completion
|
|
|
|
////
|
|
|
|
|
|
|
|
void
|
|
|
|
IdeController::setDmaComplete(IdeDisk *disk)
|
|
|
|
{
|
|
|
|
int diskNum = getDisk(disk);
|
|
|
|
|
|
|
|
if (diskNum < 0)
|
|
|
|
panic("Unable to find disk based on pointer %#x\n", disk);
|
|
|
|
|
|
|
|
if (diskNum < 2) {
|
|
|
|
// clear the start/stop bit in the command register
|
2005-08-15 22:59:58 +02:00
|
|
|
bmi_regs.bmic0 &= ~SSBM;
|
2004-05-03 17:47:52 +02:00
|
|
|
// clear the bus master active bit in the status register
|
2005-08-15 22:59:58 +02:00
|
|
|
bmi_regs.bmis0 &= ~BMIDEA;
|
2004-05-03 17:47:52 +02:00
|
|
|
// set the interrupt bit
|
2005-08-15 22:59:58 +02:00
|
|
|
bmi_regs.bmis0 |= IDEINTS;
|
2004-05-03 17:47:52 +02:00
|
|
|
} else {
|
|
|
|
// clear the start/stop bit in the command register
|
2005-08-15 22:59:58 +02:00
|
|
|
bmi_regs.bmic1 &= ~SSBM;
|
2004-05-03 17:47:52 +02:00
|
|
|
// clear the bus master active bit in the status register
|
2005-08-15 22:59:58 +02:00
|
|
|
bmi_regs.bmis1 &= ~BMIDEA;
|
2004-05-03 17:47:52 +02:00
|
|
|
// set the interrupt bit
|
2005-08-15 22:59:58 +02:00
|
|
|
bmi_regs.bmis1 |= IDEINTS;
|
2004-05-03 17:47:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-03-23 23:10:07 +01:00
|
|
|
////
|
|
|
|
// Bus timing and bus access functions
|
|
|
|
////
|
|
|
|
|
|
|
|
Tick
|
|
|
|
IdeController::cacheAccess(MemReqPtr &req)
|
|
|
|
{
|
|
|
|
// @todo Add more accurate timing to cache access
|
2004-07-13 04:58:22 +02:00
|
|
|
return curTick + pioLatency;
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
////
|
|
|
|
// Read and write handling
|
|
|
|
////
|
|
|
|
|
|
|
|
void
|
2005-08-15 22:59:58 +02:00
|
|
|
IdeController::readConfig(int offset, int size, uint8_t *data)
|
2004-03-23 23:10:07 +01:00
|
|
|
{
|
2005-08-15 22:59:58 +02:00
|
|
|
int config_offset;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
|
|
|
if (offset < PCI_DEVICE_SPECIFIC) {
|
2005-08-15 22:59:58 +02:00
|
|
|
PciDev::readConfig(offset, size, data);
|
|
|
|
} else if (offset >= IDE_CTRL_CONF_START &&
|
|
|
|
(offset + size) <= IDE_CTRL_CONF_END) {
|
|
|
|
|
|
|
|
config_offset = offset - IDE_CTRL_CONF_START;
|
|
|
|
|
|
|
|
switch (size) {
|
|
|
|
case sizeof(uint8_t):
|
|
|
|
*data = config_regs.data[config_offset];
|
|
|
|
break;
|
|
|
|
case sizeof(uint16_t):
|
|
|
|
*(uint16_t*)data = *(uint16_t*)&config_regs.data[config_offset];
|
|
|
|
break;
|
|
|
|
case sizeof(uint32_t):
|
|
|
|
*(uint32_t*)data = *(uint32_t*)&config_regs.data[config_offset];
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("Invalid PCI configuration read size!\n");
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
DPRINTF(IdeCtrl, "PCI read offset: %#x size: %#x data: %#x\n",
|
|
|
|
offset, size, *(uint32_t*)data);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
} else {
|
|
|
|
panic("Read of unimplemented PCI config. register: %x\n", offset);
|
|
|
|
}
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-08-15 22:59:58 +02:00
|
|
|
IdeController::writeConfig(int offset, int size, const uint8_t *data)
|
2004-03-23 23:10:07 +01:00
|
|
|
{
|
2005-08-15 22:59:58 +02:00
|
|
|
int config_offset;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
|
|
|
if (offset < PCI_DEVICE_SPECIFIC) {
|
2005-08-15 22:59:58 +02:00
|
|
|
PciDev::writeConfig(offset, size, data);
|
|
|
|
} else if (offset >= IDE_CTRL_CONF_START &&
|
|
|
|
(offset + size) <= IDE_CTRL_CONF_END) {
|
|
|
|
|
|
|
|
config_offset = offset - IDE_CTRL_CONF_START;
|
|
|
|
|
|
|
|
switch(size) {
|
|
|
|
case sizeof(uint8_t):
|
|
|
|
config_regs.data[config_offset] = *data;
|
2005-09-13 04:53:57 +02:00
|
|
|
break;
|
2005-08-15 22:59:58 +02:00
|
|
|
case sizeof(uint16_t):
|
|
|
|
*(uint16_t*)&config_regs.data[config_offset] = *(uint16_t*)data;
|
2005-09-13 04:53:57 +02:00
|
|
|
break;
|
2005-08-15 22:59:58 +02:00
|
|
|
case sizeof(uint32_t):
|
|
|
|
*(uint32_t*)&config_regs.data[config_offset] = *(uint32_t*)data;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("Invalid PCI configuration write size!\n");
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
2005-08-15 22:59:58 +02:00
|
|
|
} else {
|
|
|
|
panic("Write of unimplemented PCI config. register: %x\n", offset);
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
DPRINTF(IdeCtrl, "PCI write offset: %#x size: %#x data: %#x\n",
|
|
|
|
offset, size, data);
|
|
|
|
|
2004-06-04 21:12:27 +02:00
|
|
|
// Catch the writes to specific PCI registers that have side affects
|
|
|
|
// (like updating the PIO ranges)
|
|
|
|
switch (offset) {
|
|
|
|
case PCI_COMMAND:
|
2005-08-15 22:59:58 +02:00
|
|
|
if (letoh(config.command) & PCI_CMD_IOSE)
|
2004-03-23 23:10:07 +01:00
|
|
|
io_enabled = true;
|
|
|
|
else
|
|
|
|
io_enabled = false;
|
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
if (letoh(config.command) & PCI_CMD_BME)
|
2004-03-23 23:10:07 +01:00
|
|
|
bm_enabled = true;
|
|
|
|
else
|
|
|
|
bm_enabled = false;
|
2004-06-04 21:12:27 +02:00
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-06-04 21:12:27 +02:00
|
|
|
case PCI0_BASE_ADDR0:
|
|
|
|
if (BARAddrs[0] != 0) {
|
2004-03-23 23:10:07 +01:00
|
|
|
pri_cmd_addr = BARAddrs[0];
|
|
|
|
if (pioInterface)
|
2004-10-22 07:34:40 +02:00
|
|
|
pioInterface->addAddrRange(RangeSize(pri_cmd_addr,
|
|
|
|
pri_cmd_size));
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-11-13 20:01:38 +01:00
|
|
|
pri_cmd_addr &= EV5::PAddrUncachedMask;
|
2004-06-04 21:12:27 +02:00
|
|
|
}
|
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-06-04 21:12:27 +02:00
|
|
|
case PCI0_BASE_ADDR1:
|
|
|
|
if (BARAddrs[1] != 0) {
|
2004-03-23 23:10:07 +01:00
|
|
|
pri_ctrl_addr = BARAddrs[1];
|
|
|
|
if (pioInterface)
|
2004-10-22 07:34:40 +02:00
|
|
|
pioInterface->addAddrRange(RangeSize(pri_ctrl_addr,
|
|
|
|
pri_ctrl_size));
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-11-13 20:01:38 +01:00
|
|
|
pri_ctrl_addr &= EV5::PAddrUncachedMask;
|
2004-06-04 21:12:27 +02:00
|
|
|
}
|
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-06-04 21:12:27 +02:00
|
|
|
case PCI0_BASE_ADDR2:
|
|
|
|
if (BARAddrs[2] != 0) {
|
2004-03-23 23:10:07 +01:00
|
|
|
sec_cmd_addr = BARAddrs[2];
|
|
|
|
if (pioInterface)
|
2004-10-22 07:34:40 +02:00
|
|
|
pioInterface->addAddrRange(RangeSize(sec_cmd_addr,
|
|
|
|
sec_cmd_size));
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-11-13 20:01:38 +01:00
|
|
|
sec_cmd_addr &= EV5::PAddrUncachedMask;
|
2004-06-04 21:12:27 +02:00
|
|
|
}
|
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-06-04 21:12:27 +02:00
|
|
|
case PCI0_BASE_ADDR3:
|
|
|
|
if (BARAddrs[3] != 0) {
|
2004-03-23 23:10:07 +01:00
|
|
|
sec_ctrl_addr = BARAddrs[3];
|
|
|
|
if (pioInterface)
|
2004-10-22 07:34:40 +02:00
|
|
|
pioInterface->addAddrRange(RangeSize(sec_ctrl_addr,
|
|
|
|
sec_ctrl_size));
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-11-13 20:01:38 +01:00
|
|
|
sec_ctrl_addr &= EV5::PAddrUncachedMask;
|
2004-06-04 21:12:27 +02:00
|
|
|
}
|
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-06-04 21:12:27 +02:00
|
|
|
case PCI0_BASE_ADDR4:
|
|
|
|
if (BARAddrs[4] != 0) {
|
2004-03-23 23:10:07 +01:00
|
|
|
bmi_addr = BARAddrs[4];
|
|
|
|
if (pioInterface)
|
2004-10-22 07:34:40 +02:00
|
|
|
pioInterface->addAddrRange(RangeSize(bmi_addr, bmi_size));
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-11-13 20:01:38 +01:00
|
|
|
bmi_addr &= EV5::PAddrUncachedMask;
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
2004-06-04 21:12:27 +02:00
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
Fault *
|
2004-03-23 23:10:07 +01:00
|
|
|
IdeController::read(MemReqPtr &req, uint8_t *data)
|
|
|
|
{
|
2004-05-03 17:47:52 +02:00
|
|
|
Addr offset;
|
2005-08-15 22:59:58 +02:00
|
|
|
IdeChannel channel;
|
|
|
|
IdeRegType reg_type;
|
2004-05-03 17:47:52 +02:00
|
|
|
int disk;
|
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
parseAddr(req->paddr, offset, channel, reg_type);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
|
|
|
if (!io_enabled)
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
return NoFault;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
switch (reg_type) {
|
|
|
|
case BMI_BLOCK:
|
|
|
|
switch (req->size) {
|
|
|
|
case sizeof(uint8_t):
|
|
|
|
*data = bmi_regs.data[offset];
|
|
|
|
break;
|
|
|
|
case sizeof(uint16_t):
|
|
|
|
*(uint16_t*)data = *(uint16_t*)&bmi_regs.data[offset];
|
|
|
|
break;
|
|
|
|
case sizeof(uint32_t):
|
|
|
|
*(uint32_t*)data = *(uint32_t*)&bmi_regs.data[offset];
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("IDE read of BMI reg invalid size: %#x\n", req->size);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case COMMAND_BLOCK:
|
|
|
|
case CONTROL_BLOCK:
|
|
|
|
disk = getDisk(channel);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
if (disks[disk] == NULL)
|
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
switch (offset) {
|
|
|
|
case DATA_OFFSET:
|
|
|
|
switch (req->size) {
|
|
|
|
case sizeof(uint16_t):
|
|
|
|
disks[disk]->read(offset, reg_type, data);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sizeof(uint32_t):
|
|
|
|
disks[disk]->read(offset, reg_type, data);
|
|
|
|
disks[disk]->read(offset, reg_type, &data[2]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
panic("IDE read of data reg invalid size: %#x\n", req->size);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (req->size == sizeof(uint8_t)) {
|
|
|
|
disks[disk]->read(offset, reg_type, data);
|
|
|
|
} else
|
|
|
|
panic("IDE read of command reg of invalid size: %#x\n", req->size);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("IDE controller read of unknown register block type!\n");
|
2004-05-03 17:47:52 +02:00
|
|
|
}
|
|
|
|
|
2005-04-06 23:39:25 +02:00
|
|
|
DPRINTF(IdeCtrl, "read from offset: %#x size: %#x data: %#x\n",
|
2005-08-15 22:59:58 +02:00
|
|
|
offset, req->size, *(uint32_t*)data);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
return NoFault;
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
Fault *
|
2004-03-23 23:10:07 +01:00
|
|
|
IdeController::write(MemReqPtr &req, const uint8_t *data)
|
|
|
|
{
|
2004-05-03 17:47:52 +02:00
|
|
|
Addr offset;
|
2005-08-15 22:59:58 +02:00
|
|
|
IdeChannel channel;
|
|
|
|
IdeRegType reg_type;
|
2004-05-03 17:47:52 +02:00
|
|
|
int disk;
|
|
|
|
uint8_t oldVal, newVal;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
parseAddr(req->paddr, offset, channel, reg_type);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
if (!io_enabled)
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
return NoFault;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
switch (reg_type) {
|
|
|
|
case BMI_BLOCK:
|
|
|
|
if (!bm_enabled)
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
return NoFault;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
switch (offset) {
|
|
|
|
// Bus master IDE command register
|
|
|
|
case BMIC1:
|
|
|
|
case BMIC0:
|
|
|
|
if (req->size != sizeof(uint8_t))
|
|
|
|
panic("Invalid BMIC write size: %x\n", req->size);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
// select the current disk based on DEV bit
|
2005-08-15 22:59:58 +02:00
|
|
|
disk = getDisk(channel);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-19 23:10:17 +02:00
|
|
|
oldVal = bmi_regs.chan[channel].bmic;
|
|
|
|
newVal = *data;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
// if a DMA transfer is in progress, R/W control cannot change
|
|
|
|
if (oldVal & SSBM) {
|
|
|
|
if ((oldVal & RWCON) ^ (newVal & RWCON)) {
|
|
|
|
(oldVal & RWCON) ? newVal |= RWCON : newVal &= ~RWCON;
|
|
|
|
}
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
// see if the start/stop bit is being changed
|
|
|
|
if ((oldVal & SSBM) ^ (newVal & SSBM)) {
|
|
|
|
if (oldVal & SSBM) {
|
|
|
|
// stopping DMA transfer
|
|
|
|
DPRINTF(IdeCtrl, "Stopping DMA transfer\n");
|
|
|
|
|
|
|
|
// clear the BMIDEA bit
|
2005-08-19 23:10:17 +02:00
|
|
|
bmi_regs.chan[channel].bmis =
|
|
|
|
bmi_regs.chan[channel].bmis & ~BMIDEA;
|
2004-05-03 17:47:52 +02:00
|
|
|
|
|
|
|
if (disks[disk] == NULL)
|
|
|
|
panic("DMA stop for disk %d which does not exist\n",
|
|
|
|
disk);
|
|
|
|
|
|
|
|
// inform the disk of the DMA transfer abort
|
|
|
|
disks[disk]->abortDma();
|
|
|
|
} else {
|
|
|
|
// starting DMA transfer
|
|
|
|
DPRINTF(IdeCtrl, "Starting DMA transfer\n");
|
|
|
|
|
|
|
|
// set the BMIDEA bit
|
2005-08-19 23:10:17 +02:00
|
|
|
bmi_regs.chan[channel].bmis =
|
|
|
|
bmi_regs.chan[channel].bmis | BMIDEA;
|
2004-05-03 17:47:52 +02:00
|
|
|
|
|
|
|
if (disks[disk] == NULL)
|
|
|
|
panic("DMA start for disk %d which does not exist\n",
|
|
|
|
disk);
|
|
|
|
|
|
|
|
// inform the disk of the DMA transfer start
|
2005-08-15 22:59:58 +02:00
|
|
|
disks[disk]->startDma(letoh(bmi_regs.chan[channel].bmidtp));
|
2004-05-03 17:47:52 +02:00
|
|
|
}
|
|
|
|
}
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
// update the register value
|
2005-08-19 23:10:17 +02:00
|
|
|
bmi_regs.chan[channel].bmic = newVal;
|
2004-05-03 17:47:52 +02:00
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
// Bus master IDE status register
|
|
|
|
case BMIS0:
|
|
|
|
case BMIS1:
|
|
|
|
if (req->size != sizeof(uint8_t))
|
|
|
|
panic("Invalid BMIS write size: %x\n", req->size);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-19 23:10:17 +02:00
|
|
|
oldVal = bmi_regs.chan[channel].bmis;
|
|
|
|
newVal = *data;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
// the BMIDEA bit is RO
|
|
|
|
newVal |= (oldVal & BMIDEA);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
// to reset (set 0) IDEINTS and IDEDMAE, write 1 to each
|
|
|
|
if ((oldVal & IDEINTS) && (newVal & IDEINTS))
|
|
|
|
newVal &= ~IDEINTS; // clear the interrupt?
|
|
|
|
else
|
|
|
|
(oldVal & IDEINTS) ? newVal |= IDEINTS : newVal &= ~IDEINTS;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
if ((oldVal & IDEDMAE) && (newVal & IDEDMAE))
|
|
|
|
newVal &= ~IDEDMAE;
|
|
|
|
else
|
|
|
|
(oldVal & IDEDMAE) ? newVal |= IDEDMAE : newVal &= ~IDEDMAE;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-19 23:10:17 +02:00
|
|
|
bmi_regs.chan[channel].bmis = newVal;
|
2004-05-03 17:47:52 +02:00
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
// Bus master IDE descriptor table pointer register
|
|
|
|
case BMIDTP0:
|
|
|
|
case BMIDTP1:
|
2005-08-19 23:10:17 +02:00
|
|
|
{
|
|
|
|
if (req->size != sizeof(uint32_t))
|
|
|
|
panic("Invalid BMIDTP write size: %x\n", req->size);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2005-08-19 23:10:17 +02:00
|
|
|
uint32_t host_data = letoh(*(uint32_t*)data);
|
|
|
|
host_data &= ~0x3;
|
|
|
|
bmi_regs.chan[channel].bmidtp = htole(host_data);
|
|
|
|
}
|
2004-05-03 17:47:52 +02:00
|
|
|
break;
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
default:
|
|
|
|
if (req->size != sizeof(uint8_t) &&
|
|
|
|
req->size != sizeof(uint16_t) &&
|
|
|
|
req->size != sizeof(uint32_t))
|
|
|
|
panic("IDE controller write of invalid write size: %x\n",
|
|
|
|
req->size);
|
2004-03-23 23:10:07 +01:00
|
|
|
|
2004-05-03 17:47:52 +02:00
|
|
|
// do a default copy of data into the registers
|
2005-08-15 22:59:58 +02:00
|
|
|
memcpy(&bmi_regs.data[offset], data, req->size);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case COMMAND_BLOCK:
|
|
|
|
if (offset == IDE_SELECT_OFFSET) {
|
|
|
|
uint8_t *devBit = &dev[channel];
|
|
|
|
*devBit = (letoh(*data) & IDE_SELECT_DEV_BIT) ? 1 : 0;
|
2004-05-03 17:47:52 +02:00
|
|
|
}
|
2005-08-15 22:59:58 +02:00
|
|
|
// fall-through ok!
|
|
|
|
case CONTROL_BLOCK:
|
|
|
|
disk = getDisk(channel);
|
|
|
|
|
|
|
|
if (disks[disk] == NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
switch (offset) {
|
|
|
|
case DATA_OFFSET:
|
|
|
|
switch (req->size) {
|
|
|
|
case sizeof(uint16_t):
|
|
|
|
disks[disk]->write(offset, reg_type, data);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sizeof(uint32_t):
|
|
|
|
disks[disk]->write(offset, reg_type, data);
|
|
|
|
disks[disk]->write(offset, reg_type, &data[2]);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("IDE write of data reg invalid size: %#x\n", req->size);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (req->size == sizeof(uint8_t)) {
|
|
|
|
disks[disk]->write(offset, reg_type, data);
|
|
|
|
} else
|
|
|
|
panic("IDE write of command reg of invalid size: %#x\n", req->size);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("IDE controller write of unknown register block type!\n");
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
DPRINTF(IdeCtrl, "write to offset: %#x size: %#x data: %#x\n",
|
|
|
|
offset, req->size, *(uint32_t*)data);
|
|
|
|
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
return NoFault;
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
////
|
|
|
|
// Serialization
|
|
|
|
////
|
|
|
|
|
|
|
|
void
|
|
|
|
IdeController::serialize(std::ostream &os)
|
|
|
|
{
|
2004-06-04 21:12:27 +02:00
|
|
|
// Serialize the PciDev base class
|
|
|
|
PciDev::serialize(os);
|
|
|
|
|
2004-05-12 22:55:49 +02:00
|
|
|
// Serialize register addresses and sizes
|
|
|
|
SERIALIZE_SCALAR(pri_cmd_addr);
|
|
|
|
SERIALIZE_SCALAR(pri_cmd_size);
|
|
|
|
SERIALIZE_SCALAR(pri_ctrl_addr);
|
|
|
|
SERIALIZE_SCALAR(pri_ctrl_size);
|
|
|
|
SERIALIZE_SCALAR(sec_cmd_addr);
|
|
|
|
SERIALIZE_SCALAR(sec_cmd_size);
|
|
|
|
SERIALIZE_SCALAR(sec_ctrl_addr);
|
|
|
|
SERIALIZE_SCALAR(sec_ctrl_size);
|
|
|
|
SERIALIZE_SCALAR(bmi_addr);
|
|
|
|
SERIALIZE_SCALAR(bmi_size);
|
|
|
|
|
|
|
|
// Serialize registers
|
2005-08-23 17:45:52 +02:00
|
|
|
SERIALIZE_ARRAY(bmi_regs.data,
|
|
|
|
sizeof(bmi_regs.data) / sizeof(bmi_regs.data[0]));
|
|
|
|
SERIALIZE_ARRAY(dev, sizeof(dev) / sizeof(dev[0]));
|
|
|
|
SERIALIZE_ARRAY(config_regs.data,
|
|
|
|
sizeof(config_regs.data) / sizeof(config_regs.data[0]));
|
2004-05-12 22:55:49 +02:00
|
|
|
|
|
|
|
// Serialize internal state
|
|
|
|
SERIALIZE_SCALAR(io_enabled);
|
|
|
|
SERIALIZE_SCALAR(bm_enabled);
|
2005-08-23 17:45:52 +02:00
|
|
|
SERIALIZE_ARRAY(cmd_in_progress,
|
|
|
|
sizeof(cmd_in_progress) / sizeof(cmd_in_progress[0]));
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
IdeController::unserialize(Checkpoint *cp, const std::string §ion)
|
|
|
|
{
|
2004-06-04 21:12:27 +02:00
|
|
|
// Unserialize the PciDev base class
|
|
|
|
PciDev::unserialize(cp, section);
|
|
|
|
|
2004-05-12 22:55:49 +02:00
|
|
|
// Unserialize register addresses and sizes
|
|
|
|
UNSERIALIZE_SCALAR(pri_cmd_addr);
|
|
|
|
UNSERIALIZE_SCALAR(pri_cmd_size);
|
|
|
|
UNSERIALIZE_SCALAR(pri_ctrl_addr);
|
|
|
|
UNSERIALIZE_SCALAR(pri_ctrl_size);
|
|
|
|
UNSERIALIZE_SCALAR(sec_cmd_addr);
|
|
|
|
UNSERIALIZE_SCALAR(sec_cmd_size);
|
|
|
|
UNSERIALIZE_SCALAR(sec_ctrl_addr);
|
|
|
|
UNSERIALIZE_SCALAR(sec_ctrl_size);
|
|
|
|
UNSERIALIZE_SCALAR(bmi_addr);
|
|
|
|
UNSERIALIZE_SCALAR(bmi_size);
|
|
|
|
|
|
|
|
// Unserialize registers
|
2005-08-23 17:45:52 +02:00
|
|
|
UNSERIALIZE_ARRAY(bmi_regs.data,
|
|
|
|
sizeof(bmi_regs.data) / sizeof(bmi_regs.data[0]));
|
|
|
|
UNSERIALIZE_ARRAY(dev, sizeof(dev) / sizeof(dev[0]));
|
|
|
|
UNSERIALIZE_ARRAY(config_regs.data,
|
|
|
|
sizeof(config_regs.data) / sizeof(config_regs.data[0]));
|
2004-05-12 22:55:49 +02:00
|
|
|
|
|
|
|
// Unserialize internal state
|
|
|
|
UNSERIALIZE_SCALAR(io_enabled);
|
|
|
|
UNSERIALIZE_SCALAR(bm_enabled);
|
2005-08-23 17:45:52 +02:00
|
|
|
UNSERIALIZE_ARRAY(cmd_in_progress,
|
|
|
|
sizeof(cmd_in_progress) / sizeof(cmd_in_progress[0]));
|
2004-06-17 17:24:14 +02:00
|
|
|
|
2004-06-11 07:55:20 +02:00
|
|
|
if (pioInterface) {
|
2004-10-22 07:34:40 +02:00
|
|
|
pioInterface->addAddrRange(RangeSize(pri_cmd_addr, pri_cmd_size));
|
|
|
|
pioInterface->addAddrRange(RangeSize(pri_ctrl_addr, pri_ctrl_size));
|
|
|
|
pioInterface->addAddrRange(RangeSize(sec_cmd_addr, sec_cmd_size));
|
|
|
|
pioInterface->addAddrRange(RangeSize(sec_ctrl_addr, sec_ctrl_size));
|
|
|
|
pioInterface->addAddrRange(RangeSize(bmi_addr, bmi_size));
|
2004-06-11 07:55:20 +02:00
|
|
|
}
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_THIS
|
|
|
|
|
|
|
|
BEGIN_DECLARE_SIM_OBJECT_PARAMS(IdeController)
|
|
|
|
|
2005-01-15 10:12:25 +01:00
|
|
|
Param<Addr> addr;
|
2004-03-23 23:10:07 +01:00
|
|
|
SimObjectVectorParam<IdeDisk *> disks;
|
|
|
|
SimObjectParam<MemoryController *> mmu;
|
|
|
|
SimObjectParam<PciConfigAll *> configspace;
|
|
|
|
SimObjectParam<PciConfigData *> configdata;
|
2004-11-13 21:45:22 +01:00
|
|
|
SimObjectParam<Platform *> platform;
|
2004-03-23 23:10:07 +01:00
|
|
|
Param<uint32_t> pci_bus;
|
|
|
|
Param<uint32_t> pci_dev;
|
|
|
|
Param<uint32_t> pci_func;
|
2005-11-20 22:57:53 +01:00
|
|
|
SimObjectParam<Bus *> pio_bus;
|
|
|
|
SimObjectParam<Bus *> dma_bus;
|
2004-07-13 04:58:22 +02:00
|
|
|
Param<Tick> pio_latency;
|
2004-03-23 23:10:07 +01:00
|
|
|
SimObjectParam<HierParams *> hier;
|
|
|
|
|
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(IdeController)
|
|
|
|
|
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(IdeController)
|
|
|
|
|
2005-01-15 10:12:25 +01:00
|
|
|
INIT_PARAM(addr, "Device Address"),
|
2004-03-23 23:10:07 +01:00
|
|
|
INIT_PARAM(disks, "IDE disks attached to this controller"),
|
|
|
|
INIT_PARAM(mmu, "Memory controller"),
|
|
|
|
INIT_PARAM(configspace, "PCI Configspace"),
|
|
|
|
INIT_PARAM(configdata, "PCI Config data"),
|
2004-11-13 21:45:22 +01:00
|
|
|
INIT_PARAM(platform, "Platform pointer"),
|
2004-03-23 23:10:07 +01:00
|
|
|
INIT_PARAM(pci_bus, "PCI bus ID"),
|
|
|
|
INIT_PARAM(pci_dev, "PCI device number"),
|
|
|
|
INIT_PARAM(pci_func, "PCI function code"),
|
2005-11-20 22:57:53 +01:00
|
|
|
INIT_PARAM(pio_bus, ""),
|
|
|
|
INIT_PARAM(dma_bus, ""),
|
2004-07-13 04:58:22 +02:00
|
|
|
INIT_PARAM_DFLT(pio_latency, "Programmed IO latency in bus cycles", 1),
|
2004-03-23 23:10:07 +01:00
|
|
|
INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams)
|
|
|
|
|
|
|
|
END_INIT_SIM_OBJECT_PARAMS(IdeController)
|
|
|
|
|
|
|
|
CREATE_SIM_OBJECT(IdeController)
|
|
|
|
{
|
2004-11-13 21:45:22 +01:00
|
|
|
IdeController::Params *params = new IdeController::Params;
|
|
|
|
params->name = getInstanceName();
|
|
|
|
params->mmu = mmu;
|
|
|
|
params->configSpace = configspace;
|
|
|
|
params->configData = configdata;
|
|
|
|
params->plat = platform;
|
|
|
|
params->busNum = pci_bus;
|
|
|
|
params->deviceNum = pci_dev;
|
|
|
|
params->functionNum = pci_func;
|
|
|
|
|
|
|
|
params->disks = disks;
|
2005-11-20 22:57:53 +01:00
|
|
|
params->pio_bus = pio_bus;
|
|
|
|
params->dma_bus = dma_bus;
|
2004-11-13 21:45:22 +01:00
|
|
|
params->pio_latency = pio_latency;
|
|
|
|
params->hier = hier;
|
|
|
|
return new IdeController(params);
|
2004-03-23 23:10:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
REGISTER_SIM_OBJECT("IdeController", IdeController)
|
|
|
|
|
|
|
|
#endif //DOXYGEN_SHOULD_SKIP_THIS
|