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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9AE7EB64D8 for ; Sat, 17 Jun 2023 00:44:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229950AbjFQAoE (ORCPT ); Fri, 16 Jun 2023 20:44:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229667AbjFQAoE (ORCPT ); Fri, 16 Jun 2023 20:44:04 -0400 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 778C63A9B for ; Fri, 16 Jun 2023 17:44:02 -0700 (PDT) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2b466066950so3766821fa.2 for ; Fri, 16 Jun 2023 17:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686962641; x=1689554641; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=9mU9/r2NP5pdyOYwI4LQnZTUP7KdrI2cN021yOGtwio=; b=o3hkf4LmU9suujKu2ERmn6Gh1FpoCEhilDqUtyCUr9uFhBcl7CEtu9FlHhBfl6c9xZ Fl9kN2K80JY7VpuHcpAnOmrmMD2BZuaCVMUfrNLYQb3zsVbtFDfLV/X4GDksMlFpcjub OEhM91WO/H4xixVW4NXx1DPRWE6fEbNE/WjR1Y9Hw5GbWoGEg+c5Bfpk715gjvBTTqic 7A+qYqjDAK+/5OR/qSY6H+uVqqWZgLOKVeZ9TEG5mY08vLLeaGjr2zJPQnvt8BFA3zJf e8/VUrcJKxuuRc15A5difpTpVfe+83IwPSsY+4BPe6thRD6HlQd7V4Bi92/ilt2vbymt ZsaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686962641; x=1689554641; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9mU9/r2NP5pdyOYwI4LQnZTUP7KdrI2cN021yOGtwio=; b=Q7OAv1IMQeePfBi703xvIQTMtyjpAKV5WHa0nSOlApBc3+5rgYgz5/K4IU1lYGusv9 hd7k3aq5oo/6XXx78eLR3PXsD4HzsjFlaf8vwbT4fGhPNy0tCVNkK5UXRT/f6Xv09YTW yKeLgfGMOhS1ZnCamRwfzwxj0zh0NY57S8ItLLm5CpPn+2ocL7sbxKrKhgNENExiUPbb JkVu/ujOwvOCWnu92OCO2CNQ17fYiGRvQe9AdqiACqF0fW0M/SEAjDr8mfV3puldEyi4 PGH9dQ30Zlbd+5UDHFtNdl8ZqRPl2AqJw4lur+1Wusg9AQjQTD6YYTvJwiyJJ0OC5Ghq VNGA== X-Gm-Message-State: AC+VfDyFaIG1Ga5zAOpXbT3vDUeIu3jpiIyjpUnV0tZb+08ewVI2Lj3Q IxOtub3/iAWaxmIY5ZkdJ8e5ATTNlIvyr7YC8+jMZg== X-Google-Smtp-Source: ACHHUZ4/NJzvy9Ymi1RNhlhOYdBvrKxBA5Ui0VN9jETqQpt1BUY1v2MlEH0NcxHdO2ACnkRNIFfmnw== X-Received: by 2002:a05:6512:3125:b0:4f8:5864:3cb5 with SMTP id p5-20020a056512312500b004f858643cb5mr2067503lfd.13.1686962640709; Fri, 16 Jun 2023 17:44:00 -0700 (PDT) Received: from [192.168.1.212] ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id q16-20020ac25290000000b004f85cf6416asm147300lfm.118.2023.06.16.17.43.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Jun 2023 17:44:00 -0700 (PDT) Message-ID: <6c91dfd9-50b1-7196-9191-c7dbf1ec4ed2@linaro.org> Date: Sat, 17 Jun 2023 03:43:59 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros Content-Language: en-GB To: Akhil P Oommen , Juerg Haefliger Cc: robdclark@gmail.com, quic_abhinavk@quicinc.com, sean@poorly.run, airlied@gmail.com, daniel@ffwll.ch, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, johan+linaro@kernel.org, konrad.dybcio@linaro.org, ribalda@chromium.org, joel@joelfernandes.org References: <20230616122815.1037425-1-juerg.haefliger@canonical.com> From: Dmitry Baryshkov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 16/06/2023 18:55, Akhil P Oommen wrote: > On Fri, Jun 16, 2023 at 02:28:15PM +0200, Juerg Haefliger wrote: >> >> Add missing MODULE_FIRMWARE macros and remove some for firmwares that >> the driver no longer references. >> >> Signed-off-by: Juerg Haefliger >> --- >> drivers/gpu/drm/msm/adreno/adreno_device.c | 23 ++++++++++++++++++---- >> 1 file changed, 19 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c >> index 8cff86e9d35c..9f70d7c1a72a 100644 >> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c >> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c >> @@ -364,17 +364,32 @@ MODULE_FIRMWARE("qcom/a330_pm4.fw"); >> MODULE_FIRMWARE("qcom/a330_pfp.fw"); >> MODULE_FIRMWARE("qcom/a420_pm4.fw"); >> MODULE_FIRMWARE("qcom/a420_pfp.fw"); >> +MODULE_FIRMWARE("qcom/a506_zap.mdt"); >> +MODULE_FIRMWARE("qcom/a508_zap.mdt"); >> +MODULE_FIRMWARE("qcom/a512_zap.mdt"); >> MODULE_FIRMWARE("qcom/a530_pm4.fw"); >> MODULE_FIRMWARE("qcom/a530_pfp.fw"); >> MODULE_FIRMWARE("qcom/a530v3_gpmu.fw2"); >> MODULE_FIRMWARE("qcom/a530_zap.mdt"); >> -MODULE_FIRMWARE("qcom/a530_zap.b00"); >> -MODULE_FIRMWARE("qcom/a530_zap.b01"); >> -MODULE_FIRMWARE("qcom/a530_zap.b02"); > Why are these not required when "qcom/a530_zap.mdt" is present? > > mdt & b0* binaries are different partitions of the same secure > firmware. Even though we specify only the .mdt file here, the PIL driver > will load the *.b0* file automatically. OTOH, "*.mbn" is a standalone > unified binary format. > > If the requirement is to ensure that all necessary firmwares are part of > your distribution, you should include the *.b0* files too here. I'd say, we should drop all zap files from this list. Linux-firmware does not provide files with such names. The zap file name depends on the SoC and the platform name. Juerg, could you please split the patch into two parts: - pfp/pm4/sqe firmware names (which can be merged pretty quickly, as there is no controversy) and zap files changes (after we finish discussion in this thread). > > -Akhil > >> +MODULE_FIRMWARE("qcom/a540_gpmu.fw2"); >> +MODULE_FIRMWARE("qcom/a540_zap.mdt"); >> +MODULE_FIRMWARE("qcom/a615_zap.mdt"); >> MODULE_FIRMWARE("qcom/a619_gmu.bin"); >> MODULE_FIRMWARE("qcom/a630_sqe.fw"); >> MODULE_FIRMWARE("qcom/a630_gmu.bin"); >> -MODULE_FIRMWARE("qcom/a630_zap.mbn"); >> +MODULE_FIRMWARE("qcom/a630_zap.mdt"); >> +MODULE_FIRMWARE("qcom/a640_gmu.bin"); >> +MODULE_FIRMWARE("qcom/a640_zap.mdt"); >> +MODULE_FIRMWARE("qcom/a650_gmu.bin"); >> +MODULE_FIRMWARE("qcom/a650_sqe.fw"); >> +MODULE_FIRMWARE("qcom/a650_zap.mdt"); >> +MODULE_FIRMWARE("qcom/a660_gmu.bin"); >> +MODULE_FIRMWARE("qcom/a660_sqe.fw"); >> +MODULE_FIRMWARE("qcom/a660_zap.mdt"); >> +MODULE_FIRMWARE("qcom/leia_pfp_470.fw"); >> +MODULE_FIRMWARE("qcom/leia_pm4_470.fw"); >> +MODULE_FIRMWARE("qcom/yamato_pfp.fw"); >> +MODULE_FIRMWARE("qcom/yamato_pm4.fw"); >> >> static inline bool _rev_match(uint8_t entry, uint8_t id) >> { >> -- >> 2.37.2 >> -- With best wishes Dmitry