2007-05-28 04:21:17 +02:00
|
|
|
# Copyright (c) 2005-2007 The Regents of The University of Michigan
|
|
|
|
|
# All rights reserved.
|
|
|
|
|
#
|
|
|
|
|
# Redistribution and use in source and binary forms, with or without
|
|
|
|
|
# modification, are permitted provided that the following conditions are
|
|
|
|
|
# met: redistributions of source code must retain the above copyright
|
|
|
|
|
# notice, this list of conditions and the following disclaimer;
|
|
|
|
|
# redistributions in binary form must reproduce the above copyright
|
|
|
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
|
|
|
# documentation and/or other materials provided with the distribution;
|
|
|
|
|
# neither the name of the copyright holders nor the names of its
|
|
|
|
|
# contributors may be used to endorse or promote products derived from
|
|
|
|
|
# this software without specific prior written permission.
|
|
|
|
|
#
|
|
|
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
|
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
|
|
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
|
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
#
|
|
|
|
|
# Authors: Nathan Binkert
|
|
|
|
|
|
2006-09-05 02:14:07 +02:00
|
|
|
from m5.SimObject import SimObject
|
|
|
|
|
from m5.params import *
|
|
|
|
|
from m5.proxy import *
|
2006-07-12 23:16:00 +02:00
|
|
|
from Pci import PciDevice, PciConfigData
|
2005-01-15 10:12:25 +01:00
|
|
|
|
2005-05-29 07:14:50 +02:00
|
|
|
class EtherInt(SimObject):
|
2005-02-03 03:13:01 +01:00
|
|
|
type = 'EtherInt'
|
2005-01-15 10:12:25 +01:00
|
|
|
abstract = True
|
|
|
|
|
peer = Param.EtherInt(NULL, "peer interface")
|
|
|
|
|
|
2005-05-29 07:14:50 +02:00
|
|
|
class EtherLink(SimObject):
|
2005-02-03 03:13:01 +01:00
|
|
|
type = 'EtherLink'
|
2005-01-15 10:12:25 +01:00
|
|
|
int1 = Param.EtherInt("interface 1")
|
|
|
|
|
int2 = Param.EtherInt("interface 2")
|
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
|
|
|
delay = Param.Latency('0us', "packet transmit delay")
|
2005-11-02 20:44:42 +01:00
|
|
|
delay_var = Param.Latency('0ns', "packet transmit delay variability")
|
2005-06-02 17:19:01 +02:00
|
|
|
speed = Param.NetworkBandwidth('1Gbps', "link speed")
|
2005-01-15 10:12:25 +01:00
|
|
|
dump = Param.EtherDump(NULL, "dump object")
|
|
|
|
|
|
2005-05-29 07:14:50 +02:00
|
|
|
class EtherBus(SimObject):
|
2005-02-03 03:13:01 +01:00
|
|
|
type = 'EtherBus'
|
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
|
|
|
loopback = Param.Bool(True, "send packet back to the sending interface")
|
2005-01-15 10:12:25 +01:00
|
|
|
dump = Param.EtherDump(NULL, "dump 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
|
|
|
speed = Param.NetworkBandwidth('100Mbps', "bus speed in bits per second")
|
2005-01-15 10:12:25 +01:00
|
|
|
|
2005-05-29 07:14:50 +02:00
|
|
|
class EtherTap(EtherInt):
|
2005-02-03 03:13:01 +01:00
|
|
|
type = 'EtherTap'
|
2005-01-15 10:12:25 +01:00
|
|
|
bufsz = Param.Int(10000, "tap buffer size")
|
|
|
|
|
dump = Param.EtherDump(NULL, "dump object")
|
|
|
|
|
port = Param.UInt16(3500, "tap port")
|
|
|
|
|
|
2005-05-29 07:14:50 +02:00
|
|
|
class EtherDump(SimObject):
|
2005-02-03 03:13:01 +01:00
|
|
|
type = 'EtherDump'
|
2005-01-15 10:12:25 +01:00
|
|
|
file = Param.String("dump file")
|
2005-09-17 16:47:16 +02:00
|
|
|
maxlen = Param.Int(96, "max portion of packet data to dump")
|
2005-01-15 10:12:25 +01:00
|
|
|
|
2006-09-19 02:12:45 +02:00
|
|
|
class IGbE(PciDevice):
|
|
|
|
|
type = 'IGbE'
|
2007-06-20 17:14:11 +02:00
|
|
|
hardware_address = Param.EthernetAddr(NextEthernetAddr,
|
|
|
|
|
"Ethernet Hardware Address")
|
2007-05-28 04:21:17 +02:00
|
|
|
use_flow_control = Param.Bool(False,
|
|
|
|
|
"Should we use xon/xoff flow contorl (UNIMPLEMENTD)")
|
2007-03-27 00:40:18 +02:00
|
|
|
rx_fifo_size = Param.MemorySize('384kB', "Size of the rx FIFO")
|
|
|
|
|
tx_fifo_size = Param.MemorySize('384kB', "Size of the tx FIFO")
|
2007-05-28 04:21:17 +02:00
|
|
|
rx_desc_cache_size = Param.Int(64,
|
|
|
|
|
"Number of enteries in the rx descriptor cache")
|
|
|
|
|
tx_desc_cache_size = Param.Int(64,
|
|
|
|
|
"Number of enteries in the rx descriptor cache")
|
2007-03-27 00:40:18 +02:00
|
|
|
clock = Param.Clock('500MHz', "Clock speed of the device")
|
|
|
|
|
|
2006-09-19 02:12:45 +02:00
|
|
|
class IGbEPciData(PciConfigData):
|
|
|
|
|
VendorID = 0x8086
|
2006-10-20 19:00:05 +02:00
|
|
|
DeviceID = 0x1075
|
2006-09-19 02:12:45 +02:00
|
|
|
SubsystemID = 0x1008
|
|
|
|
|
SubsystemVendorID = 0x8086
|
|
|
|
|
Status = 0x0000
|
|
|
|
|
SubClassCode = 0x00
|
|
|
|
|
ClassCode = 0x02
|
|
|
|
|
ProgIF = 0x00
|
|
|
|
|
BAR0 = 0x00000000
|
|
|
|
|
BAR1 = 0x00000000
|
|
|
|
|
BAR2 = 0x00000000
|
|
|
|
|
BAR3 = 0x00000000
|
|
|
|
|
BAR4 = 0x00000000
|
|
|
|
|
BAR5 = 0x00000000
|
|
|
|
|
MaximumLatency = 0x00
|
|
|
|
|
MinimumGrant = 0xff
|
|
|
|
|
InterruptLine = 0x1e
|
|
|
|
|
InterruptPin = 0x01
|
|
|
|
|
BAR0Size = '128kB'
|
|
|
|
|
|
|
|
|
|
class IGbEInt(EtherInt):
|
|
|
|
|
type = 'IGbEInt'
|
|
|
|
|
device = Param.IGbE("Ethernet device of this interface")
|
|
|
|
|
|
2005-10-19 04:05:05 +02:00
|
|
|
class EtherDevBase(PciDevice):
|
2007-06-20 17:14:11 +02:00
|
|
|
type = 'EtherDevBase'
|
|
|
|
|
abstract = True
|
2005-01-15 10:12:25 +01:00
|
|
|
hardware_address = Param.EthernetAddr(NextEthernetAddr,
|
|
|
|
|
"Ethernet Hardware Address")
|
|
|
|
|
|
2005-06-27 23:02:40 +02:00
|
|
|
clock = Param.Clock('0ns', "State machine processor 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
|
|
|
|
|
|
|
|
dma_read_delay = Param.Latency('0us', "fixed delay for dma reads")
|
|
|
|
|
dma_read_factor = Param.Latency('0us', "multiplier for dma reads")
|
|
|
|
|
dma_write_delay = Param.Latency('0us', "fixed delay for dma writes")
|
|
|
|
|
dma_write_factor = Param.Latency('0us', "multiplier for dma writes")
|
2005-04-30 03:01:43 +02: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
|
|
|
rx_delay = Param.Latency('1us', "Receive Delay")
|
|
|
|
|
tx_delay = Param.Latency('1us', "Transmit Delay")
|
2005-10-19 04:05:05 +02:00
|
|
|
rx_fifo_size = Param.MemorySize('512kB', "max size of rx fifo")
|
|
|
|
|
tx_fifo_size = Param.MemorySize('512kB', "max size of tx fifo")
|
2005-01-15 10:12:25 +01:00
|
|
|
|
2005-10-19 04:05:05 +02:00
|
|
|
rx_filter = Param.Bool(True, "Enable Receive Filter")
|
2005-11-25 19:33:36 +01:00
|
|
|
intr_delay = Param.Latency('10us', "Interrupt propagation delay")
|
|
|
|
|
rx_thread = Param.Bool(False, "dedicated kernel thread for transmit")
|
|
|
|
|
tx_thread = Param.Bool(False, "dedicated kernel threads for receive")
|
2006-03-03 20:17:48 +01:00
|
|
|
rss = Param.Bool(False, "Receive Side Scaling")
|
2005-01-15 10:12:25 +01:00
|
|
|
|
2006-07-12 23:16:00 +02:00
|
|
|
class NSGigEPciData(PciConfigData):
|
|
|
|
|
VendorID = 0x100B
|
|
|
|
|
DeviceID = 0x0022
|
|
|
|
|
Status = 0x0290
|
|
|
|
|
SubClassCode = 0x00
|
|
|
|
|
ClassCode = 0x02
|
|
|
|
|
ProgIF = 0x00
|
|
|
|
|
BAR0 = 0x00000001
|
|
|
|
|
BAR1 = 0x00000000
|
|
|
|
|
BAR2 = 0x00000000
|
|
|
|
|
BAR3 = 0x00000000
|
|
|
|
|
BAR4 = 0x00000000
|
|
|
|
|
BAR5 = 0x00000000
|
|
|
|
|
MaximumLatency = 0x34
|
|
|
|
|
MinimumGrant = 0xb0
|
|
|
|
|
InterruptLine = 0x1e
|
|
|
|
|
InterruptPin = 0x01
|
|
|
|
|
BAR0Size = '256B'
|
|
|
|
|
BAR1Size = '4kB'
|
|
|
|
|
|
2005-10-19 04:05:05 +02:00
|
|
|
class NSGigE(EtherDevBase):
|
|
|
|
|
type = 'NSGigE'
|
2005-04-25 03:32:32 +02:00
|
|
|
|
2005-10-19 04:05:05 +02:00
|
|
|
dma_data_free = Param.Bool(False, "DMA of Data is free")
|
|
|
|
|
dma_desc_free = Param.Bool(False, "DMA of Descriptors is free")
|
2006-04-25 01:31:50 +02:00
|
|
|
dma_no_allocate = Param.Bool(True, "Should we allocate cache on read")
|
2005-10-19 04:05:05 +02:00
|
|
|
|
2006-07-12 23:16:00 +02:00
|
|
|
configdata = NSGigEPciData()
|
|
|
|
|
|
2005-01-15 10:12:25 +01:00
|
|
|
|
2005-05-29 07:14:50 +02:00
|
|
|
class NSGigEInt(EtherInt):
|
2005-02-03 03:13:01 +01:00
|
|
|
type = 'NSGigEInt'
|
2005-01-15 10:12:25 +01:00
|
|
|
device = Param.NSGigE("Ethernet device of this interface")
|
|
|
|
|
|
2006-07-12 23:16:00 +02:00
|
|
|
class SinicPciData(PciConfigData):
|
|
|
|
|
VendorID = 0x1291
|
|
|
|
|
DeviceID = 0x1293
|
|
|
|
|
Status = 0x0290
|
|
|
|
|
SubClassCode = 0x00
|
|
|
|
|
ClassCode = 0x02
|
|
|
|
|
ProgIF = 0x00
|
|
|
|
|
BAR0 = 0x00000000
|
|
|
|
|
BAR1 = 0x00000000
|
|
|
|
|
BAR2 = 0x00000000
|
|
|
|
|
BAR3 = 0x00000000
|
|
|
|
|
BAR4 = 0x00000000
|
|
|
|
|
BAR5 = 0x00000000
|
|
|
|
|
MaximumLatency = 0x34
|
|
|
|
|
MinimumGrant = 0xb0
|
|
|
|
|
InterruptLine = 0x1e
|
|
|
|
|
InterruptPin = 0x01
|
|
|
|
|
BAR0Size = '64kB'
|
|
|
|
|
|
2005-10-19 04:05:05 +02:00
|
|
|
class Sinic(EtherDevBase):
|
2005-05-03 01:00:11 +02:00
|
|
|
type = 'Sinic'
|
2007-07-24 06:51:38 +02:00
|
|
|
cxx_namespace = 'Sinic'
|
|
|
|
|
cxx_class = 'Device'
|
2005-05-03 01:00:11 +02:00
|
|
|
|
2005-10-19 04:05:05 +02:00
|
|
|
rx_max_copy = Param.MemorySize('1514B', "rx max copy")
|
2005-05-03 01:00:11 +02:00
|
|
|
tx_max_copy = Param.MemorySize('16kB', "tx max copy")
|
Major changes to sinic device model. Rearrage read/write, better
interrupts.
dev/sinic.cc:
- The prepareRead function sets all the variables in the register
file that depend on various state bits that change on the fly.
Includes RxDone, RxWait, TxDone, and TxWait
- Use the new register information accessor functions to grab
validity and size information for the read and write functions
- read all registers directly from the register space by offset
and size, not by actual name (less code)
- The side effect of reading the interrupt status (clearing it) now
happens outside the actual chunk of code where the value is loaded.
- Add an iprRead function for when we may want speculative access
to device registers through an ipr or special instruction.
- When RxData or TxData are written, their busy flag is set to
indicate that they have an outstanding transaction.
- The RxHigh and TxLow interrupts are special, they only interrupt
if the rxEmpty or txFull limits were hit
- Move reset to the command register
- Update more registers on reset, clear rxEmpty and txFull
- Data dumps only happen if EthernetData trace flag set
- When a DMA completes, kick the other engine if it was waiting
- implement all of the new interrupts
- serialize the new stuff
dev/sinic.hh:
- Put all registers with their proper size and alignment into
the regs struct so that we can copy multiple at a time.
- Provide accessor functions for accessing the registers with
different sizes.
- Flags to track when the rx fifo hit empty and the tx fifo became
full. These flags are used to determine what to do when below
the watermarks, and are reset when crossing the watermark.
- the txDmaEvent should actually trigger the txDmaDone function
- Add an iprRead function for when we may want speculative access
to device registers through an ipr or special instruction.
- The prepareRead function sets all the variables in the register
file that depend on various state bits that change on the fly.
- add rx_max_intr and dedicated (for dedicated thread) config params
dev/sinicreg.hh:
Add some new registers: Command, RxMaxIntr, RxFifoSize, TxFifoSize,
rename XxThreshold to XxFifoMark
Move Reset to the Command register
Add Thread to the Config register
New interrupts, better names
More info in RxDone and TxDone
Easier access to information on each register (size, read, write, name)
python/m5/objects/Ethernet.py:
Both sinic and nsgige have the dedicated thread
Add a parameter to configure the maximum number for receive
packets per interrupt
--HG--
extra : convert_revision : 407c5a993b6fb17326b4c623ee5d4b25fd69ac80
2005-10-22 02:28:21 +02:00
|
|
|
rx_max_intr = Param.UInt32(10, "max rx packets per interrupt")
|
2006-04-26 23:52:33 +02:00
|
|
|
rx_fifo_threshold = Param.MemorySize('384kB', "rx fifo high threshold")
|
|
|
|
|
rx_fifo_low_mark = Param.MemorySize('128kB', "rx fifo low threshold")
|
|
|
|
|
tx_fifo_high_mark = Param.MemorySize('384kB', "tx fifo high threshold")
|
|
|
|
|
tx_fifo_threshold = Param.MemorySize('128kB', "tx fifo low threshold")
|
|
|
|
|
virtual_count = Param.UInt32(1, "Virtualized SINIC")
|
|
|
|
|
zero_copy = Param.Bool(False, "Zero copy receive")
|
|
|
|
|
delay_copy = Param.Bool(False, "Delayed copy transmit")
|
|
|
|
|
virtual_addr = Param.Bool(False, "Virtual addressing")
|
2005-05-03 01:00:11 +02:00
|
|
|
|
2006-07-12 23:16:00 +02:00
|
|
|
configdata = SinicPciData()
|
|
|
|
|
|
2005-05-29 07:14:50 +02:00
|
|
|
class SinicInt(EtherInt):
|
2005-05-03 01:00:11 +02:00
|
|
|
type = 'SinicInt'
|
2007-07-24 06:51:38 +02:00
|
|
|
cxx_namespace = 'Sinic'
|
|
|
|
|
cxx_class = 'Interface'
|
|
|
|
|
|
2005-05-03 01:00:11 +02:00
|
|
|
device = Param.Sinic("Ethernet device of this interface")
|
