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.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 A4C0BC00523 for ; Wed, 8 Jan 2020 05:01:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 62E102067D for ; Wed, 8 Jan 2020 05:01:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NUiVu62v" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725845AbgAHFA7 (ORCPT ); Wed, 8 Jan 2020 00:00:59 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:46108 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725773AbgAHFA7 (ORCPT ); Wed, 8 Jan 2020 00:00:59 -0500 Received: by mail-pg1-f193.google.com with SMTP id z124so925103pgb.13 for ; Tue, 07 Jan 2020 21:00:59 -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:user-agent; bh=X37F/PBhiA4LwJm08uRB6YNKHdDjwop2i2GIlG0JFWg=; b=NUiVu62v3HRo0eFiWC89LLpUuaBgLMcU8567eZd8RGwJUXIP+hwUtxWw8qdZtAROrx 2GyZJNn4cYwyKjXe6VBoV/hrPM33WX1ytgGf4qSj2tLY22f2BIJMKVQ6dOkxd6PTQ8Pq eJ/pyeosrxmzpzdK3TaGdcozwHQqbOUG8giwUJSV+gRo3mPTVZD3qOTIKRC6uz/fFeTT lIlDuMbPhceLob0Z0hDXw4JwJUXA3JE/mlKM1bMBsAlcrjBj2oZjcV+G4b1oEDcNZ0Il okqbzPeowrV9S2F+/bJ+fBL3Dpz4FPNBz7i9pxMizR9CAhIKo4IL3gRIAAfuV/TjYhbm Ic6g== 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:user-agent; bh=X37F/PBhiA4LwJm08uRB6YNKHdDjwop2i2GIlG0JFWg=; b=O76o0qyTEE+aiNnSkRfvCTq3Vpsfjxo83WD/kqBFrR+B68pDvj8vRO7OlgUemb10bO TMom+bJZnJ/8P80JqQyRXotYdsUg/teOCAJB2kGpd/cnKNB+2YDu2L4pnUzaRrlaucyg L2C8VnRtcLbJAmEmPZrzJkyXd8bnMI/w4K6jQsYwVotCIBs1lng5Q9U/mQVRoFEiSrmn 4A7B/uojcvqZOKH85qoxw3YT46ziqudf/pkwbvbEfsq/DI3IoHppezD9xn4wuLcFuiTb N2xloG666DfhQh7I4Z5BjpWrnACyne9x80fZ1ki8h3uPDZzaqP9uZNE0A6FOFEVicrtb qmdQ== X-Gm-Message-State: APjAAAWdLQAyjIy6Uc1hvk6ltR8Sqq5xNM3IiyCxim3QkPxk1QdDL1Da 5IC22pntHRhHE5XkpifKkTQSPg== X-Google-Smtp-Source: APXvYqwjTVtnryOd1gkgsIYiny/IO42W3vQYflxFzhsS6U/6YKIfqzOoivrrcRW9DWuo9N0ausldWA== X-Received: by 2002:a62:1c88:: with SMTP id c130mr3132646pfc.195.1578459658738; Tue, 07 Jan 2020 21:00:58 -0800 (PST) Received: from yoga (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id n14sm1349243pff.188.2020.01.07.21.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 21:00:58 -0800 (PST) Date: Tue, 7 Jan 2020 21:00:55 -0800 From: Bjorn Andersson To: Rob Clark Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Jordan Crouse , Sharat Masetty , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Greg Kroah-Hartman , Douglas Anderson , Brian Masney , Fabio Estevam , Thomas Gleixner , open list Subject: Re: [PATCH 1/3] drm/msm: support firmware-name for zap fw Message-ID: <20200108050055.GJ738324@yoga> References: <20200108013847.899170-1-robdclark@gmail.com> <20200108013847.899170-2-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200108013847.899170-2-robdclark@gmail.com> User-Agent: Mutt/1.12.2 (2019-09-21) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Tue 07 Jan 17:38 PST 2020, 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. > > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 32 ++++++++++++++++++++++--- > 1 file changed, 29 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..aa8737bd58db 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,33 @@ 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, signed_fwname, gpu->dev->dev); > + if (ret) { > + DRM_DEV_ERROR(dev, "could not load signed zap firmware: %d\n", ret); > + fw = ERR_PTR(ret); Perhaps just return ret; here, or omit the error print here any rely solely on the one below? > + } > + } else { > + /* Request the MDT file for the firmware */ How about changing this to "Request the MDT file from the default location" or something like that? Rest looks good. Regards, Bjorn > + 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 +121,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 > 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 737E5C00523 for ; Wed, 8 Jan 2020 08:13:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 45FD4205F4 for ; Wed, 8 Jan 2020 08:13:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NUiVu62v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45FD4205F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B93C26E86F; Wed, 8 Jan 2020 08:12:58 +0000 (UTC) Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 34E966E156 for ; Wed, 8 Jan 2020 05:00:59 +0000 (UTC) Received: by mail-pf1-x442.google.com with SMTP id 2so973275pfg.12 for ; Tue, 07 Jan 2020 21:00:59 -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:user-agent; bh=X37F/PBhiA4LwJm08uRB6YNKHdDjwop2i2GIlG0JFWg=; b=NUiVu62v3HRo0eFiWC89LLpUuaBgLMcU8567eZd8RGwJUXIP+hwUtxWw8qdZtAROrx 2GyZJNn4cYwyKjXe6VBoV/hrPM33WX1ytgGf4qSj2tLY22f2BIJMKVQ6dOkxd6PTQ8Pq eJ/pyeosrxmzpzdK3TaGdcozwHQqbOUG8giwUJSV+gRo3mPTVZD3qOTIKRC6uz/fFeTT lIlDuMbPhceLob0Z0hDXw4JwJUXA3JE/mlKM1bMBsAlcrjBj2oZjcV+G4b1oEDcNZ0Il okqbzPeowrV9S2F+/bJ+fBL3Dpz4FPNBz7i9pxMizR9CAhIKo4IL3gRIAAfuV/TjYhbm Ic6g== 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:user-agent; bh=X37F/PBhiA4LwJm08uRB6YNKHdDjwop2i2GIlG0JFWg=; b=hKNOyxsVC8vQlYA1usyW8OclA8IdKSbXYFHoudAw+2nZtkFG7Up2jJdap0BUGjp1YN glG4vRKrRFRksp5GGn7jLM4mQZYSgukWLG+xdJu+mXn854PDZGswb2ZBImu2rgbWpN0v V+R88jDagX9guY1s/0xvyYbp7I5gwvQ49kDT2ibHOLOPKLvKD6QPlxnLpw2TfpJCT8AA o9tPe7zh4q1PFwbsLTTLRvwvOOjibu6waVs2IDMZthxCVGflidu8968Rw6BlCE9vsg6M vkk4xhtYP5c7N3qVpyGVtYTAjPWVZFXnJkTeXIXvr9z9my2HgCf5v99b+G1z5tAyQpTJ 8dsA== X-Gm-Message-State: APjAAAXTyaXcdvtWrKW6Tu664xegVhSiGS20pwav8Azm/ZAbxxHDK9sB Ry8AcuDkJ35WeoFFHg5E475tjA== X-Google-Smtp-Source: APXvYqwjTVtnryOd1gkgsIYiny/IO42W3vQYflxFzhsS6U/6YKIfqzOoivrrcRW9DWuo9N0ausldWA== X-Received: by 2002:a62:1c88:: with SMTP id c130mr3132646pfc.195.1578459658738; Tue, 07 Jan 2020 21:00:58 -0800 (PST) Received: from yoga (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id n14sm1349243pff.188.2020.01.07.21.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 21:00:58 -0800 (PST) Date: Tue, 7 Jan 2020 21:00:55 -0800 From: Bjorn Andersson To: Rob Clark Subject: Re: [PATCH 1/3] drm/msm: support firmware-name for zap fw Message-ID: <20200108050055.GJ738324@yoga> References: <20200108013847.899170-1-robdclark@gmail.com> <20200108013847.899170-2-robdclark@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200108013847.899170-2-robdclark@gmail.com> User-Agent: Mutt/1.12.2 (2019-09-21) X-Mailman-Approved-At: Wed, 08 Jan 2020 08:12:31 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , devicetree@vger.kernel.org, David Airlie , linux-arm-msm@vger.kernel.org, Sharat Masetty , Douglas Anderson , dri-devel@lists.freedesktop.org, open list , Sean Paul , Greg Kroah-Hartman , Thomas Gleixner , freedreno@lists.freedesktop.org, Brian Masney Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue 07 Jan 17:38 PST 2020, 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. > > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 32 ++++++++++++++++++++++--- > 1 file changed, 29 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..aa8737bd58db 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,33 @@ 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, signed_fwname, gpu->dev->dev); > + if (ret) { > + DRM_DEV_ERROR(dev, "could not load signed zap firmware: %d\n", ret); > + fw = ERR_PTR(ret); Perhaps just return ret; here, or omit the error print here any rely solely on the one below? > + } > + } else { > + /* Request the MDT file for the firmware */ How about changing this to "Request the MDT file from the default location" or something like that? Rest looks good. Regards, Bjorn > + 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 +121,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 > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel