From patchwork Sat Jul 15 21:27:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 27436 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBEFEC27C7A for ; Sat, 15 Jul 2023 21:27:39 +0000 (UTC) Received: from a27-23.smtp-out.us-west-2.amazonses.com (a27-23.smtp-out.us-west-2.amazonses.com [54.240.27.23]) by mx.groups.io with SMTP id smtpd.web11.6035.1689456455316427164 for ; Sat, 15 Jul 2023 14:27:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=DTZmwRAC; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.23, mailfrom: 010101895b73ab50-f15be0b0-e838-422e-9eb6-a00f261bc848-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1689456454; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=ys1tFpofZHe9KNupggYrUSdhwdWDj4xdCqQsD3FMC6w=; b=DTZmwRACrsfzeAywySt66XJaGa/egu7yPiilTFSm+ajbDDGnRz13Uq4f2/cMAw07 crFFotzQdeUSc/BXkwlfUXldAYKew9bektu1sBtO8Su/GuKjLJqLdAmQ7oJpps58lZ5 JfAiJjcTWZfEHF9mG7KXLcCE7ku+8V2gYrAiLNHU= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1689456454; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=ys1tFpofZHe9KNupggYrUSdhwdWDj4xdCqQsD3FMC6w=; b=US15JJMxHNfbg6PbuOrGde7sHvGKYmsoYsWyIMcQM7SUmyJr3j4lCDF1WAOqFsFJ SioRfkDCOWlGxuu/hbgYyMX4i116Ovh8O28V1j3QC5U+IL/OA5xDTUk6ndFC1hmwjwv HoIgR5KPPqHLuspBalFRVT0pHAXuQVaNXkEvsB7A= MIME-Version: 1.0 From: auh@yoctoproject.org To: Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: [AUH] qemu: upgrading to 8.0.3 FAILED Message-ID: <010101895b73ab50-f15be0b0-e838-422e-9eb6-a00f261bc848-000000@us-west-2.amazonses.com> Date: Sat, 15 Jul 2023 21:27:34 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.07.15-54.240.27.23 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 15 Jul 2023 21:27:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184347 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *qemu* to *8.0.3* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-qemu-upgrade-8.0.0-8.0.3.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 414a3c6dc332e45d5a7c5480390694dfd3c1e631 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 15 Jul 2023 13:38:26 +0000 Subject: [PATCH] qemu: upgrade 8.0.0 -> 8.0.3 --- meta/recipes-devtools/qemu/qemu.inc | 4 +- meta/recipes-devtools/qemu/qemu/ppc.patch | 148 ------------------ .../qemu/{qemu_8.0.0.bb => qemu_8.0.3.bb} | 0 3 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/ppc.patch rename meta/recipes-devtools/qemu/{qemu_8.0.0.bb => qemu_8.0.3.bb} (100%) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index a5bdeef66d..97e1150b66 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -30,11 +30,11 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch \ file://qemu-guest-agent.init \ file://qemu-guest-agent.udev \ - file://ppc.patch \ + file://cross.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "bb60f0341531181d6cc3969dd19a013d0427a87f918193970d9adb91131e56d0" +SRC_URI[sha256sum] = "ecf4d32cbef9d397bfc8cc50e4d1e92a1b30253bf32e8ee73c7a8dcf9a232b09" SRC_URI:append:class-target = " file://cross.patch" SRC_URI:append:class-nativesdk = " file://cross.patch" diff --git a/meta/recipes-devtools/qemu/qemu/ppc.patch b/meta/recipes-devtools/qemu/qemu/ppc.patch deleted file mode 100644 index e14c48cf85..0000000000 --- a/meta/recipes-devtools/qemu/qemu/ppc.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 31f02021ac17442c514593f7b9ed750ea87c21b1 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Sat, 6 May 2023 07:42:35 +0100 -Cc: Víctor Colombo -Cc: Matheus Ferst -Cc: Daniel Henrique Barboza -Cc: Richard Henderson -Cc: Philippe Mathieu-Daudé -Subject: [PATCH v3] target/ppc: Fix fallback to MFSS for MFFS* instructions on - pre 3.0 ISAs - -The following commits changed the code such that the fallback to MFSS for MFFSCRN, -MFFSCRNI, MFFSCE and MFFSL on pre 3.0 ISAs was removed and became an illegal instruction: - - bf8adfd88b547680aa857c46098f3a1e94373160 - target/ppc: Move mffscrn[i] to decodetree - 394c2e2fda70da722f20fb60412d6c0ca4bfaa03 - target/ppc: Move mffsce to decodetree - 3e5bce70efe6bd1f684efbb21fd2a316cbf0657e - target/ppc: Move mffsl to decodetree - -The hardware will handle them as a MFFS instruction as the code did previously. -This means applications that were segfaulting under qemu when encountering these -instructions which is used in glibc libm functions for example. - -The fallback for MFFSCDRN and MFFSCDRNI added in a later patch was also missing. - -This patch restores the fallback to MFSS for these instructions on pre 3.0s ISAs -as the hardware decoder would, fixing the segfaulting libm code. It doesn't have -the fallback for 3.0 onwards to match hardware behaviour. - -Signed-off-by: Richard Purdie ---- - target/ppc/insn32.decode | 20 +++++++++++++------- - target/ppc/translate/fp-impl.c.inc | 22 ++++++++++++++++------ - 2 files changed, 29 insertions(+), 13 deletions(-) - -v3 - drop fallback to MFFS for 3.0 ISA to match hardware -v2 - switch to use decodetree pattern groups per feedback - -Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20230506065240.3177798-1-richard.purdie@linuxfoundation.org/] - -diff --git a/target/ppc/insn32.decode b/target/ppc/insn32.decode -index f8f589e9fd..4fcf3af8d0 100644 ---- a/target/ppc/insn32.decode -+++ b/target/ppc/insn32.decode -@@ -390,13 +390,19 @@ SETNBCR 011111 ..... ..... ----- 0111100000 - @X_bi - - ### Move To/From FPSCR - --MFFS 111111 ..... 00000 ----- 1001000111 . @X_t_rc --MFFSCE 111111 ..... 00001 ----- 1001000111 - @X_t --MFFSCRN 111111 ..... 10110 ..... 1001000111 - @X_tb --MFFSCDRN 111111 ..... 10100 ..... 1001000111 - @X_tb --MFFSCRNI 111111 ..... 10111 ---.. 1001000111 - @X_imm2 --MFFSCDRNI 111111 ..... 10101 --... 1001000111 - @X_imm3 --MFFSL 111111 ..... 11000 ----- 1001000111 - @X_t -+{ -+ # Before Power ISA v3.0, MFFS bits 11~15 were reserved and should be ignored -+ MFFS_ISA207 111111 ..... ----- ----- 1001000111 . @X_t_rc -+ [ -+ MFFS 111111 ..... 00000 ----- 1001000111 . @X_t_rc -+ MFFSCE 111111 ..... 00001 ----- 1001000111 - @X_t -+ MFFSCRN 111111 ..... 10110 ..... 1001000111 - @X_tb -+ MFFSCDRN 111111 ..... 10100 ..... 1001000111 - @X_tb -+ MFFSCRNI 111111 ..... 10111 ---.. 1001000111 - @X_imm2 -+ MFFSCDRNI 111111 ..... 10101 --... 1001000111 - @X_imm3 -+ MFFSL 111111 ..... 11000 ----- 1001000111 - @X_t -+ ] -+} - - ### Decimal Floating-Point Arithmetic Instructions - -diff --git a/target/ppc/translate/fp-impl.c.inc b/target/ppc/translate/fp-impl.c.inc -index 57d8437851..874774eade 100644 ---- a/target/ppc/translate/fp-impl.c.inc -+++ b/target/ppc/translate/fp-impl.c.inc -@@ -568,6 +568,22 @@ static void store_fpscr_masked(TCGv_i64 fpscr, uint64_t clear_mask, - gen_helper_store_fpscr(cpu_env, fpscr_masked, st_mask); - } - -+static bool trans_MFFS_ISA207(DisasContext *ctx, arg_X_t_rc *a) -+{ -+ if (!(ctx->insns_flags2 & PPC2_ISA300)) { -+ /* -+ * Before Power ISA v3.0, MFFS bits 11~15 were reserved, any instruction -+ * with OPCD=63 and XO=583 should be decoded as MFFS. -+ */ -+ return trans_MFFS(ctx, a); -+ } -+ /* -+ * For Power ISA v3.0+, return false and let the pattern group -+ * select the correct instruction. -+ */ -+ return false; -+} -+ - static bool trans_MFFS(DisasContext *ctx, arg_X_t_rc *a) - { - REQUIRE_FPU(ctx); -@@ -584,7 +600,6 @@ static bool trans_MFFSCE(DisasContext *ctx, arg_X_t *a) - { - TCGv_i64 fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - gen_reset_fpstatus(); -@@ -597,7 +612,6 @@ static bool trans_MFFSCRN(DisasContext *ctx, arg_X_tb *a) - { - TCGv_i64 t1, fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - t1 = tcg_temp_new_i64(); -@@ -614,7 +628,6 @@ static bool trans_MFFSCDRN(DisasContext *ctx, arg_X_tb *a) - { - TCGv_i64 t1, fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - t1 = tcg_temp_new_i64(); -@@ -631,7 +644,6 @@ static bool trans_MFFSCRNI(DisasContext *ctx, arg_X_imm2 *a) - { - TCGv_i64 t1, fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - t1 = tcg_temp_new_i64(); -@@ -647,7 +659,6 @@ static bool trans_MFFSCDRNI(DisasContext *ctx, arg_X_imm3 *a) - { - TCGv_i64 t1, fpscr; - -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - t1 = tcg_temp_new_i64(); -@@ -661,7 +672,6 @@ static bool trans_MFFSCDRNI(DisasContext *ctx, arg_X_imm3 *a) - - static bool trans_MFFSL(DisasContext *ctx, arg_X_t *a) - { -- REQUIRE_INSNS_FLAGS2(ctx, ISA300); - REQUIRE_FPU(ctx); - - gen_reset_fpstatus(); --- -2.39.2 - diff --git a/meta/recipes-devtools/qemu/qemu_8.0.0.bb b/meta/recipes-devtools/qemu/qemu_8.0.3.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_8.0.0.bb rename to meta/recipes-devtools/qemu/qemu_8.0.3.bb