From patchwork Fri Mar 31 14:50:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 668850 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp535603wrt; Fri, 31 Mar 2023 07:51:46 -0700 (PDT) X-Google-Smtp-Source: AKy350YIBeLOki3UARygQVNOYLjKG/AJtryYx4fFBqDvxpE2vvL4UO3XW/gYdnmZv8pF/6TEnxvz X-Received: by 2002:a05:622a:84:b0:3d4:205e:be4e with SMTP id o4-20020a05622a008400b003d4205ebe4emr16255002qtw.13.1680274306524; Fri, 31 Mar 2023 07:51:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680274306; cv=none; d=google.com; s=arc-20160816; b=A/w/ue+m6C2nOcYik3BYTf2vgyYXUNTM0BZSFB1ZBgP0hz39uiOVQgYNLqKY3XrClG 7avJyotgQxKSKJxUsr3208K6bYqEVQjY3mCzN5GLPgZ+PbWBpAk+PNMW8EYXjBKC3yaL WjrakzTOJ1LaGKCijBlSFIK3gATNdxbyu4lNY8a6MPOFaiEtrByXJm7Bsqp1GsdoG8ys z5u7djNl4Pjg6Cz6IFZrADhndhXZLK6lvg2/Zif8BWZ/MBwOdFmfn8W1suPM3PjRh+Jt E2v+VFI361l6bASKeAnivJt9QGtxYwpPmM/PT/l0YAczEmftsQJjbb/lhihu/AW4u+j3 yrpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=lxHwKmEkcI9a9cB3NtBeKtlKzdxzWz/JBHE/okIH9Ik=; b=dLVdlW/M1B8oMNdcAoBbuY4Dgpyl/nuaVNcwTlwpYmU8A8E96TFRpkUS0QRKKqgD9O qFrspai/WMRy/jB52V6N2yEQEQlZKxOEz1iiHwF84UOBjkJ2ebxZSfaUBy+x+tyy0FQ3 z7Oo/LR6GEx5LA14ZAwuNRWsW6ODdRBoo7DtwQIt4tSAKkUK5lrZNgudONUH06SIGk6C khzyZ3OUzGBDjH6AZ8NOVQAauqg6qxL8A8LXKG7vxzbU79qfFYYsQwaCkVfZFTxKluI/ /5FVxmBMIql1Xt/hWhFUXuWULFQ9EBG8rj99t9ZALzMZV9M3ShieNeFZ+g8Vll3v3FOZ A4/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VoCODkxF; 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=pass (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 i18-20020a05620a249200b0074660f49336si1816358qkn.173.2023.03.31.07.51.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Mar 2023 07:51:46 -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=pass header.i=@linaro.org header.s=google header.b=VoCODkxF; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piG5g-0000ah-1I; Fri, 31 Mar 2023 10:50:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1piG5c-0000ZK-A6 for qemu-devel@nongnu.org; Fri, 31 Mar 2023 10:50:52 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piG5Y-0000bY-Mu for qemu-devel@nongnu.org; Fri, 31 Mar 2023 10:50:51 -0400 Received: by mail-wr1-x42d.google.com with SMTP id e18so22690599wra.9 for ; Fri, 31 Mar 2023 07:50:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680274247; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lxHwKmEkcI9a9cB3NtBeKtlKzdxzWz/JBHE/okIH9Ik=; b=VoCODkxFyuo15LAlwYAAEIujOQypvws9LzQ2YyxyCutoHMnGkjwW7WukAvKVuIeL81 KYt0nZ+zHQu4HjpBLVrvv1hjxlgmg/1aJnCnbZeqp6ML27C7arO/r6g9+bCJNKsYQe8k /RtIy0JKxhGjwSjB8uotvSWRRLmj7Enn0kZwhZMGxEWCjKS9msNuuA8CRh8LfZzk5TJH rbwrqGhcw4ENHtJR3htctdyEzcFtycj9/zY+GPkKqpKCHxwILgHq0ua+LvzNkEIIvBT5 OiHAZeTH295TgYZaw8g8iAoopVmYZnDxaKRWbgyNs4g8lj05ELLAerOFyqaTj1S6iyUF ywgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680274247; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lxHwKmEkcI9a9cB3NtBeKtlKzdxzWz/JBHE/okIH9Ik=; b=qt334JSBcEoti5Tb5/fGVzLsp6ywIQAr3i0mUpFj+xlBBDs3QMbmk5EneF+D8bJFW7 YjTX7DwHx4iHjTRzqEBOzyp1Xiyr1ovhysOI/UFIwv2YI1pfHntgPYcXoZw1kH9LrrmR M6fxWm8QlW1Rd8vmT+4Xj/Ooq3FdClaNMXQQ8Ae1IBANUNnyghFK0NjvX5Jq8aqiEK9k tFdap008QEWIMhglQEAqQFuVnD+MX1UlIcN4BsJFTJ+NtvwVPHp8+5VFebJHPiDA0Mai JVTn0YwznGzz6I1IUC2lF+PH/EyX1sBSNd7MPj9C88DWtjmcGzuYLa+A3K6/KBxX5jUJ y9+w== X-Gm-Message-State: AAQBX9eW1QuSQ5/2ZhSQzcOnpYg9Qd+BDgog6ahYs/osjSvZq4eV/7Hw EKu33qLgP2mzsqGBxfcQSs4nGA== X-Received: by 2002:a5d:62cd:0:b0:2e4:f53a:45a1 with SMTP id o13-20020a5d62cd000000b002e4f53a45a1mr3982609wrv.57.1680274247270; Fri, 31 Mar 2023 07:50:47 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id l12-20020a5d560c000000b002cfe685bfd6sm2339831wrv.108.2023.03.31.07.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 07:50:47 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/3] target/arm: Pass ARMMMUFaultInfo to merge_syn_data_abort() Date: Fri, 31 Mar 2023 15:50:43 +0100 Message-Id: <20230331145045.2584941-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230331145045.2584941-1-peter.maydell@linaro.org> References: <20230331145045.2584941-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We already pass merge_syn_data_abort() two fields from the ARMMMUFaultInfo struct, and we're about to want to use a third field. Refactor to just pass a pointer to the fault info. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/arm/tcg/tlb_helper.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index 31eb77f7df9..1a61adb8a68 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -24,9 +24,9 @@ bool arm_s1_regime_using_lpae_format(CPUARMState *env, ARMMMUIdx mmu_idx) } static inline uint32_t merge_syn_data_abort(uint32_t template_syn, + ARMMMUFaultInfo *fi, unsigned int target_el, - bool same_el, bool ea, - bool s1ptw, bool is_write, + bool same_el, bool is_write, int fsc) { uint32_t syn; @@ -43,9 +43,9 @@ static inline uint32_t merge_syn_data_abort(uint32_t template_syn, * ISS encoding for an exception from a Data Abort, the * ISV field. */ - if (!(template_syn & ARM_EL_ISV) || target_el != 2 || s1ptw) { + if (!(template_syn & ARM_EL_ISV) || target_el != 2 || fi->s1ptw) { syn = syn_data_abort_no_iss(same_el, 0, - ea, 0, s1ptw, is_write, fsc); + fi->ea, 0, fi->s1ptw, is_write, fsc); } else { /* * Fields: IL, ISV, SAS, SSE, SRT, SF and AR come from the template @@ -54,7 +54,7 @@ static inline uint32_t merge_syn_data_abort(uint32_t template_syn, */ syn = syn_data_abort_with_iss(same_el, 0, 0, 0, 0, 0, - ea, 0, s1ptw, is_write, fsc, + fi->ea, 0, fi->s1ptw, is_write, fsc, true); /* Merge the runtime syndrome with the template syndrome. */ syn |= template_syn; @@ -117,9 +117,8 @@ void arm_deliver_fault(ARMCPU *cpu, vaddr addr, syn = syn_insn_abort(same_el, fi->ea, fi->s1ptw, fsc); exc = EXCP_PREFETCH_ABORT; } else { - syn = merge_syn_data_abort(env->exception.syndrome, target_el, - same_el, fi->ea, fi->s1ptw, - access_type == MMU_DATA_STORE, + syn = merge_syn_data_abort(env->exception.syndrome, fi, target_el, + same_el, access_type == MMU_DATA_STORE, fsc); if (access_type == MMU_DATA_STORE && arm_feature(env, ARM_FEATURE_V6)) {