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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 047F9C433E0 for ; Fri, 15 May 2020 11:39:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 C35622065C for ; Fri, 15 May 2020 11:39:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Jgoh/nCX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C35622065C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=w6K4M0J4c9ejuxiecZznX9Eulsf9Tcjek3QxCd/Agpw=; b=Jgoh/nCXrsqzag hVJUYpaaSUH5kjTWPQqG88daoMXUdWAD53yUKVicyIj3Mghfxgg2A2iJLxEbNNRlSBZ3T7p/ysW2d fYbR5RQT9n9aZYhxyKXptsFfD2AVHcD6iXeD4fuBn56TBJoSWgDj8BWxudO7hygKJBPDuWJiR6nXg D/qp98ssh0+deoKEDdmPhdSA4rdK2LKwskcB9o8Y+nXTep7kq3XY/qz/ppmoHe3rqTMY8ZBrddPOZ iOuK3QwiNtQenSDZeMsY7JijdbrcUzV/gL9W/VFnPvhsl475l0d028J6HmnIwVoNCeuikAk6Dh7tI 4hiPPYXKDAaOlqQah0FQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jZYgz-0005St-CQ; Fri, 15 May 2020 11:39:53 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jZYgt-0005RU-M9 for linux-arm-kernel@lists.infradead.org; Fri, 15 May 2020 11:39:51 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 15873D6E; Fri, 15 May 2020 04:39:47 -0700 (PDT) Received: from C02TD0UTHF1T.local (unknown [10.57.24.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EFB3B3F305; Fri, 15 May 2020 04:39:44 -0700 (PDT) Date: Fri, 15 May 2020 12:39:42 +0100 From: Mark Rutland To: Sudeep Holla Subject: Re: [PATCH v3 4/7] firmware: smccc: Drop smccc_version enum and use ARM_SMCCC_VERSION_1_x instead Message-ID: <20200515113942.GD67718@C02TD0UTHF1T.local> References: <20200506164411.3284-1-sudeep.holla@arm.com> <20200506164411.3284-5-sudeep.holla@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200506164411.3284-5-sudeep.holla@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200515_043949_978319_AA47CBDF X-CRM114-Status: GOOD ( 18.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Arnd Bergmann , Catalin Marinas , linux-kernel@vger.kernel.org, Steven Price , harb@amperecomputing.com, Will Deacon , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, May 06, 2020 at 05:44:08PM +0100, Sudeep Holla wrote: > Instead of maintaining 2 sets of enums/macros for tracking SMCCC version, > let us drop smccc_version enum and use ARM_SMCCC_VERSION_1_x directly > instead. > > This is in preparation to drop smccc_version here and move it separately > under drivers/firmware/smccc. > > Reviewed-by: Steven Price > Signed-off-by: Sudeep Holla Acked-by: Mark Rutland Thanks, Mark. > --- > arch/arm64/kernel/paravirt.c | 2 +- > drivers/firmware/psci/psci.c | 8 ++++---- > include/linux/psci.h | 7 +------ > 3 files changed, 6 insertions(+), 11 deletions(-) > > diff --git a/arch/arm64/kernel/paravirt.c b/arch/arm64/kernel/paravirt.c > index 1ef702b0be2d..295d66490584 100644 > --- a/arch/arm64/kernel/paravirt.c > +++ b/arch/arm64/kernel/paravirt.c > @@ -120,7 +120,7 @@ static bool has_pv_steal_clock(void) > struct arm_smccc_res res; > > /* To detect the presence of PV time support we require SMCCC 1.1+ */ > - if (psci_ops.smccc_version < SMCCC_VERSION_1_1) > + if (arm_smccc_1_1_get_conduit() == SMCCC_CONDUIT_NONE) > return false; > > arm_smccc_1_1_invoke(ARM_SMCCC_ARCH_FEATURES_FUNC_ID, > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > index 2937d44b5df4..6a56d7196697 100644 > --- a/drivers/firmware/psci/psci.c > +++ b/drivers/firmware/psci/psci.c > @@ -54,12 +54,12 @@ bool psci_tos_resident_on(int cpu) > > struct psci_operations psci_ops = { > .conduit = SMCCC_CONDUIT_NONE, > - .smccc_version = SMCCC_VERSION_1_0, > + .smccc_version = ARM_SMCCC_VERSION_1_0, > }; > > enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void) > { > - if (psci_ops.smccc_version < SMCCC_VERSION_1_1) > + if (psci_ops.smccc_version < ARM_SMCCC_VERSION_1_1) > return SMCCC_CONDUIT_NONE; > > return psci_ops.conduit; > @@ -411,8 +411,8 @@ static void __init psci_init_smccc(void) > if (feature != PSCI_RET_NOT_SUPPORTED) { > u32 ret; > ret = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0); > - if (ret == ARM_SMCCC_VERSION_1_1) { > - psci_ops.smccc_version = SMCCC_VERSION_1_1; > + if (ret >= ARM_SMCCC_VERSION_1_1) { > + psci_ops.smccc_version = ret; > ver = ret; > } > } > diff --git a/include/linux/psci.h b/include/linux/psci.h > index a67712b73b6c..29bd0671e5bb 100644 > --- a/include/linux/psci.h > +++ b/include/linux/psci.h > @@ -21,11 +21,6 @@ bool psci_power_state_is_valid(u32 state); > int psci_set_osi_mode(void); > bool psci_has_osi_support(void); > > -enum smccc_version { > - SMCCC_VERSION_1_0, > - SMCCC_VERSION_1_1, > -}; > - > struct psci_operations { > u32 (*get_version)(void); > int (*cpu_suspend)(u32 state, unsigned long entry_point); > @@ -36,7 +31,7 @@ struct psci_operations { > unsigned long lowest_affinity_level); > int (*migrate_info_type)(void); > enum arm_smccc_conduit conduit; > - enum smccc_version smccc_version; > + u32 smccc_version; > }; > > extern struct psci_operations psci_ops; > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel