From nobody Mon Apr 29 14:21:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530734433814415.82637646428475; Wed, 4 Jul 2018 13:00:33 -0700 (PDT) Received: from localhost ([::1]:49037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fanwx-0005sA-3q for importer@patchew.org; Wed, 04 Jul 2018 16:00:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fanvH-0004op-GP for qemu-devel@nongnu.org; Wed, 04 Jul 2018 15:58:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fanvG-0001in-Es for qemu-devel@nongnu.org; Wed, 04 Jul 2018 15:58:43 -0400 Received: from smtp37.i.mail.ru ([94.100.177.97]:45132) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fanvG-0001iB-16 for qemu-devel@nongnu.org; Wed, 04 Jul 2018 15:58:42 -0400 Received: by smtp37.i.mail.ru with esmtpa (envelope-from ) id 1fanvE-0007a4-4a; Wed, 04 Jul 2018 22:58:40 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=w3IbplxGgVuUgUZzjYXpUDy/Mf7OJZHVMNs+iRVu67E=; b=NMSdUrYSjMTtMj1vaYeS4smTIBBOwjyJ4OvGG+UBZGCUfG3Af19O2FOUhHjp+QGtZPTEC5+Z28822q2dz63s4N5yxE/OrLkJZkIX9nM4QFHWBIRzPo6B/SfcNqzO64+/0JF5n2uJMXHOHf7YmOv2yZ3xGW1ssg/2l5NptLCedKc=; To: qemu-devel@nongnu.org Date: Wed, 4 Jul 2018 22:58:11 +0300 Message-Id: <20180704195812.28798-2-jusual@mail.ru> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180704195812.28798-1-jusual@mail.ru> References: <20180704195812.28798-1-jusual@mail.ru> Authentication-Results: smtp37.i.mail.ru; auth=pass smtp.auth=jusual@mail.ru smtp.mailfrom=jusual@mail.ru X-7FA49CB5: 0D63561A33F958A5ED825544E5E0E57B30657E86835CCC178BCEF1FDFEC742CB0A6AB1C7CE11FEE34AF66DFF1D4D208B76E601842F6C81A1F004C906525384306FED454B719173D6725E5C173C3A84C31205B1F03D11AAAB85EB82DF8C8CD87257739F23D657EF2BB5C8C57E37DE458B4C7702A67D5C3316FA3894348FB808DBAF038BB36E94EA6B574AF45C6390F7469DAA53EE0834AAEE X-Mailru-Sender: 7766D515518070DE138AAC7428EA760D4EF54B90D3896DB8E9254759A3FC3FE5D1256FE8925F02CF7C4160E8B47E48163DDE9B364B0DF2898CB68AF7A628805D594FB4C9F0DBF412AE208404248635DF X-Mras: OK X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 94.100.177.97 Subject: [Qemu-devel] [PATCH 1/2] nvic: Handle ARMv6-M SCS reserved registers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Julia Suvorova via Qemu-devel Reply-To: Julia Suvorova Cc: Peter Maydell , Jim Mussared , =?UTF-8?q?Steffen=20G=C3=B6rtz?= , Joel Stanley , Stefan Hajnoczi , Julia Suvorova Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Handle SCS reserved registers listed in ARMv6-M ARM D3.6.1. All reserved registers are RAZ/WI. Signed-off-by: Julia Suvorova --- hw/intc/armv7m_nvic.c | 69 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index aba4510c70..fb61a1d08d 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -865,6 +865,9 @@ static uint32_t nvic_readl(NVICState *s, uint32_t offse= t, MemTxAttrs attrs) } return val; case 0xd10: /* System Control. */ + if (!arm_feature(&cpu->env, ARM_FEATURE_V7)) { + return 0; + } return cpu->env.v7m.scr[attrs.secure]; case 0xd14: /* Configuration Control. */ /* The BFHFNMIGN bit is the only non-banked bit; we @@ -986,12 +989,21 @@ static uint32_t nvic_readl(NVICState *s, uint32_t off= set, MemTxAttrs attrs) } return val; case 0xd2c: /* Hard Fault Status. */ + if (!arm_feature(&cpu->env, ARM_FEATURE_V7)) { + return 0; + } return cpu->env.v7m.hfsr; case 0xd30: /* Debug Fault Status. */ return cpu->env.v7m.dfsr; case 0xd34: /* MMFAR MemManage Fault Address */ + if (!arm_feature(&cpu->env, ARM_FEATURE_V7)) { + return 0; + } return cpu->env.v7m.mmfar[attrs.secure]; case 0xd38: /* Bus Fault Address. */ + if (!arm_feature(&cpu->env, ARM_FEATURE_V7)) { + return 0; + } return cpu->env.v7m.bfar; case 0xd3c: /* Aux Fault Status. */ /* TODO: Implement fault status registers. */ @@ -1292,8 +1304,10 @@ static void nvic_writel(NVICState *s, uint32_t offse= t, uint32_t value, * QEMU's implementation ignores SEVONPEND and SLEEPONEXIT, which * is architecturally permitted. */ - value &=3D ~(R_V7M_SCR_SLEEPDEEP_MASK | R_V7M_SCR_SLEEPDEEPS_MASK); - cpu->env.v7m.scr[attrs.secure] =3D value; + if (arm_feature(&cpu->env, ARM_FEATURE_V7)) { + value &=3D ~(R_V7M_SCR_SLEEPDEEP_MASK | R_V7M_SCR_SLEEPDEEPS_M= ASK); + cpu->env.v7m.scr[attrs.secure] =3D value; + } break; case 0xd14: /* Configuration Control. */ /* Enforce RAZ/WI on reserved and must-RAZ/WI bits */ @@ -1388,16 +1402,22 @@ static void nvic_writel(NVICState *s, uint32_t offs= et, uint32_t value, nvic_irq_update(s); break; case 0xd2c: /* Hard Fault Status. */ - cpu->env.v7m.hfsr &=3D ~value; /* W1C */ + if (arm_feature(&cpu->env, ARM_FEATURE_V7)) { + cpu->env.v7m.hfsr &=3D ~value; /* W1C */ + } break; case 0xd30: /* Debug Fault Status. */ cpu->env.v7m.dfsr &=3D ~value; /* W1C */ break; case 0xd34: /* Mem Manage Address. */ - cpu->env.v7m.mmfar[attrs.secure] =3D value; + if (arm_feature(&cpu->env, ARM_FEATURE_V7)) { + cpu->env.v7m.mmfar[attrs.secure] =3D value; + } return; case 0xd38: /* Bus Fault Address. */ - cpu->env.v7m.bfar =3D value; + if (arm_feature(&cpu->env, ARM_FEATURE_V7)) { + cpu->env.v7m.bfar =3D value; + } return; case 0xd3c: /* Aux Fault Status. */ qemu_log_mask(LOG_UNIMP, @@ -1624,13 +1644,13 @@ static void nvic_writel(NVICState *s, uint32_t offs= et, uint32_t value, cpu->env.v7m.sfsr =3D value; break; case 0xf00: /* Software Triggered Interrupt Register */ - { - int excnum =3D (value & 0x1ff) + NVIC_FIRST_IRQ; - if (excnum < s->num_irq) { - armv7m_nvic_set_pending(s, excnum, false); + if (arm_feature(&cpu->env, ARM_FEATURE_V7)) { + int excnum =3D (value & 0x1ff) + NVIC_FIRST_IRQ; + if (excnum < s->num_irq) { + armv7m_nvic_set_pending(s, excnum, false); + } } break; - } case 0xf50: /* ICIALLU */ case 0xf58: /* ICIMVAU */ case 0xf5c: /* DCIMVAC */ @@ -1775,7 +1795,13 @@ static MemTxResult nvic_sysreg_read(void *opaque, hw= addr addr, } } break; - case 0xd18 ... 0xd23: /* System Handler Priority (SHPR1, SHPR2, SHPR3)= */ + case 0xd18: /* System Handler Priority (SHPR1) */ + if (!arm_feature(&s->cpu->env, ARM_FEATURE_V7)) { + val =3D 0; + break; + } + /* fall through */ + case 0xd1c ... 0xd23: /* System Handler Priority (SHPR2, SHPR3) */ val =3D 0; for (i =3D 0; i < size; i++) { unsigned hdlidx =3D (offset - 0xd14) + i; @@ -1791,10 +1817,20 @@ static MemTxResult nvic_sysreg_read(void *opaque, h= waddr addr, /* The BFSR bits [15:8] are shared between security states * and we store them in the NS copy */ + if (!arm_feature(&s->cpu->env, ARM_FEATURE_V7)) { + val =3D 0; + break; + }; val =3D s->cpu->env.v7m.cfsr[attrs.secure]; val |=3D s->cpu->env.v7m.cfsr[M_REG_NS] & R_V7M_CFSR_BFSR_MASK; val =3D extract32(val, (offset - 0xd28) * 8, size * 8); break; + case 0xd40 ... 0xd7c: /* CPUID registers */ + if (!arm_feature(&s->cpu->env, ARM_FEATURE_V7)) { + val =3D 0; + break; + } + goto proceed_to_readl; case 0xfe0 ... 0xfff: /* ID. */ if (offset & 3) { val =3D 0; @@ -1803,6 +1839,7 @@ static MemTxResult nvic_sysreg_read(void *opaque, hwa= ddr addr, } break; default: + proceed_to_readl: if (size =3D=3D 4) { val =3D nvic_readl(s, offset, attrs); } else { @@ -1882,7 +1919,12 @@ static MemTxResult nvic_sysreg_write(void *opaque, h= waddr addr, } nvic_irq_update(s); return MEMTX_OK; - case 0xd18 ... 0xd23: /* System Handler Priority (SHPR1, SHPR2, SHPR3)= */ + case 0xd18: /* System Handler Priority (SHPR1) */ + if (!arm_feature(&s->cpu->env, ARM_FEATURE_V7)) { + return MEMTX_OK; + } + /* fall through */ + case 0xd1c ... 0xd23: /* System Handler Priority (SHPR2, SHPR3) */ for (i =3D 0; i < size; i++) { unsigned hdlidx =3D (offset - 0xd14) + i; int newprio =3D extract32(value, i * 8, 8); @@ -1899,6 +1941,9 @@ static MemTxResult nvic_sysreg_write(void *opaque, hw= addr addr, /* All bits are W1C, so construct 32 bit value with 0s in * the parts not written by the access size */ + if (!arm_feature(&s->cpu->env, ARM_FEATURE_V7)) { + return MEMTX_OK; + } value <<=3D ((offset - 0xd28) * 8); =20 s->cpu->env.v7m.cfsr[attrs.secure] &=3D ~value; --=20 2.17.1 From nobody Mon Apr 29 14:21:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530734439693841.7663470781766; Wed, 4 Jul 2018 13:00:39 -0700 (PDT) Received: from localhost ([::1]:49041 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fanx4-0005y8-QL for importer@patchew.org; Wed, 04 Jul 2018 16:00:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fanvO-0004tC-Hj for qemu-devel@nongnu.org; Wed, 04 Jul 2018 15:58:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fanvL-0001ls-BB for qemu-devel@nongnu.org; Wed, 04 Jul 2018 15:58:50 -0400 Received: from smtp37.i.mail.ru ([94.100.177.97]:51456) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fanvL-0001l6-2F for qemu-devel@nongnu.org; Wed, 04 Jul 2018 15:58:47 -0400 Received: by smtp37.i.mail.ru with esmtpa (envelope-from ) id 1fanvJ-0007a4-7N; Wed, 04 Jul 2018 22:58:45 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Iqwgw1AmpCeOMK+FtjGhwZzlNEyu93a52V80bEbwa9Q=; b=c03lQ7+k7KHr9tVRfkoJOQy/vMh6ld9UC1m03UB8RaG2cgtATjsc/8FJjRfTlp7dLheVuiHU9ftmAYI0KQZWqEqzFcRa7ehToNYIiUGOMTDEuR2pzsyo/RYBp6oSp1G4vpDbT+wst1Vkb0KEGupEGTeujSe2Emdtsu+49PV2M7Q=; To: qemu-devel@nongnu.org Date: Wed, 4 Jul 2018 22:58:12 +0300 Message-Id: <20180704195812.28798-3-jusual@mail.ru> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180704195812.28798-1-jusual@mail.ru> References: <20180704195812.28798-1-jusual@mail.ru> Authentication-Results: smtp37.i.mail.ru; auth=pass smtp.auth=jusual@mail.ru smtp.mailfrom=jusual@mail.ru X-7FA49CB5: 0D63561A33F958A5A8332615784465FC30657E86835CCC17BB5A7B0D773225A00A6AB1C7CE11FEE34AF66DFF1D4D208B76E601842F6C81A1F004C906525384306FED454B719173D6725E5C173C3A84C37952320C71F5F86719BF08CBC38C640DD05AD665AB97B35DC4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0FECB2555BB02FD5A93B503F486389A921A5CC5B56E945C8DA X-Mailru-Sender: 7766D515518070DE138AAC7428EA760D8A8C259E07818792701FF501C2A73D5067C2D45AF0EACA2E7C4160E8B47E48163DDE9B364B0DF2898CB68AF7A628805D594FB4C9F0DBF412AE208404248635DF X-Mras: OK X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 94.100.177.97 Subject: [Qemu-devel] [RFC 2/2] tests: Add ARMv6-M reserved register test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Julia Suvorova via Qemu-devel Reply-To: Julia Suvorova Cc: Peter Maydell , Jim Mussared , =?UTF-8?q?Steffen=20G=C3=B6rtz?= , Joel Stanley , Stefan Hajnoczi , Julia Suvorova Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Check that reserved SCS registers return 0 at read, and writes are ignored. Based-on: <20180627143815.1829-1-joel@jms.id.au> Based-on: <20180630091343.14391-1-stefanha@redhat.com> Signed-off-by: Julia Suvorova --- Test will work if Joel's patches will use ARMv6-M. tests/Makefile.include | 2 ++ tests/tcg/arm/test-reserved-reg.c | 60 +++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 tests/tcg/arm/test-reserved-reg.c diff --git a/tests/Makefile.include b/tests/Makefile.include index d323c42682..8ab0b0d15f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -387,6 +387,7 @@ gcov-files-arm-y +=3D hw/timer/arm_mptimer.c check-qtest-arm-y +=3D tests/boot-serial-test$(EXESUF) check-qtest-arm-y +=3D tests/sdhci-test$(EXESUF) check-qtest-arm-y +=3D tests/hexloader-test$(EXESUF) +check-qtest-arm-y +=3D tests/tcg/arm/test-reserved-reg$(EXESUF) =20 check-qtest-aarch64-y =3D tests/numa-test$(EXESUF) check-qtest-aarch64-y +=3D tests/sdhci-test$(EXESUF) @@ -771,6 +772,7 @@ tests/device-introspect-test$(EXESUF): tests/device-int= rospect-test.o tests/rtc-test$(EXESUF): tests/rtc-test.o tests/m48t59-test$(EXESUF): tests/m48t59-test.o tests/hexloader-test$(EXESUF): tests/hexloader-test.o +tests/test-reserved-reg$(EXESUF): tests/tcg/arm/test-reserved-reg.o tests/endianness-test$(EXESUF): tests/endianness-test.o tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y) tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y) diff --git a/tests/tcg/arm/test-reserved-reg.c b/tests/tcg/arm/test-reserve= d-reg.c new file mode 100644 index 0000000000..97273ff24d --- /dev/null +++ b/tests/tcg/arm/test-reserved-reg.c @@ -0,0 +1,60 @@ +/* + * Test ARMv6-M SCS reserved registers + * + * Copyright (c) 2018 Julia Suvorova + * + * This work is licensed under the terms of the GNU GPL, version 2 + * or later. See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "libqtest.h" + +static void test_reserved_reg(void) +{ + QTestState *s; + int i; + static const uint64_t reserved_reg[] =3D { 0xe000ed10, /* SCR */ + 0xe000ed18, /* SHPR1 */ + 0xe000ed28, /* CFSR */ + 0xe000ed2c, /* HFSR */ + 0xe000ed34, /* MMFAR */ + 0xe000ed38, /* BFAR */ + 0xe000ed3c, /* AFSR */ + 0xe000ed40, /* CPUID */ + 0xe000ed88, /* CPACR */ + 0xe000ef00 /* STIR */ }; + static const uint8_t mini_kernel[] =3D { 0x00, 0x00, 0x00, 0x00, + 0x09, 0x00, 0x00, 0x00 }; + ssize_t wlen, kernel_size =3D sizeof(mini_kernel); + int code_fd; + char codetmp[] =3D "/tmp/reserved-reg-test-XXXXXX"; + + code_fd =3D mkstemp(codetmp); + wlen =3D write(code_fd, mini_kernel, sizeof(mini_kernel)); + g_assert(wlen =3D=3D kernel_size); + close(code_fd); + + s =3D qtest_startf("-kernel %s -M microbit -nographic", codetmp); + + for (i =3D 0; i < ARRAY_SIZE(reserved_reg); i++) { + int res; + qtest_writel(s, reserved_reg[i], 1); + res =3D qtest_readl(s, reserved_reg[i]); + g_assert(!res); + } + + qtest_quit(s); +} + +int main(int argc, char **argv) +{ + int ret; + + g_test_init(&argc, &argv, NULL); + + qtest_add_func("tcg/arm/test-reserved-reg", test_reserved_reg); + ret =3D g_test_run(); + + return ret; +} --=20 2.17.1