Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1627231/?format=api
{ "id": 1627231, "url": "http://patchwork.ozlabs.org/api/patches/1627231/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20220505184938.351866-23-danielhb413@gmail.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20220505184938.351866-23-danielhb413@gmail.com>", "list_archive_url": null, "date": "2022-05-05T18:49:30", "name": "[PULL,22/30] target/ppc: Remove msr_ir macro", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "ec33c3c1b4f29bca4d4bf16161c12140a8ef1c1a", "submitter": { "id": 74265, "url": "http://patchwork.ozlabs.org/api/people/74265/?format=api", "name": "Daniel Henrique Barboza", "email": "danielhb413@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20220505184938.351866-23-danielhb413@gmail.com/mbox/", "series": [ { "id": 298671, "url": "http://patchwork.ozlabs.org/api/series/298671/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=298671", "date": "2022-05-05T18:49:09", "name": "[PULL,01/30] target/ppc: initialize 'val' union in kvm_get_one_spr()", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/298671/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1627231/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1627231/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "bilbo.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20210112 header.b=d1Gby2Zy;\n\tdkim-atps=neutral", "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=<UNKNOWN>)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby bilbo.ozlabs.org (Postfix) with ESMTPS id 4KvPfM2LTvz9sBF\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 6 May 2022 05:59:07 +1000 (AEST)", "from localhost ([::1]:52582 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1nmhcv-0003QC-3l\n\tfor incoming@patchwork.ozlabs.org; Thu, 05 May 2022 15:59:05 -0400", "from eggs.gnu.org ([2001:470:142:3::10]:48180)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <danielhb413@gmail.com>)\n id 1nmgZJ-0003fc-RS; Thu, 05 May 2022 14:51:17 -0400", "from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]:33776)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <danielhb413@gmail.com>)\n id 1nmgZH-0004or-Ve; Thu, 05 May 2022 14:51:17 -0400", "by mail-ot1-x334.google.com with SMTP id\n c5-20020a9d75c5000000b00605ff3b9997so3534087otl.0;\n Thu, 05 May 2022 11:51:15 -0700 (PDT)", "from balboa.ibmuc.com (201-1-57-208.dsl.telesp.net.br.\n [201.1.57.208]) by smtp.gmail.com with ESMTPSA id\n n67-20020aca4046000000b00325cda1ff94sm917146oia.19.2022.05.05.11.51.11\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 05 May 2022 11:51:14 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=U1z8vMIfOXAZ4PuirGgfmdCyJQ9770ek9XusFJNQJkI=;\n b=d1Gby2Zy79mLjS+AnO9c6ZKmSlD3rTpx6grsJ/ih6qr+kystM0u3q858a+7D/OUj/8\n Q5O1XJoR/Xby8jTQhyl/NmL9B66OsGTT31lPYOzcU+Y1YDxsqNsFr5/Rk9aiHDKkFVtP\n ZV8BecuLIHRLYTK/RaR9LQVX4nmLPAEFGU4/GY98u//Q6C5GVbhcPs9oOtffud0sIKkD\n mZw/LmJJx6bWp6EN9C1e1s7/Hv1ORyZ0Uq90B3wNeZOoD67VMrvPOwANUMfzh/m+Y+qE\n /5yGLu0DRgB46jzzYx8z9tj1/JMgkkEyBsiyfwyxwtkUtWUWTY/LMwSc7BQfYSEIsc+l\n caZw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=U1z8vMIfOXAZ4PuirGgfmdCyJQ9770ek9XusFJNQJkI=;\n b=qM6hX9xPhCLYxsdOULJ5GkKmyQg7vgPuSni5zpeW6uwKOG5PIDs/W6yc6glQLyIofM\n HCTr5RbeX3NSWCxCWcM3G9oZqtXscZhJzTaQD6KqL7rsRYKt9/Dmkf5unLJuguRyPoOS\n +qQ9q9l4C1MyG7TqDcQ1DuRVtGfV84a6/bJJVPbBp1EOxUR5CaZbB+fAMS82I63Y4RmR\n axte2k/xL70cFKG1n7t02Zy9/4vZZWR/jgTbWQ1MH2BszwBKXi9U0pSDlWvmR+HkjfN0\n Qr39iR+gKMYZl50epTlCLyl9ZauuGnPB+u8f95rVN2+NH00zDYhAh8mxuPeGGNUk4naZ\n S58w==", "X-Gm-Message-State": "AOAM532C7k/fUSvJHnoWMn/uPgFotShq8Vp8e185QicdD3iiyva29hcE\n HQD10V1poDG7j/bPLVOPm+io6rTOmdY=", "X-Google-Smtp-Source": "\n ABdhPJyWMdO/pksQc2QxJPIUomp6W35YHmR7VF30pz8SNumrFdpDjjXrnggYg10V28NSjeNXQeVIeg==", "X-Received": "by 2002:a9d:27a9:0:b0:605:efee:1a4e with SMTP id\n c38-20020a9d27a9000000b00605efee1a4emr9812998otb.287.1651776674494;\n Thu, 05 May 2022 11:51:14 -0700 (PDT)", "From": "Daniel Henrique Barboza <danielhb413@gmail.com>", "To": "qemu-devel@nongnu.org", "Cc": "qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org,\n richard.henderson@linaro.org,\n =?utf-8?q?V=C3=ADctor_Colombo?= <victor.colombo@eldorado.org.br>", "Subject": "[PULL 22/30] target/ppc: Remove msr_ir macro", "Date": "Thu, 5 May 2022 15:49:30 -0300", "Message-Id": "<20220505184938.351866-23-danielhb413@gmail.com>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20220505184938.351866-1-danielhb413@gmail.com>", "References": "<20220505184938.351866-1-danielhb413@gmail.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2607:f8b0:4864:20::334;\n envelope-from=danielhb413@gmail.com; helo=mail-ot1-x334.google.com", "X-Spam_score_int": "-18", "X-Spam_score": "-1.9", "X-Spam_bar": "-", "X-Spam_report": "(-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,\n T_SCC_BODY_TEXT_LINE=-0.01 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": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: Víctor Colombo <victor.colombo@eldorado.org.br>\n\nmsr_ir macro hides the usage of env->msr, which is a bad behavior\nSubstitute it with FIELD_EX64 calls that explicitly use env->msr\nas a parameter.\n\nSuggested-by: Richard Henderson <richard.henderson@linaro.org>\nSigned-off-by: Víctor Colombo <victor.colombo@eldorado.org.br>\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nMessage-Id: <20220504210541.115256-15-victor.colombo@eldorado.org.br>\nSigned-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>\n---\n target/ppc/cpu.h | 2 +-\n target/ppc/helper_regs.c | 2 +-\n target/ppc/mmu_common.c | 11 ++++++-----\n 3 files changed, 8 insertions(+), 7 deletions(-)", "diff": "diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h\nindex 75a81d4304..6cfbec26a1 100644\n--- a/target/ppc/cpu.h\n+++ b/target/ppc/cpu.h\n@@ -363,6 +363,7 @@ FIELD(MSR, EE, MSR_EE, 1)\n FIELD(MSR, PR, MSR_PR, 1)\n FIELD(MSR, FP, MSR_FP, 1)\n FIELD(MSR, ME, MSR_ME, 1)\n+FIELD(MSR, IR, MSR_IR, 1)\n FIELD(MSR, DS, MSR_DS, 1)\n FIELD(MSR, LE, MSR_LE, 1)\n \n@@ -485,7 +486,6 @@ FIELD(MSR, LE, MSR_LE, 1)\n #define msr_de ((env->msr >> MSR_DE) & 1)\n #define msr_fe1 ((env->msr >> MSR_FE1) & 1)\n #define msr_ep ((env->msr >> MSR_EP) & 1)\n-#define msr_ir ((env->msr >> MSR_IR) & 1)\n #define msr_dr ((env->msr >> MSR_DR) & 1)\n #define msr_ts ((env->msr >> MSR_TS1) & 3)\n \ndiff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c\nindex 4e649d8b0e..e40078c001 100644\n--- a/target/ppc/helper_regs.c\n+++ b/target/ppc/helper_regs.c\n@@ -227,7 +227,7 @@ int hreg_store_msr(CPUPPCState *env, target_ulong value, int alter_hv)\n value &= ~MSR_HVB;\n value |= env->msr & MSR_HVB;\n }\n- if (((value >> MSR_IR) & 1) != msr_ir ||\n+ if (((value ^ env->msr) & R_MSR_IR_MASK) ||\n ((value >> MSR_DR) & 1) != msr_dr) {\n cpu_interrupt_exittb(cs);\n }\ndiff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c\nindex 031bb4493b..30deca0425 100644\n--- a/target/ppc/mmu_common.c\n+++ b/target/ppc/mmu_common.c\n@@ -388,7 +388,7 @@ static int get_segment_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx,\n \" nip=\" TARGET_FMT_lx \" lr=\" TARGET_FMT_lx\n \" ir=%d dr=%d pr=%d %d t=%d\\n\",\n eaddr, (int)(eaddr >> 28), sr, env->nip, env->lr,\n- (int)msr_ir, (int)msr_dr, pr ? 1 : 0,\n+ (int)FIELD_EX64(env->msr, MSR, IR), (int)msr_dr, pr ? 1 : 0,\n access_type == MMU_DATA_STORE, type);\n pgidx = (eaddr & ~SEGMENT_MASK_256M) >> target_page_bits;\n hash = vsid ^ pgidx;\n@@ -626,7 +626,8 @@ found_tlb:\n }\n \n /* Check the address space */\n- if ((access_type == MMU_INST_FETCH ? msr_ir : msr_dr) != (tlb->attr & 1)) {\n+ if ((access_type == MMU_INST_FETCH ?\n+ FIELD_EX64(env->msr, MSR, IR) : msr_dr) != (tlb->attr & 1)) {\n qemu_log_mask(CPU_LOG_MMU, \"%s: AS doesn't match\\n\", __func__);\n return -1;\n }\n@@ -839,7 +840,7 @@ found_tlb:\n if (access_type == MMU_INST_FETCH) {\n /* There is no way to fetch code using epid load */\n assert(!use_epid);\n- as = msr_ir;\n+ as = FIELD_EX64(env->msr, MSR, IR);\n }\n \n if (as != ((tlb->mas1 & MAS1_TS) >> MAS1_TS_SHIFT)) {\n@@ -1169,7 +1170,7 @@ int get_physical_address_wtlb(CPUPPCState *env, mmu_ctx_t *ctx,\n int mmu_idx)\n {\n int ret = -1;\n- bool real_mode = (type == ACCESS_CODE && msr_ir == 0)\n+ bool real_mode = (type == ACCESS_CODE && !FIELD_EX64(env->msr, MSR, IR))\n || (type != ACCESS_CODE && msr_dr == 0);\n \n switch (env->mmu_model) {\n@@ -1231,7 +1232,7 @@ static void booke206_update_mas_tlb_miss(CPUPPCState *env, target_ulong address,\n bool use_epid = mmubooke206_get_as(env, mmu_idx, &epid, &as, &pr);\n \n if (access_type == MMU_INST_FETCH) {\n- as = msr_ir;\n+ as = FIELD_EX64(env->msr, MSR, IR);\n }\n env->spr[SPR_BOOKE_MAS0] = env->spr[SPR_BOOKE_MAS4] & MAS4_TLBSELD_MASK;\n env->spr[SPR_BOOKE_MAS1] = env->spr[SPR_BOOKE_MAS4] & MAS4_TSIZED_MASK;\n", "prefixes": [ "PULL", "22/30" ] }