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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 4FCB6C433E0 for ; Sat, 6 Mar 2021 00:45:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 253006507C for ; Sat, 6 Mar 2021 00:45:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229730AbhCFAof (ORCPT ); Fri, 5 Mar 2021 19:44:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229642AbhCFAoE (ORCPT ); Fri, 5 Mar 2021 19:44:04 -0500 Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8764C06175F for ; Fri, 5 Mar 2021 16:44:03 -0800 (PST) Received: by mail-oi1-x236.google.com with SMTP id i21so4548019oii.2 for ; Fri, 05 Mar 2021 16:44:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Wljdg2Ulm2u3Dpzx8Iq4uzqIrv5JdcAhx+0eauq9coc=; b=IJ+cvLOg/toHpJIFHESEiOn/U6WxswcFCFnETj9qi98y89NZi/M/Jz0aDlrz1QOsxV IY8HknqMCZh8ybLBTVSaDR36oWTg9UCXJuZZSnTLZjrvUXSPFtwmHicqH+iXO9F5IlIp qyQa1YLCDIsA4IouvThH4c1Xc6hrkt2o8yAlwJk4InggOF4WNFgyTpO9MkuEFSc9bmxr 6Fhe4aMKGQTKW/wlpzsRAJMV8iZvYAsF6SALlOrKrFfeXz7n5tN4ZdyPa1GmVmC9VkFT VrHTkRBYD1tvbOFOKnQFuVoGFH2tFB/PiVTr7ukomW/IV5xgyA2uvUSbJNgXAb73LwYn 2CvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Wljdg2Ulm2u3Dpzx8Iq4uzqIrv5JdcAhx+0eauq9coc=; b=oufcyU3QUVtZ8iMvJEFxOTdEm46uIi5Y2Ei0n+rjgUFXfhfryHoa6V5/5Bu8yLbxRj CDfXPhic1g8v4F5861ITlC9mBJcJ/ikKOTsuh3R3LC7OE80W1bPDxgpxklp3NfeMvKPo CNLnomsTI6s/Jel5J2hycxUG4IxKGFXJ7Dlds2rta8xoBtcTJOTwaVb5HSfk9rzHsUDe msS0Aa47lbdWLqkqrxFO8FCoJKJKHkSS61KFM8RugoY0NRy/Vlw4qZYW0ewXsUlJey12 6OyP5s/OcCtJTqpOyESFmEdWtLJCj4pM0IDzTjZDbGZqD9NDN/Z2emoz8E81b28f/qHU OROA== X-Gm-Message-State: AOAM533xB9vCov5E7rWUVEzT4hq51bZ8rRX3TggPAKr91S+kBQK9OeSI js4j7A5ciUFKc8vw8iypA0pIUA== X-Google-Smtp-Source: ABdhPJwaUlESQTDr6uRL3opuUdtoNtjtVPl0s2jwKflYDEbRC2BlspmSEcEJ53RbG5R8hYVCQeYarA== X-Received: by 2002:aca:5cd6:: with SMTP id q205mr9100063oib.94.1614991443260; Fri, 05 Mar 2021 16:44:03 -0800 (PST) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id f193sm866606oig.8.2021.03.05.16.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 16:44:02 -0800 (PST) Date: Fri, 5 Mar 2021 18:44:01 -0600 From: Bjorn Andersson To: Stephen Boyd Cc: Andy Gross , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Elliot Berman , Brian Masney , Stephan Gerhold , Jeffrey Hugo , Douglas Anderson Subject: Re: [PATCH 1/6] firmware: qcom_scm: Make __qcom_scm_is_call_available() return bool Message-ID: References: <20210223214539.1336155-1-swboyd@chromium.org> <20210223214539.1336155-2-swboyd@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210223214539.1336155-2-swboyd@chromium.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Tue 23 Feb 15:45 CST 2021, Stephen Boyd wrote: > Make __qcom_scm_is_call_available() return bool instead of int. The > function has "is" in the name, so it should return a bool to indicate > the truth of the call being available. Unfortunately, it can return a > number < 0 which also looks "true", but not all callers expect that and > thus they think a call is available when really the check to see if the > call is available failed to figure it out. > > Cc: Elliot Berman > Cc: Brian Masney > Cc: Stephan Gerhold > Cc: Jeffrey Hugo > Cc: Douglas Anderson > Fixes: 0f206514749b ("scsi: firmware: qcom_scm: Add support for programming inline crypto keys") > Fixes: 0434a4061471 ("firmware: qcom: scm: add support to restore secure config to qcm_scm-32") > Fixes: b0a1614fb1f5 ("firmware: qcom: scm: add OCMEM lock/unlock interface") > Signed-off-by: Stephen Boyd Reviewed-by: Bjorn Andersson Regards, Bjorn > --- > drivers/firmware/qcom_scm.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c > index f57779fc7ee9..2be5573dce53 100644 > --- a/drivers/firmware/qcom_scm.c > +++ b/drivers/firmware/qcom_scm.c > @@ -113,9 +113,6 @@ static void qcom_scm_clk_disable(void) > clk_disable_unprepare(__scm->bus_clk); > } > > -static int __qcom_scm_is_call_available(struct device *dev, u32 svc_id, > - u32 cmd_id); > - > enum qcom_scm_convention qcom_scm_convention; > static bool has_queried __read_mostly; > static DEFINE_SPINLOCK(query_lock); > @@ -219,8 +216,8 @@ static int qcom_scm_call_atomic(struct device *dev, > } > } > > -static int __qcom_scm_is_call_available(struct device *dev, u32 svc_id, > - u32 cmd_id) > +static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id, > + u32 cmd_id) > { > int ret; > struct qcom_scm_desc desc = { > @@ -247,7 +244,7 @@ static int __qcom_scm_is_call_available(struct device *dev, u32 svc_id, > > ret = qcom_scm_call(dev, &desc, &res); > > - return ret ? : res.result[0]; > + return ret ? false : !!res.result[0]; > } > > /** > @@ -585,9 +582,8 @@ bool qcom_scm_pas_supported(u32 peripheral) > }; > struct qcom_scm_res res; > > - ret = __qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_PIL, > - QCOM_SCM_PIL_PAS_IS_SUPPORTED); > - if (ret <= 0) > + if (!__qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_PIL, > + QCOM_SCM_PIL_PAS_IS_SUPPORTED)) > return false; > > ret = qcom_scm_call(__scm->dev, &desc, &res); > @@ -1060,17 +1056,18 @@ EXPORT_SYMBOL(qcom_scm_ice_set_key); > */ > bool qcom_scm_hdcp_available(void) > { > + bool avail; > int ret = qcom_scm_clk_enable(); > > if (ret) > return ret; > > - ret = __qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_HDCP, > + avail = __qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_HDCP, > QCOM_SCM_HDCP_INVOKE); > > qcom_scm_clk_disable(); > > - return ret > 0; > + return avail; > } > EXPORT_SYMBOL(qcom_scm_hdcp_available); > > -- > https://chromeos.dev >