From nobody Thu Nov 13 03:23:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1576084975; cv=none; d=zohomail.com; s=zohoarc; b=iP+D6tcIwK8jzX3d6vIos3qN75u/LnzBvVG6o/esWBUq3sjHhZsGhCHF0B7vkDlilm0MV/X5zr5/WNWBD2F/B43ErjLJnwuMSz52/k0lcBKSx398EebekeW5CmkSeRcWaAluOvpOle2bHI3caAVfTGFjeSjiNHHfhruvm0DkApU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576084975; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EBZ3DPnRoL/gVkfjngBhb96wArtd46lZaB9In16XXlo=; b=Au8fS4bDbpqpJjf6ysMT/QyHwr98E7bDyNdY3H7bx+GQubIcYwA8Zzjs40JUczI/JBeXUiNW9DwgQ/4L8KuSEuDXJUst/2oRmmKov14mv4HH+JYCDFmp+fWjWYZBDiZn3TjUDgLUoVf6sz6SFSkNkOQBie5nHkwxVvYM2biMMok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576084975806466.20832024101423; Wed, 11 Dec 2019 09:22:55 -0800 (PST) Received: from localhost ([::1]:46668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1if5hO-0006H2-CF for importer@patchew.org; Wed, 11 Dec 2019 12:22:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53020) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1if5WD-0003IC-T5 for qemu-devel@nongnu.org; Wed, 11 Dec 2019 12:11:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1if5WB-0003Dv-5K for qemu-devel@nongnu.org; Wed, 11 Dec 2019 12:11:21 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34133) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1if5WA-0003AT-Qv for qemu-devel@nongnu.org; Wed, 11 Dec 2019 12:11:19 -0500 Received: by mail-wr1-x444.google.com with SMTP id t2so24916392wrr.1 for ; Wed, 11 Dec 2019 09:11:17 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s25sm2808856wmh.4.2019.12.11.09.11.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 09:11:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1420E1FF9D; Wed, 11 Dec 2019 17:05:24 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EBZ3DPnRoL/gVkfjngBhb96wArtd46lZaB9In16XXlo=; b=zToJGI66PDBZiVPjo+8oYb3OOwV0rJoYuExUkXp/R0BDL/KjN3pbKzHWMTo2n1nLDB lnOvE6y2XYBmJoBTxYB7q46VKXtJH9SIfx4pHoxzJ4NVY2RuZ0mOFmvRRzaoHYojsHbX o/NuX0Tr6nfMYNPmr+1meYsr+lg15NHarSfiCeOajHeJdvP2cFMcc15Xvxcj9Tw83XhK /VRGXfXF7SoSdijPLubewE75jwEoqAz2UDYGg2GdJO3WYzOZUkTNO5fq76cMVgrDEaAa /jxadglFfuU+OnFM/vhKN1FNO1ZmsjtmIdn/JjTMp/BvSHvHYuilaUyegLNryYrnQ8Xr Mdwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EBZ3DPnRoL/gVkfjngBhb96wArtd46lZaB9In16XXlo=; b=MNPeSTS2rnNZQXcDS8vFajf3HQzzZpkqRhcqA/H6yg8CyxPGkDJ59r6oMgAEc7TX6N eIBMbZBzh5jJJZsHgfFzipsvX8+8aZ13PgNmPUgUIs9LHxFJiESYABBq9Aq8bXnwOsNK U07F88+zwxMUNmjgO97NKELUeKebFXyjeuD/4FfjhH07M9b6odGHkImlrcQT0QErqCJZ Vp2RnQmTCh9IH6BF+WGG28aZJwUk5jsHWpj6GfHtVW4zMcngcKO6J4AxV+o8qreqh1yP bezBEK3hMJYlX77aRyWUQz3pPAgZJc0fm7AiLQZOOFBVytyR3xf1oD5w16ANDpAL0qbG ioRg== X-Gm-Message-State: APjAAAXYX8Bbnfy+/xb3R/eNtPiA+3Y42VZ43XhTZYIsIqlt47MDKcfk nH0h4zAARt0qtSAh9GSB5v0VhcnhKYs= X-Google-Smtp-Source: APXvYqxqxqKa6h2J7yq0/uDYSOcFtz1QIqt8aC3kb0Hl04gwzKA12eGTVepFRYbLJldzO2Md2MaG7g== X-Received: by 2002:adf:f6c8:: with SMTP id y8mr882775wrp.167.1576084276620; Wed, 11 Dec 2019 09:11:16 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 14/20] target/arm: don't bother with id_aa64pfr0_read for USER_ONLY Date: Wed, 11 Dec 2019 17:05:14 +0000 Message-Id: <20191211170520.7747-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191211170520.7747-1-alex.bennee@linaro.org> References: <20191211170520.7747-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 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: damien.hedde@greensocs.com, Peter Maydell , luis.machado@linaro.org, richard.henderson@linaro.org, "open list:ARM TCG CPUs" , alan.hayward@arm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) For system emulation we need to check the state of the GIC before we report the value. However this isn't relevant to exporting of the value to linux-user and indeed breaks the exported value as set by modify_arm_cp_regs. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- v2 - extend the ifdef and make type CONST with no accessfn --- target/arm/helper.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index b6e1fe51d76..58592c86714 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5878,6 +5878,7 @@ static uint64_t id_pfr1_read(CPUARMState *env, const = ARMCPRegInfo *ri) return pfr1; } =20 +#ifndef CONFIG_USER_ONLY static uint64_t id_aa64pfr0_read(CPUARMState *env, const ARMCPRegInfo *ri) { ARMCPU *cpu =3D env_archcpu(env); @@ -5888,6 +5889,7 @@ static uint64_t id_aa64pfr0_read(CPUARMState *env, co= nst ARMCPRegInfo *ri) } return pfr0; } +#endif =20 /* Shared logic between LORID and the rest of the LOR* registers. * Secure state has already been delt with. @@ -6308,16 +6310,24 @@ void register_cp_regs_for_features(ARMCPU *cpu) * define new registers here. */ ARMCPRegInfo v8_idregs[] =3D { - /* ID_AA64PFR0_EL1 is not a plain ARM_CP_CONST because we don't - * know the right value for the GIC field until after we - * define these regs. + /* + * ID_AA64PFR0_EL1 is not a plain ARM_CP_CONST in system + * emulation because we don't know the right value for the + * GIC field until after we define these regs. */ { .name =3D "ID_AA64PFR0_EL1", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 0, .crm =3D 4, .opc2 =3D = 0, - .access =3D PL1_R, .type =3D ARM_CP_NO_RAW, + .access =3D PL1_R, +#ifdef CONFIG_USER_ONLY + .type =3D ARM_CP_CONST, + .resetvalue =3D cpu->isar.id_aa64pfr0 +#else + .type =3D ARM_CP_NO_RAW, .accessfn =3D access_aa64_tid3, .readfn =3D id_aa64pfr0_read, - .writefn =3D arm_cp_write_ignore }, + .writefn =3D arm_cp_write_ignore +#endif + }, { .name =3D "ID_AA64PFR1_EL1", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 0, .crm =3D 4, .opc2 =3D = 1, .access =3D PL1_R, .type =3D ARM_CP_CONST, --=20 2.20.1