From patchwork Mon Oct 10 14:27:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 613748 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2024472pvb; Mon, 10 Oct 2022 07:52:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7vWl+FYYWMsahtC2xPb5RsBVAvEHhTwmZpTd3Zjw8p2Whdg5MByktBFCHlb5XnHY39/Njy X-Received: by 2002:ac8:4e44:0:b0:399:efde:98c5 with SMTP id e4-20020ac84e44000000b00399efde98c5mr4736542qtw.640.1665413543393; Mon, 10 Oct 2022 07:52:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665413543; cv=none; d=google.com; s=arc-20160816; b=xCHgrP1U4sqR0Oz9Ej+caPfg6OzHt/3S/Tuolzq7x9eqByVLhlJee5H+FL2EOTfRRv 3wg2/4J5LgcmzuiLW74dBNfwqczCG3H5eiP0CxZu4uGGPSbPM7EQigftQTXc8wHA043V x9PYaK65Vv5ILHlS3O3kXqQ0hGab5qVS3HiutxadsVxK4nZnSL/B3DMzlx0OeWxj/Lll c1Uwhn7DTjWteCJBo0Oh/ca5nXM5Seh6NgkVrwZwYoo5u3wMhPGK1rB1qiNKw3stk7a8 MKdJPNQ5TXud+SycJwCCbcwHyYZyNt+GEEjfIfx9hJEgkYb7Eh/Oi0DH7e5QhTOn5KSM WGBg== 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=e+zdmXfTwEDKvAlf77ndTlEHPt6WHX1xALzzxaa3N9s=; b=nANQzHNumWu5zMrMMdESvZ1sMYcQa1qUj51npx2C77c3jOXlv8J3n0wRn09ZlbcDLM ZeHxyXpAjuuSW4UZM71f4ep/WAUkSUnpdwsK1PmN+zFoDmt+u4JI+M7JZYfarRh2f4k+ OcRd7kSrJKLd5PGFQKqlNzTOwUBbnrnWIvdctPro0GktOC9+eiGPvh6JCqcPQvUxc71j GNpcoSOqDdmSRQFgyVGAD3xSI/0LmU1WGQhPnGdbFF5ORAFcnlHpxJcfdlVtyMrHQiyk eRWd1CIbaq8PjVZJFnWBsFcZKQw7+Y7nUQCS+ozKsQPfyX8IFvX6z7DOe23OhWFEYgI9 J0rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ejz0ZKUE; 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 l6-20020ac87246000000b0031ee925f28bsi4121448qtp.150.2022.10.10.07.52.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Oct 2022 07:52:23 -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=ejz0ZKUE; 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]:59480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohu8k-000195-3i for patch@linaro.org; Mon, 10 Oct 2022 10:52:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohtl4-0006Oy-R1 for qemu-devel@nongnu.org; Mon, 10 Oct 2022 10:27:54 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:47075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohtl3-0005YG-BH for qemu-devel@nongnu.org; Mon, 10 Oct 2022 10:27:54 -0400 Received: by mail-wr1-x42b.google.com with SMTP id bk15so17272320wrb.13 for ; Mon, 10 Oct 2022 07:27:52 -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:to:from:from:to:cc:subject:date:message-id :reply-to; bh=e+zdmXfTwEDKvAlf77ndTlEHPt6WHX1xALzzxaa3N9s=; b=ejz0ZKUE+LTWQYhuCAky/l7DTK+nGsvHtU879SaczMpzHEkrUaI74uJBoq0VCxWu1j VSH1maV/IWQzlRVm79Tix7ssYaCtHxTHSBYrVM3ZRmJlfGPOWqgyi7IE+2NPW8thQ+Hq 0XMpRAxMuKdBIdOW4C1PfxrAKfA4jWQgjFMandKG9BmhvqkCz8DPd4VfZbwYJxaZ3apO uOEGJ/Dy4vrfGpvoj+weC2H24Oaqg8lvjlij8aZ4PQA5+3kr+sX//0c2J9hIes9e1CV8 PRD07Xm7ENOH6RG5DWaT3fvc6GExZDoDQjDDOcWqt3bUiiAZ9fltNYTGm9Qx+5jNAAV+ 2/ew== 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e+zdmXfTwEDKvAlf77ndTlEHPt6WHX1xALzzxaa3N9s=; b=4IZ015v11+0UogtUi3pSAAvL5kh3QDlbeZlTX7ww9jnaBEEgB82SOvRZ+YAzP6Xom+ TfYRx6EKyMeZfMK3E+kYw2/xZv1LKHo2cuFJuXap9I+aFPnKEUskEisuG1b8HV1aaEHC t4K+tycANSQ33/+JaSHgw3eovwhQsIfH7uxuXYH5T6YmBHxsyOJeGDCihlIkW48mEB7F 4DxQlZKY1AWKDapeWu3D/VeH/nQ+l1HHEOsKHTPAMkTR7non03xtHtsYjOENeQAtjLXi NUs6FmmxyIJsUIExez4HZKkUTTQUixBxkQF99NSC3PAMMzHWyKJRmMUvGOJx49s+YuHw tX7g== X-Gm-Message-State: ACrzQf1YsUadncHRKv93XzHrOFvKcIhb7IDFQdXOz501ArF23eBZz6Fa S7kE71jDX+45+mQVZrLp+O34jxWpTweFog== X-Received: by 2002:a5d:648c:0:b0:22e:63be:be09 with SMTP id o12-20020a5d648c000000b0022e63bebe09mr11554333wri.159.1665412072465; Mon, 10 Oct 2022 07:27:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id u6-20020adfed46000000b0022e04bfa661sm9037054wro.59.2022.10.10.07.27.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Oct 2022 07:27:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/28] target/arm: Remove env argument from combined_attrs_fwb Date: Mon, 10 Oct 2022 15:27:21 +0100 Message-Id: <20221010142730.502083-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221010142730.502083-1-peter.maydell@linaro.org> References: <20221010142730.502083-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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" From: Richard Henderson This value is unused. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-id: 20221001162318.153420-16-richard.henderson@linaro.org Signed-off-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 b40b4586f87..7d607c2e7b5 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); }