2004-02-06 00:23:16 +01:00
|
|
|
/*
|
2005-01-30 22:58:39 +01:00
|
|
|
* Copyright (c) 2004-2005 The Regents of The University of Michigan
|
2004-02-06 00:23:16 +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.
|
|
|
|
*/
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2005-06-05 07:22:21 +02:00
|
|
|
/** @file
|
2004-01-26 19:26:34 +01:00
|
|
|
* Tsunami I/O including PIC, PIT, RTC, DMA
|
2004-01-22 02:14:10 +01:00
|
|
|
*/
|
|
|
|
|
2004-01-26 19:26:34 +01:00
|
|
|
#include <sys/time.h>
|
|
|
|
|
2004-01-22 02:14:10 +01:00
|
|
|
#include <deque>
|
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
#include "base/trace.hh"
|
2005-08-15 22:59:58 +02:00
|
|
|
#include "dev/pitreg.h"
|
2006-04-11 19:42:47 +02:00
|
|
|
#include "dev/rtcreg.h"
|
2004-01-28 03:36:46 +01:00
|
|
|
#include "dev/tsunami_cchip.hh"
|
2006-04-11 19:42:47 +02:00
|
|
|
#include "dev/tsunami.hh"
|
|
|
|
#include "dev/tsunami_io.hh"
|
2004-06-10 19:30:58 +02:00
|
|
|
#include "dev/tsunamireg.h"
|
2006-04-11 19:42:47 +02:00
|
|
|
#include "mem/port.hh"
|
|
|
|
#include "sim/builder.hh"
|
|
|
|
#include "sim/system.hh"
|
2004-01-22 02:14:10 +01:00
|
|
|
|
|
|
|
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
|
|
|
//Should this be AlphaISA?
|
|
|
|
using namespace TheISA;
|
2004-01-26 19:26:34 +01:00
|
|
|
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::RTC::RTC(const string &name, Tsunami* t, Tick i)
|
|
|
|
: _name(name), event(t, i), addr(0)
|
2005-08-15 22:59:58 +02:00
|
|
|
{
|
|
|
|
memset(clock_data, 0, sizeof(clock_data));
|
|
|
|
stat_regA = RTCA_32768HZ | RTCA_1024HZ;
|
|
|
|
stat_regB = RTCB_PRDC_IE |RTCB_BIN | RTCB_24HR;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::RTC::set_time(time_t t)
|
|
|
|
{
|
|
|
|
struct tm tm;
|
|
|
|
gmtime_r(&t, &tm);
|
|
|
|
|
|
|
|
sec = tm.tm_sec;
|
|
|
|
min = tm.tm_min;
|
|
|
|
hour = tm.tm_hour;
|
|
|
|
wday = tm.tm_wday + 1;
|
|
|
|
mday = tm.tm_mday;
|
|
|
|
mon = tm.tm_mon + 1;
|
|
|
|
year = tm.tm_year;
|
|
|
|
|
|
|
|
DPRINTFN("Real-time clock set to %s", asctime(&tm));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-04-10 20:14:06 +02:00
|
|
|
TsunamiIO::RTC::writeAddr(const uint8_t data)
|
2005-08-15 22:59:58 +02:00
|
|
|
{
|
2006-04-11 19:42:47 +02:00
|
|
|
if (data <= RTC_STAT_REGD)
|
2006-04-10 20:14:06 +02:00
|
|
|
addr = data;
|
2005-08-15 22:59:58 +02:00
|
|
|
else
|
|
|
|
panic("RTC addresses over 0xD are not implemented.\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-04-10 20:14:06 +02:00
|
|
|
TsunamiIO::RTC::writeData(const uint8_t data)
|
2005-08-15 22:59:58 +02:00
|
|
|
{
|
|
|
|
if (addr < RTC_STAT_REGA)
|
2006-04-10 20:14:06 +02:00
|
|
|
clock_data[addr] = data;
|
2005-08-15 22:59:58 +02:00
|
|
|
else {
|
|
|
|
switch (addr) {
|
|
|
|
case RTC_STAT_REGA:
|
2006-04-10 20:14:06 +02:00
|
|
|
if (data != (RTCA_32768HZ | RTCA_1024HZ))
|
2005-08-15 22:59:58 +02:00
|
|
|
panic("Unimplemented RTC register A value write!\n");
|
2006-04-11 19:42:47 +02:00
|
|
|
stat_regA = data;
|
2005-08-15 22:59:58 +02:00
|
|
|
break;
|
|
|
|
case RTC_STAT_REGB:
|
2006-04-10 20:14:06 +02:00
|
|
|
if ((data & ~(RTCB_PRDC_IE | RTCB_SQWE)) != (RTCB_BIN | RTCB_24HR))
|
2005-08-15 22:59:58 +02:00
|
|
|
panic("Write to RTC reg B bits that are not implemented!\n");
|
|
|
|
|
2006-04-11 19:42:47 +02:00
|
|
|
if (data & RTCB_PRDC_IE) {
|
2005-08-15 22:59:58 +02:00
|
|
|
if (!event.scheduled())
|
|
|
|
event.scheduleIntr();
|
|
|
|
} else {
|
|
|
|
if (event.scheduled())
|
|
|
|
event.deschedule();
|
|
|
|
}
|
2006-04-10 20:14:06 +02:00
|
|
|
stat_regB = data;
|
2005-08-15 22:59:58 +02:00
|
|
|
break;
|
|
|
|
case RTC_STAT_REGC:
|
|
|
|
case RTC_STAT_REGD:
|
|
|
|
panic("RTC status registers C and D are not implemented.\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::RTC::readData(uint8_t *data)
|
|
|
|
{
|
|
|
|
if (addr < RTC_STAT_REGA)
|
|
|
|
*data = clock_data[addr];
|
|
|
|
else {
|
|
|
|
switch (addr) {
|
|
|
|
case RTC_STAT_REGA:
|
|
|
|
// toggle UIP bit for linux
|
|
|
|
stat_regA ^= RTCA_UIP;
|
|
|
|
*data = stat_regA;
|
|
|
|
break;
|
|
|
|
case RTC_STAT_REGB:
|
|
|
|
*data = stat_regB;
|
|
|
|
break;
|
|
|
|
case RTC_STAT_REGC:
|
|
|
|
case RTC_STAT_REGD:
|
|
|
|
*data = 0x00;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::RTC::serialize(const string &base, ostream &os)
|
2005-08-15 22:59:58 +02:00
|
|
|
{
|
2005-08-23 17:45:52 +02:00
|
|
|
paramOut(os, base + ".addr", addr);
|
|
|
|
arrayParamOut(os, base + ".clock_data", clock_data, sizeof(clock_data));
|
|
|
|
paramOut(os, base + ".stat_regA", stat_regA);
|
|
|
|
paramOut(os, base + ".stat_regB", stat_regB);
|
2005-08-15 22:59:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::RTC::unserialize(const string &base, Checkpoint *cp,
|
|
|
|
const string §ion)
|
2005-08-15 22:59:58 +02:00
|
|
|
{
|
2005-08-23 17:45:52 +02:00
|
|
|
paramIn(cp, section, base + ".addr", addr);
|
|
|
|
arrayParamIn(cp, section, base + ".clock_data", clock_data,
|
|
|
|
sizeof(clock_data));
|
|
|
|
paramIn(cp, section, base + ".stat_regA", stat_regA);
|
|
|
|
paramIn(cp, section, base + ".stat_regB", stat_regB);
|
2005-08-15 22:59:58 +02:00
|
|
|
|
2005-08-23 17:45:52 +02:00
|
|
|
// We're not unserializing the event here, but we need to
|
|
|
|
// rescehedule the event since curTick was moved forward by the
|
|
|
|
// checkpoint
|
|
|
|
event.reschedule(curTick + event.interval);
|
2005-08-15 22:59:58 +02:00
|
|
|
}
|
2004-01-26 19:26:34 +01:00
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
TsunamiIO::RTC::RTCEvent::RTCEvent(Tsunami*t, Tick i)
|
Make the notion of a global event tick independent of the actual
CPU cycle ticks. This allows the user to have CPUs of different
frequencies, and also allows frequencies and latencies that are
not evenly divisible by the CPU frequency. For now, the CPU
frequency is still set to the global frequency, but soon, we'll
hopefully make the global frequency fixed at something like 1THz
and set all other frequencies independently.
arch/alpha/ev5.cc:
The cycles counter is based on the current cpu cycle.
cpu/base_cpu.cc:
frequency isn't the cpu parameter anymore, cycleTime is.
cpu/base_cpu.hh:
frequency isn't the cpu parameter anymore, cycleTime is.
create several public functions for getting the cpu frequency
and the numbers of ticks for a given number of cycles, etc.
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/trace/trace_cpu.cc:
Now that ticks aren't cpu cycles, fixup code to advance
by the proper number of ticks.
cpu/memtest/memtest.hh:
cpu/trace/trace_cpu.hh:
Provide a function to get the number of ticks for a given
number of cycles.
dev/alpha_console.cc:
Update for changes in the way that frequencies and latencies are
accessed. Move some stuff to init()
dev/alpha_console.hh:
Need a pointer to the system and the cpu to get the frequency
so we can pass the info to the console code.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
dev/ide_disk.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
Add some extra debugging printfs
dev/platform.cc:
dev/sinic.cc:
dev/sinic.hh:
outline the constructor and destructor
dev/platform.hh:
outline the constructor and destructor.
don't keep track of the interrupt frequency. Only provide the
accessor function.
dev/tsunami.cc:
dev/tsunami.hh:
outline the constructor and destructor
Don't set the interrupt frequency here. Get it from the actual device
that does the interrupting.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make the interrupt interval a configuration parameter. (And convert
the interval to the new latency/frequency stuff in the python)
kern/linux/linux_system.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
kern/tru64/tru64_system.cc:
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
python/m5/config.py:
Fix support for cycle_time relative latencies and frequencies.
Add support for getting a NetworkBandwidth or a MemoryBandwidth.
python/m5/objects/BaseCPU.mpy:
All CPUs now have a cycle_time. The default is the global frequency,
but it is now possible to set the global frequency to some large value
(like 1THz) and set each CPU frequency independently.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ide.mpy:
Make this a Latency parameter
python/m5/objects/BaseSystem.mpy:
We need to pass the boot CPU's frequency to the system
python/m5/objects/Ethernet.mpy:
Update parameter types to use latency and bandwidth types
python/m5/objects/Platform.mpy:
this frequency isn't needed. We get it from the clock interrupt.
python/m5/objects/Tsunami.mpy:
The clock generator should hold the frequency
sim/eventq.hh:
Need to remove this assertion because the writeback event
queue is different from the CPU's event queue which can cause
this assertion to fail.
sim/process.cc:
Fix comment.
sim/system.hh:
Struct member to hold the boot CPU's frequency.
sim/universe.cc:
remove unneeded variable.
--HG--
extra : convert_revision : 51efe4041095234bf458d9b3b0d417f4cae16fdc
2005-04-11 21:32:06 +02:00
|
|
|
: Event(&mainEventQueue), tsunami(t), interval(i)
|
2004-01-23 19:01:32 +01:00
|
|
|
{
|
2004-01-26 19:26:34 +01:00
|
|
|
DPRINTF(MC146818, "RTC Event Initilizing\n");
|
Make the notion of a global event tick independent of the actual
CPU cycle ticks. This allows the user to have CPUs of different
frequencies, and also allows frequencies and latencies that are
not evenly divisible by the CPU frequency. For now, the CPU
frequency is still set to the global frequency, but soon, we'll
hopefully make the global frequency fixed at something like 1THz
and set all other frequencies independently.
arch/alpha/ev5.cc:
The cycles counter is based on the current cpu cycle.
cpu/base_cpu.cc:
frequency isn't the cpu parameter anymore, cycleTime is.
cpu/base_cpu.hh:
frequency isn't the cpu parameter anymore, cycleTime is.
create several public functions for getting the cpu frequency
and the numbers of ticks for a given number of cycles, etc.
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/trace/trace_cpu.cc:
Now that ticks aren't cpu cycles, fixup code to advance
by the proper number of ticks.
cpu/memtest/memtest.hh:
cpu/trace/trace_cpu.hh:
Provide a function to get the number of ticks for a given
number of cycles.
dev/alpha_console.cc:
Update for changes in the way that frequencies and latencies are
accessed. Move some stuff to init()
dev/alpha_console.hh:
Need a pointer to the system and the cpu to get the frequency
so we can pass the info to the console code.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
dev/ide_disk.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
Add some extra debugging printfs
dev/platform.cc:
dev/sinic.cc:
dev/sinic.hh:
outline the constructor and destructor
dev/platform.hh:
outline the constructor and destructor.
don't keep track of the interrupt frequency. Only provide the
accessor function.
dev/tsunami.cc:
dev/tsunami.hh:
outline the constructor and destructor
Don't set the interrupt frequency here. Get it from the actual device
that does the interrupting.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make the interrupt interval a configuration parameter. (And convert
the interval to the new latency/frequency stuff in the python)
kern/linux/linux_system.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
kern/tru64/tru64_system.cc:
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
python/m5/config.py:
Fix support for cycle_time relative latencies and frequencies.
Add support for getting a NetworkBandwidth or a MemoryBandwidth.
python/m5/objects/BaseCPU.mpy:
All CPUs now have a cycle_time. The default is the global frequency,
but it is now possible to set the global frequency to some large value
(like 1THz) and set each CPU frequency independently.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ide.mpy:
Make this a Latency parameter
python/m5/objects/BaseSystem.mpy:
We need to pass the boot CPU's frequency to the system
python/m5/objects/Ethernet.mpy:
Update parameter types to use latency and bandwidth types
python/m5/objects/Platform.mpy:
this frequency isn't needed. We get it from the clock interrupt.
python/m5/objects/Tsunami.mpy:
The clock generator should hold the frequency
sim/eventq.hh:
Need to remove this assertion because the writeback event
queue is different from the CPU's event queue which can cause
this assertion to fail.
sim/process.cc:
Fix comment.
sim/system.hh:
Struct member to hold the boot CPU's frequency.
sim/universe.cc:
remove unneeded variable.
--HG--
extra : convert_revision : 51efe4041095234bf458d9b3b0d417f4cae16fdc
2005-04-11 21:32:06 +02:00
|
|
|
schedule(curTick + interval);
|
2004-01-23 19:01:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-08-15 22:59:58 +02:00
|
|
|
TsunamiIO::RTC::RTCEvent::scheduleIntr()
|
|
|
|
{
|
|
|
|
schedule(curTick + interval);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::RTC::RTCEvent::process()
|
2004-01-23 19:01:32 +01:00
|
|
|
{
|
2004-01-29 00:12:52 +01:00
|
|
|
DPRINTF(MC146818, "RTC Timer Interrupt\n");
|
Make the notion of a global event tick independent of the actual
CPU cycle ticks. This allows the user to have CPUs of different
frequencies, and also allows frequencies and latencies that are
not evenly divisible by the CPU frequency. For now, the CPU
frequency is still set to the global frequency, but soon, we'll
hopefully make the global frequency fixed at something like 1THz
and set all other frequencies independently.
arch/alpha/ev5.cc:
The cycles counter is based on the current cpu cycle.
cpu/base_cpu.cc:
frequency isn't the cpu parameter anymore, cycleTime is.
cpu/base_cpu.hh:
frequency isn't the cpu parameter anymore, cycleTime is.
create several public functions for getting the cpu frequency
and the numbers of ticks for a given number of cycles, etc.
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/trace/trace_cpu.cc:
Now that ticks aren't cpu cycles, fixup code to advance
by the proper number of ticks.
cpu/memtest/memtest.hh:
cpu/trace/trace_cpu.hh:
Provide a function to get the number of ticks for a given
number of cycles.
dev/alpha_console.cc:
Update for changes in the way that frequencies and latencies are
accessed. Move some stuff to init()
dev/alpha_console.hh:
Need a pointer to the system and the cpu to get the frequency
so we can pass the info to the console code.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
dev/ide_disk.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
Add some extra debugging printfs
dev/platform.cc:
dev/sinic.cc:
dev/sinic.hh:
outline the constructor and destructor
dev/platform.hh:
outline the constructor and destructor.
don't keep track of the interrupt frequency. Only provide the
accessor function.
dev/tsunami.cc:
dev/tsunami.hh:
outline the constructor and destructor
Don't set the interrupt frequency here. Get it from the actual device
that does the interrupting.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make the interrupt interval a configuration parameter. (And convert
the interval to the new latency/frequency stuff in the python)
kern/linux/linux_system.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
kern/tru64/tru64_system.cc:
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
python/m5/config.py:
Fix support for cycle_time relative latencies and frequencies.
Add support for getting a NetworkBandwidth or a MemoryBandwidth.
python/m5/objects/BaseCPU.mpy:
All CPUs now have a cycle_time. The default is the global frequency,
but it is now possible to set the global frequency to some large value
(like 1THz) and set each CPU frequency independently.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ide.mpy:
Make this a Latency parameter
python/m5/objects/BaseSystem.mpy:
We need to pass the boot CPU's frequency to the system
python/m5/objects/Ethernet.mpy:
Update parameter types to use latency and bandwidth types
python/m5/objects/Platform.mpy:
this frequency isn't needed. We get it from the clock interrupt.
python/m5/objects/Tsunami.mpy:
The clock generator should hold the frequency
sim/eventq.hh:
Need to remove this assertion because the writeback event
queue is different from the CPU's event queue which can cause
this assertion to fail.
sim/process.cc:
Fix comment.
sim/system.hh:
Struct member to hold the boot CPU's frequency.
sim/universe.cc:
remove unneeded variable.
--HG--
extra : convert_revision : 51efe4041095234bf458d9b3b0d417f4cae16fdc
2005-04-11 21:32:06 +02:00
|
|
|
schedule(curTick + interval);
|
2004-01-26 19:26:34 +01:00
|
|
|
//Actually interrupt the processor here
|
2004-02-20 22:51:19 +01:00
|
|
|
tsunami->cchip->postRTC();
|
2004-01-23 19:01:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
const char *
|
2005-08-15 22:59:58 +02:00
|
|
|
TsunamiIO::RTC::RTCEvent::description()
|
2004-01-23 19:01:32 +01:00
|
|
|
{
|
Make the notion of a global event tick independent of the actual
CPU cycle ticks. This allows the user to have CPUs of different
frequencies, and also allows frequencies and latencies that are
not evenly divisible by the CPU frequency. For now, the CPU
frequency is still set to the global frequency, but soon, we'll
hopefully make the global frequency fixed at something like 1THz
and set all other frequencies independently.
arch/alpha/ev5.cc:
The cycles counter is based on the current cpu cycle.
cpu/base_cpu.cc:
frequency isn't the cpu parameter anymore, cycleTime is.
cpu/base_cpu.hh:
frequency isn't the cpu parameter anymore, cycleTime is.
create several public functions for getting the cpu frequency
and the numbers of ticks for a given number of cycles, etc.
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/trace/trace_cpu.cc:
Now that ticks aren't cpu cycles, fixup code to advance
by the proper number of ticks.
cpu/memtest/memtest.hh:
cpu/trace/trace_cpu.hh:
Provide a function to get the number of ticks for a given
number of cycles.
dev/alpha_console.cc:
Update for changes in the way that frequencies and latencies are
accessed. Move some stuff to init()
dev/alpha_console.hh:
Need a pointer to the system and the cpu to get the frequency
so we can pass the info to the console code.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
dev/ide_disk.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
Add some extra debugging printfs
dev/platform.cc:
dev/sinic.cc:
dev/sinic.hh:
outline the constructor and destructor
dev/platform.hh:
outline the constructor and destructor.
don't keep track of the interrupt frequency. Only provide the
accessor function.
dev/tsunami.cc:
dev/tsunami.hh:
outline the constructor and destructor
Don't set the interrupt frequency here. Get it from the actual device
that does the interrupting.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make the interrupt interval a configuration parameter. (And convert
the interval to the new latency/frequency stuff in the python)
kern/linux/linux_system.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
kern/tru64/tru64_system.cc:
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
python/m5/config.py:
Fix support for cycle_time relative latencies and frequencies.
Add support for getting a NetworkBandwidth or a MemoryBandwidth.
python/m5/objects/BaseCPU.mpy:
All CPUs now have a cycle_time. The default is the global frequency,
but it is now possible to set the global frequency to some large value
(like 1THz) and set each CPU frequency independently.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ide.mpy:
Make this a Latency parameter
python/m5/objects/BaseSystem.mpy:
We need to pass the boot CPU's frequency to the system
python/m5/objects/Ethernet.mpy:
Update parameter types to use latency and bandwidth types
python/m5/objects/Platform.mpy:
this frequency isn't needed. We get it from the clock interrupt.
python/m5/objects/Tsunami.mpy:
The clock generator should hold the frequency
sim/eventq.hh:
Need to remove this assertion because the writeback event
queue is different from the CPU's event queue which can cause
this assertion to fail.
sim/process.cc:
Fix comment.
sim/system.hh:
Struct member to hold the boot CPU's frequency.
sim/universe.cc:
remove unneeded variable.
--HG--
extra : convert_revision : 51efe4041095234bf458d9b3b0d417f4cae16fdc
2005-04-11 21:32:06 +02:00
|
|
|
return "tsunami RTC interrupt";
|
2004-01-23 19:01:32 +01:00
|
|
|
}
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::PITimer::PITimer(const string &name)
|
|
|
|
: _name(name), counter0(name + ".counter0"), counter1(name + ".counter1"),
|
|
|
|
counter2(name + ".counter2")
|
2004-06-17 00:20:10 +02:00
|
|
|
{
|
2005-08-23 17:45:52 +02:00
|
|
|
counter[0] = &counter0;
|
|
|
|
counter[1] = &counter0;
|
|
|
|
counter[2] = &counter0;
|
2005-08-15 22:59:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-04-10 20:14:06 +02:00
|
|
|
TsunamiIO::PITimer::writeControl(const uint8_t data)
|
2004-01-23 01:02:07 +01:00
|
|
|
{
|
2005-08-15 22:59:58 +02:00
|
|
|
int rw;
|
|
|
|
int sel;
|
|
|
|
|
2006-04-10 20:14:06 +02:00
|
|
|
sel = GET_CTRL_SEL(data);
|
2005-08-15 22:59:58 +02:00
|
|
|
|
|
|
|
if (sel == PIT_READ_BACK)
|
|
|
|
panic("PITimer Read-Back Command is not implemented.\n");
|
2005-03-29 14:55:44 +02:00
|
|
|
|
2006-04-11 19:42:47 +02:00
|
|
|
rw = GET_CTRL_RW(data);
|
2005-08-15 22:59:58 +02:00
|
|
|
|
|
|
|
if (rw == PIT_RW_LATCH_COMMAND)
|
2005-08-23 17:45:52 +02:00
|
|
|
counter[sel]->latchCount();
|
2005-08-15 22:59:58 +02:00
|
|
|
else {
|
2005-08-23 17:45:52 +02:00
|
|
|
counter[sel]->setRW(rw);
|
2006-04-10 20:14:06 +02:00
|
|
|
counter[sel]->setMode(GET_CTRL_MODE(data));
|
|
|
|
counter[sel]->setBCD(GET_CTRL_BCD(data));
|
2005-08-15 22:59:58 +02:00
|
|
|
}
|
2004-01-23 01:02:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::PITimer::serialize(const string &base, ostream &os)
|
2004-01-23 01:02:07 +01:00
|
|
|
{
|
2005-08-15 22:59:58 +02:00
|
|
|
// serialize the counters
|
2005-08-23 17:45:52 +02:00
|
|
|
counter0.serialize(base + ".counter0", os);
|
|
|
|
counter1.serialize(base + ".counter1", os);
|
|
|
|
counter2.serialize(base + ".counter2", os);
|
2004-01-23 01:02:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::PITimer::unserialize(const string &base, Checkpoint *cp,
|
|
|
|
const string §ion)
|
2004-01-23 01:02:07 +01:00
|
|
|
{
|
2005-08-15 22:59:58 +02:00
|
|
|
// unserialze the counters
|
2005-08-23 17:45:52 +02:00
|
|
|
counter0.unserialize(base + ".counter0", cp, section);
|
|
|
|
counter1.unserialize(base + ".counter1", cp, section);
|
|
|
|
counter2.unserialize(base + ".counter2", cp, section);
|
2004-01-23 01:02:07 +01:00
|
|
|
}
|
|
|
|
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::PITimer::Counter::Counter(const string &name)
|
|
|
|
: _name(name), event(this), count(0), latched_count(0), period(0),
|
2005-08-15 22:59:58 +02:00
|
|
|
mode(0), output_high(false), latch_on(false), read_byte(LSB),
|
|
|
|
write_byte(LSB)
|
2004-01-23 01:02:07 +01:00
|
|
|
{
|
2005-08-15 22:59:58 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::PITimer::Counter::latchCount()
|
|
|
|
{
|
|
|
|
// behave like a real latch
|
|
|
|
if(!latch_on) {
|
|
|
|
latch_on = true;
|
|
|
|
read_byte = LSB;
|
|
|
|
latched_count = count;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::PITimer::Counter::read(uint8_t *data)
|
|
|
|
{
|
|
|
|
if (latch_on) {
|
|
|
|
switch (read_byte) {
|
|
|
|
case LSB:
|
|
|
|
read_byte = MSB;
|
|
|
|
*data = (uint8_t)latched_count;
|
|
|
|
break;
|
|
|
|
case MSB:
|
|
|
|
read_byte = LSB;
|
|
|
|
latch_on = false;
|
|
|
|
*data = latched_count >> 8;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
switch (read_byte) {
|
|
|
|
case LSB:
|
|
|
|
read_byte = MSB;
|
|
|
|
*data = (uint8_t)count;
|
|
|
|
break;
|
|
|
|
case MSB:
|
|
|
|
read_byte = LSB;
|
|
|
|
*data = count >> 8;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-04-10 20:14:06 +02:00
|
|
|
TsunamiIO::PITimer::Counter::write(const uint8_t data)
|
2005-08-15 22:59:58 +02:00
|
|
|
{
|
|
|
|
switch (write_byte) {
|
|
|
|
case LSB:
|
2006-04-10 20:14:06 +02:00
|
|
|
count = (count & 0xFF00) | data;
|
2005-08-15 22:59:58 +02:00
|
|
|
|
|
|
|
if (event.scheduled())
|
|
|
|
event.deschedule();
|
|
|
|
output_high = false;
|
|
|
|
write_byte = MSB;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MSB:
|
2006-04-10 20:14:06 +02:00
|
|
|
count = (count & 0x00FF) | (data << 8);
|
2005-08-15 22:59:58 +02:00
|
|
|
period = count;
|
|
|
|
|
|
|
|
if (period > 0) {
|
2005-08-23 17:45:52 +02:00
|
|
|
DPRINTF(Tsunami, "Timer set to curTick + %d\n",
|
|
|
|
count * event.interval);
|
2005-08-15 22:59:58 +02:00
|
|
|
event.schedule(curTick + count * event.interval);
|
|
|
|
}
|
|
|
|
write_byte = LSB;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::PITimer::Counter::setRW(int rw_val)
|
|
|
|
{
|
|
|
|
if (rw_val != PIT_RW_16BIT)
|
|
|
|
panic("Only LSB/MSB read/write is implemented.\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::PITimer::Counter::setMode(int mode_val)
|
|
|
|
{
|
|
|
|
if(mode_val != PIT_MODE_INTTC && mode_val != PIT_MODE_RATEGEN &&
|
|
|
|
mode_val != PIT_MODE_SQWAVE)
|
|
|
|
panic("PIT mode %#x is not implemented: \n", mode_val);
|
|
|
|
|
|
|
|
mode = mode_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::PITimer::Counter::setBCD(int bcd_val)
|
|
|
|
{
|
|
|
|
if (bcd_val != PIT_BCD_FALSE)
|
|
|
|
panic("PITimer does not implement BCD counts.\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
TsunamiIO::PITimer::Counter::outputHigh()
|
|
|
|
{
|
|
|
|
return output_high;
|
2004-01-23 01:02:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::PITimer::Counter::serialize(const string &base, ostream &os)
|
2004-01-23 01:02:07 +01:00
|
|
|
{
|
2005-08-23 17:45:52 +02:00
|
|
|
paramOut(os, base + ".count", count);
|
|
|
|
paramOut(os, base + ".latched_count", latched_count);
|
|
|
|
paramOut(os, base + ".period", period);
|
|
|
|
paramOut(os, base + ".mode", mode);
|
|
|
|
paramOut(os, base + ".output_high", output_high);
|
|
|
|
paramOut(os, base + ".latch_on", latch_on);
|
|
|
|
paramOut(os, base + ".read_byte", read_byte);
|
|
|
|
paramOut(os, base + ".write_byte", write_byte);
|
2005-08-15 22:59:58 +02:00
|
|
|
|
2005-08-23 17:45:52 +02:00
|
|
|
Tick event_tick = 0;
|
|
|
|
if (event.scheduled())
|
|
|
|
event_tick = event.when();
|
|
|
|
paramOut(os, base + ".event_tick", event_tick);
|
2005-08-15 22:59:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::PITimer::Counter::unserialize(const string &base, Checkpoint *cp,
|
|
|
|
const string §ion)
|
2005-08-15 22:59:58 +02:00
|
|
|
{
|
2005-08-23 17:45:52 +02:00
|
|
|
paramIn(cp, section, base + ".count", count);
|
|
|
|
paramIn(cp, section, base + ".latched_count", latched_count);
|
|
|
|
paramIn(cp, section, base + ".period", period);
|
|
|
|
paramIn(cp, section, base + ".mode", mode);
|
|
|
|
paramIn(cp, section, base + ".output_high", output_high);
|
|
|
|
paramIn(cp, section, base + ".latch_on", latch_on);
|
|
|
|
paramIn(cp, section, base + ".read_byte", read_byte);
|
|
|
|
paramIn(cp, section, base + ".write_byte", write_byte);
|
2005-08-15 22:59:58 +02:00
|
|
|
|
2005-08-23 17:45:52 +02:00
|
|
|
Tick event_tick;
|
|
|
|
paramIn(cp, section, base + ".event_tick", event_tick);
|
|
|
|
if (event_tick)
|
|
|
|
event.schedule(event_tick);
|
2005-08-15 22:59:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
TsunamiIO::PITimer::Counter::CounterEvent::CounterEvent(Counter* c_ptr)
|
|
|
|
: Event(&mainEventQueue)
|
|
|
|
{
|
|
|
|
interval = (Tick)(Clock::Float::s / 1193180.0);
|
|
|
|
counter = c_ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::PITimer::Counter::CounterEvent::process()
|
|
|
|
{
|
|
|
|
DPRINTF(Tsunami, "Timer Interrupt\n");
|
|
|
|
switch (counter->mode) {
|
|
|
|
case PIT_MODE_INTTC:
|
|
|
|
counter->output_high = true;
|
|
|
|
case PIT_MODE_RATEGEN:
|
|
|
|
case PIT_MODE_SQWAVE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
panic("Unimplemented PITimer mode.\n");
|
|
|
|
}
|
2004-01-23 01:02:07 +01:00
|
|
|
}
|
|
|
|
|
2005-08-15 22:59:58 +02:00
|
|
|
const char *
|
|
|
|
TsunamiIO::PITimer::Counter::CounterEvent::description()
|
2004-01-23 01:02:07 +01:00
|
|
|
{
|
2005-08-15 22:59:58 +02:00
|
|
|
return "tsunami 8254 Interval timer";
|
2004-01-23 01:02:07 +01:00
|
|
|
}
|
|
|
|
|
2006-04-10 20:14:06 +02:00
|
|
|
TsunamiIO::TsunamiIO(Params *p)
|
|
|
|
: BasicPioDevice(p), tsunami(p->tsunami), pitimer(p->name + "pitimer"),
|
2006-04-11 19:42:47 +02:00
|
|
|
rtc(p->name + ".rtc", p->tsunami, p->frequency)
|
2004-01-22 02:14:10 +01:00
|
|
|
{
|
2006-04-10 20:14:06 +02:00
|
|
|
pioSize = 0xff;
|
2004-06-10 19:30:58 +02:00
|
|
|
|
2004-02-06 00:23:16 +01:00
|
|
|
// set the back pointer from tsunami to myself
|
|
|
|
tsunami->io = this;
|
|
|
|
|
2004-01-23 01:02:07 +01:00
|
|
|
timerData = 0;
|
2006-04-11 19:42:47 +02:00
|
|
|
rtc.set_time(p->init_time == 0 ? time(NULL) : p->init_time);
|
2004-01-29 01:18:29 +01:00
|
|
|
picr = 0;
|
|
|
|
picInterrupting = false;
|
2004-01-26 19:26:34 +01:00
|
|
|
}
|
|
|
|
|
Make the notion of a global event tick independent of the actual
CPU cycle ticks. This allows the user to have CPUs of different
frequencies, and also allows frequencies and latencies that are
not evenly divisible by the CPU frequency. For now, the CPU
frequency is still set to the global frequency, but soon, we'll
hopefully make the global frequency fixed at something like 1THz
and set all other frequencies independently.
arch/alpha/ev5.cc:
The cycles counter is based on the current cpu cycle.
cpu/base_cpu.cc:
frequency isn't the cpu parameter anymore, cycleTime is.
cpu/base_cpu.hh:
frequency isn't the cpu parameter anymore, cycleTime is.
create several public functions for getting the cpu frequency
and the numbers of ticks for a given number of cycles, etc.
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/trace/trace_cpu.cc:
Now that ticks aren't cpu cycles, fixup code to advance
by the proper number of ticks.
cpu/memtest/memtest.hh:
cpu/trace/trace_cpu.hh:
Provide a function to get the number of ticks for a given
number of cycles.
dev/alpha_console.cc:
Update for changes in the way that frequencies and latencies are
accessed. Move some stuff to init()
dev/alpha_console.hh:
Need a pointer to the system and the cpu to get the frequency
so we can pass the info to the console code.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
dev/ide_disk.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
Add some extra debugging printfs
dev/platform.cc:
dev/sinic.cc:
dev/sinic.hh:
outline the constructor and destructor
dev/platform.hh:
outline the constructor and destructor.
don't keep track of the interrupt frequency. Only provide the
accessor function.
dev/tsunami.cc:
dev/tsunami.hh:
outline the constructor and destructor
Don't set the interrupt frequency here. Get it from the actual device
that does the interrupting.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make the interrupt interval a configuration parameter. (And convert
the interval to the new latency/frequency stuff in the python)
kern/linux/linux_system.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
kern/tru64/tru64_system.cc:
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
python/m5/config.py:
Fix support for cycle_time relative latencies and frequencies.
Add support for getting a NetworkBandwidth or a MemoryBandwidth.
python/m5/objects/BaseCPU.mpy:
All CPUs now have a cycle_time. The default is the global frequency,
but it is now possible to set the global frequency to some large value
(like 1THz) and set each CPU frequency independently.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ide.mpy:
Make this a Latency parameter
python/m5/objects/BaseSystem.mpy:
We need to pass the boot CPU's frequency to the system
python/m5/objects/Ethernet.mpy:
Update parameter types to use latency and bandwidth types
python/m5/objects/Platform.mpy:
this frequency isn't needed. We get it from the clock interrupt.
python/m5/objects/Tsunami.mpy:
The clock generator should hold the frequency
sim/eventq.hh:
Need to remove this assertion because the writeback event
queue is different from the CPU's event queue which can cause
this assertion to fail.
sim/process.cc:
Fix comment.
sim/system.hh:
Struct member to hold the boot CPU's frequency.
sim/universe.cc:
remove unneeded variable.
--HG--
extra : convert_revision : 51efe4041095234bf458d9b3b0d417f4cae16fdc
2005-04-11 21:32:06 +02:00
|
|
|
Tick
|
|
|
|
TsunamiIO::frequency() const
|
|
|
|
{
|
2006-04-10 20:14:06 +02:00
|
|
|
return Clock::Frequency / params()->frequency;
|
Make the notion of a global event tick independent of the actual
CPU cycle ticks. This allows the user to have CPUs of different
frequencies, and also allows frequencies and latencies that are
not evenly divisible by the CPU frequency. For now, the CPU
frequency is still set to the global frequency, but soon, we'll
hopefully make the global frequency fixed at something like 1THz
and set all other frequencies independently.
arch/alpha/ev5.cc:
The cycles counter is based on the current cpu cycle.
cpu/base_cpu.cc:
frequency isn't the cpu parameter anymore, cycleTime is.
cpu/base_cpu.hh:
frequency isn't the cpu parameter anymore, cycleTime is.
create several public functions for getting the cpu frequency
and the numbers of ticks for a given number of cycles, etc.
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/trace/trace_cpu.cc:
Now that ticks aren't cpu cycles, fixup code to advance
by the proper number of ticks.
cpu/memtest/memtest.hh:
cpu/trace/trace_cpu.hh:
Provide a function to get the number of ticks for a given
number of cycles.
dev/alpha_console.cc:
Update for changes in the way that frequencies and latencies are
accessed. Move some stuff to init()
dev/alpha_console.hh:
Need a pointer to the system and the cpu to get the frequency
so we can pass the info to the console code.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
dev/ide_disk.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
Add some extra debugging printfs
dev/platform.cc:
dev/sinic.cc:
dev/sinic.hh:
outline the constructor and destructor
dev/platform.hh:
outline the constructor and destructor.
don't keep track of the interrupt frequency. Only provide the
accessor function.
dev/tsunami.cc:
dev/tsunami.hh:
outline the constructor and destructor
Don't set the interrupt frequency here. Get it from the actual device
that does the interrupting.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make the interrupt interval a configuration parameter. (And convert
the interval to the new latency/frequency stuff in the python)
kern/linux/linux_system.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
kern/tru64/tru64_system.cc:
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
python/m5/config.py:
Fix support for cycle_time relative latencies and frequencies.
Add support for getting a NetworkBandwidth or a MemoryBandwidth.
python/m5/objects/BaseCPU.mpy:
All CPUs now have a cycle_time. The default is the global frequency,
but it is now possible to set the global frequency to some large value
(like 1THz) and set each CPU frequency independently.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ide.mpy:
Make this a Latency parameter
python/m5/objects/BaseSystem.mpy:
We need to pass the boot CPU's frequency to the system
python/m5/objects/Ethernet.mpy:
Update parameter types to use latency and bandwidth types
python/m5/objects/Platform.mpy:
this frequency isn't needed. We get it from the clock interrupt.
python/m5/objects/Tsunami.mpy:
The clock generator should hold the frequency
sim/eventq.hh:
Need to remove this assertion because the writeback event
queue is different from the CPU's event queue which can cause
this assertion to fail.
sim/process.cc:
Fix comment.
sim/system.hh:
Struct member to hold the boot CPU's frequency.
sim/universe.cc:
remove unneeded variable.
--HG--
extra : convert_revision : 51efe4041095234bf458d9b3b0d417f4cae16fdc
2005-04-11 21:32:06 +02:00
|
|
|
}
|
|
|
|
|
2006-04-11 19:42:47 +02:00
|
|
|
Tick
|
2006-04-10 20:14:06 +02:00
|
|
|
TsunamiIO::read(Packet &pkt)
|
2004-01-22 02:14:10 +01:00
|
|
|
{
|
2006-04-10 20:14:06 +02:00
|
|
|
assert(pkt.result == Unknown);
|
|
|
|
assert(pkt.addr >= pioAddr && pkt.addr < pioAddr + pioSize);
|
|
|
|
|
|
|
|
pkt.time = curTick + pioDelay;
|
|
|
|
Addr daddr = pkt.addr - pioAddr;
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2006-04-10 20:14:06 +02:00
|
|
|
DPRINTF(Tsunami, "io read va=%#x size=%d IOPorrt=%#x\n", pkt.addr,
|
|
|
|
pkt.size, daddr);
|
2004-05-14 23:34:15 +02:00
|
|
|
|
2006-04-25 01:31:50 +02:00
|
|
|
pkt.allocate();
|
2006-04-10 20:14:06 +02:00
|
|
|
|
|
|
|
if (pkt.size == sizeof(uint8_t)) {
|
2004-02-06 00:23:16 +01:00
|
|
|
switch(daddr) {
|
2005-08-15 22:59:58 +02:00
|
|
|
// PIC1 mask read
|
|
|
|
case TSDEV_PIC1_MASK:
|
2006-04-25 01:31:50 +02:00
|
|
|
pkt.set(~mask1);
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
2005-08-15 22:59:58 +02:00
|
|
|
case TSDEV_PIC2_MASK:
|
2006-04-25 01:31:50 +02:00
|
|
|
pkt.set(~mask2);
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
2004-05-14 23:34:15 +02:00
|
|
|
case TSDEV_PIC1_ISR:
|
|
|
|
// !!! If this is modified 64bit case needs to be too
|
|
|
|
// Pal code has to do a 64 bit physical read because there is
|
|
|
|
// no load physical byte instruction
|
2006-04-25 01:31:50 +02:00
|
|
|
pkt.set(picr);
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
2004-05-14 23:34:15 +02:00
|
|
|
case TSDEV_PIC2_ISR:
|
|
|
|
// PIC2 not implemnted... just return 0
|
2006-04-25 01:31:50 +02:00
|
|
|
pkt.set(0x00);
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
2005-08-15 22:59:58 +02:00
|
|
|
case TSDEV_TMR0_DATA:
|
2006-04-25 01:31:50 +02:00
|
|
|
pitimer.counter0.read(pkt.getPtr<uint8_t>());
|
2006-04-11 19:42:47 +02:00
|
|
|
break;
|
2005-08-15 22:59:58 +02:00
|
|
|
case TSDEV_TMR1_DATA:
|
2006-04-25 01:31:50 +02:00
|
|
|
pitimer.counter1.read(pkt.getPtr<uint8_t>());
|
2006-04-11 19:42:47 +02:00
|
|
|
break;
|
2005-08-15 22:59:58 +02:00
|
|
|
case TSDEV_TMR2_DATA:
|
2006-04-25 01:31:50 +02:00
|
|
|
pitimer.counter2.read(pkt.getPtr<uint8_t>());
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
2004-02-06 00:23:16 +01:00
|
|
|
case TSDEV_RTC_DATA:
|
2006-04-25 01:31:50 +02:00
|
|
|
rtc.readData(pkt.getPtr<uint8_t>());
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
2005-08-15 22:59:58 +02:00
|
|
|
case TSDEV_CTRL_PORTB:
|
|
|
|
if (pitimer.counter2.outputHigh())
|
2006-04-25 01:31:50 +02:00
|
|
|
pkt.set(PORTB_SPKR_HIGH);
|
2005-08-15 22:59:58 +02:00
|
|
|
else
|
2006-04-25 01:31:50 +02:00
|
|
|
pkt.set(0x00);
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
2004-02-06 00:23:16 +01:00
|
|
|
default:
|
2006-04-10 20:14:06 +02:00
|
|
|
panic("I/O Read - va%#x size %d\n", pkt.addr, pkt.size);
|
2004-02-06 00:23:16 +01:00
|
|
|
}
|
2006-04-10 20:14:06 +02:00
|
|
|
} else if (pkt.size == sizeof(uint64_t)) {
|
|
|
|
if (daddr == TSDEV_PIC1_ISR)
|
2006-04-25 01:31:50 +02:00
|
|
|
pkt.set<uint64_t>(picr);
|
2006-04-10 20:14:06 +02:00
|
|
|
else
|
|
|
|
panic("I/O Read - invalid addr - va %#x size %d\n",
|
2006-04-11 19:42:47 +02:00
|
|
|
pkt.addr, pkt.size);
|
2006-04-10 20:14:06 +02:00
|
|
|
} else {
|
2006-04-11 19:42:47 +02:00
|
|
|
panic("I/O Read - invalid size - va %#x size %d\n", pkt.addr, pkt.size);
|
2004-01-23 01:02:07 +01:00
|
|
|
}
|
2006-04-10 20:14:06 +02:00
|
|
|
pkt.result = Success;
|
|
|
|
return pioDelay;
|
2004-01-22 02:14:10 +01:00
|
|
|
}
|
|
|
|
|
2006-04-10 20:14:06 +02:00
|
|
|
Tick
|
|
|
|
TsunamiIO::write(Packet &pkt)
|
2004-01-22 02:14:10 +01:00
|
|
|
{
|
2006-04-10 20:14:06 +02:00
|
|
|
pkt.time = curTick + pioDelay;
|
|
|
|
|
|
|
|
assert(pkt.result == Unknown);
|
|
|
|
assert(pkt.addr >= pioAddr && pkt.addr < pioAddr + pioSize);
|
|
|
|
Addr daddr = pkt.addr - pioAddr;
|
2004-01-30 21:24:50 +01:00
|
|
|
|
|
|
|
DPRINTF(Tsunami, "io write - va=%#x size=%d IOPort=%#x Data=%#x\n",
|
2006-04-25 01:31:50 +02:00
|
|
|
pkt.addr, pkt.size, pkt.addr & 0xfff, (uint32_t)pkt.get<uint8_t>());
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2006-04-10 20:14:06 +02:00
|
|
|
assert(pkt.size == sizeof(uint8_t));
|
2004-01-22 06:08:48 +01:00
|
|
|
|
2006-04-10 20:14:06 +02:00
|
|
|
switch(daddr) {
|
|
|
|
case TSDEV_PIC1_MASK:
|
2006-04-25 01:31:50 +02:00
|
|
|
mask1 = ~(pkt.get<uint8_t>());
|
2006-04-10 20:14:06 +02:00
|
|
|
if ((picr & mask1) && !picInterrupting) {
|
|
|
|
picInterrupting = true;
|
|
|
|
tsunami->cchip->postDRIR(55);
|
|
|
|
DPRINTF(Tsunami, "posting pic interrupt to cchip\n");
|
2004-02-06 00:23:16 +01:00
|
|
|
}
|
2006-04-10 20:14:06 +02:00
|
|
|
if ((!(picr & mask1)) && picInterrupting) {
|
|
|
|
picInterrupting = false;
|
|
|
|
tsunami->cchip->clearDRIR(55);
|
|
|
|
DPRINTF(Tsunami, "clearing pic interrupt\n");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TSDEV_PIC2_MASK:
|
2006-04-25 01:31:50 +02:00
|
|
|
mask2 = pkt.get<uint8_t>();
|
2006-04-10 20:14:06 +02:00
|
|
|
//PIC2 Not implemented to interrupt
|
|
|
|
break;
|
|
|
|
case TSDEV_PIC1_ACK:
|
|
|
|
// clear the interrupt on the PIC
|
2006-04-25 01:31:50 +02:00
|
|
|
picr &= ~(1 << (pkt.get<uint8_t>() & 0xF));
|
2006-04-10 20:14:06 +02:00
|
|
|
if (!(picr & mask1))
|
|
|
|
tsunami->cchip->clearDRIR(55);
|
|
|
|
break;
|
|
|
|
case TSDEV_DMA1_MODE:
|
2006-04-25 01:31:50 +02:00
|
|
|
mode1 = pkt.get<uint8_t>();
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
|
|
|
case TSDEV_DMA2_MODE:
|
2006-04-25 01:31:50 +02:00
|
|
|
mode2 = pkt.get<uint8_t>();
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
|
|
|
case TSDEV_TMR0_DATA:
|
2006-04-25 01:31:50 +02:00
|
|
|
pitimer.counter0.write(pkt.get<uint8_t>());
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
|
|
|
case TSDEV_TMR1_DATA:
|
2006-04-25 01:31:50 +02:00
|
|
|
pitimer.counter1.write(pkt.get<uint8_t>());
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
|
|
|
case TSDEV_TMR2_DATA:
|
2006-04-25 01:31:50 +02:00
|
|
|
pitimer.counter2.write(pkt.get<uint8_t>());
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
|
|
|
case TSDEV_TMR_CTRL:
|
2006-04-25 01:31:50 +02:00
|
|
|
pitimer.writeControl(pkt.get<uint8_t>());
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
|
|
|
case TSDEV_RTC_ADDR:
|
2006-04-25 01:31:50 +02:00
|
|
|
rtc.writeAddr(pkt.get<uint8_t>());
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
|
|
|
case TSDEV_RTC_DATA:
|
2006-04-25 01:31:50 +02:00
|
|
|
rtc.writeData(pkt.get<uint8_t>());
|
2006-04-10 20:14:06 +02:00
|
|
|
break;
|
|
|
|
case TSDEV_KBD:
|
|
|
|
case TSDEV_DMA1_CMND:
|
|
|
|
case TSDEV_DMA2_CMND:
|
|
|
|
case TSDEV_DMA1_MMASK:
|
|
|
|
case TSDEV_DMA2_MMASK:
|
|
|
|
case TSDEV_PIC2_ACK:
|
|
|
|
case TSDEV_DMA1_RESET:
|
|
|
|
case TSDEV_DMA2_RESET:
|
|
|
|
case TSDEV_DMA1_MASK:
|
|
|
|
case TSDEV_DMA2_MASK:
|
|
|
|
case TSDEV_CTRL_PORTB:
|
|
|
|
break;
|
2004-02-06 00:23:16 +01:00
|
|
|
default:
|
2006-04-25 01:31:50 +02:00
|
|
|
panic("I/O Write - va%#x size %d data %#x\n", pkt.addr, pkt.size, pkt.get<uint8_t>());
|
2004-01-22 06:08:48 +01:00
|
|
|
}
|
|
|
|
|
2006-04-10 20:14:06 +02:00
|
|
|
pkt.result = Success;
|
|
|
|
return pioDelay;
|
2004-01-22 02:14:10 +01:00
|
|
|
}
|
|
|
|
|
2004-01-29 01:18:29 +01:00
|
|
|
void
|
|
|
|
TsunamiIO::postPIC(uint8_t bitvector)
|
|
|
|
{
|
|
|
|
//PIC2 Is not implemented, because nothing of interest there
|
|
|
|
picr |= bitvector;
|
2004-05-14 23:34:15 +02:00
|
|
|
if (picr & mask1) {
|
2004-02-16 05:56:44 +01:00
|
|
|
tsunami->cchip->postDRIR(55);
|
2004-01-29 01:18:29 +01:00
|
|
|
DPRINTF(Tsunami, "posting pic interrupt to cchip\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
TsunamiIO::clearPIC(uint8_t bitvector)
|
|
|
|
{
|
|
|
|
//PIC2 Is not implemented, because nothing of interest there
|
|
|
|
picr &= ~bitvector;
|
|
|
|
if (!(picr & mask1)) {
|
2004-02-16 05:56:44 +01:00
|
|
|
tsunami->cchip->clearDRIR(55);
|
2004-01-29 01:18:29 +01:00
|
|
|
DPRINTF(Tsunami, "clearing pic interrupt to cchip\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-01-22 02:14:10 +01:00
|
|
|
void
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::serialize(ostream &os)
|
2004-01-22 02:14:10 +01:00
|
|
|
{
|
2004-02-11 21:32:30 +01:00
|
|
|
SERIALIZE_SCALAR(timerData);
|
2004-06-04 20:26:17 +02:00
|
|
|
SERIALIZE_SCALAR(mask1);
|
|
|
|
SERIALIZE_SCALAR(mask2);
|
|
|
|
SERIALIZE_SCALAR(mode1);
|
|
|
|
SERIALIZE_SCALAR(mode2);
|
2004-02-11 21:32:30 +01:00
|
|
|
SERIALIZE_SCALAR(picr);
|
|
|
|
SERIALIZE_SCALAR(picInterrupting);
|
|
|
|
|
2004-06-17 01:47:07 +02:00
|
|
|
// Serialize the timers
|
2005-08-23 17:45:52 +02:00
|
|
|
pitimer.serialize("pitimer", os);
|
|
|
|
rtc.serialize("rtc", os);
|
2004-01-22 02:14:10 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-08-23 17:45:52 +02:00
|
|
|
TsunamiIO::unserialize(Checkpoint *cp, const string §ion)
|
2004-01-22 02:14:10 +01:00
|
|
|
{
|
2004-02-11 21:32:30 +01:00
|
|
|
UNSERIALIZE_SCALAR(timerData);
|
2004-06-04 20:26:17 +02:00
|
|
|
UNSERIALIZE_SCALAR(mask1);
|
|
|
|
UNSERIALIZE_SCALAR(mask2);
|
|
|
|
UNSERIALIZE_SCALAR(mode1);
|
|
|
|
UNSERIALIZE_SCALAR(mode2);
|
2004-02-11 21:32:30 +01:00
|
|
|
UNSERIALIZE_SCALAR(picr);
|
|
|
|
UNSERIALIZE_SCALAR(picInterrupting);
|
2004-06-17 01:47:07 +02:00
|
|
|
|
|
|
|
// Unserialize the timers
|
2005-08-23 17:45:52 +02:00
|
|
|
pitimer.unserialize("pitimer", cp, section);
|
|
|
|
rtc.unserialize("rtc", cp, section);
|
2004-01-22 02:14:10 +01:00
|
|
|
}
|
|
|
|
|
2004-01-22 06:36:26 +01:00
|
|
|
BEGIN_DECLARE_SIM_OBJECT_PARAMS(TsunamiIO)
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2006-04-10 20:14:06 +02:00
|
|
|
Param<Addr> pio_addr;
|
2004-07-13 04:58:22 +02:00
|
|
|
Param<Tick> pio_latency;
|
Make the notion of a global event tick independent of the actual
CPU cycle ticks. This allows the user to have CPUs of different
frequencies, and also allows frequencies and latencies that are
not evenly divisible by the CPU frequency. For now, the CPU
frequency is still set to the global frequency, but soon, we'll
hopefully make the global frequency fixed at something like 1THz
and set all other frequencies independently.
arch/alpha/ev5.cc:
The cycles counter is based on the current cpu cycle.
cpu/base_cpu.cc:
frequency isn't the cpu parameter anymore, cycleTime is.
cpu/base_cpu.hh:
frequency isn't the cpu parameter anymore, cycleTime is.
create several public functions for getting the cpu frequency
and the numbers of ticks for a given number of cycles, etc.
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/trace/trace_cpu.cc:
Now that ticks aren't cpu cycles, fixup code to advance
by the proper number of ticks.
cpu/memtest/memtest.hh:
cpu/trace/trace_cpu.hh:
Provide a function to get the number of ticks for a given
number of cycles.
dev/alpha_console.cc:
Update for changes in the way that frequencies and latencies are
accessed. Move some stuff to init()
dev/alpha_console.hh:
Need a pointer to the system and the cpu to get the frequency
so we can pass the info to the console code.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
dev/ide_disk.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
Add some extra debugging printfs
dev/platform.cc:
dev/sinic.cc:
dev/sinic.hh:
outline the constructor and destructor
dev/platform.hh:
outline the constructor and destructor.
don't keep track of the interrupt frequency. Only provide the
accessor function.
dev/tsunami.cc:
dev/tsunami.hh:
outline the constructor and destructor
Don't set the interrupt frequency here. Get it from the actual device
that does the interrupting.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make the interrupt interval a configuration parameter. (And convert
the interval to the new latency/frequency stuff in the python)
kern/linux/linux_system.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
kern/tru64/tru64_system.cc:
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
python/m5/config.py:
Fix support for cycle_time relative latencies and frequencies.
Add support for getting a NetworkBandwidth or a MemoryBandwidth.
python/m5/objects/BaseCPU.mpy:
All CPUs now have a cycle_time. The default is the global frequency,
but it is now possible to set the global frequency to some large value
(like 1THz) and set each CPU frequency independently.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ide.mpy:
Make this a Latency parameter
python/m5/objects/BaseSystem.mpy:
We need to pass the boot CPU's frequency to the system
python/m5/objects/Ethernet.mpy:
Update parameter types to use latency and bandwidth types
python/m5/objects/Platform.mpy:
this frequency isn't needed. We get it from the clock interrupt.
python/m5/objects/Tsunami.mpy:
The clock generator should hold the frequency
sim/eventq.hh:
Need to remove this assertion because the writeback event
queue is different from the CPU's event queue which can cause
this assertion to fail.
sim/process.cc:
Fix comment.
sim/system.hh:
Struct member to hold the boot CPU's frequency.
sim/universe.cc:
remove unneeded variable.
--HG--
extra : convert_revision : 51efe4041095234bf458d9b3b0d417f4cae16fdc
2005-04-11 21:32:06 +02:00
|
|
|
Param<Tick> frequency;
|
2006-04-10 20:14:06 +02:00
|
|
|
SimObjectParam<Platform *> platform;
|
|
|
|
SimObjectParam<System *> system;
|
|
|
|
Param<time_t> time;
|
|
|
|
SimObjectParam<Tsunami *> tsunami;
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2004-01-22 06:36:26 +01:00
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(TsunamiIO)
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2004-01-22 06:36:26 +01:00
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(TsunamiIO)
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2006-04-10 20:14:06 +02:00
|
|
|
INIT_PARAM(pio_addr, "Device Address"),
|
|
|
|
INIT_PARAM(pio_latency, "Programmed IO latency"),
|
2006-04-11 19:42:47 +02:00
|
|
|
INIT_PARAM(frequency, "clock interrupt frequency"),
|
2006-04-10 20:14:06 +02:00
|
|
|
INIT_PARAM(platform, "platform"),
|
|
|
|
INIT_PARAM(system, "system object"),
|
Make the notion of a global event tick independent of the actual
CPU cycle ticks. This allows the user to have CPUs of different
frequencies, and also allows frequencies and latencies that are
not evenly divisible by the CPU frequency. For now, the CPU
frequency is still set to the global frequency, but soon, we'll
hopefully make the global frequency fixed at something like 1THz
and set all other frequencies independently.
arch/alpha/ev5.cc:
The cycles counter is based on the current cpu cycle.
cpu/base_cpu.cc:
frequency isn't the cpu parameter anymore, cycleTime is.
cpu/base_cpu.hh:
frequency isn't the cpu parameter anymore, cycleTime is.
create several public functions for getting the cpu frequency
and the numbers of ticks for a given number of cycles, etc.
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/trace/trace_cpu.cc:
Now that ticks aren't cpu cycles, fixup code to advance
by the proper number of ticks.
cpu/memtest/memtest.hh:
cpu/trace/trace_cpu.hh:
Provide a function to get the number of ticks for a given
number of cycles.
dev/alpha_console.cc:
Update for changes in the way that frequencies and latencies are
accessed. Move some stuff to init()
dev/alpha_console.hh:
Need a pointer to the system and the cpu to get the frequency
so we can pass the info to the console code.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
dev/ide_disk.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
Add some extra debugging printfs
dev/platform.cc:
dev/sinic.cc:
dev/sinic.hh:
outline the constructor and destructor
dev/platform.hh:
outline the constructor and destructor.
don't keep track of the interrupt frequency. Only provide the
accessor function.
dev/tsunami.cc:
dev/tsunami.hh:
outline the constructor and destructor
Don't set the interrupt frequency here. Get it from the actual device
that does the interrupting.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make the interrupt interval a configuration parameter. (And convert
the interval to the new latency/frequency stuff in the python)
kern/linux/linux_system.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
kern/tru64/tru64_system.cc:
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
python/m5/config.py:
Fix support for cycle_time relative latencies and frequencies.
Add support for getting a NetworkBandwidth or a MemoryBandwidth.
python/m5/objects/BaseCPU.mpy:
All CPUs now have a cycle_time. The default is the global frequency,
but it is now possible to set the global frequency to some large value
(like 1THz) and set each CPU frequency independently.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ide.mpy:
Make this a Latency parameter
python/m5/objects/BaseSystem.mpy:
We need to pass the boot CPU's frequency to the system
python/m5/objects/Ethernet.mpy:
Update parameter types to use latency and bandwidth types
python/m5/objects/Platform.mpy:
this frequency isn't needed. We get it from the clock interrupt.
python/m5/objects/Tsunami.mpy:
The clock generator should hold the frequency
sim/eventq.hh:
Need to remove this assertion because the writeback event
queue is different from the CPU's event queue which can cause
this assertion to fail.
sim/process.cc:
Fix comment.
sim/system.hh:
Struct member to hold the boot CPU's frequency.
sim/universe.cc:
remove unneeded variable.
--HG--
extra : convert_revision : 51efe4041095234bf458d9b3b0d417f4cae16fdc
2005-04-11 21:32:06 +02:00
|
|
|
INIT_PARAM(time, "System time to use (0 for actual time"),
|
2006-04-10 20:14:06 +02:00
|
|
|
INIT_PARAM(tsunami, "Tsunami")
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2004-01-22 06:36:26 +01:00
|
|
|
END_INIT_SIM_OBJECT_PARAMS(TsunamiIO)
|
2004-01-22 02:14:10 +01:00
|
|
|
|
2004-01-22 06:36:26 +01:00
|
|
|
CREATE_SIM_OBJECT(TsunamiIO)
|
2004-01-22 02:14:10 +01:00
|
|
|
{
|
2006-04-10 20:14:06 +02:00
|
|
|
TsunamiIO::Params *p = new TsunamiIO::Params;
|
|
|
|
p->frequency = frequency;
|
|
|
|
p->name = getInstanceName();
|
|
|
|
p->pio_addr = pio_addr;
|
|
|
|
p->pio_delay = pio_latency;
|
|
|
|
p->platform = platform;
|
|
|
|
p->system = system;
|
|
|
|
p->init_time = time;
|
|
|
|
p->tsunami = tsunami;
|
|
|
|
return new TsunamiIO(p);
|
2004-01-22 02:14:10 +01:00
|
|
|
}
|
|
|
|
|
2004-01-22 06:36:26 +01:00
|
|
|
REGISTER_SIM_OBJECT("TsunamiIO", TsunamiIO)
|