On Tue, Nov 5, 2024 at 11:06 PM Philippe Mathieu-Daudé
<philmd@xxxxxxxxxx> wrote:
>
> The petalogix-ml605 machine was explicitly added as little-endian only
> machine in commit 00914b7d970 ("microblaze: Add PetaLogix ml605 MMU
> little-endian ref design"). Mark the big-endian version as deprecated.
>
> When the xlnx-zynqmp-pmu machine's CPU was added in commit 133d23b3ad1
> ("xlnx-zynqmp-pmu: Add the CPU and memory"), its 'endianness' property
> was set to %true, thus wired in little endianness.
>
> Both machine are included in the big-endian system binary, while their
> CPU is working in little-endian. Unlikely to work as it. Deprecate now
> as broken config so we can remove soon.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
Acked-by: Alistair Francis <alistair.francis@xxxxxxx>
Alistair
> ---
> docs/about/deprecated.rst | 6 ++++++
> configs/devices/microblaze-softmmu/default.mak | 2 --
> configs/devices/microblazeel-softmmu/default.mak | 5 ++++-
> hw/microblaze/petalogix_ml605_mmu.c | 7 ++++++-
> hw/microblaze/xlnx-zynqmp-pmu.c | 8 ++++++--
> 5 files changed, 22 insertions(+), 6 deletions(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index ff404d44f85..e1c8829e1a4 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -279,6 +279,12 @@ BMC and a witherspoon like OpenPOWER system. It was used for bring up
> of the AST2600 SoC in labs. It can be easily replaced by the
> ``rainier-bmc`` machine which is a real product.
>
> +Big-Endian variants of MicroBlaze ``petalogix-ml605`` and ``xlnx-zynqmp-pmu`` machines (since 9.2)
> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +Both ``petalogix-ml605`` and ``xlnx-zynqmp-pmu`` were added for little endian
> +CPUs. Big endian support is not tested.
> +
> Backend options
> ---------------
>
> diff --git a/configs/devices/microblaze-softmmu/default.mak b/configs/devices/microblaze-softmmu/default.mak
> index 583e3959bb7..78941064655 100644
> --- a/configs/devices/microblaze-softmmu/default.mak
> +++ b/configs/devices/microblaze-softmmu/default.mak
> @@ -2,5 +2,3 @@
>
> # Boards are selected by default, uncomment to keep out of the build.
> # CONFIG_PETALOGIX_S3ADSP1800=n
> -# CONFIG_PETALOGIX_ML605=n
> -# CONFIG_XLNX_ZYNQMP_PMU=n
> diff --git a/configs/devices/microblazeel-softmmu/default.mak b/configs/devices/microblazeel-softmmu/default.mak
> index 29f7f13816c..4c1086435bf 100644
> --- a/configs/devices/microblazeel-softmmu/default.mak
> +++ b/configs/devices/microblazeel-softmmu/default.mak
> @@ -1,3 +1,6 @@
> # Default configuration for microblazeel-softmmu
>
> -include ../microblaze-softmmu/default.mak
> +# Boards are selected by default, uncomment to keep out of the build.
> +# CONFIG_PETALOGIX_S3ADSP1800=n
> +# CONFIG_PETALOGIX_ML605=n
> +# CONFIG_XLNX_ZYNQMP_PMU=n
> diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
> index df808ac323e..61e47d83988 100644
> --- a/hw/microblaze/petalogix_ml605_mmu.c
> +++ b/hw/microblaze/petalogix_ml605_mmu.c
> @@ -213,7 +213,12 @@ petalogix_ml605_init(MachineState *machine)
>
> static void petalogix_ml605_machine_init(MachineClass *mc)
> {
> - mc->desc = "PetaLogix linux refdesign for xilinx ml605 little endian";
> +#if TARGET_BIG_ENDIAN
> + mc->desc = "PetaLogix linux refdesign for xilinx ml605 (big endian)";
> + mc->deprecation_reason = "big endian support is not tested";
> +#else
> + mc->desc = "PetaLogix linux refdesign for xilinx ml605 (little endian)";
> +#endif
> mc->init = petalogix_ml605_init;
> }
>
> diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
> index 43608c2dca4..567aad47bfc 100644
> --- a/hw/microblaze/xlnx-zynqmp-pmu.c
> +++ b/hw/microblaze/xlnx-zynqmp-pmu.c
> @@ -181,9 +181,13 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)
>
> static void xlnx_zynqmp_pmu_machine_init(MachineClass *mc)
> {
> - mc->desc = "Xilinx ZynqMP PMU machine";
> +#if TARGET_BIG_ENDIAN
> + mc->desc = "Xilinx ZynqMP PMU machine (big endian)";
> + mc->deprecation_reason = "big endian support is not tested";
> +#else
> + mc->desc = "Xilinx ZynqMP PMU machine (little endian)";
> +#endif
> mc->init = xlnx_zynqmp_pmu_init;
> }
>
> DEFINE_MACHINE("xlnx-zynqmp-pmu", xlnx_zynqmp_pmu_machine_init)
> -
> --
> 2.45.2
>
>
