From patchwork Mon Jun 27 10:22:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 585293 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp2964234mab; Mon, 27 Jun 2022 03:52:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1taOFkNCTzBO8I9rxVY+RuwWehalHC4eKNKPBp45+C1hwSICoRq/0k8P9ELRvfh8FAtjXWz X-Received: by 2002:a37:6453:0:b0:6ae:e740:92c1 with SMTP id y80-20020a376453000000b006aee74092c1mr7222671qkb.174.1656327169273; Mon, 27 Jun 2022 03:52:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656327169; cv=none; d=google.com; s=arc-20160816; b=KuWaskCvjWXZ+UbUHxM0ib3z3P3XTZ2cQoLdiAfumItSlUByK7LRIoJt9lSBUz19Rf wUIZf34SUo7dKA8IEkOF5gFLrLuMrsk2ZL7HpTMDANhabtw1xn+3dvEmGkPWpNPqgBr0 bWOdLHhKf1WBJwmlIpJytnar8AEPWNblQZteTYnKUUId6teou8UEF+7/W7ZJdBztzE3c aTw+ZDibjU2B9ITWd9QbktlMZV0AWiiaaUh5itT/huwVslqAKQ4TzPDS17j88zbKqE1A 1jiZDl1qouuOJuES4NIx4FmgGas8ywoabR9jH8OXpm0Hvkg9zRJ4HZU/lMsdb6RHHXUw Ep9g== 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=YXCaAkUvHPYJs8/UPRqGbeUcr38m+MRpEiyfDOsqhAg=; b=Fv4oFERh2uhDL75fuQhiMx4a3ckoLqmXp5QQPd3mVQqQBfIMoi2fBhfRWvuijpFO59 E70rpfenFy747om0Wa/u9+d5x9y6SuUe8TRik1duv7ZVIFYMcWaQzq1IxHOjQt0zKUAo k3F2qa8JcChTzs88KWNx845mbXV4GRLl/nGMABG8/CgMw2pzREXQNFhoHB1YSvils53x k23ECCIXnNxs+v2/G0ucdOdh0IM//VSYvR9n8fI9PW7pFuurYkrClvit43nKlIyN3BIb +mdj3lxnETI0fWhbKWGoJ3uIpk5UoZCdCxIoda0c6Me0f0fC8M33ARO+kOk1BBAH7/ZO PpuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hPQEZcFa; 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 im10-20020a056214246a00b0047059799e9bsi5870131qvb.70.2022.06.27.03.52.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 03:52:49 -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=hPQEZcFa; 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]:53448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5mMK-0000D2-Oa for patch@linaro.org; Mon, 27 Jun 2022 06:52:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5ltN-0002Nl-Mm for qemu-devel@nongnu.org; Mon, 27 Jun 2022 06:22:54 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:53879) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o5ltL-0004ul-O6 for qemu-devel@nongnu.org; Mon, 27 Jun 2022 06:22:53 -0400 Received: by mail-wm1-x329.google.com with SMTP id l68so66802wml.3 for ; Mon, 27 Jun 2022 03:22:51 -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=YXCaAkUvHPYJs8/UPRqGbeUcr38m+MRpEiyfDOsqhAg=; b=hPQEZcFau4t9PdThcg3XH4HzA/rLQUsUCY4XWR2tUeyhydtPskFjUy3tGav9RvFnEK jLBa7xBN/3ngwon1n7R3ITtFuZdxGVGKketWEqudLnW7VxGribQHf0lAjVjo8GYyh6nj 8aBvvA1A9di97Yg+goPnE8A/uCSIZR6e7xW8oo1gUIy97xebmeHfOYBYGQ4VLQnoFnI4 Y+g4pGf+Hc4i/IcfRnnRsT8o54hk8lKE92cdqcY4sdQBMjrZYBCip+2oDCtiX0kCyJ0V +wpbVgBFabqg+nkXj/FXrL2kiVtpPPl95WYptG8hB2R0EoWuJxRuYJa3uSv0YTN3gZZz bpSw== 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=YXCaAkUvHPYJs8/UPRqGbeUcr38m+MRpEiyfDOsqhAg=; b=YFzkovVfaH1s8GYVqyHL+OW7jB2n0vFqAlpUK7Ug3Qk3Eb4WQaqgiRpgzmUvkCHq50 /Vgv45bdF6BvQya6xBV0PRY8mBh36GZCkr0/qUV0wXyFPNj1g9HmR5PbUzAiUMqfLilS nEkkjtFrR6pFKjeJCyVQhWq0I9RpuecToMWexjM1GkI1Rnt6MXSCKnjpd7xo+BpPdS+m 2VHfEcncwAbfBcy/BDd5H63XXRMxHneSXFrGzCMz7uJfXUbgWYiSFvYMTn20ErZEdoGz PONVqSxpecDOAczrfPnQxZgkkOa9hUKsjL4GgtKkH8mu9OLm2dyajTCaBVV15MUPz0Wb +bkg== X-Gm-Message-State: AJIora8rkX7qz+o1I8LYCoXeGgduECmrXhAp+h9/BUw/wMJjfNNAtWW0 G0mt67zwJmFmaIvLuRdzWeHTkgZl0ZiP/g== X-Received: by 2002:a05:600c:3d9a:b0:3a0:3aad:b1f2 with SMTP id bi26-20020a05600c3d9a00b003a03aadb1f2mr19420913wmb.138.1656325370360; Mon, 27 Jun 2022 03:22:50 -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.49 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 16/25] target/arm: Generalize cpu_arm_{get,set}_vq Date: Mon, 27 Jun 2022 11:22:27 +0100 Message-Id: <20220627102236.3097629-17-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::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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_vq, and take the ARMVQMap as the opaque parameter. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220620175235.60881-14-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu64.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index cadc401c7e0..1a3cb953bf0 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -579,15 +579,15 @@ static void cpu_max_set_sve_max_vq(Object *obj, Visitor *v, const char *name, } /* - * Note that cpu_arm_get/set_sve_vq cannot use the simpler - * object_property_add_bool interface because they make use - * of the contents of "name" to determine which bit on which - * to operate. + * Note that cpu_arm_{get,set}_vq cannot use the simpler + * object_property_add_bool interface because they make use of the + * contents of "name" to determine which bit on which to operate. */ -static void cpu_arm_get_sve_vq(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void cpu_arm_get_vq(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { ARMCPU *cpu = ARM_CPU(obj); + ARMVQMap *vq_map = opaque; uint32_t vq = atoi(&name[3]) / 128; bool value; @@ -595,15 +595,15 @@ static void cpu_arm_get_sve_vq(Object *obj, Visitor *v, const char *name, if (!cpu_isar_feature(aa64_sve, cpu)) { value = false; } else { - value = extract32(cpu->sve_vq.map, vq - 1, 1); + value = extract32(vq_map->map, vq - 1, 1); } visit_type_bool(v, name, &value, errp); } -static void cpu_arm_set_sve_vq(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void cpu_arm_set_vq(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { - ARMCPU *cpu = ARM_CPU(obj); + ARMVQMap *vq_map = opaque; uint32_t vq = atoi(&name[3]) / 128; bool value; @@ -611,8 +611,8 @@ static void cpu_arm_set_sve_vq(Object *obj, Visitor *v, const char *name, return; } - cpu->sve_vq.map = deposit32(cpu->sve_vq.map, vq - 1, 1, value); - cpu->sve_vq.init |= 1 << (vq - 1); + vq_map->map = deposit32(vq_map->map, vq - 1, 1, value); + vq_map->init |= 1 << (vq - 1); } static bool cpu_arm_get_sve(Object *obj, Error **errp) @@ -691,6 +691,7 @@ static void cpu_arm_get_sve_default_vec_len(Object *obj, Visitor *v, void aarch64_add_sve_properties(Object *obj) { + ARMCPU *cpu = ARM_CPU(obj); uint32_t vq; object_property_add_bool(obj, "sve", cpu_arm_get_sve, cpu_arm_set_sve); @@ -698,8 +699,8 @@ void aarch64_add_sve_properties(Object *obj) for (vq = 1; vq <= ARM_MAX_VQ; ++vq) { char name[8]; sprintf(name, "sve%d", vq * 128); - object_property_add(obj, name, "bool", cpu_arm_get_sve_vq, - cpu_arm_set_sve_vq, NULL, NULL); + object_property_add(obj, name, "bool", cpu_arm_get_vq, + cpu_arm_set_vq, NULL, &cpu->sve_vq); } #ifdef CONFIG_USER_ONLY