From patchwork Wed Jul 6 08:24:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 587746 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:1ec:0:0:0:0 with SMTP id 12csp2581832map; Wed, 6 Jul 2022 02:44:12 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uMvj/d0j/b58/39i7Y5QdSN3mu3cOD/mCcgpM3/5G1vvQ+LZcWqv3tUC6W3XMUYYd1BORG X-Received: by 2002:a25:2e4f:0:b0:664:e436:e89e with SMTP id b15-20020a252e4f000000b00664e436e89emr42343584ybn.646.1657100652507; Wed, 06 Jul 2022 02:44:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657100652; cv=none; d=google.com; s=arc-20160816; b=V0n5RJh7xEI2zI10uuOdEdGSGC15V7dhuLfN8krdqyQLDkqJHtAdZnWrwdBU/Zs/5F 58K4NxPJ4fTq8LNkyePatWafFxFXIhiHMM6YXh2m0hV9+SLKaGmPS6aczh2xVU0OZSGI Vbc4gGPbI5Q5sn3kP7QbO5Z/vlsF1Vgu5NXbERq40zfcDULp+lQ8A7RUhPd/rmah+xA+ Bdl8gSEepmqJzlKfP3bA7rpgZohRQJoQ+/zs2uRltFj4Sbr7foOOcvwGDKDqtFMaWddD v+T8LpjLOfV7XxWe10l2cUa5O7Uj/ze2pFfmWpt2W0/QN154EIATyKk7Wlk3d6roaXMl uYoA== 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=V2fLCOd7w5RVaZMEE/2yClzk5I5RfuvEjcRKKU0Ql6A=; b=VGD6FpC5HDJkKaVoxzsc2ifN1YczVOZzu/XnAxlyG3vz5PmhPIw+aakn4NJbkd3maW O7pNgjTWRGmo9bR0qLciiSHZVgqvRTtD3BKg8zc8vdfkfDG6+yZ9WbbfN5+oX5K5o2jX gbLulLlVmW/PPc902flUBmw893511STq6ZeVzDW8WjyKOHM8Pot+UGE55TvpqZQL0wor nXKS5csM1AT0rXtWxxBnte4aZ1Kx6Sig/aEmCXKeJ87Polo2unEtjGHGBhL5DIjMrqgn P7Usgma8lwXJ3kcio0VzTZ6uFCpWv7ywstbi2/lQiX+Gy9zodNLWgUtD8LeQFW6KT/zd 0weg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qsZ5LjNo; 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 r8-20020a056902154800b0066ea2050be8si736100ybu.9.2022.07.06.02.44.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Jul 2022 02:44:12 -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=qsZ5LjNo; 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]:47922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o91Zr-0000Am-VP for patch@linaro.org; Wed, 06 Jul 2022 05:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o90PN-0000e9-6L for qemu-devel@nongnu.org; Wed, 06 Jul 2022 04:29:17 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:43894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o90PI-0001Dr-1B for qemu-devel@nongnu.org; Wed, 06 Jul 2022 04:29:13 -0400 Received: by mail-pf1-x434.google.com with SMTP id t3so579943pfq.10 for ; Wed, 06 Jul 2022 01:29:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V2fLCOd7w5RVaZMEE/2yClzk5I5RfuvEjcRKKU0Ql6A=; b=qsZ5LjNo8Qf/WXeTA2oQWiDDZhX9rW/OtwK3zFruCPowC2ujdFiBHmv7ALVXOLS+/3 d4yrA0cvtSXI2ehE8qT3NthGNd0ioOvdML1qmjNThtCsfM77JJgYU3MzAp+GzY3RwyUZ NUgAMC3wguD6RX6vL7GCgBwlJPgc11+qcOfyHGvVcR+zE9rZ9BCQaoC0hUhR1GghXsLK F1+Nqqbg1qevx0nqpDIAjMADIiYcgUlmOvi8YHi9XITsjSQHVfl8qbxAZpX486F3pspB 5DSGuNsWoifBs0Fdbw3mBhZ9ojFunocO+nhjD3dRz9uiODj5HejSm4KLL2WxPAGU+gQo 2lcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V2fLCOd7w5RVaZMEE/2yClzk5I5RfuvEjcRKKU0Ql6A=; b=W0SQdbVThWz0N17FQH18ZtHE2fu68lmqd0PNY3+cCXsyMqJChOzFPvBvqLzMoN0cCj t2bytoFuWRPO0qMOVREsEiMRXvV/kIH6RbIxQdmAeTe0PAAMTYSr/1X+bpjpfxpc17UV wlW8rM8oRtCVzvJ0db8kD7RohWIp5RHByJuPv/Mj7i+9qOiY7pc1SmWI/CsobD7Kh3Qn WCG94aep3Rjgt9qKjPboRmAXq0lSfZKGHqlF/dg8zlzXJY3K2LEDaZmBdqdMQ39cdkCi 3ggp9zKU+Hd7HPt+x1IwPWVTeCOM8sKyoA4GRyB90pXLHWKkIZa240KTEcFCNXxvcq9d 3SjQ== X-Gm-Message-State: AJIora+aAws2W4w6B/IztupyzpnQUjvLYGDdq6LnmGM4P74wgNqyG1xU DSTJkIYXud8Tg8dfXJvjkawCO6wH1OmO5Jk0 X-Received: by 2002:a63:20a:0:b0:411:909f:8ae2 with SMTP id 10-20020a63020a000000b00411909f8ae2mr32602128pgc.132.1657096150724; Wed, 06 Jul 2022 01:29:10 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id c17-20020a170903235100b0016bdf53b303sm6700529plh.205.2022.07.06.01.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 01:29:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v5 41/45] linux-user: Rename sve prctls Date: Wed, 6 Jul 2022 13:54:07 +0530 Message-Id: <20220706082411.1664825-42-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706082411.1664825-1-richard.henderson@linaro.org> References: <20220706082411.1664825-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.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=unavailable 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" Add "sve" to the sve prctl functions, to distinguish them from the coming "sme" prctls with similar names. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/aarch64/target_prctl.h | 8 ++++---- linux-user/syscall.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/linux-user/aarch64/target_prctl.h b/linux-user/aarch64/target_prctl.h index 1d440ffbea..40481e6663 100644 --- a/linux-user/aarch64/target_prctl.h +++ b/linux-user/aarch64/target_prctl.h @@ -6,7 +6,7 @@ #ifndef AARCH64_TARGET_PRCTL_H #define AARCH64_TARGET_PRCTL_H -static abi_long do_prctl_get_vl(CPUArchState *env) +static abi_long do_prctl_sve_get_vl(CPUArchState *env) { ARMCPU *cpu = env_archcpu(env); if (cpu_isar_feature(aa64_sve, cpu)) { @@ -14,9 +14,9 @@ static abi_long do_prctl_get_vl(CPUArchState *env) } return -TARGET_EINVAL; } -#define do_prctl_get_vl do_prctl_get_vl +#define do_prctl_sve_get_vl do_prctl_sve_get_vl -static abi_long do_prctl_set_vl(CPUArchState *env, abi_long arg2) +static abi_long do_prctl_sve_set_vl(CPUArchState *env, abi_long arg2) { /* * We cannot support either PR_SVE_SET_VL_ONEXEC or PR_SVE_VL_INHERIT. @@ -47,7 +47,7 @@ static abi_long do_prctl_set_vl(CPUArchState *env, abi_long arg2) } return -TARGET_EINVAL; } -#define do_prctl_set_vl do_prctl_set_vl +#define do_prctl_sve_set_vl do_prctl_sve_set_vl static abi_long do_prctl_reset_keys(CPUArchState *env, abi_long arg2) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 669add74c1..cbde82c907 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6362,11 +6362,11 @@ static abi_long do_prctl_inval1(CPUArchState *env, abi_long arg2) #ifndef do_prctl_set_fp_mode #define do_prctl_set_fp_mode do_prctl_inval1 #endif -#ifndef do_prctl_get_vl -#define do_prctl_get_vl do_prctl_inval0 +#ifndef do_prctl_sve_get_vl +#define do_prctl_sve_get_vl do_prctl_inval0 #endif -#ifndef do_prctl_set_vl -#define do_prctl_set_vl do_prctl_inval1 +#ifndef do_prctl_sve_set_vl +#define do_prctl_sve_set_vl do_prctl_inval1 #endif #ifndef do_prctl_reset_keys #define do_prctl_reset_keys do_prctl_inval1 @@ -6431,9 +6431,9 @@ static abi_long do_prctl(CPUArchState *env, abi_long option, abi_long arg2, case PR_SET_FP_MODE: return do_prctl_set_fp_mode(env, arg2); case PR_SVE_GET_VL: - return do_prctl_get_vl(env); + return do_prctl_sve_get_vl(env); case PR_SVE_SET_VL: - return do_prctl_set_vl(env, arg2); + return do_prctl_sve_set_vl(env, arg2); case PR_PAC_RESET_KEYS: if (arg3 || arg4 || arg5) { return -TARGET_EINVAL;