From patchwork Tue Jun 7 20:33:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 579396 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp5552026max; Tue, 7 Jun 2022 15:05:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnrPJG3IfWgewPhO/SN+zar7lYjJxU4r8dgS1CRXxmAfOu5HxUfuNeeAAf47zRET75YPuq X-Received: by 2002:a05:620a:28c1:b0:6a0:464a:a9c4 with SMTP id l1-20020a05620a28c100b006a0464aa9c4mr20581727qkp.397.1654639545731; Tue, 07 Jun 2022 15:05:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654639545; cv=none; d=google.com; s=arc-20160816; b=HKV8vUR02OS+lv82Oi/eZjLLpTVTSvVWOmqBfDsESejfNq2agUJ2C0Hg5ZTD75Nu5M vUFDwRMJfgozzLtVgLlzNvksUJwrklJWwEm9TloWuSsHz6p3q+8KmmFxxYbOlAWZ/iFm ZAchdWnHvZ6JvUxjDnLWs+Q4TG50c6Z5/65lD80Gw0tqyDvT4ELpBdvEGyGD/G4SX5+9 EeZ8AmzwUrbe98iZwDqv+VaCFj1dNIMoaXAWMQojgK2S+aZC5rFQlU4aLhe4jitloUPc cgkHgmbRqANzYjSp1kYtervFks+I1DXXnhAXhOeihORq/tYOQ6p3EB7ElCfCVUV8Hrhm Lx0Q== 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=peylD0MqTkY6Ni4gfiTgUpLQJeWJHjooqBzEUJMAaO0=; b=Iz5TfPAIbIxcQeitln1Pkrfs7z2riEWrNzRlUbHBIbXJfw7m7tiDxnSyVPuVSPsZsI V/ZU+K/Jo/oNpL1XsMX505ek+Ze++PHw/E3w6PZxoAlFN4OVHg5dVq521NRXzQpEAarP z6vME0irHEjrmQUGPlXawgBg7DQ8MMC8zCPht+D8eSBtVsTC5goaVbV6vy5KF6nQ4m87 0lx4zV4E2DpdUQLB98VqLjTLQFV8VK0iMobraAwt/xVQgao4T6mbhbfcSBCCGottTzhn 7WwvjKYJU6mqF0l1O+6Y17k0t0KjXa16RcSZrf2cvapgxN4Iji4PvY3ad5/ePfONOLLM tuYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gOAiS0rV; 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 w21-20020a05620a445500b0069f3b690b97si11669779qkp.257.2022.06.07.15.05.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jun 2022 15:05:45 -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=gOAiS0rV; 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]:33052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyhKZ-0005za-3z for patch@linaro.org; Tue, 07 Jun 2022 18:05:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyfx2-0007iS-Gw for qemu-devel@nongnu.org; Tue, 07 Jun 2022 16:37:20 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:39740) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyfwv-0008N7-2M for qemu-devel@nongnu.org; Tue, 07 Jun 2022 16:37:20 -0400 Received: by mail-pf1-x429.google.com with SMTP id y196so16509810pfb.6 for ; Tue, 07 Jun 2022 13:37:12 -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=peylD0MqTkY6Ni4gfiTgUpLQJeWJHjooqBzEUJMAaO0=; b=gOAiS0rVWkLDFTHVeBQJPQVlA2a66QQH93VP/ML0CbYCn8So8/2uYpQMM09PA3WaPj OXS2rhagBQWVdp5iUWYeWzRam9s5hPKpDJlM5TXzotAk3kNy5Q0sND16BL0iXbHVlx17 +1q4on+V9ep0SVsr03rRAevS9ZS4DDTH2vjWd5qetOV45S7TBCUSonMUN7qER2FXuJPT IQ0d2S5ZgObeDVRV8WNXodnWbwiKV9xTStfEYXXf3XwbtpapgY+07NjdyHfCjUFVMO+H xfOKy1XlxxZhtQ5ihTnNv3gC0dXOWeX5F6yi/1eMi+Kme/OJnocW41Jd6K3jvH/8pyis oo3g== 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=peylD0MqTkY6Ni4gfiTgUpLQJeWJHjooqBzEUJMAaO0=; b=MbkDsGJmowT2VfC8p9fDBiJmszsD3dYnE5mNILfVF4REQbT/C8A53wLjKToyVHYZsL QAA4TH3veKNYv8tnh6IQ+0Ec3T8b/Z1igUh4jxnCR74p1jNtyuPbozeXmUhVX7xL+pY+ C7dPfR9g/jjPcGTvorCo1uPbqVWpSsJyEaKpREqg0zYIiHjDHM6cFkQQpHVB8xW+hWgs DLwH4Z5a0F6NtLycodV+E6ZIMOov5Ne4RM/qAXvmMjOqJ3taOyQ0xs8kzUFWUxF1M1lV ZTmHCQkwIXYb4CkoItNdDIgFLgn+Urq4g00ZGR55H6EKvTMfZswBJTFo6j5ZpuCpP5F7 htDw== X-Gm-Message-State: AOAM530uJSmBXtOFUg4XmPBxZldSMZyxAsUQV2P+2cRBmOlKNfVszgj1 9SNsCXWqlJgtu7UiOtRKO/+dM7o4lFBm1w== X-Received: by 2002:a63:1f55:0:b0:3fd:41c5:b53a with SMTP id q21-20020a631f55000000b003fd41c5b53amr18274454pgm.441.1654634229656; Tue, 07 Jun 2022 13:37:09 -0700 (PDT) Received: from stoup.. ([2602:ae:1547:e101:3cf2:c634:5b19:25f6]) by smtp.gmail.com with ESMTPSA id s18-20020aa78d52000000b0050dc76281fdsm13235645pfe.215.2022.06.07.13.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 13:37:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Subject: [PATCH v2 67/71] linux-user: Rename sve prctls Date: Tue, 7 Jun 2022 13:33:02 -0700 Message-Id: <20220607203306.657998-68-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220607203306.657998-1-richard.henderson@linaro.org> References: <20220607203306.657998-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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. 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 f55cdebee5..a7f41ef0ac 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6365,11 +6365,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 @@ -6434,9 +6434,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;