From patchwork Sat Oct 1 16:22:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 611393 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp278997pvb; Sat, 1 Oct 2022 09:42:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4KQKb49hdJdaH9TH9Lj7pFDEr2K4NyJCnZFImG28AKntyERt6H4T07PD3MAaQJ27+RasLM X-Received: by 2002:ac8:7089:0:b0:35b:b5fa:5e35 with SMTP id y9-20020ac87089000000b0035bb5fa5e35mr10906169qto.449.1664642540725; Sat, 01 Oct 2022 09:42:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664642540; cv=none; d=google.com; s=arc-20160816; b=ChMnfQxjMHmtkP5LSduaM/HF1BwODDrg0mTj1VWgoTCpQptBJiYHTHQyRzhxWXu5aA ezFeqO0z+qISOeDRKkYv9bCtSvnRDXunQojGvBvLM4119QmBQb1AMo57wPmitGB2Azm5 IsCPN4kiBQzseAcA2C3u052FJol+fYDgjZSkS+I9DkpcvOimKtSw0UQKNX2yY1tfZQLj juSCCdcjmR2/ca8aCmbvg0guHT6M9PXECX+nor7s8Ux2w6SLnixB1TGgQvkcwM8qpwap nqqYuV2gm/LU1NlQy36em0Evovma6DG0kPxsUae3NvxDoEsCtIs2APHdj6gNVIlakwNH m0BA== 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:cc:to :from:dkim-signature; bh=P8opVlBK6qS9SIIhCXO8x07deEen8LaeMoy6ZbnmA70=; b=yG2RNACqc9YRuO+8UNox8o4HfiPsETp53AbdcMc1flSa8tWdDhC/uDT3Uwtbg0hN9O o2Tq41+REuv7NXOcwhNiygK9V0ksR4o9JvA9cBqtGAUT3hdHWo42ve0WntOSHNN3Qa2U Ddp3H4l81Kg4Z1BVXsrXhPFgBuJcZFT4qbk0nJEoyNBNLI3RRyHz2QoUyaRR8cuu7B0S 2LXEXbReeLON2KmxeNBjcr5AjyiQ+mnV4U2fJmi65H9Ex6reLK//tfu590n7VCKX4/a0 XZLlY09aRjn8HHSFE4rfahAjNUZoF1XZYdecxqih+UQvGshFPHG5DK47qdOv5bXZx6zL 2jfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="XAdRu//v"; 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 l3-20020a0cac03000000b004ad750d09acsi2380660qvb.145.2022.10.01.09.42.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Oct 2022 09:42:20 -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="XAdRu//v"; 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]:48664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oefZC-00087p-NY for patch@linaro.org; Sat, 01 Oct 2022 12:42:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oefHa-0006l4-3v for qemu-devel@nongnu.org; Sat, 01 Oct 2022 12:24:07 -0400 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:45762) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oefHW-0006Dr-1K for qemu-devel@nongnu.org; Sat, 01 Oct 2022 12:24:04 -0400 Received: by mail-qt1-x82a.google.com with SMTP id r20so4338428qtn.12 for ; Sat, 01 Oct 2022 09:24:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=P8opVlBK6qS9SIIhCXO8x07deEen8LaeMoy6ZbnmA70=; b=XAdRu//vQrtm6MSyDktvSrC/IqCmY012tqjZz2Xrsz/bOM3CXp0EpydwCu/meiwmDX RT/71PsrNX2vJbfW5/Jiw5Fm3UpTRadqPl4trnWoBfxwWt4UZqn0bpVS0KKm4fcnoeRw Z31LUjfBRwCQCiBn56kJSQBYbtx/eid8dynmBXrdAyIqINOzOhj+StKzPXNi5mmE4Sx+ pBbc/4bp+Z6gi2mKUjv4kQ5PpgGj8mLR76ILvFg7cxBiJ6e4o5grJJfNG20sYCW9PMsu J3p5JiRO1yzPaqMkfM26Fbj+kVL9WN4IuB2CZibuz3o9bwysa85m/n7ebDeKJVI1HY9k Io4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=P8opVlBK6qS9SIIhCXO8x07deEen8LaeMoy6ZbnmA70=; b=M+DfIgjGGHiusbbGQiPc9WVNA5MSveGPQxlWrKyicaigWZq8sPFrjN6Ppb16u2dy/V OjKL7JNoP82zGAD/pjHw+SbhFuHwv/YwSdeF+TNmZfey910aE1DhvfDrDZItig/QhrVt y9ZbGtAacNgAfJIu7gwFllQEc63eQIYBTuJjQlKXsIHfQ3VxJi9p6bmhiTkzVC8U+ba0 cbgWscX3NVLjyIAIYmhRWG+vRt7wUWXoQHYUaEjm7xchS91S/zTwR6D22C+FYaA7HYBa dbsu8dN/nAJKR2spn7iDDXF0CAQtmJiTosIdr3GScA7xGRt6K9r4VlihKFrNrDhQ6GPu FssQ== X-Gm-Message-State: ACrzQf3HFafsdKOvLfRtTHXVPBbZr+g23zapXetLcKkODcZ1C8OUaVLG rAhJbqXhfxEu+Ims1vi1++XWqcYNOwBP5A== X-Received: by 2002:ac8:57cc:0:b0:35c:b5d1:9024 with SMTP id w12-20020ac857cc000000b0035cb5d19024mr11070281qta.214.1664641439948; Sat, 01 Oct 2022 09:23:59 -0700 (PDT) Received: from stoup.. ([2605:ef80:8084:91a4:f7cb:db31:c505:b931]) by smtp.gmail.com with ESMTPSA id t4-20020a37ea04000000b006d1d8fdea8asm4387445qkj.85.2022.10.01.09.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 09:23:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v3 15/42] target/arm: Remove env argument from combined_attrs_fwb Date: Sat, 1 Oct 2022 09:22:51 -0700 Message-Id: <20221001162318.153420-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221001162318.153420-1-richard.henderson@linaro.org> References: <20221001162318.153420-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82a; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x82a.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" This value is unused. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/ptw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index cb072792a2..2f0eeee161 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2172,8 +2172,7 @@ static uint8_t force_cacheattr_nibble_wb(uint8_t attr) * s1 and s2 for the HCR_EL2.FWB == 1 case, returning the * combined attributes in MAIR_EL1 format. */ -static uint8_t combined_attrs_fwb(CPUARMState *env, - ARMCacheAttrs s1, ARMCacheAttrs s2) +static uint8_t combined_attrs_fwb(ARMCacheAttrs s1, ARMCacheAttrs s2) { switch (s2.attrs) { case 7: @@ -2246,7 +2245,7 @@ static ARMCacheAttrs combine_cacheattrs(CPUARMState *env, /* Combine memory type and cacheability attributes */ if (arm_hcr_el2_eff(env) & HCR_FWB) { - ret.attrs = combined_attrs_fwb(env, s1, s2); + ret.attrs = combined_attrs_fwb(s1, s2); } else { ret.attrs = combined_attrs_nofwb(env, s1, s2); }