From nobody Tue May 21 04:05:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1611790890; cv=none; d=zohomail.com; s=zohoarc; b=nWKF3bmmZU9jPDdZl2Motl6NRN1kTCAWolgXu/waUyl8U564TcDreSegr0zRJFbhiTFYcRG2Nb6udHYlKuc2BNUyT56QX+VVuWFlr4KYNPVM+uD6ElAEEhtffZAmyGoweKwdTLZhXnUPIC9mMcC7b1ZxknPKIhhPqsrzv4io3Y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611790890; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WDUUFabGCpfCL1l7QMgDUHrlWMhVwt9PxBXe9pD+ufs=; b=U/W9PBecnN0D91+e+NlAZFT7z8mYHYhxO6tnhORI4JcQPRMDZw5wokYHezg4VzvhhAuoJSBl8ItXtjFzhaKYuHVMVbGHWMeW2lHSWFY7CHkwPqNOyAwW0oH5MlK/Jiexz2sp7dYLtqrY56VTQiXddagcEst6V0apx2XdF0UTYG0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1611790890263139.08517497677929; Wed, 27 Jan 2021 15:41:30 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id c4so943467wru.9 for ; Wed, 27 Jan 2021 15:41:28 -0800 (PST) Return-Path: Return-Path: 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) 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=gvxJB8a6bYkqDtD3w5DWIhzZIRrBuaqatw1ewhCzS1POoSfYmFI2YXkKh3MQv8PLnF qNfJKM/MmDaUvq7U7fub5GpIi7xHI9ACa7MQ96kfxLOoCzxHJEbs7wtnmcSkhLE7PEhk xcIKMBc34Vs6CHOxhYTMP3gHb7zNzGqG7Qbzql215aPwgAj8HddVUFWZpj+OdSRUDipZ KnujeHEpJNEXLcmy4sAgX1R0WoZKEqrO2rr9X4nSvAytSTiimCUegvgqMdgAVGW5Hs10 gq1HZZo1JjYVBf/fcDrAcvbffMxaI64eW4iVKzj8/tFiP7noUnfc5JkHJNp4ecUIsAIp g2Ag== X-Gm-Message-State: AOAM532j9zLXMnRnqlQzPJZo6hJ9z+qAw4IHq6QCMaDDgtDy5t3UpUCp THg59WnS+ztYTNvjd6BQBPI= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Joe Komlodi , Chris Wulff , Richard Henderson , Marek Vasut , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) cpu_get_phys_page_debug() uses 'DATA LOAD' MMU access type. The first MMU is the supervisor one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 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, vadd= r addr) unsigned int hit; =20 if (cpu->mmu_present && (addr < 0xC0000000)) { - hit =3D mmu_translate(env, &lu, addr, 0, 0); + hit =3D mmu_translate(env, &lu, addr, MMU_DATA_LOAD, MMU_SUPERVISO= R_IDX); if (hit) { vaddr =3D addr & TARGET_PAGE_MASK; paddr =3D lu.paddr + vaddr - lu.vaddr; --=20 2.26.2 From nobody Tue May 21 04:05:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611790894; cv=none; d=zohomail.com; s=zohoarc; b=D+ypWKoZV0UUce7ZrDdGDu3V/mv7mVggRIfMTU9WI0orKQWSwOqaSyk+LqALbiKp3uJvHzLdhO3yXY04mm7UYgFsycY8Sdq89XNTZPlmsZsGU5Bgvq9zb0heWwNOb0DrSCkcCrR8dlLdwwOQkEs1UFcuq7CwvxAxg4NFBU7/zIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611790894; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RURiTY/Wc59G330AGMgU1K21BtflcqCz0oy9kI/xiq0=; b=fybaXsbYyvq6Pat0hkIz2EA9N4BawR6r9ZNMmiax9pSskej7B+h49rS8eMZZrbS9ZhEkb9etqvr5VTP/7Gs9zlmMd6gJwF8LZNFHhrpr5idhdNSm0lN3L5eTRkZWJOTjrg4EoLE2NJPPXU7JHFHvh18xGez/X0p5WnfBTdIBnEk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1611790894449645.6881944604876; Wed, 27 Jan 2021 15:41:34 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id 6so3662507wri.3 for ; Wed, 27 Jan 2021 15:41:33 -0800 (PST) Return-Path: Return-Path: 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) 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=eNJ/lyv/Hthtzd41yFsfeAcG8rucYbjJ3Etyyo5QqeAGFq2V4DOpv5NnRPabzboWQd QTBUA+iatHbZOW/8wRFx0j9rbDGUZC+qzWCiOUgGIwZHcSy1L8VxapfSp4ktpMfaBdSX PBsCl8S4w0r64QSN9td/9WLTDi6bNHRgdrt2GXm7i3V2VN/3TGOTN968fTobkS2Z0E8o jSxjmQo453Hn4YzUkTiQ45BobDjVvUWofpJqaQM7C6tzoSngk1YWjHreoTwHSdnxr+Qh oTT5+Si6hcpCWQiV/zxrBhUzVHv+748IiZFYiSx4L/kCERi12NSHUjhvBiGEiXflSua9 VpTQ== X-Gm-Message-State: AOAM533AtWCDzrffyytuypRlqRV5ocLxnud6AiHuHcKAYsbJfKFAYdY2 RchBBtJfHmucoqixWxNrv3neBS2spM0= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Joe Komlodi , Chris Wulff , Richard Henderson , Marek Vasut , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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) } } =20 -/* rw - 0 =3D read, 1 =3D write, 2 =3D 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 =3D env_archcpu(env); int pid =3D (env->mmu.tlbmisc_wr & CR_TLBMISC_PID_MASK) >> 4; --=20 2.26.2