From patchwork Tue Mar 17 17:50:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184656 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4445725ile; Tue, 17 Mar 2020 11:05:21 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvZahJwJ/YMZHkNM4UWmt+zgiKhI7ewJqzhV8WxBXrHFxueKXKTCmdsp3EyUkmR8CIosP0b X-Received: by 2002:a0c:c283:: with SMTP id b3mr398634qvi.180.1584468321385; Tue, 17 Mar 2020 11:05:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584468321; cv=none; d=google.com; s=arc-20160816; b=F/b5ZZD64KoZsFjz5/xq29gWwKhbexiu6yRxKfmAH5wySPAflYJMT01rK9b7uYlEE1 1LK4CPpZ5YXdg9bcniFl0H+ffiz31p+se5RkcJkXzfG2eIRMNOhtg+6mvsJHra4glFF7 tPeJ/Xe20DQMnaCl2Xf4SiwfHGI8B2nEh5hiZBp17iqeMlrD8EdQCqSxuH3VjqSkhApg LbG+IikwALvkk+J71aZipkGqjxW/t64YOuTIB+EJOkq3F/G9ZRiiWwkw0UIcorYhH3dg Z2p2PY6NjnFG43TJ8auTxo167aZ/vAHRbRJSuAcwvsRFke3ww9+7eF51ab9dhrI8uhQ0 H2rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Z2YdO0eBBHYBuVAaMP2mXqLSUKwI7KCxJYvCQtmd2VM=; b=lGpAMUCg/QJGqUnlqdEaBmYnczv0fJ663see1MX6b9j4dS+KUOIkLyazzxoJbqazfY k3RoT+e3mOC3N4/z5qsz2nHndR/xKBMt8oH+6S80HzaWlOeNfe+3pV5CUkRbvqB/riTD 98dKzuvMw/DnP7YP2rwkmZfQflZojwqr1syZSj2byFXhCRA/v7n2gZ8FDGXf9tBKXxLL uHijR/iPbLyEfFaVIgcZVPXH+4j1g38o3DfsZUn0t27Ce1yK1AYMMoiYeCSVhc+Y3XEf PcHHM/HcwJvIwjwtfSoZP5ucyocEHDTpDUFWZ3HXQhf/0GXhySaiHKaswpWObHrH1ZXe uCHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eG87WYHX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k3si2219664qvr.132.2020.03.17.11.05.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Mar 2020 11:05:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eG87WYHX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGae-00047Q-Qo for patch@linaro.org; Tue, 17 Mar 2020 14:05:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36527) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGUQ-0005S8-2Q for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:58:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEGUN-0008JA-Aa for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:58:53 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:40285) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEGUL-0008Ca-Jf for qemu-devel@nongnu.org; Tue, 17 Mar 2020 13:58:50 -0400 Received: by mail-wm1-x32f.google.com with SMTP id z12so254032wmf.5 for ; Tue, 17 Mar 2020 10:58:48 -0700 (PDT) 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=Z2YdO0eBBHYBuVAaMP2mXqLSUKwI7KCxJYvCQtmd2VM=; b=eG87WYHXKlRUlu9pUbxueBEqwocJOn6lcQTvIf9lZdlcXHSAtYbrNk+X7NPsADue+/ AiJN+HhqoXheS95WS/Z+wdGUJYt7YdSlOFQm9nM2Hdw835iNvZxF8y6G9gc66UWhWgwy ZUcR0vdlRpIR7gXfurBjI58VbP27SoELi3tPA0AIl6v2RVJhXInip+PJ6azayduVQBeb /Is80Qe5MbtfldSlrgCWGeetq1WOVt0vGTHaq/3pMYuNFsF4KOCnyM/56oqwwKg1hvyh 6iRgUmmXh06GJJHrvFB/1VxjON+3RUwnpt+wIt2A9l1nff5HcNZn0QCIUDg1vUwuzvRS nL+A== 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=Z2YdO0eBBHYBuVAaMP2mXqLSUKwI7KCxJYvCQtmd2VM=; b=kXJ2lDd4NicCVrEjg99dsmyWaeaj/fl8Vl8W8sfVRG3Z97cu5DjPgPxVM8LqFfpHxM yqX4+//rJzsAtMlMAWck/VIrLHe+oQucPxsqVWYgRxwFX02YecjIrTn/Nr9ek8DhVTeW 8Gs4XRKjGvF62gstXQ+JnyTBu+mFHySMJkGtGNOEVekgPzoIYRUyUuOqvCGn7RQWu+ov qw+To7T7fpj48T70H4c7RcIyvevbm7Rgv35qU3YxuUo+EeZP4padnpe9LFJLqvAYqeTD JYXH/q+NJyavDQhLgVmGGZB3B01WqgemrXX9RzoPef4lIZk2fc1DnKgR4WNPuYo9JDaW ZtKw== X-Gm-Message-State: ANhLgQ3tA4dzAyVRiO+MaIe39uvunmdeihw/fhPK4OljI/Q3cJFqwy4D Fh3bDyy99+pV7gsP90CUWOkVVA== X-Received: by 2002:a1c:5443:: with SMTP id p3mr169796wmi.149.1584467927282; Tue, 17 Mar 2020 10:58:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c23sm215647wme.39.2020.03.17.10.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 10:58:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5009E1FFA9; Tue, 17 Mar 2020 17:50:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 19/28] target/arm: don't bother with id_aa64pfr0_read for USER_ONLY Date: Tue, 17 Mar 2020 17:50:44 +0000 Message-Id: <20200317175053.5278-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317175053.5278-1-alex.bennee@linaro.org> References: <20200317175053.5278-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f 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: Richard Henderson , "open list:ARM TCG CPUs" , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200316172155.971-20-alex.bennee@linaro.org> -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 7e560ea7db6..d2ec2c53510 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6697,6 +6697,7 @@ static uint64_t id_pfr1_read(CPUARMState *env, const ARMCPRegInfo *ri) return pfr1; } +#ifndef CONFIG_USER_ONLY static uint64_t id_aa64pfr0_read(CPUARMState *env, const ARMCPRegInfo *ri) { ARMCPU *cpu = env_archcpu(env); @@ -6707,6 +6708,7 @@ static uint64_t id_aa64pfr0_read(CPUARMState *env, const ARMCPRegInfo *ri) } return pfr0; } +#endif /* Shared logic between LORID and the rest of the LOR* registers. * Secure state has already been delt with. @@ -7280,16 +7282,24 @@ void register_cp_regs_for_features(ARMCPU *cpu) * define new registers here. */ ARMCPRegInfo v8_idregs[] = { - /* 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 = "ID_AA64PFR0_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 4, .opc2 = 0, - .access = PL1_R, .type = ARM_CP_NO_RAW, + .access = PL1_R, +#ifdef CONFIG_USER_ONLY + .type = ARM_CP_CONST, + .resetvalue = cpu->isar.id_aa64pfr0 +#else + .type = ARM_CP_NO_RAW, .accessfn = access_aa64_tid3, .readfn = id_aa64pfr0_read, - .writefn = arm_cp_write_ignore }, + .writefn = arm_cp_write_ignore +#endif + }, { .name = "ID_AA64PFR1_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 4, .opc2 = 1, .access = PL1_R, .type = ARM_CP_CONST,