2004-11-13 23:10:48 +01:00
|
|
|
/*
|
2005-06-05 11:16:00 +02:00
|
|
|
* Copyright (c) 2004-2005 The Regents of The University of Michigan
|
2004-11-13 23:10:48 +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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef __DEV_SINIC_HH__
|
|
|
|
#define __DEV_SINIC_HH__
|
|
|
|
|
|
|
|
#include "base/inet.hh"
|
|
|
|
#include "base/statistics.hh"
|
|
|
|
#include "dev/etherint.hh"
|
|
|
|
#include "dev/etherpkt.hh"
|
|
|
|
#include "dev/io_device.hh"
|
|
|
|
#include "dev/pcidev.hh"
|
|
|
|
#include "dev/pktfifo.hh"
|
|
|
|
#include "dev/sinicreg.hh"
|
|
|
|
#include "mem/bus/bus.hh"
|
|
|
|
#include "sim/eventq.hh"
|
|
|
|
|
|
|
|
namespace Sinic {
|
|
|
|
|
|
|
|
class Interface;
|
|
|
|
class Base : public PciDev
|
|
|
|
{
|
|
|
|
protected:
|
|
|
|
bool rxEnable;
|
|
|
|
bool txEnable;
|
2005-10-19 04:05:05 +02:00
|
|
|
Tick clock;
|
|
|
|
inline Tick cycles(int numCycles) const { return numCycles * clock; }
|
2004-11-13 23:10:48 +01:00
|
|
|
|
|
|
|
protected:
|
|
|
|
Tick intrDelay;
|
|
|
|
Tick intrTick;
|
|
|
|
bool cpuIntrEnable;
|
|
|
|
bool cpuPendingIntr;
|
|
|
|
void cpuIntrPost(Tick when);
|
|
|
|
void cpuInterrupt();
|
|
|
|
void cpuIntrClear();
|
|
|
|
|
|
|
|
typedef EventWrapper<Base, &Base::cpuInterrupt> IntrEvent;
|
2005-01-15 00:34:56 +01:00
|
|
|
friend void IntrEvent::process();
|
2004-11-13 23:10:48 +01:00
|
|
|
IntrEvent *intrEvent;
|
|
|
|
Interface *interface;
|
|
|
|
|
|
|
|
bool cpuIntrPending() const;
|
|
|
|
void cpuIntrAck() { cpuIntrClear(); }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Serialization stuff
|
|
|
|
*/
|
|
|
|
public:
|
|
|
|
virtual void serialize(std::ostream &os);
|
|
|
|
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Construction/Destruction/Parameters
|
|
|
|
*/
|
|
|
|
public:
|
|
|
|
struct Params : public PciDev::Params
|
|
|
|
{
|
2005-10-19 04:05:05 +02:00
|
|
|
Tick clock;
|
2004-11-13 23:10:48 +01:00
|
|
|
Tick intr_delay;
|
|
|
|
};
|
|
|
|
|
|
|
|
Base(Params *p);
|
|
|
|
};
|
|
|
|
|
|
|
|
class Device : public Base
|
|
|
|
{
|
|
|
|
protected:
|
|
|
|
Platform *plat;
|
|
|
|
PhysicalMemory *physmem;
|
|
|
|
|
|
|
|
protected:
|
|
|
|
/** Receive State Machine States */
|
|
|
|
enum RxState {
|
|
|
|
rxIdle,
|
|
|
|
rxFifoBlock,
|
|
|
|
rxBeginCopy,
|
|
|
|
rxCopy,
|
|
|
|
rxCopyDone
|
|
|
|
};
|
|
|
|
|
|
|
|
/** Transmit State Machine states */
|
|
|
|
enum TxState {
|
|
|
|
txIdle,
|
|
|
|
txFifoBlock,
|
|
|
|
txBeginCopy,
|
|
|
|
txCopy,
|
|
|
|
txCopyDone
|
|
|
|
};
|
|
|
|
|
|
|
|
/** device register file */
|
|
|
|
struct {
|
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
|
|
|
uint32_t Config; // 0x00
|
|
|
|
uint32_t Command; // 0x04
|
|
|
|
uint32_t IntrStatus; // 0x08
|
|
|
|
uint32_t IntrMask; // 0x0c
|
|
|
|
uint32_t RxMaxCopy; // 0x10
|
|
|
|
uint32_t TxMaxCopy; // 0x14
|
|
|
|
uint32_t RxMaxIntr; // 0x18
|
|
|
|
uint32_t Reserved0; // 0x1c
|
|
|
|
uint32_t RxFifoSize; // 0x20
|
|
|
|
uint32_t TxFifoSize; // 0x24
|
|
|
|
uint32_t RxFifoMark; // 0x28
|
|
|
|
uint32_t TxFifoMark; // 0x2c
|
|
|
|
uint64_t RxData; // 0x30
|
|
|
|
uint64_t RxDone; // 0x38
|
|
|
|
uint64_t RxWait; // 0x40
|
|
|
|
uint64_t TxData; // 0x48
|
|
|
|
uint64_t TxDone; // 0x50
|
|
|
|
uint64_t TxWait; // 0x58
|
|
|
|
uint64_t HwAddr; // 0x60
|
2004-11-13 23:10:48 +01:00
|
|
|
} regs;
|
|
|
|
|
2005-11-25 19:33:36 +01:00
|
|
|
struct VirtualReg {
|
|
|
|
uint64_t RxData;
|
|
|
|
uint64_t RxDone;
|
|
|
|
uint64_t TxData;
|
|
|
|
uint64_t TxDone;
|
|
|
|
|
|
|
|
PacketFifo::iterator rxPacket;
|
|
|
|
int rxPacketOffset;
|
|
|
|
int rxPacketBytes;
|
|
|
|
uint64_t rxDoneData;
|
|
|
|
|
|
|
|
VirtualReg()
|
|
|
|
: RxData(0), RxDone(0), TxData(0), TxDone(0),
|
|
|
|
rxPacketOffset(0), rxPacketBytes(0), rxDoneData(0)
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
typedef std::vector<VirtualReg> VirtualRegs;
|
|
|
|
typedef std::list<int> VirtualList;
|
|
|
|
VirtualRegs virtualRegs;
|
|
|
|
VirtualList rxList;
|
|
|
|
VirtualList txList;
|
|
|
|
|
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
|
|
|
uint8_t ®Data8(Addr daddr) { return *((uint8_t *)®s + daddr); }
|
|
|
|
uint32_t ®Data32(Addr daddr) { return *(uint32_t *)®Data8(daddr); }
|
|
|
|
uint64_t ®Data64(Addr daddr) { return *(uint64_t *)®Data8(daddr); }
|
|
|
|
|
2004-11-13 23:10:48 +01:00
|
|
|
private:
|
|
|
|
Addr addr;
|
|
|
|
static const Addr size = Regs::Size;
|
|
|
|
|
|
|
|
protected:
|
|
|
|
RxState rxState;
|
|
|
|
PacketFifo rxFifo;
|
2005-11-25 19:33:36 +01:00
|
|
|
PacketFifo::iterator rxFifoPtr;
|
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
|
|
|
bool rxEmpty;
|
2004-11-13 23:10:48 +01:00
|
|
|
Addr rxDmaAddr;
|
|
|
|
uint8_t *rxDmaData;
|
|
|
|
int rxDmaLen;
|
|
|
|
|
|
|
|
TxState txState;
|
|
|
|
PacketFifo txFifo;
|
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
|
|
|
bool txFull;
|
2004-11-13 23:10:48 +01:00
|
|
|
PacketPtr txPacket;
|
2005-11-25 19:33:36 +01:00
|
|
|
int txPacketOffset;
|
|
|
|
int txPacketBytes;
|
2004-11-13 23:10:48 +01:00
|
|
|
Addr txDmaAddr;
|
|
|
|
uint8_t *txDmaData;
|
|
|
|
int txDmaLen;
|
|
|
|
|
|
|
|
protected:
|
|
|
|
void reset();
|
|
|
|
|
|
|
|
void rxKick();
|
|
|
|
Tick rxKickTick;
|
|
|
|
typedef EventWrapper<Device, &Device::rxKick> RxKickEvent;
|
2005-01-15 00:34:56 +01:00
|
|
|
friend void RxKickEvent::process();
|
2004-11-13 23:10:48 +01:00
|
|
|
|
|
|
|
void txKick();
|
|
|
|
Tick txKickTick;
|
|
|
|
typedef EventWrapper<Device, &Device::txKick> TxKickEvent;
|
2005-01-15 00:34:56 +01:00
|
|
|
friend void TxKickEvent::process();
|
2004-11-13 23:10:48 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Retransmit event
|
|
|
|
*/
|
|
|
|
void transmit();
|
|
|
|
void txEventTransmit()
|
|
|
|
{
|
|
|
|
transmit();
|
|
|
|
if (txState == txFifoBlock)
|
|
|
|
txKick();
|
|
|
|
}
|
|
|
|
typedef EventWrapper<Device, &Device::txEventTransmit> TxEvent;
|
2005-01-15 00:34:56 +01:00
|
|
|
friend void TxEvent::process();
|
2004-11-13 23:10:48 +01:00
|
|
|
TxEvent txEvent;
|
|
|
|
|
|
|
|
void txDump() const;
|
|
|
|
void rxDump() const;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* receive address filter
|
|
|
|
*/
|
|
|
|
bool rxFilter(const PacketPtr &packet);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* device configuration
|
|
|
|
*/
|
|
|
|
void changeConfig(uint32_t newconfig);
|
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
|
|
|
void command(uint32_t command);
|
2004-11-13 23:10:48 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* device ethernet interface
|
|
|
|
*/
|
|
|
|
public:
|
|
|
|
bool recvPacket(PacketPtr packet);
|
|
|
|
void transferDone();
|
|
|
|
void setInterface(Interface *i) { assert(!interface); interface = i; }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* DMA parameters
|
|
|
|
*/
|
|
|
|
protected:
|
|
|
|
void rxDmaCopy();
|
|
|
|
void rxDmaDone();
|
|
|
|
friend class EventWrapper<Device, &Device::rxDmaDone>;
|
|
|
|
EventWrapper<Device, &Device::rxDmaDone> rxDmaEvent;
|
|
|
|
|
|
|
|
void txDmaCopy();
|
|
|
|
void txDmaDone();
|
|
|
|
friend class EventWrapper<Device, &Device::txDmaDone>;
|
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
|
|
|
EventWrapper<Device, &Device::txDmaDone> txDmaEvent;
|
2004-11-13 23:10:48 +01:00
|
|
|
|
|
|
|
Tick dmaReadDelay;
|
|
|
|
Tick dmaReadFactor;
|
|
|
|
Tick dmaWriteDelay;
|
|
|
|
Tick dmaWriteFactor;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Interrupt management
|
|
|
|
*/
|
|
|
|
protected:
|
|
|
|
void devIntrPost(uint32_t interrupts);
|
|
|
|
void devIntrClear(uint32_t interrupts = Regs::Intr_All);
|
|
|
|
void devIntrChangeMask(uint32_t newmask);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* PCI Configuration interface
|
|
|
|
*/
|
|
|
|
public:
|
2005-08-15 22:59:58 +02:00
|
|
|
virtual void writeConfig(int offset, int size, const uint8_t *data);
|
2004-11-13 23:10:48 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Memory Interface
|
|
|
|
*/
|
|
|
|
public:
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
virtual Fault * read(MemReqPtr &req, uint8_t *data);
|
|
|
|
virtual Fault * write(MemReqPtr &req, const uint8_t *data);
|
2005-11-22 03:52:04 +01:00
|
|
|
|
2005-11-25 19:33:36 +01:00
|
|
|
void prepareIO(int cpu, int index);
|
|
|
|
void prepareRead(int cpu, int index);
|
|
|
|
void prepareWrite(int cpu, int index);
|
Changed the fault enum into a class, and fixed everything up to work with it. Next, the faults need to be pulled out of all the other code so that they are only used to communicate between the CPU and the ISA.
SConscript:
The new faults.cc file in sim allocates the system wide faults. When these faults are generated through a function interface in the ISA, this file may go away.
arch/alpha/alpha_memory.cc:
Changed Fault to Fault * and took the underscores out of fault names.
arch/alpha/alpha_memory.hh:
Changed Fault to Fault *. Also, added an include for the alpha faults.
arch/alpha/ev5.cc:
Changed the fault_addr array into a fault_addr function. Once all of the faults can be expected to have the same type, fault_addr can go away completely and the info it provided will come from the fault itself. Also, Fault was changed to Fault *, and underscores were taken out of fault names.
arch/alpha/isa/decoder.isa:
Changed Fault to Fault * and took the underscores out fault names.
arch/alpha/isa/fp.isa:
Changed Fault to Fault *, and took the underscores out of fault names.
arch/alpha/isa/main.isa:
Changed Fault to Fault *, removed underscores from fault names, and made an include of the alpha faults show up in all the generated files.
arch/alpha/isa/mem.isa:
Changed Fault to Fault * and removed underscores from fault names.
arch/alpha/isa/unimp.isa:
arch/alpha/isa/unknown.isa:
cpu/exec_context.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.cc:
dev/alpha_console.cc:
dev/ide_ctrl.cc:
dev/isa_fake.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
Changed Fault to Fault *, and removed underscores from fault names.
arch/alpha/isa_traits.hh:
Changed the include of arch/alpha/faults.hh to sim/faults.hh, since the alpha faults weren't needed.
cpu/base_dyn_inst.cc:
Changed Fault to Fault *, and removed underscores from fault names. This file probably shouldn't use the Unimplemented Opcode fault.
cpu/base_dyn_inst.hh:
Changed Fault to Fault * and took the underscores out of the fault names.
cpu/exec_context.cc:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/fetch.hh:
dev/alpha_console.hh:
dev/baddev.hh:
dev/ide_ctrl.hh:
dev/isa_fake.hh:
dev/ns_gige.hh:
dev/pciconfigall.hh:
dev/sinic.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
dev/uart.hh:
dev/uart8250.hh:
Changed Fault to Fault *.
cpu/o3/alpha_cpu.hh:
Changed Fault to Fault *, removed underscores from fault names.
cpu/o3/alpha_cpu_impl.hh:
Changed Fault to Fault *, removed underscores from fault names, and changed the fault_addr array to the fault_addr function. Once all faults are from the ISA, this function will probably go away.
cpu/o3/commit_impl.hh:
cpu/o3/fetch_impl.hh:
dev/baddev.cc:
Changed Fault to Fault *, and removed underscores from the fault names.
cpu/o3/regfile.hh:
Added an include for the alpha specific faults which will hopefully go away once the ipr stuff is moved, changed Fault to Fault *, and removed the underscores from fault names.
cpu/simple/cpu.hh:
Changed Fault to Fault *
dev/ns_gige.cc:
Changed Fault to Fault *, and removdd underscores from fault names.
dev/sinic.cc:
Changed Fault to Fault *, and removed the underscores from fault names.
dev/uart8250.cc:
Chanted Fault to Fault *, and removed underscores from fault names.
kern/kernel_stats.cc:
Removed underscores from fault names, and from NumFaults.
kern/kernel_stats.hh:
Changed the predeclaration of Fault from an enum to a class, and changd the "fault" function to work with the classes instead of the enum. Once there are no system wide faults anymore, this code will simplify back to something like it was originally.
sim/faults.cc:
This allocates the system wide faults.
sim/faults.hh:
This declares the system wide faults.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Removed the underscores from fault names.
--HG--
rename : arch/alpha/faults.cc => sim/faults.cc
rename : arch/alpha/faults.hh => sim/faults.hh
extra : convert_revision : 253d39258237333ae8ec4d8047367cb3ea68569d
2006-02-16 07:22:51 +01:00
|
|
|
Fault * iprRead(Addr daddr, int cpu, uint64_t &result);
|
|
|
|
Fault * readBar0(MemReqPtr &req, Addr daddr, uint8_t *data);
|
|
|
|
Fault * writeBar0(MemReqPtr &req, Addr daddr, const uint8_t *data);
|
2005-11-22 05:43:15 +01:00
|
|
|
void regWrite(Addr daddr, int cpu, const uint8_t *data);
|
2004-11-13 23:10:48 +01:00
|
|
|
Tick cacheAccess(MemReqPtr &req);
|
|
|
|
|
2005-11-22 05:43:15 +01:00
|
|
|
protected:
|
|
|
|
struct RegWriteData {
|
|
|
|
Addr daddr;
|
|
|
|
uint64_t value;
|
|
|
|
RegWriteData(Addr da, uint64_t val) : daddr(da), value(val) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
std::vector<std::list<RegWriteData> > writeQueue;
|
|
|
|
|
|
|
|
bool pioDelayWrite;
|
|
|
|
|
2004-11-13 23:10:48 +01:00
|
|
|
/**
|
|
|
|
* Statistics
|
|
|
|
*/
|
|
|
|
private:
|
|
|
|
Stats::Scalar<> rxBytes;
|
|
|
|
Stats::Formula rxBandwidth;
|
|
|
|
Stats::Scalar<> rxPackets;
|
|
|
|
Stats::Formula rxPacketRate;
|
|
|
|
Stats::Scalar<> rxIpPackets;
|
|
|
|
Stats::Scalar<> rxTcpPackets;
|
|
|
|
Stats::Scalar<> rxUdpPackets;
|
|
|
|
Stats::Scalar<> rxIpChecksums;
|
|
|
|
Stats::Scalar<> rxTcpChecksums;
|
|
|
|
Stats::Scalar<> rxUdpChecksums;
|
|
|
|
|
|
|
|
Stats::Scalar<> txBytes;
|
|
|
|
Stats::Formula txBandwidth;
|
2005-01-20 00:40:02 +01:00
|
|
|
Stats::Formula totBandwidth;
|
|
|
|
Stats::Formula totPackets;
|
|
|
|
Stats::Formula totBytes;
|
|
|
|
Stats::Formula totPacketRate;
|
2004-11-13 23:10:48 +01:00
|
|
|
Stats::Scalar<> txPackets;
|
|
|
|
Stats::Formula txPacketRate;
|
|
|
|
Stats::Scalar<> txIpPackets;
|
|
|
|
Stats::Scalar<> txTcpPackets;
|
|
|
|
Stats::Scalar<> txUdpPackets;
|
|
|
|
Stats::Scalar<> txIpChecksums;
|
|
|
|
Stats::Scalar<> txTcpChecksums;
|
|
|
|
Stats::Scalar<> txUdpChecksums;
|
|
|
|
|
|
|
|
public:
|
|
|
|
virtual void regStats();
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Serialization stuff
|
|
|
|
*/
|
|
|
|
public:
|
|
|
|
virtual void serialize(std::ostream &os);
|
|
|
|
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Construction/Destruction/Parameters
|
|
|
|
*/
|
|
|
|
public:
|
|
|
|
struct Params : public Base::Params
|
|
|
|
{
|
|
|
|
IntrControl *i;
|
|
|
|
PhysicalMemory *pmem;
|
|
|
|
Tick tx_delay;
|
|
|
|
Tick rx_delay;
|
|
|
|
HierParams *hier;
|
2005-11-20 22:57:53 +01:00
|
|
|
Bus *pio_bus;
|
|
|
|
Bus *header_bus;
|
2004-11-13 23:10:48 +01:00
|
|
|
Bus *payload_bus;
|
|
|
|
Tick pio_latency;
|
2005-11-22 05:43:15 +01:00
|
|
|
bool pio_delay_write;
|
2004-11-13 23:10:48 +01:00
|
|
|
PhysicalMemory *physmem;
|
|
|
|
IntrControl *intctrl;
|
|
|
|
bool rx_filter;
|
|
|
|
Net::EthAddr eaddr;
|
|
|
|
uint32_t rx_max_copy;
|
|
|
|
uint32_t 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
|
|
|
uint32_t rx_max_intr;
|
2004-11-13 23:10:48 +01:00
|
|
|
uint32_t rx_fifo_size;
|
|
|
|
uint32_t tx_fifo_size;
|
|
|
|
uint32_t rx_fifo_threshold;
|
|
|
|
uint32_t tx_fifo_threshold;
|
|
|
|
Tick dma_read_delay;
|
|
|
|
Tick dma_read_factor;
|
|
|
|
Tick dma_write_delay;
|
|
|
|
Tick dma_write_factor;
|
2005-04-30 03:01:43 +02:00
|
|
|
bool dma_no_allocate;
|
2005-11-25 19:33:36 +01:00
|
|
|
bool rx_thread;
|
|
|
|
bool tx_thread;
|
2004-11-13 23:10:48 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
protected:
|
|
|
|
const Params *params() const { return (const Params *)_params; }
|
|
|
|
|
|
|
|
public:
|
|
|
|
Device(Params *params);
|
|
|
|
~Device();
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Ethernet Interface for an Ethernet Device
|
|
|
|
*/
|
|
|
|
class Interface : public EtherInt
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
Device *dev;
|
|
|
|
|
|
|
|
public:
|
|
|
|
Interface(const std::string &name, Device *d)
|
|
|
|
: EtherInt(name), dev(d) { dev->setInterface(this); }
|
|
|
|
|
|
|
|
virtual bool recvPacket(PacketPtr pkt) { return dev->recvPacket(pkt); }
|
|
|
|
virtual void sendDone() { dev->transferDone(); }
|
|
|
|
};
|
|
|
|
|
|
|
|
/* namespace Sinic */ }
|
|
|
|
|
|
|
|
#endif // __DEV_SINIC_HH__
|