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=-13.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 B35CCC433DF for ; Fri, 15 May 2020 09:25:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F650206F1 for ; Fri, 15 May 2020 09:25:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727964AbgEOJZE (ORCPT ); Fri, 15 May 2020 05:25:04 -0400 Received: from foss.arm.com ([217.140.110.172]:51828 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727116AbgEOJZE (ORCPT ); Fri, 15 May 2020 05:25:04 -0400 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 C428C2F; Fri, 15 May 2020 02:25:03 -0700 (PDT) Received: from bogus (unknown [10.37.12.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AF31D3F71E; Fri, 15 May 2020 02:25:00 -0700 (PDT) Date: Fri, 15 May 2020 10:24:57 +0100 From: Sudeep Holla To: Etienne Carriere Cc: linux-kernel@vger.kernel.org, Mark Rutland , lorenzo.pieralisi@arm.com, maz@kernel.org, Steven Price , alexios.zavras@intel.com, Thomas Gleixner , will@kernel.org, "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" Subject: Re: [PATCH 2/2] firmware: psci: support SMCCC v1.2 for SMCCC conduit Message-ID: <20200515092457.GB23671@bogus> References: <20200514082109.27573-1-etienne.carriere@linaro.org> <20200514082109.27573-2-etienne.carriere@linaro.org> <20200514142442.GB23401@bogus> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 14, 2020 at 04:56:53PM +0200, Etienne Carriere wrote: > On Thu, 14 May 2020 at 16:24, Sudeep Holla wrote: > > > > On Thu, May 14, 2020 at 10:21:09AM +0200, Etienne Carriere wrote: > > > Update PSCI driver to support SMCCC v1.2 reported by secure firmware > > > and indirectly make SMCCC conduit properly set when so. TF-A release > > > v2.3 implements and reports SMCCC v1.2 since commit [1]. > > > > > > Link: [1] https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=e34cc0cedca6e229847c232fe58d37fad2610ce9 > > > Signed-off-by: Etienne Carriere > > > --- > > > drivers/firmware/psci/psci.c | 14 ++++++++++---- > > > include/linux/psci.h | 1 + > > > 2 files changed, 11 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > > > index 2937d44b5df4..80cf73bea4b0 100644 > > > --- a/drivers/firmware/psci/psci.c > > > +++ b/drivers/firmware/psci/psci.c > > > @@ -409,11 +409,17 @@ static void __init psci_init_smccc(void) > > > feature = psci_features(ARM_SMCCC_VERSION_FUNC_ID); > > > > > > 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) { > > > + ver = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0); > > > + > > > + switch (ver) { > > > + case ARM_SMCCC_VERSION_1_1: > > > psci_ops.smccc_version = SMCCC_VERSION_1_1; > > > - ver = ret; > > > + break; > > > + case ARM_SMCCC_VERSION_1_2: > > > + psci_ops.smccc_version = SMCCC_VERSION_1_2; > > > + break; > > > + default: > > > + break; > > > } > > > } > > > > > > diff --git a/include/linux/psci.h b/include/linux/psci.h > > > index a67712b73b6c..c7d99b7f34ed 100644 > > > --- a/include/linux/psci.h > > > +++ b/include/linux/psci.h > > > @@ -24,6 +24,7 @@ bool psci_has_osi_support(void); > > > enum smccc_version { > > > SMCCC_VERSION_1_0, > > > SMCCC_VERSION_1_1, > > > + SMCCC_VERSION_1_2, > > > > I took approach to kill this completely [1] instead of having to keep > > expanding it for ever. > > Yes, I've been pointed to [1]. Discard this change. Sorry for the > (little) noise. > No worries, it's not a noise, just different approach. -- Regards, Sudeep