From patchwork Mon Jun 27 10:22:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 585282 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp2955142mab; Mon, 27 Jun 2022 03:38:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sFRoS3BQw8nZ5YP5Ej6/uaVISkmH5am60aMXteGFOZZDb9Avg8TxwNiF1MdLBzz6HhIK8e X-Received: by 2002:a05:622a:1a21:b0:2f1:f29e:40a with SMTP id f33-20020a05622a1a2100b002f1f29e040amr8665336qtb.235.1656326313541; Mon, 27 Jun 2022 03:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656326313; cv=none; d=google.com; s=arc-20160816; b=JmMU5ymMD5wggreKtKZi8YQRQkvbW4vlYS87VnyM6cYhtaVwDs2J+qLuXn/eqmoU16 1fDsmsT2I7WbGQ/NI1j+Sv1XFvXnXMLp9GOL6TaawL79578mxO/pvSqcQPDYiphmNXpE sT76m8cn+jES//sxtlqSlGIojlx6SjuQ8eF0efPr8vBrMzbMhi4DEqSxOo/gQaPvylU4 uOU0kjZWZxX81YK+5fEkZie3wai4cLY98ym5dwV17RfXfrRJE8JGLd/LHqZVXsPQ/ekV muiFqdGgmYG27r4WQaLRiFuRjCx71u+CYqo4vHCcm+pLxwtyd+HFpWn95/qdtSc0SeOm 0eLA== 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=SSW/9q08rUws37xTPG8UfI9QgtPGrD6IO9sQdb0NX2k=; b=ENhfxa2ZSbOvRkzRSoT3hO8gBid13HFXTLMIKIldRlFvVg8cgmurM3SqthZqyDt8Ok SYzesrpSx7oZEwbJRnSYt54YZ7+b3NNBInkpUQlDGMcE/2eQjvrOp1lRzbcig3CwtxdE K5aUhBHcuT0nJAat9vnAnACXmn20qYar+uise6ZQQ/BMnytDEhOpGbOcATEht/Wl0LW1 E73ibq9ESgFY5lmGUs+5/z8fFv/twHtDI+GmkPjIKTymPMqiEqmJ7h8YtKCDaiov1zCn 9dC3lquNFQQB99z2udQCehIdB7Dz1sOmBfa4Z/Hg8LlMZXDVZ3LjuTNowcUVq6jauUwb o2AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W2yxR1xc; 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 q10-20020a05621419ea00b004644918d50bsi5536405qvc.148.2022.06.27.03.38.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 03:38:33 -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=W2yxR1xc; 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]:50902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5m8X-0003me-5K for patch@linaro.org; Mon, 27 Jun 2022 06:38:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5ltO-0002No-Dr for qemu-devel@nongnu.org; Mon, 27 Jun 2022 06:22:54 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:56003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o5ltM-0004vI-HQ for qemu-devel@nongnu.org; Mon, 27 Jun 2022 06:22:54 -0400 Received: by mail-wm1-x32c.google.com with SMTP id f190so4817752wma.5 for ; Mon, 27 Jun 2022 03:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=SSW/9q08rUws37xTPG8UfI9QgtPGrD6IO9sQdb0NX2k=; b=W2yxR1xch57VBaguafQmmfs2c0p4WG86/NpcjpWAEonP+E+ANG2pZkAYWWsz/Lgqz4 ly9Qeiloc5fNLus41ynZaDyx6WRN/6hP9Nj/h8Z6m8xcZQJxu+eoExzhITbPok+1jNNX 1L1RMiECDqcfshV1vQzzulYj4HQKS8/umpZoVqpPViM3bMvmzd8qtI4ZlEbLfLp35Wyz kFVhd5EXaxhI7sYFpFfIUk29kPvN5KnGPVm9XF9PfEyXIN9gBCNTfT5xQm5+WMmFOHFV ujVa31Z+cTkui86vRcqCXbkVuwXnIm87bRFIoYbkCZp0LyVqMeyJrPWRjJaPqXpJFRnk Q/4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SSW/9q08rUws37xTPG8UfI9QgtPGrD6IO9sQdb0NX2k=; b=M15ceqolUqA3Ekn0CF5f0BtY4AmUVUc+O0DtPj/Z6Z+i21n7OARvfh02CrJAkOVB9O sZ/P9QND+AqzMaipgzO8ENv7Hqk187pYXBmnALX5yZHt5WZheKuS5wJYhLPpFDnY4yb/ sFrgya5QOoxn5g7sN+z129WLRn5+rMFCmfleX6xQnJTC9j++KM+DNj7UPXgvwGeFHoIg tsTwkXBIiU/f1UVmewgWS2TXz6BdhvFig+Bts9OAI0zknCwojGTeHM9Q4zD+WtwGZr59 CmLuTtYafipsNXOg0GOr75sTzOFwGpLjkg66O9ZC8il3UB7kEugksqj1I+nMLjNBXFJA bz1A== X-Gm-Message-State: AJIora8gdMWDcXA6EOHLR/hc6azfPPieHpru25stUhemn7uXB2JEYcI3 rkg0EZdzn65d0GrHmXkH2ffJIWGB+T7LNQ== X-Received: by 2002:a05:600c:41d1:b0:3a0:301d:f75f with SMTP id t17-20020a05600c41d100b003a0301df75fmr19693095wmh.31.1656325371096; Mon, 27 Jun 2022 03:22:51 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id d11-20020a5d6dcb000000b0020e6ce4dabdsm9754335wrz.103.2022.06.27.03.22.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 03:22:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/25] target/arm: Generalize cpu_arm_{get, set}_default_vec_len Date: Mon, 27 Jun 2022 11:22:28 +0100 Message-Id: <20220627102236.3097629-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220627102236.3097629-1-peter.maydell@linaro.org> References: <20220627102236.3097629-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Rename from cpu_arm_{get,set}_sve_default_vec_len, and take the pointer to default_vq from opaque. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220620175235.60881-15-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu64.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 1a3cb953bf0..b15a0d398ad 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -638,11 +638,11 @@ static void cpu_arm_set_sve(Object *obj, bool value, Error **errp) #ifdef CONFIG_USER_ONLY /* Mirror linux /proc/sys/abi/sve_default_vector_length. */ -static void cpu_arm_set_sve_default_vec_len(Object *obj, Visitor *v, - const char *name, void *opaque, - Error **errp) +static void cpu_arm_set_default_vec_len(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) { - ARMCPU *cpu = ARM_CPU(obj); + uint32_t *ptr_default_vq = opaque; int32_t default_len, default_vq, remainder; if (!visit_type_int32(v, name, &default_len, errp)) { @@ -651,7 +651,7 @@ static void cpu_arm_set_sve_default_vec_len(Object *obj, Visitor *v, /* Undocumented, but the kernel allows -1 to indicate "maximum". */ if (default_len == -1) { - cpu->sve_default_vq = ARM_MAX_VQ; + *ptr_default_vq = ARM_MAX_VQ; return; } @@ -675,15 +675,15 @@ static void cpu_arm_set_sve_default_vec_len(Object *obj, Visitor *v, return; } - cpu->sve_default_vq = default_vq; + *ptr_default_vq = default_vq; } -static void cpu_arm_get_sve_default_vec_len(Object *obj, Visitor *v, - const char *name, void *opaque, - Error **errp) +static void cpu_arm_get_default_vec_len(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) { - ARMCPU *cpu = ARM_CPU(obj); - int32_t value = cpu->sve_default_vq * 16; + uint32_t *ptr_default_vq = opaque; + int32_t value = *ptr_default_vq * 16; visit_type_int32(v, name, &value, errp); } @@ -706,8 +706,9 @@ void aarch64_add_sve_properties(Object *obj) #ifdef CONFIG_USER_ONLY /* Mirror linux /proc/sys/abi/sve_default_vector_length. */ object_property_add(obj, "sve-default-vector-length", "int32", - cpu_arm_get_sve_default_vec_len, - cpu_arm_set_sve_default_vec_len, NULL, NULL); + cpu_arm_get_default_vec_len, + cpu_arm_set_default_vec_len, NULL, + &cpu->sve_default_vq); #endif }