From patchwork Tue Nov 5 22:47:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 840820 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp239604wru; Tue, 5 Nov 2024 14:48:35 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX+fVyX5DiEXaD5tz/Mb3/pAlED9bNS91DkWCbypbCPy+zHqtbWWY/6nErlTkGQG2o5dNm8Kw==@linaro.org X-Google-Smtp-Source: AGHT+IHe/UwV8eSimbmFmtVBnN7DmidibzVQhkHVtPvp/RZM4hjjI5ODy8cdjreW7QnB8bh95suO X-Received: by 2002:a05:690c:7207:b0:6ea:90b6:ab48 with SMTP id 00721157ae682-6ea90b6ae95mr92267877b3.18.1730846915076; Tue, 05 Nov 2024 14:48:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1730846915; cv=none; d=google.com; s=arc-20240605; b=j07OA2X8feeXynJjEmJQ0F/x94Scy3BPxKvl7SCdPpLdEkdAIbQv4CNeKUDyjtUA8m 0/PBoXSZY9PA3HMUQ5nqm373ZPs9Mn4thP8+kNXH473ZDLH9uTgWlyA41eFMUUEW1lV9 4m6nc0Z+7PcNykZjKIh9iso7yof5rtJOntF+i3vmkJBHQRJlgjRoWL/mc6ic6GFvXUUE cLdG8KUugldDtGUXqyVFV53UHeObPHMViCQQN5dIJptZb6lL3JHI+LRzTB6ZNHmlxAfU CEORth4Qb6N9vg2ljQCsEDACPKGV749W9mAo0AQLOd9WaEbXj8DHU/NyoA7Nra7uRqln 3Zaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ho0A2jlp8lVsHZmosL6iA363WYyynJomIliKjY9MJKY=; fh=v41eRp8YuWdase5ys9+9lPhyd//Bn4qAd25PQiL7wo8=; b=hcyD3CSQcyAHxkDHOFGNMzCt2EmLZzch/4P4aW8En4MdMHp94i7BmR15Jz4T0wIdIQ kQ/TDvqz2BX8Jvu6mC1w3v1/PkgdBFHa8cLweENW0o+aWBt7dTE3vDAsaG5aFyT5bkUV gjxWbminSgustgC48mh45KBmBxbfGJGrdnpaSCooQNF6aSQr+P4r3mDjpM9KbUX5Nqla AAv6N5wFfNY0R+e03GL+D8RUmPtC/j+EVbnbFf9INwog9JoCr9D3Fs7WPFna1jy5Mrsk kUcuR+oDrPMJKkzyzyj7oOCmDmi+zb6NW2+STXHm4m443EoLGH7tZedOUPFN+DaPfHOV U3+g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UHY2XbpN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6d353fa6c4asi143416376d6.82.2024.11.05.14.48.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Nov 2024 14:48:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UHY2XbpN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8SKw-0004x1-Am; Tue, 05 Nov 2024 17:47:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8SKu-0004wq-75 for qemu-devel@nongnu.org; Tue, 05 Nov 2024 17:47:44 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t8SKs-00047R-EU for qemu-devel@nongnu.org; Tue, 05 Nov 2024 17:47:43 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4315e9e9642so51809505e9.0 for ; Tue, 05 Nov 2024 14:47:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1730846860; x=1731451660; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ho0A2jlp8lVsHZmosL6iA363WYyynJomIliKjY9MJKY=; b=UHY2XbpN4y/010fbc5NRCwweMEIii809WMvW2Oj335QOXtW+Vl2adigmE04i5W7cPU qPXyAyxfQpE37utScB7xVrjrsYGu40tfY4IJhd3rQVVuZJdl9P1DhR/q7GErLidoMpMM BT6jGZsJn+JuvSeikpEUaephsLgzgJUgiakOsC0aUS/wbdd5gFYm+8a3tWSDedGUmWiP RZlX5c5chwIRCDjzRAsOQTCFoqwiZyNADs0koP3VzA34ZXgEpsNhDBqq4OHx6VvZpg0I ySFsgc+LCbSNDuJZLbGCkFr5f+kbhd/Yci1V/YZF+1a7+G07XLXvzw/rwU1DiVdPuUQR hI0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730846860; x=1731451660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ho0A2jlp8lVsHZmosL6iA363WYyynJomIliKjY9MJKY=; b=afELQZ+fjfNEGgO4/W0t4PsVQYpJiQ4vVHVOjIcKDRWE+kvV5jQG3C3Ik4KtApVCa0 A16Yv0qdjbRubbfMUzci8ctiGGbuStxa0K8HMcyHHVqxX8/uieMLbKG7yuYM1w26bmvs az3LTjxvcRIeowii9Al0w9qWKYxqSraNlsrDeBfJKtsF3aJUSajBLRCwTZaiHI6pu4Gd 8qi6zZkVCXokXS3+amT1uA7SfDLdfyqbZvC3R8roCBPzSx8apgoRcxrnWcj9ygf2oRCv W7GYRYFjFL6k7hhJzVwDLZQ28HxuLRT3PCmgxqvXuR6eDZq4ZbWc+gP7ILFegdxm3jly fpIQ== X-Gm-Message-State: AOJu0YypAHnZU4VXKcoP+d5QOPx+N8fZmYB0xgTTiL/S+M368zq4Cx0u cBRSVr1g21xgDjkjSq4UDOfZODSCY+SZxbQ1Rc496FfAanUrmaPpAHYiCFFfqJKbODQQ1Iwi8iX p13+bbg== X-Received: by 2002:a05:600c:1c93:b0:431:5a27:839c with SMTP id 5b1f17b1804b1-4327b6f4675mr183347105e9.5.1730846860472; Tue, 05 Nov 2024 14:47:40 -0800 (PST) Received: from localhost.localdomain ([89.101.134.25]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381c10d42adsm17334977f8f.40.2024.11.05.14.47.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 05 Nov 2024 14:47:39 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anton Johansson , Alistair Francis Subject: [PULL 02/29] hw/microblaze: Deprecate big-endian petalogix-ml605 & xlnx-zynqmp-pmu Date: Tue, 5 Nov 2024 22:47:00 +0000 Message-ID: <20241105224727.53059-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241105224727.53059-1-philmd@linaro.org> References: <20241105224727.53059-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Anton Johansson Acked-by: Alistair Francis Message-Id: <20241105130431.22564-3-philmd@linaro.org> --- 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 720d4eec8a9..d8dc29d0a4e 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -271,6 +271,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) -