From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49CE1C47082 for ; Sat, 5 Jun 2021 22:15:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CB3B76054E for ; Sat, 5 Jun 2021 22:15:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB3B76054E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lpeZj-00070w-LK for qemu-devel@archiver.kernel.org; Sat, 05 Jun 2021 18:15:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpeYa-00066m-17 for qemu-devel@nongnu.org; Sat, 05 Jun 2021 18:14:16 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:37852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lpeYX-0006Kr-Sk for qemu-devel@nongnu.org; Sat, 05 Jun 2021 18:14:15 -0400 Received: by mail-pg1-x533.google.com with SMTP id t9so10807950pgn.4 for ; Sat, 05 Jun 2021 15:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Ch4/PIbrzUawveB5cBKf/HXBwMIDZk9V7lpdvUKfu3U=; b=j+/etm1teDijmRNbYJlpYBRrdKOGr4yZOnpKx3agWoKmWmUxq2C4HjChO6GBSS1iUm m2o1I2XgDGyK5mWBUsyk7fvqkLr00uMnd8h1L6++G09lmuSYdgjFiPWvtF29qpFdVF2j fOfdpiRT3tKEVBTHMCu3mWQUwXCL3EDtjgc1CH99kb7RsN039lAzZFyzfJ+SvwFQxYYD L7ChVQA3vyVPVfsnUj8d/DegpBsp926cLk6Eb31xrkpWyFJJ0MroWWuNQYrqnJT0MfxD S6PH9WPTUF872AUtjnP1+xCiBEH7QDsVjc04QbSY70NRS6ry9Qmmy57GIKD/frg5yL2L nM7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Ch4/PIbrzUawveB5cBKf/HXBwMIDZk9V7lpdvUKfu3U=; b=f15MKhbaAzWPKsYBCl0Y8Pp+UVKizlLDo7IQDmgScAOEEPaGz4LZzrak3ro6aAHQCL ESTbnGZKGKA+kKuhmYaFBUGUSNfJqSXnaPk9bqFB/m8uKw0+tRbTxuI+ih+wRoGX+pO8 RRIXAb/Vhc//QIv4ZcCxMBaKdCOUUlitL8YSYkFR6cDXWP8bwG94ItLmXibE05algh79 CxVMP+gwHdf6UxQI1a86w6z5QpYZw313vjxvyfiSvDQh7NjAqOrczsixlECfrFPoZgjT /VnhXO75MqkH74poo23v6Ppdhp0IgiYT7o2mGCpZ01tS1kBozW33PD4oHcDZlXdq63er gyPQ== X-Gm-Message-State: AOAM5314C0UiNk/Miczj/hkSIBujGT3qprG0jl3brSId5zkuxQju4wf0 KJNMXuoCEzjtkkO4pyxzuzcAxQ== X-Google-Smtp-Source: ABdhPJzQedStELT7z+saYLHHX71gtqS930a8UPNW2GJ/X2ZsEbs2SkhvHtKmAkX7BUEPiRM/PECP2w== X-Received: by 2002:a63:475b:: with SMTP id w27mr11186935pgk.305.1622931252425; Sat, 05 Jun 2021 15:14:12 -0700 (PDT) Received: from [192.168.1.11] (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id m1sm5161438pgd.78.2021.06.05.15.14.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 05 Jun 2021 15:14:12 -0700 (PDT) Subject: Re: [PATCH v16 87/99] target/arm: move arm_cpu_finalize_features into cpu64 To: =?UTF-8?Q?Alex_Benn=c3=a9e?= , qemu-devel@nongnu.org References: <20210604155312.15902-1-alex.bennee@linaro.org> <20210604155312.15902-88-alex.bennee@linaro.org> From: Richard Henderson Message-ID: Date: Sat, 5 Jun 2021 15:14:10 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210604155312.15902-88-alex.bennee@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.google.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 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, NICE_REPLY_A=-0.59, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, Claudio Fontana Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 6/4/21 8:53 AM, Alex Bennée wrote: > diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c > index fefb6954fc..c762f3f07a 100644 > --- a/target/arm/cpu64.c > +++ b/target/arm/cpu64.c > @@ -469,6 +469,40 @@ static gchar *aarch64_gdb_arch_name(CPUState *cs) > return g_strdup("aarch64"); > } > > +void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp) > +{ > + Error *local_err = NULL; > + > +#ifdef TARGET_AARCH64 > + if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { > + if (!cpu_sve_finalize_features(cpu, &local_err)) { > + error_propagate(errp, local_err); > + return; > + } > + > + /* > + * KVM does not support modifications to this feature. > + * We have not registered the cpu properties when KVM > + * is in use, so the user will not be able to set them. > + */ > + if (tcg_enabled()) { > + if (!cpu_pauth_finalize(cpu, &local_err)) { > + error_propagate(errp, local_err); > + return; > + } > + } > + } > +#endif /* TARGET_AARCH64 */ These ifdefs are useless. > diff --git a/target/arm/monitor.c b/target/arm/monitor.c > index 0c72bf7c31..95c1e72cd1 100644 > --- a/target/arm/monitor.c > +++ b/target/arm/monitor.c > @@ -184,9 +184,11 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, > if (!err) { > visit_check_struct(visitor, &err); > } > +#ifdef TARGET_AARCH64 > if (!err) { > arm_cpu_finalize_features(ARM_CPU(obj), &err); > } > +#endif /* TARGET_AARCH64 */ > visit_end_struct(visitor, NULL); > visit_free(visitor); > if (err) { > @@ -195,7 +197,9 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, > return NULL; > } > } else { > +#ifdef TARGET_AARCH64 > arm_cpu_finalize_features(ARM_CPU(obj), &error_abort); > +#endif /* TARGET_AARCH64 */ Not keen on all of the extra ifdefs here. r~