| Message ID | 20220130231206.34035-2-edgar.iglesias@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/arm: zynqmp: Add CRF and APU control to support PSCI | expand |
On 31/1/22 00:12, Edgar E. Iglesias wrote: > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > Add unimplemented SERDES area. > > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > --- > include/hw/arm/xlnx-zynqmp.h | 2 +- > hw/arm/xlnx-zynqmp.c | 4 ++++ > 2 files changed, 5 insertions(+), 1 deletion(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On Mon, Jan 31, 2022 at 12:12:01AM +0100, Edgar E. Iglesias wrote: > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > Add unimplemented SERDES area. > > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Francisco Iglesias <francisco.iglesias@xilinx.com> > --- > include/hw/arm/xlnx-zynqmp.h | 2 +- > hw/arm/xlnx-zynqmp.c | 4 ++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h > index 062e637fe4..99ceb8a609 100644 > --- a/include/hw/arm/xlnx-zynqmp.h > +++ b/include/hw/arm/xlnx-zynqmp.h > @@ -84,7 +84,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP) > /* > * Unimplemented mmio regions needed to boot some images. > */ > -#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1 > +#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 2 > > struct XlnxZynqMPState { > /*< private >*/ > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 17305fe7b7..ba44e95899 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -51,6 +51,9 @@ > #define QSPI_IRQ 15 > #define QSPI_DMA_ADDR 0xff0f0800 > > +#define SERDES_ADDR 0xfd400000 > +#define SERDES_SIZE 0x20000 > + > #define DP_ADDR 0xfd4a0000 > #define DP_IRQ 113 > > @@ -284,6 +287,7 @@ static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s) > hwaddr size; > } unimp_areas[ARRAY_SIZE(s->mr_unimp)] = { > { .name = "apu", APU_ADDR, APU_SIZE }, > + { .name = "serdes", SERDES_ADDR, SERDES_SIZE }, > }; > unsigned int nr; > > -- > 2.25.1 >
On Sun, 30 Jan 2022 at 23:12, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote: > > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > Add unimplemented SERDES area. What's a SERDES ? A brief description might be helpful in the commit message or a comment. thanks -- PMM
On Mon, Jan 31, 2022 at 03:32:25PM +0000, Peter Maydell wrote: > On Sun, 30 Jan 2022 at 23:12, Edgar E. Iglesias > <edgar.iglesias@gmail.com> wrote: > > > > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > > > Add unimplemented SERDES area. > > What's a SERDES ? A brief description might be helpful in > the commit message or a comment. These are config registers for the SER/DESerializers (for high-speed IO). This patch was not strictly needed to pass the test-case but it came up I'm guessing due to some SW dependency in the test-case itself... I'll add a comment and mention it in the commit message. Thanks, Edgar
diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 062e637fe4..99ceb8a609 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -84,7 +84,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP) /* * Unimplemented mmio regions needed to boot some images. */ -#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1 +#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 2 struct XlnxZynqMPState { /*< private >*/ diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 17305fe7b7..ba44e95899 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -51,6 +51,9 @@ #define QSPI_IRQ 15 #define QSPI_DMA_ADDR 0xff0f0800 +#define SERDES_ADDR 0xfd400000 +#define SERDES_SIZE 0x20000 + #define DP_ADDR 0xfd4a0000 #define DP_IRQ 113 @@ -284,6 +287,7 @@ static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s) hwaddr size; } unimp_areas[ARRAY_SIZE(s->mr_unimp)] = { { .name = "apu", APU_ADDR, APU_SIZE }, + { .name = "serdes", SERDES_ADDR, SERDES_SIZE }, }; unsigned int nr;