[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v3 11/11] imx_fec: Reserve full FSL_IMX25_FEC_SIZE pag
From: |
Andrey Smirnov |
Subject: |
[Qemu-arm] [PATCH v3 11/11] imx_fec: Reserve full FSL_IMX25_FEC_SIZE page for the register file |
Date: |
Tue, 2 Jan 2018 11:36:22 -0800 |
Some i.MX SoCs (e.g. i.MX7) have FEC registers going as far as offset
0x614, so to avoid getting aborts when accessing those on QEMU, extend
the register file to cover FSL_IMX25_FEC_SIZE(16K) of address space
instead of just 1K.
Cc: Peter Maydell <address@hidden>
Cc: Jason Wang <address@hidden>
Cc: Philippe Mathieu-Daudé <address@hidden>
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Andrey Smirnov <address@hidden>
---
hw/net/imx_fec.c | 2 +-
include/hw/arm/fsl-imx25.h | 1 -
include/hw/net/imx_fec.h | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
index c1cf7f9c58..4fb48f62ba 100644
--- a/hw/net/imx_fec.c
+++ b/hw/net/imx_fec.c
@@ -1281,7 +1281,7 @@ static void imx_eth_realize(DeviceState *dev, Error
**errp)
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
memory_region_init_io(&s->iomem, OBJECT(dev), &imx_eth_ops, s,
- TYPE_IMX_FEC, 0x400);
+ TYPE_IMX_FEC, FSL_IMX25_FEC_SIZE);
sysbus_init_mmio(sbd, &s->iomem);
sysbus_init_irq(sbd, &s->irq[0]);
sysbus_init_irq(sbd, &s->irq[1]);
diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h
index d0e8e9d956..65a73714ef 100644
--- a/include/hw/arm/fsl-imx25.h
+++ b/include/hw/arm/fsl-imx25.h
@@ -192,7 +192,6 @@ typedef struct FslIMX25State {
#define FSL_IMX25_UART5_ADDR 0x5002C000
#define FSL_IMX25_UART5_SIZE 0x4000
#define FSL_IMX25_FEC_ADDR 0x50038000
-#define FSL_IMX25_FEC_SIZE 0x4000
#define FSL_IMX25_CCM_ADDR 0x53F80000
#define FSL_IMX25_CCM_SIZE 0x4000
#define FSL_IMX25_GPT4_ADDR 0x53F84000
diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h
index 91ef8f89a6..7b3faa4019 100644
--- a/include/hw/net/imx_fec.h
+++ b/include/hw/net/imx_fec.h
@@ -245,6 +245,7 @@ typedef struct {
#define ENET_TX_RING_NUM 3
+#define FSL_IMX25_FEC_SIZE 0x4000
typedef struct IMXFECState {
/*< private >*/
--
2.14.3
- [Qemu-arm] [PATCH v3 01/11] imx_fec: Do not link to netdev, (continued)
- [Qemu-arm] [PATCH v3 01/11] imx_fec: Do not link to netdev, Andrey Smirnov, 2018/01/02
- [Qemu-arm] [PATCH v3 03/11] imx_fec: Change queue flushing heuristics, Andrey Smirnov, 2018/01/02
- [Qemu-arm] [PATCH v3 04/11] imx_fec: Move Tx frame buffer away from the stack, Andrey Smirnov, 2018/01/02
- [Qemu-arm] [PATCH v3 05/11] imx_fec: Use ENET_FTRL to determine truncation length, Andrey Smirnov, 2018/01/02
- [Qemu-arm] [PATCH v3 07/11] imx_fec: Emulate SHIFT16 in ENETx_RACC, Andrey Smirnov, 2018/01/02
- [Qemu-arm] [PATCH v3 06/11] imx_fec: Use MIN instead of explicit ternary operator, Andrey Smirnov, 2018/01/02
- [Qemu-arm] [PATCH v3 08/11] imx_fec: Add support for multiple Tx DMA rings, Andrey Smirnov, 2018/01/02
- [Qemu-arm] [PATCH v3 10/11] imx_fec: Fix a typo in imx_enet_receive(), Andrey Smirnov, 2018/01/02
- [Qemu-arm] [PATCH v3 11/11] imx_fec: Reserve full FSL_IMX25_FEC_SIZE page for the register file,
Andrey Smirnov <=
- [Qemu-arm] [PATCH v3 09/11] imx_fec: Use correct length for packet size, Andrey Smirnov, 2018/01/02
- Re: [Qemu-arm] [PATCH v3 00/11] i.MX FEC changes, Peter Maydell, 2018/01/08