From patchwork Wed Jan 27 23:41:18 2021 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: 12051253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02597C433E0 for ; Wed, 27 Jan 2021 23:43:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8BEF060C40 for ; Wed, 27 Jan 2021 23:43:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BEF060C40 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4uSm-00078C-KC for qemu-devel@archiver.kernel.org; Wed, 27 Jan 2021 18:43:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4uRH-0006GX-91 for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:41:31 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:40774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4uRF-0008DA-OT for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:41:30 -0500 Received: by mail-wr1-x42b.google.com with SMTP id c12so3658312wrc.7 for ; Wed, 27 Jan 2021 15:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WDUUFabGCpfCL1l7QMgDUHrlWMhVwt9PxBXe9pD+ufs=; b=Eqy+HoSlDRoulNTSMZtNG914Hl7s4eROt6t72Gzyir3QBOgS6sH/kjPyrmyaYug6fY R+7lTfDLFyAfQiyb5XE884K4+EM+dKUIXYQwVeBEvUnSkw87hrAE30Pvmq+DGaVPlxzn gnWbWMcvrVhuxoDXlbddBYBiuH3cCfWC26ZyVrHYG6fCNhB9eWcum+TqIwEhaMdfMcCU neRAplowYRYciy6C6gacTFPOPT75GTGmTvwOSGWCclbCu9tkbTmt1Na6qI81mIy7gy0B Znm3OorpuhROGV+ciqeK9RoySP3ELGXc9UpmFGdPVl0EDayjyvK+8/JtLYflmwUyjCqe JD0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WDUUFabGCpfCL1l7QMgDUHrlWMhVwt9PxBXe9pD+ufs=; b=p8zMfTKSzeXaWhsMIvldeHA3UREHfVG8KRdJU3rbRrU8QELtlr7N70Mvra7H1XGYQQ ZT76DprMkiaNzH/40bsRs9o2i5FEuQbm1UiDfrikaqdHYy7pj6bGhLVEMPQ+bHSuPhOy 8PTQwVnraotikA6wrZiSJi5TCbQ64N44RRFeRL3yjAL6SplZYQwZeP8yhvrUCmtfqMWH 3UMNZJ+n9Ct3QEHoeSPbjk8iHdLOTwW6r6d0cMtD84y/d1MnkLugqiAebpqeiodg/MhI ZGCGsqC3xi0gfjZ9oOT9d4Gu+kDdPZsmZ6vZC5t1ja1SfgI1LM3qFlqgZPJZsIXhL8ls tbNA== X-Gm-Message-State: AOAM533wKCAHT8q8pRNKOdvrLzrX224sg9vH1aJijFAYloi7dLVJV1b7 v1m7cPQi9ogv8VW46jcFkbQ4L/udseE= X-Google-Smtp-Source: ABdhPJwx9C/A9A9IzjY2XOkpvaaaUURgmt1+rHZQ9QkZgfzfMQMoo+8T0GoaRxRayGSjKDLW6vepqg== X-Received: by 2002:a5d:6944:: with SMTP id r4mr6927457wrw.399.1611790887618; Wed, 27 Jan 2021 15:41:27 -0800 (PST) Received: from localhost.localdomain (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id d30sm4942341wrc.92.2021.01.27.15.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 15:41:27 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/2] target/nios2: Replace magic value by MMU definitions Date: Thu, 28 Jan 2021 00:41:18 +0100 Message-Id: <20210127234119.3537399-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210127234119.3537399-1-f4bug@amsat.org> References: <20210127234119.3537399-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Chris Wulff , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Joe Komlodi Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" cpu_get_phys_page_debug() uses 'DATA LOAD' MMU access type. The first MMU is the supervisor one. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/nios2/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/nios2/helper.c b/target/nios2/helper.c index 57c97bde3c6..fea34c957d9 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -209,7 +209,7 @@ hwaddr nios2_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) unsigned int hit; if (cpu->mmu_present && (addr < 0xC0000000)) { - hit = mmu_translate(env, &lu, addr, 0, 0); + hit = mmu_translate(env, &lu, addr, MMU_DATA_LOAD, MMU_SUPERVISOR_IDX); if (hit) { vaddr = addr & TARGET_PAGE_MASK; paddr = lu.paddr + vaddr - lu.vaddr; From patchwork Wed Jan 27 23:41:19 2021 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: 12051255 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 077FAC433E0 for ; Wed, 27 Jan 2021 23:44:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7181264D99 for ; Wed, 27 Jan 2021 23:44:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7181264D99 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4uU9-0008Sx-Ib for qemu-devel@archiver.kernel.org; Wed, 27 Jan 2021 18:44:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4uRN-0006Ip-3V for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:41:37 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:34678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4uRK-0008DN-VD for qemu-devel@nongnu.org; Wed, 27 Jan 2021 18:41:36 -0500 Received: by mail-wr1-x429.google.com with SMTP id g10so3676925wrx.1 for ; Wed, 27 Jan 2021 15:41:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RURiTY/Wc59G330AGMgU1K21BtflcqCz0oy9kI/xiq0=; b=KlKzn0aTrzFB5/wZoJhCGfGh4Ww89xKjp3WMiSriMBZnXBFfG8M0e5ZnsARbVQXcMp GY1IWnKX20MFi8t/u5iowRaqCWlYfWkqE10Lm7uEUbTQOOJAn5wu5jKTGnF05eYvN4GY XoE0DN4RWseacaUZRO+8voR2lvo6gEeiZegDwegTDKf62tw2Mhj8ujl+MIDs/Ua2LBfZ 5Smat6wJPS83baUVcf9EYfSzeU5MkIkntXSObiT/K8qsPJ9t2rZF2gnHqq8O9h70wvuh 2cVBQBr5wC0LpOLbJqc2rMFfOTFq0PsyvII+64SWTuvtClFTjRoTbsEeTUJE4njq7T9K sIcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RURiTY/Wc59G330AGMgU1K21BtflcqCz0oy9kI/xiq0=; b=SinW8SHq3JoWo4HDB9490XDlkejxnMowqZKUYxtxP6st4evEUpeetKHies9aILQeWQ joLtwAxmawJhUdF8xqbQ64L0290SYsV+qtdLLX2DtALXrDT/FV8teAkp83SUy/+r5Nc/ MLKuHBBfN34h8nmne5zXt45NSiai6Alj8aBGmyQ+KFdLXyC0OMfLItfqK+Ac/SGFlKAK F4F1jfQxaRFq4EazRT77vUsbORy4ps/IIrmxkQLqSUzVy2pURN0Qog9hC8eM3sGEEPYT RY84YxGAzmX9TG23GUUzhpFqy0eicZIMEq3+BYRXqmLAXQayxO80RrC77BNtid6pmqU8 uKUQ== X-Gm-Message-State: AOAM532X7S/axwsdgMB9pJv+hbpxuThR6klYFEt73Qi0AkZFKxY+CVZ/ Oz0kJUgweFOV5TZYFihQDeQdTNmJmNw= X-Google-Smtp-Source: ABdhPJxWkNLd8VSFsNJyGl30/5ORfHUCYmpXK/ikSzP1rR6Dy3HbToGBPYIXit4s85vQVQV52vPbog== X-Received: by 2002:a5d:4d08:: with SMTP id z8mr125609wrt.240.1611790892730; Wed, 27 Jan 2021 15:41:32 -0800 (PST) Received: from localhost.localdomain (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id y63sm3988603wmd.21.2021.01.27.15.41.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 15:41:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] target/nios2: Use MMUAccessType enum type when possible Date: Thu, 28 Jan 2021 00:41:19 +0100 Message-Id: <20210127234119.3537399-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210127234119.3537399-1-f4bug@amsat.org> References: <20210127234119.3537399-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Chris Wulff , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Joe Komlodi Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" All callers of mmu_translate() provide it a MMUAccessType type. Let the prototype use it as argument, as it is stricter than an integer. We can remove the documentation as enum names are self explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/nios2/mmu.h | 3 ++- target/nios2/mmu.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target/nios2/mmu.h b/target/nios2/mmu.h index 4f46fbb82e2..2f4e325a81e 100644 --- a/target/nios2/mmu.h +++ b/target/nios2/mmu.h @@ -43,7 +43,8 @@ typedef struct Nios2MMULookup { void mmu_flip_um(CPUNios2State *env, unsigned int um); unsigned int mmu_translate(CPUNios2State *env, Nios2MMULookup *lu, - target_ulong vaddr, int rw, int mmu_idx); + target_ulong vaddr, + MMUAccessType access_type, int mmu_idx); void mmu_read_debug(CPUNios2State *env, uint32_t rn); void mmu_write(CPUNios2State *env, uint32_t rn, uint32_t v); void mmu_init(CPUNios2State *env); diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c index 2545c06761f..ebe13b89f68 100644 --- a/target/nios2/mmu.c +++ b/target/nios2/mmu.c @@ -55,10 +55,10 @@ void mmu_read_debug(CPUNios2State *env, uint32_t rn) } } -/* rw - 0 = read, 1 = write, 2 = fetch. */ unsigned int mmu_translate(CPUNios2State *env, Nios2MMULookup *lu, - target_ulong vaddr, int rw, int mmu_idx) + target_ulong vaddr, + MMUAccessType access_type, int mmu_idx) { Nios2CPU *cpu = env_archcpu(env); int pid = (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> 4;