mirror of https://github.com/xemu-project/xemu.git
hw/net:ftgmac100: update memory region size to 64KB
According to the datasheet of ASPEED SOCs, one MAC controller owns 128KB of register space for AST2500. However, one MAC controller only owns 64KB of register space for AST2600 and AST2700. It set the memory region size 128KB and it occupied another controllers Address Spaces. Update one MAC controller memory region size to 0x1000 because AST2500 did not use register spaces over than 64KB. Introduce a new container region size to 0x1000 and its range is from 0 to 0xfff. This container is mapped a sub region for the current set of register. This sub region range is from 0 to 0xff. Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Reviewed-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
parent
44b7329de4
commit
eec2f9cc69
|
@ -1107,9 +1107,14 @@ static void ftgmac100_realize(DeviceState *dev, Error **errp)
|
|||
s->rxdes0_edorr = FTGMAC100_RXDES0_EDORR;
|
||||
}
|
||||
|
||||
memory_region_init_io(&s->iomem, OBJECT(dev), &ftgmac100_ops, s,
|
||||
TYPE_FTGMAC100, 0x2000);
|
||||
sysbus_init_mmio(sbd, &s->iomem);
|
||||
memory_region_init(&s->iomem_container, OBJECT(s),
|
||||
TYPE_FTGMAC100 ".container", FTGMAC100_MEM_SIZE);
|
||||
sysbus_init_mmio(sbd, &s->iomem_container);
|
||||
|
||||
memory_region_init_io(&s->iomem, OBJECT(s), &ftgmac100_ops, s,
|
||||
TYPE_FTGMAC100 ".regs", FTGMAC100_REG_MEM_SIZE);
|
||||
memory_region_add_subregion(&s->iomem_container, 0x0, &s->iomem);
|
||||
|
||||
sysbus_init_irq(sbd, &s->irq);
|
||||
qemu_macaddr_default_if_unset(&s->conf.macaddr);
|
||||
|
||||
|
|
|
@ -14,6 +14,9 @@
|
|||
#define TYPE_FTGMAC100 "ftgmac100"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(FTGMAC100State, FTGMAC100)
|
||||
|
||||
#define FTGMAC100_MEM_SIZE 0x1000
|
||||
#define FTGMAC100_REG_MEM_SIZE 0x100
|
||||
|
||||
#include "hw/sysbus.h"
|
||||
#include "net/net.h"
|
||||
|
||||
|
@ -30,6 +33,7 @@ struct FTGMAC100State {
|
|||
NICState *nic;
|
||||
NICConf conf;
|
||||
qemu_irq irq;
|
||||
MemoryRegion iomem_container;
|
||||
MemoryRegion iomem;
|
||||
|
||||
uint8_t frame[FTGMAC100_MAX_FRAME_SIZE];
|
||||
|
|
Loading…
Reference in New Issue