Print a warning if two devices are sharing the same interrupt
Update profile-top to print 2 or 4 graphs depending on a command line option dev/pciconfigall.cc: dev/pciconfigall.hh: dev/pcidev.hh: Print a warning if two devices are sharing the same interrupt --HG-- extra : convert_revision : 0ef99cac92fbf2916ab8e5b1125d520eb4b5ac7d
This commit is contained in:
parent
9590ca6844
commit
244ce7fb29
3 changed files with 40 additions and 0 deletions
|
@ -33,10 +33,12 @@
|
||||||
#include <deque>
|
#include <deque>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <bitset>
|
||||||
|
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
#include "dev/pciconfigall.hh"
|
#include "dev/pciconfigall.hh"
|
||||||
#include "dev/pcidev.hh"
|
#include "dev/pcidev.hh"
|
||||||
|
#include "dev/pcireg.h"
|
||||||
#include "mem/bus/bus.hh"
|
#include "mem/bus/bus.hh"
|
||||||
#include "mem/bus/pio_interface.hh"
|
#include "mem/bus/pio_interface.hh"
|
||||||
#include "mem/bus/pio_interface_impl.hh"
|
#include "mem/bus/pio_interface_impl.hh"
|
||||||
|
@ -65,6 +67,33 @@ PciConfigAll::PciConfigAll(const string &name, Addr a, MemoryController *mmu,
|
||||||
devices[x][y] = NULL;
|
devices[x][y] = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If two interrupts share the same line largely bad things will happen.
|
||||||
|
// Since we don't track how many times an interrupt was set and correspondingly
|
||||||
|
// cleared two devices on the same interrupt line and assert and deassert each
|
||||||
|
// others interrupt "line". Interrupts will not work correctly.
|
||||||
|
void
|
||||||
|
PciConfigAll::startup()
|
||||||
|
{
|
||||||
|
bitset<256> intLines;
|
||||||
|
PciDev *tempDev;
|
||||||
|
uint8_t intline;
|
||||||
|
|
||||||
|
for (int x = 0; x < MAX_PCI_DEV; x++) {
|
||||||
|
for (int y = 0; y < MAX_PCI_FUNC; y++) {
|
||||||
|
if (devices[x][y] != NULL) {
|
||||||
|
tempDev = devices[x][y];
|
||||||
|
intline = tempDev->interruptLine();
|
||||||
|
if (intLines.test(intline))
|
||||||
|
warn("Interrupt line %#X is used multiple times"
|
||||||
|
"(You probably want to fix this).\n", (uint32_t)intline);
|
||||||
|
else
|
||||||
|
intLines.set(intline);
|
||||||
|
} // devices != NULL
|
||||||
|
} // PCI_FUNC
|
||||||
|
} // PCI_DEV
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
Fault
|
Fault
|
||||||
PciConfigAll::read(MemReqPtr &req, uint8_t *data)
|
PciConfigAll::read(MemReqPtr &req, uint8_t *data)
|
||||||
{
|
{
|
||||||
|
|
|
@ -115,6 +115,12 @@ class PciConfigAll : public PioDevice
|
||||||
|
|
||||||
virtual Fault write(MemReqPtr &req, const uint8_t *data);
|
virtual Fault write(MemReqPtr &req, const uint8_t *data);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Start up function to check if more than one person is using an interrupt line
|
||||||
|
* and print a warning if such a case exists
|
||||||
|
*/
|
||||||
|
virtual void startup();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Serialize this object to the given output stream.
|
* Serialize this object to the given output stream.
|
||||||
* @param os The stream to serialize to.
|
* @param os The stream to serialize to.
|
||||||
|
@ -134,6 +140,7 @@ class PciConfigAll : public PioDevice
|
||||||
* @return Tick when the request is done
|
* @return Tick when the request is done
|
||||||
*/
|
*/
|
||||||
Tick cacheAccess(MemReqPtr &req);
|
Tick cacheAccess(MemReqPtr &req);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // __PCICONFIGALL_HH__
|
#endif // __PCICONFIGALL_HH__
|
||||||
|
|
|
@ -141,6 +141,10 @@ class PciDev : public DmaDevice
|
||||||
intrClear()
|
intrClear()
|
||||||
{ plat->clearPciInt(configData->config.hdr.pci0.interruptLine); }
|
{ plat->clearPciInt(configData->config.hdr.pci0.interruptLine); }
|
||||||
|
|
||||||
|
uint8_t
|
||||||
|
interruptLine()
|
||||||
|
{ return configData->config.hdr.pci0.interruptLine; }
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* Constructor for PCI Dev. This function copies data from the
|
* Constructor for PCI Dev. This function copies data from the
|
||||||
|
|
Loading…
Reference in a new issue