Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1825225/?format=api
{ "id": 1825225, "url": "http://patchwork.ozlabs.org/api/patches/1825225/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230824092409.1492470-11-gaosong@loongson.cn/", "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": "<20230824092409.1492470-11-gaosong@loongson.cn>", "list_archive_url": null, "date": "2023-08-24T09:23:48", "name": "[PULL,10/31] target/loongarch: Support LoongArch32 DMW", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "5967adb18d1fab1435a10ad2a917e20fdceae397", "submitter": { "id": 82024, "url": "http://patchwork.ozlabs.org/api/people/82024/?format=api", "name": "gaosong", "email": "gaosong@loongson.cn" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230824092409.1492470-11-gaosong@loongson.cn/mbox/", "series": [ { "id": 370173, "url": "http://patchwork.ozlabs.org/api/series/370173/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=370173", "date": "2023-08-24T09:23:41", "name": "[PULL,01/31] target/loongarch: Log I/O write accesses to CSR registers", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/370173/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1825225/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1825225/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@legolas.ozlabs.org", "Authentication-Results": "legolas.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=patchwork.ozlabs.org)", "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4RWd4r0Fcdz1ygJ\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 24 Aug 2023 19:26:36 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1qZ6bg-0003Zq-Gj; Thu, 24 Aug 2023 05:26:24 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <gaosong@loongson.cn>)\n id 1qZ6bT-0003Er-AR\n for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:26:11 -0400", "from mail.loongson.cn ([114.242.206.163])\n by eggs.gnu.org with esmtp (Exim 4.90_1)\n (envelope-from <gaosong@loongson.cn>) id 1qZ6bO-0004D5-Gh\n for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:26:10 -0400", "from loongson.cn (unknown [10.2.5.185])\n by gateway (Coremail) with SMTP id _____8DxVujBIedkUXkbAA--.20602S3;\n Thu, 24 Aug 2023 17:24:17 +0800 (CST)", "from localhost.localdomain (unknown [10.2.5.185])\n by localhost.localdomain (Coremail) with SMTP id\n AQAAf8DxJ826IedkJjhiAA--.40637S12;\n Thu, 24 Aug 2023 17:24:16 +0800 (CST)" ], "From": "Song Gao <gaosong@loongson.cn>", "To": "qemu-devel@nongnu.org", "Cc": "stefanha@redhat.com, richard.henderson@linaro.org, Jiajie Chen <c@jia.je>", "Subject": "[PULL 10/31] target/loongarch: Support LoongArch32 DMW", "Date": "Thu, 24 Aug 2023 17:23:48 +0800", "Message-Id": "<20230824092409.1492470-11-gaosong@loongson.cn>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230824092409.1492470-1-gaosong@loongson.cn>", "References": "<20230824092409.1492470-1-gaosong@loongson.cn>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-CM-TRANSID": "AQAAf8DxJ826IedkJjhiAA--.40637S12", "X-CM-SenderInfo": "5jdr20tqj6z05rqj20fqof0/", "X-Coremail-Antispam": "1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7\n ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx\n nUUI43ZEXa7xR_UUUUUUUUU==", "Received-SPF": "pass client-ip=114.242.206.163;\n envelope-from=gaosong@loongson.cn;\n helo=mail.loongson.cn", "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, SPF_HELO_NONE=0.001,\n 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": "<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-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "From: Jiajie Chen <c@jia.je>\n\nLA32 uses a different encoding for CSR.DMW and a new direct mapping\nmechanism.\n\nSigned-off-by: Jiajie Chen <c@jia.je>\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nSigned-off-by: Song Gao <gaosong@loongson.cn>\nMessage-ID: <20230822032724.1353391-3-gaosong@loongson.cn>\nMessage-Id: <20230822071405.35386-3-philmd@linaro.org>\n---\n target/loongarch/cpu-csr.h | 7 +++----\n target/loongarch/tlb_helper.c | 26 +++++++++++++++++++++++---\n 2 files changed, 26 insertions(+), 7 deletions(-)", "diff": "diff --git a/target/loongarch/cpu-csr.h b/target/loongarch/cpu-csr.h\nindex 48ed2e0632..b93f99a9ef 100644\n--- a/target/loongarch/cpu-csr.h\n+++ b/target/loongarch/cpu-csr.h\n@@ -188,10 +188,9 @@ FIELD(CSR_DMW, PLV1, 1, 1)\n FIELD(CSR_DMW, PLV2, 2, 1)\n FIELD(CSR_DMW, PLV3, 3, 1)\n FIELD(CSR_DMW, MAT, 4, 2)\n-FIELD(CSR_DMW, VSEG, 60, 4)\n-\n-#define dmw_va2pa(va) \\\n- (va & MAKE_64BIT_MASK(0, TARGET_VIRT_ADDR_SPACE_BITS))\n+FIELD(CSR_DMW_32, PSEG, 25, 3)\n+FIELD(CSR_DMW_32, VSEG, 29, 3)\n+FIELD(CSR_DMW_64, VSEG, 60, 4)\n \n /* Debug CSRs */\n #define LOONGARCH_CSR_DBG 0x500 /* debug config */\ndiff --git a/target/loongarch/tlb_helper.c b/target/loongarch/tlb_helper.c\nindex cef10e2257..1f8e7911c7 100644\n--- a/target/loongarch/tlb_helper.c\n+++ b/target/loongarch/tlb_helper.c\n@@ -173,6 +173,18 @@ static int loongarch_map_address(CPULoongArchState *env, hwaddr *physical,\n return TLBRET_NOMATCH;\n }\n \n+static hwaddr dmw_va2pa(CPULoongArchState *env, target_ulong va,\n+ target_ulong dmw)\n+{\n+ if (is_la64(env)) {\n+ return va & TARGET_VIRT_MASK;\n+ } else {\n+ uint32_t pseg = FIELD_EX32(dmw, CSR_DMW_32, PSEG);\n+ return (va & MAKE_64BIT_MASK(0, R_CSR_DMW_32_VSEG_SHIFT)) | \\\n+ (pseg << R_CSR_DMW_32_VSEG_SHIFT);\n+ }\n+}\n+\n static int get_physical_address(CPULoongArchState *env, hwaddr *physical,\n int *prot, target_ulong address,\n MMUAccessType access_type, int mmu_idx)\n@@ -192,12 +204,20 @@ static int get_physical_address(CPULoongArchState *env, hwaddr *physical,\n }\n \n plv = kernel_mode | (user_mode << R_CSR_DMW_PLV3_SHIFT);\n- base_v = address >> R_CSR_DMW_VSEG_SHIFT;\n+ if (is_la64(env)) {\n+ base_v = address >> R_CSR_DMW_64_VSEG_SHIFT;\n+ } else {\n+ base_v = address >> R_CSR_DMW_32_VSEG_SHIFT;\n+ }\n /* Check direct map window */\n for (int i = 0; i < 4; i++) {\n- base_c = FIELD_EX64(env->CSR_DMW[i], CSR_DMW, VSEG);\n+ if (is_la64(env)) {\n+ base_c = FIELD_EX64(env->CSR_DMW[i], CSR_DMW_64, VSEG);\n+ } else {\n+ base_c = FIELD_EX64(env->CSR_DMW[i], CSR_DMW_32, VSEG);\n+ }\n if ((plv & env->CSR_DMW[i]) && (base_c == base_v)) {\n- *physical = dmw_va2pa(address);\n+ *physical = dmw_va2pa(env, address, env->CSR_DMW[i]);\n *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;\n return TLBRET_MATCH;\n }\n", "prefixes": [ "PULL", "10/31" ] }