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=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 5E23EC33CAE for ; Mon, 13 Jan 2020 17:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31BA82081E for ; Mon, 13 Jan 2020 17:28:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="Ibn3osoV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728738AbgAMR2h (ORCPT ); Mon, 13 Jan 2020 12:28:37 -0500 Received: from mail26.static.mailgun.info ([104.130.122.26]:25983 "EHLO mail26.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727726AbgAMR2g (ORCPT ); Mon, 13 Jan 2020 12:28:36 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1578936515; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Cc: To: From: Date: Sender; bh=ZkDkwamCH7sXxqcGCpxSETq5EQUN29cHRpXs6HQiclE=; b=Ibn3osoV3iQO9FkLETT+lDsuQR6EvtiCUOKS4z1s4sDkpYIoXJfl1PwRKCeeEuHNVDgez79P /TtBCxzXBdbWKZDyzDiLSNIljcqpXGMOxEJtb803Nq4lMYSMffGcUiQJF/lGpQz28Maii82T d7cBBA/JsZW9PqawQlD56SmjpHA= X-Mailgun-Sending-Ip: 104.130.122.26 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e1ca8c2.7f25f9061dc0-smtp-out-n01; Mon, 13 Jan 2020 17:28:34 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id CB11CC447A6; Mon, 13 Jan 2020 17:28:32 +0000 (UTC) Received: from jcrouse1-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse) by smtp.codeaurora.org (Postfix) with ESMTPSA id AAEE1C43383; Mon, 13 Jan 2020 17:28:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org AAEE1C43383 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=jcrouse@codeaurora.org Date: Mon, 13 Jan 2020 10:28:24 -0700 From: Jordan Crouse To: Rob Clark Cc: dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Sharat Masetty , Bjorn Andersson , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Brian Masney , Douglas Anderson , Fabio Estevam , Thomas Gleixner , open list Subject: Re: [PATCH v2 1/4] drm/msm: support firmware-name for zap fw (v2) Message-ID: <20200113172824.GA26711@jcrouse1-lnx.qualcomm.com> Mail-Followup-To: Rob Clark , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Sharat Masetty , Bjorn Andersson , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Brian Masney , Douglas Anderson , Fabio Estevam , Thomas Gleixner , open list References: <20200112195405.1132288-1-robdclark@gmail.com> <20200112195405.1132288-2-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200112195405.1132288-2-robdclark@gmail.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jan 12, 2020 at 11:53:57AM -0800, Rob Clark wrote: > From: Rob Clark > > Since zap firmware can be device specific, allow for a firmware-name > property in the zap node to specify which firmware to load, similarly to > the scheme used for dsp/wifi/etc. > > v2: only need a single error msg when we can't load from firmware-name > specified path, and fix comment [Bjorn A.] Reviewed-by: Jordan Crouse > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 30 ++++++++++++++++++++++--- > 1 file changed, 27 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index 112e8b8a261e..456bb5af1717 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -26,6 +26,7 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > { > struct device *dev = &gpu->pdev->dev; > const struct firmware *fw; > + const char *signed_fwname = NULL; > struct device_node *np, *mem_np; > struct resource r; > phys_addr_t mem_phys; > @@ -58,8 +59,31 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > > mem_phys = r.start; > > - /* Request the MDT file for the firmware */ > - fw = adreno_request_fw(to_adreno_gpu(gpu), fwname); > + /* > + * Check for a firmware-name property. This is the new scheme > + * to handle firmware that may be signed with device specific > + * keys, allowing us to have a different zap fw path for different > + * devices. > + * > + * If the firmware-name property is found, we bypass the > + * adreno_request_fw() mechanism, because we don't need to handle > + * the /lib/firmware/qcom/* vs /lib/firmware/* case. > + * > + * If the firmware-name property is not found, for backwards > + * compatibility we fall back to the fwname from the gpulist > + * table. > + */ > + of_property_read_string_index(np, "firmware-name", 0, &signed_fwname); > + if (signed_fwname) { > + fwname = signed_fwname; > + ret = request_firmware_direct(&fw, fwname, gpu->dev->dev); > + if (ret) > + fw = ERR_PTR(ret); > + } else { > + /* Request the MDT file from the default location: */ > + fw = adreno_request_fw(to_adreno_gpu(gpu), fwname); > + } > + > if (IS_ERR(fw)) { > DRM_DEV_ERROR(dev, "Unable to load %s\n", fwname); > return PTR_ERR(fw); > @@ -95,7 +119,7 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > * not. But since we've already gotten through adreno_request_fw() > * we know which of the two cases it is: > */ > - if (to_adreno_gpu(gpu)->fwloc == FW_LOCATION_LEGACY) { > + if (signed_fwname || (to_adreno_gpu(gpu)->fwloc == FW_LOCATION_LEGACY)) { > ret = qcom_mdt_load(dev, fw, fwname, pasid, > mem_region, mem_phys, mem_size, NULL); > } else { > -- > 2.24.1 > -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project