On Tue, Sep 5, 2017 at 8:53 AM, Peter Maydell <peter.mayd...@linaro.org> wrote:
> Set the MachineClass flag ignore_memory_transaction_failures
> for almost all ARM boards. This means they retain the legacy
> behaviour that accesses to unimplemented addresses will RAZ/WI
> rather than aborting, when a subsequent commit adds support
> for external aborts.
>
> The exceptions are:
> * virt -- we know that guests won't try to prod devices
> that we don't describe in the device tree or ACPI tables
> * mps2 -- this board was written to use unimplemented-device
> for all the ranges with devices we don't yet handle
>
> New boards should not set the flag, but instead be written
> like the mps2.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
> For the Xilinx boards:
> Reviewed-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Thanks,
Alistair
> ---
> hw/arm/aspeed.c | 3 +++
> hw/arm/collie.c | 1 +
> hw/arm/cubieboard.c | 1 +
> hw/arm/digic_boards.c | 1 +
> hw/arm/exynos4_boards.c | 2 ++
> hw/arm/gumstix.c | 2 ++
> hw/arm/highbank.c | 2 ++
> hw/arm/imx25_pdk.c | 1 +
> hw/arm/integratorcp.c | 1 +
> hw/arm/kzm.c | 1 +
> hw/arm/mainstone.c | 1 +
> hw/arm/musicpal.c | 1 +
> hw/arm/netduino2.c | 1 +
> hw/arm/nseries.c | 2 ++
> hw/arm/omap_sx1.c | 2 ++
> hw/arm/palm.c | 1 +
> hw/arm/raspi.c | 1 +
> hw/arm/realview.c | 4 ++++
> hw/arm/sabrelite.c | 1 +
> hw/arm/spitz.c | 4 ++++
> hw/arm/stellaris.c | 2 ++
> hw/arm/tosa.c | 1 +
> hw/arm/versatilepb.c | 2 ++
> hw/arm/vexpress.c | 1 +
> hw/arm/xilinx_zynq.c | 1 +
> hw/arm/xlnx-ep108.c | 2 ++
> hw/arm/z2.c | 1 +
> 27 files changed, 43 insertions(+)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 0c5635f..ab895ad 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -270,6 +270,7 @@ static void palmetto_bmc_class_init(ObjectClass *oc, void
> *data)
> mc->no_floppy = 1;
> mc->no_cdrom = 1;
> mc->no_parallel = 1;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo palmetto_bmc_type = {
> @@ -302,6 +303,7 @@ static void ast2500_evb_class_init(ObjectClass *oc, void
> *data)
> mc->no_floppy = 1;
> mc->no_cdrom = 1;
> mc->no_parallel = 1;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo ast2500_evb_type = {
> @@ -326,6 +328,7 @@ static void romulus_bmc_class_init(ObjectClass *oc, void
> *data)
> mc->no_floppy = 1;
> mc->no_cdrom = 1;
> mc->no_parallel = 1;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo romulus_bmc_type = {
> diff --git a/hw/arm/collie.c b/hw/arm/collie.c
> index 2e69531..8830192 100644
> --- a/hw/arm/collie.c
> +++ b/hw/arm/collie.c
> @@ -64,6 +64,7 @@ static void collie_machine_init(MachineClass *mc)
> {
> mc->desc = "Sharp SL-5500 (Collie) PDA (SA-1110)";
> mc->init = collie_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("collie", collie_machine_init)
> diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
> index b98e1c4..32f1edd 100644
> --- a/hw/arm/cubieboard.c
> +++ b/hw/arm/cubieboard.c
> @@ -86,6 +86,7 @@ static void cubieboard_machine_init(MachineClass *mc)
> mc->init = cubieboard_init;
> mc->block_default_type = IF_IDE;
> mc->units_per_default_bus = 1;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("cubieboard", cubieboard_machine_init)
> diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
> index 520c8e9..9f11dcd 100644
> --- a/hw/arm/digic_boards.c
> +++ b/hw/arm/digic_boards.c
> @@ -155,6 +155,7 @@ static void canon_a1100_machine_init(MachineClass *mc)
> {
> mc->desc = "Canon PowerShot A1100 IS";
> mc->init = &canon_a1100_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init)
> diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
> index 7c03ed3..f1441ec 100644
> --- a/hw/arm/exynos4_boards.c
> +++ b/hw/arm/exynos4_boards.c
> @@ -189,6 +189,7 @@ static void nuri_class_init(ObjectClass *oc, void *data)
> mc->desc = "Samsung NURI board (Exynos4210)";
> mc->init = nuri_init;
> mc->max_cpus = EXYNOS4210_NCPUS;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo nuri_type = {
> @@ -204,6 +205,7 @@ static void smdkc210_class_init(ObjectClass *oc, void
> *data)
> mc->desc = "Samsung SMDKC210 board (Exynos4210)";
> mc->init = smdkc210_init;
> mc->max_cpus = EXYNOS4210_NCPUS;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo smdkc210_type = {
> diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
> index d59d9ba..092ce36 100644
> --- a/hw/arm/gumstix.c
> +++ b/hw/arm/gumstix.c
> @@ -128,6 +128,7 @@ static void connex_class_init(ObjectClass *oc, void *data)
>
> mc->desc = "Gumstix Connex (PXA255)";
> mc->init = connex_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo connex_type = {
> @@ -142,6 +143,7 @@ static void verdex_class_init(ObjectClass *oc, void *data)
>
> mc->desc = "Gumstix Verdex (PXA270)";
> mc->init = verdex_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo verdex_type = {
> diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
> index 942d5a8..ba27789 100644
> --- a/hw/arm/highbank.c
> +++ b/hw/arm/highbank.c
> @@ -413,6 +413,7 @@ static void highbank_class_init(ObjectClass *oc, void
> *data)
> mc->block_default_type = IF_IDE;
> mc->units_per_default_bus = 1;
> mc->max_cpus = 4;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo highbank_type = {
> @@ -430,6 +431,7 @@ static void midway_class_init(ObjectClass *oc, void *data)
> mc->block_default_type = IF_IDE;
> mc->units_per_default_bus = 1;
> mc->max_cpus = 4;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo midway_type = {
> diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
> index 7d42c74..9f3ee14 100644
> --- a/hw/arm/imx25_pdk.c
> +++ b/hw/arm/imx25_pdk.c
> @@ -148,6 +148,7 @@ static void imx25_pdk_machine_init(MachineClass *mc)
> {
> mc->desc = "ARM i.MX25 PDK board (ARM926)";
> mc->init = imx25_pdk_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init)
> diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
> index d9530ed..d603af9 100644
> --- a/hw/arm/integratorcp.c
> +++ b/hw/arm/integratorcp.c
> @@ -681,6 +681,7 @@ static void integratorcp_machine_init(MachineClass *mc)
> {
> mc->desc = "ARM Integrator/CP (ARM926EJ-S)";
> mc->init = integratorcp_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("integratorcp", integratorcp_machine_init)
> diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
> index 3ed6577..f9c2228 100644
> --- a/hw/arm/kzm.c
> +++ b/hw/arm/kzm.c
> @@ -142,6 +142,7 @@ static void kzm_machine_init(MachineClass *mc)
> {
> mc->desc = "ARM KZM Emulation Baseboard (ARM1136)";
> mc->init = kzm_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("kzm", kzm_machine_init)
> diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
> index fb268e6..637f52c 100644
> --- a/hw/arm/mainstone.c
> +++ b/hw/arm/mainstone.c
> @@ -196,6 +196,7 @@ static void mainstone2_machine_init(MachineClass *mc)
> {
> mc->desc = "Mainstone II (PXA27x)";
> mc->init = mainstone_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("mainstone", mainstone2_machine_init)
> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
> index a8b3d46..ab4ba31 100644
> --- a/hw/arm/musicpal.c
> +++ b/hw/arm/musicpal.c
> @@ -1718,6 +1718,7 @@ static void musicpal_machine_init(MachineClass *mc)
> {
> mc->desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)";
> mc->init = musicpal_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("musicpal", musicpal_machine_init)
> diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
> index 3cfe332..9d34d4c 100644
> --- a/hw/arm/netduino2.c
> +++ b/hw/arm/netduino2.c
> @@ -45,6 +45,7 @@ static void netduino2_machine_init(MachineClass *mc)
> {
> mc->desc = "Netduino 2 Machine";
> mc->init = netduino2_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("netduino2", netduino2_machine_init)
> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
> index 503a3b6..a32ac82 100644
> --- a/hw/arm/nseries.c
> +++ b/hw/arm/nseries.c
> @@ -1425,6 +1425,7 @@ static void n800_class_init(ObjectClass *oc, void *data)
> mc->desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)";
> mc->init = n800_init;
> mc->default_boot_order = "";
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo n800_type = {
> @@ -1440,6 +1441,7 @@ static void n810_class_init(ObjectClass *oc, void *data)
> mc->desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)";
> mc->init = n810_init;
> mc->default_boot_order = "";
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo n810_type = {
> diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
> index 9809106..4535617 100644
> --- a/hw/arm/omap_sx1.c
> +++ b/hw/arm/omap_sx1.c
> @@ -223,6 +223,7 @@ static void sx1_machine_v2_class_init(ObjectClass *oc,
> void *data)
>
> mc->desc = "Siemens SX1 (OMAP310) V2";
> mc->init = sx1_init_v2;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo sx1_machine_v2_type = {
> @@ -237,6 +238,7 @@ static void sx1_machine_v1_class_init(ObjectClass *oc,
> void *data)
>
> mc->desc = "Siemens SX1 (OMAP310) V1";
> mc->init = sx1_init_v1;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo sx1_machine_v1_type = {
> diff --git a/hw/arm/palm.c b/hw/arm/palm.c
> index 64cf8ca..bf070a2 100644
> --- a/hw/arm/palm.c
> +++ b/hw/arm/palm.c
> @@ -274,6 +274,7 @@ static void palmte_machine_init(MachineClass *mc)
> {
> mc->desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)";
> mc->init = palmte_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("cheetah", palmte_machine_init)
> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
> index 32cdc98..5941c9f 100644
> --- a/hw/arm/raspi.c
> +++ b/hw/arm/raspi.c
> @@ -168,5 +168,6 @@ static void raspi2_machine_init(MachineClass *mc)
> mc->no_cdrom = 1;
> mc->max_cpus = BCM2836_NCPUS;
> mc->default_ram_size = 1024 * 1024 * 1024;
> + mc->ignore_memory_transaction_failures = true;
> };
> DEFINE_MACHINE("raspi2", raspi2_machine_init)
> diff --git a/hw/arm/realview.c b/hw/arm/realview.c
> index 2736156..f3a49b6 100644
> --- a/hw/arm/realview.c
> +++ b/hw/arm/realview.c
> @@ -398,6 +398,7 @@ static void realview_eb_class_init(ObjectClass *oc, void
> *data)
> mc->desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)";
> mc->init = realview_eb_init;
> mc->block_default_type = IF_SCSI;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo realview_eb_type = {
> @@ -414,6 +415,7 @@ static void realview_eb_mpcore_class_init(ObjectClass
> *oc, void *data)
> mc->init = realview_eb_mpcore_init;
> mc->block_default_type = IF_SCSI;
> mc->max_cpus = 4;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo realview_eb_mpcore_type = {
> @@ -428,6 +430,7 @@ static void realview_pb_a8_class_init(ObjectClass *oc,
> void *data)
>
> mc->desc = "ARM RealView Platform Baseboard for Cortex-A8";
> mc->init = realview_pb_a8_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo realview_pb_a8_type = {
> @@ -443,6 +446,7 @@ static void realview_pbx_a9_class_init(ObjectClass *oc,
> void *data)
> mc->desc = "ARM RealView Platform Baseboard Explore for Cortex-A9";
> mc->init = realview_pbx_a9_init;
> mc->max_cpus = 4;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo realview_pbx_a9_type = {
> diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c
> index 4e7ac8c..ee140e5 100644
> --- a/hw/arm/sabrelite.c
> +++ b/hw/arm/sabrelite.c
> @@ -122,6 +122,7 @@ static void sabrelite_machine_init(MachineClass *mc)
> mc->desc = "Freescale i.MX6 Quad SABRE Lite Board (Cortex A9)";
> mc->init = sabrelite_init;
> mc->max_cpus = FSL_IMX6_NUM_CPUS;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("sabrelite", sabrelite_machine_init)
> diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
> index 7f588ce..6406421 100644
> --- a/hw/arm/spitz.c
> +++ b/hw/arm/spitz.c
> @@ -983,6 +983,7 @@ static void akitapda_class_init(ObjectClass *oc, void
> *data)
>
> mc->desc = "Sharp SL-C1000 (Akita) PDA (PXA270)";
> mc->init = akita_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo akitapda_type = {
> @@ -998,6 +999,7 @@ static void spitzpda_class_init(ObjectClass *oc, void
> *data)
> mc->desc = "Sharp SL-C3000 (Spitz) PDA (PXA270)";
> mc->init = spitz_init;
> mc->block_default_type = IF_IDE;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo spitzpda_type = {
> @@ -1013,6 +1015,7 @@ static void borzoipda_class_init(ObjectClass *oc, void
> *data)
> mc->desc = "Sharp SL-C3100 (Borzoi) PDA (PXA270)";
> mc->init = borzoi_init;
> mc->block_default_type = IF_IDE;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo borzoipda_type = {
> @@ -1028,6 +1031,7 @@ static void terrierpda_class_init(ObjectClass *oc, void
> *data)
> mc->desc = "Sharp SL-C3200 (Terrier) PDA (PXA270)";
> mc->init = terrier_init;
> mc->block_default_type = IF_IDE;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo terrierpda_type = {
> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index 408c1a1..b3aad23 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -1453,6 +1453,7 @@ static void lm3s811evb_class_init(ObjectClass *oc, void
> *data)
>
> mc->desc = "Stellaris LM3S811EVB";
> mc->init = lm3s811evb_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo lm3s811evb_type = {
> @@ -1467,6 +1468,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc,
> void *data)
>
> mc->desc = "Stellaris LM3S6965EVB";
> mc->init = lm3s6965evb_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo lm3s6965evb_type = {
> diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
> index 8b757ff..1134cf7 100644
> --- a/hw/arm/tosa.c
> +++ b/hw/arm/tosa.c
> @@ -263,6 +263,7 @@ static void tosapda_machine_init(MachineClass *mc)
> mc->desc = "Sharp SL-6000 (Tosa) PDA (PXA255)";
> mc->init = tosa_init;
> mc->block_default_type = IF_IDE;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("tosa", tosapda_machine_init)
> diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
> index b0e9f5b..76664e4 100644
> --- a/hw/arm/versatilepb.c
> +++ b/hw/arm/versatilepb.c
> @@ -403,6 +403,7 @@ static void versatilepb_class_init(ObjectClass *oc, void
> *data)
> mc->desc = "ARM Versatile/PB (ARM926EJ-S)";
> mc->init = vpb_init;
> mc->block_default_type = IF_SCSI;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo versatilepb_type = {
> @@ -418,6 +419,7 @@ static void versatileab_class_init(ObjectClass *oc, void
> *data)
> mc->desc = "ARM Versatile/AB (ARM926EJ-S)";
> mc->init = vab_init;
> mc->block_default_type = IF_SCSI;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static const TypeInfo versatileab_type = {
> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
> index 571dd36..e3acab6 100644
> --- a/hw/arm/vexpress.c
> +++ b/hw/arm/vexpress.c
> @@ -752,6 +752,7 @@ static void vexpress_class_init(ObjectClass *oc, void
> *data)
> mc->desc = "ARM Versatile Express";
> mc->init = vexpress_common_init;
> mc->max_cpus = 4;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> static void vexpress_a9_class_init(ObjectClass *oc, void *data)
> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
> index a750959..3759cf8 100644
> --- a/hw/arm/xilinx_zynq.c
> +++ b/hw/arm/xilinx_zynq.c
> @@ -326,6 +326,7 @@ static void zynq_machine_init(MachineClass *mc)
> mc->init = zynq_init;
> mc->max_cpus = 1;
> mc->no_sdcard = 1;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("xilinx-zynq-a9", zynq_machine_init)
> diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c
> index 860780a..c339cd4 100644
> --- a/hw/arm/xlnx-ep108.c
> +++ b/hw/arm/xlnx-ep108.c
> @@ -122,6 +122,7 @@ static void xlnx_ep108_machine_init(MachineClass *mc)
> mc->init = xlnx_ep108_init;
> mc->block_default_type = IF_IDE;
> mc->units_per_default_bus = 1;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init)
> @@ -132,6 +133,7 @@ static void xlnx_zcu102_machine_init(MachineClass *mc)
> mc->init = xlnx_ep108_init;
> mc->block_default_type = IF_IDE;
> mc->units_per_default_bus = 1;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("xlnx-zcu102", xlnx_zcu102_machine_init)
> diff --git a/hw/arm/z2.c b/hw/arm/z2.c
> index 1607cbd..417bc1a 100644
> --- a/hw/arm/z2.c
> +++ b/hw/arm/z2.c
> @@ -370,6 +370,7 @@ static void z2_machine_init(MachineClass *mc)
> {
> mc->desc = "Zipit Z2 (PXA27x)";
> mc->init = z2_init;
> + mc->ignore_memory_transaction_failures = true;
> }
>
> DEFINE_MACHINE("z2", z2_machine_init)
> --
> 2.7.4
>
>
