Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp12985773rwl; Wed, 4 Jan 2023 01:39:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXsb+uFfyHwDK4CDJBnrHkkMKq+grJe4rp3dUedSM7vN1qSmVu5+fLZcwtpBvGHVZcmDTOyv X-Received: by 2002:a05:6a20:94c3:b0:ad:dcdf:aaad with SMTP id ht3-20020a056a2094c300b000addcdfaaadmr61214804pzb.19.1672825193766; Wed, 04 Jan 2023 01:39:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672825193; cv=none; d=google.com; s=arc-20160816; b=Z9i5aQgxZ5oxY3RypHhcVZ9tWFeQS0BHW5FR6rwUVl3OdCfD7dWeveGRJHnGRv3Yxp wDx8CCyeBcV5x1ctIis06fmZ88gOBfiZ2ukNgC2ucL6iFJcjLms6asyjQlr52GdMKsB/ Td49+Uo/peBvblMHPL/YsN2GXLtFeQbSilk71wkakjKJLHLeajS+/AUP6errGwB1Qbmg FqG/arv2JnSsHdffxSMZPTs1w5FBiP0iZp5PSGCQneS0u8V7UknZrIUg+4fy8btfesjS mT2NVJFo8J2zV7cHZuuT0ZR2NFx+a5eejWVsnhmsFoB+4ZOtippUl3ZOmTwvduxVffvc jtXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=TnVvBp5CvE66t59orsQS+M89VsfZfBWG2ITuei4MwH4=; b=Whau5t1Ax657JGa5WNC99CUt83QhrCmq35Ab026qOGzw/Umbi3Sv9OYSl0bxCBJGXU VayN8e56Nef4/Y6vw/XasguvMWTy1G0+GR7Y+nK46o78hokXbF/qr+JNCgI0Ekg3QvYQ owqejNTvTfX30xEYVvNstYcoXse7h1D41uYWy2euKfaEg3rZ0yoOtVU94pAFx2C6Va8b I3NDFICGFoMTiLotRZqJw2hNLk2v03Go8YhAPwvBMId4vMt8KqnxQKQIfd8U0vqTcNKE s3qJ/7Rs6/OrI+Su52AEf3gXUf9so3xi6li4YH+mjIMxS7+26fpQyE80GUHV1TOBp+xE 3CJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=p022zXGl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n1-20020a63b441000000b0046edbb5b20esi2325162pgu.668.2023.01.04.01.39.46; Wed, 04 Jan 2023 01:39:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=p022zXGl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239215AbjADJiN (ORCPT + 57 others); Wed, 4 Jan 2023 04:38:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238440AbjADJhi (ORCPT ); Wed, 4 Jan 2023 04:37:38 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47DB1D7B for ; Wed, 4 Jan 2023 01:37:36 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id d17so12602689wrs.2 for ; Wed, 04 Jan 2023 01:37:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=TnVvBp5CvE66t59orsQS+M89VsfZfBWG2ITuei4MwH4=; b=p022zXGl7ys+VouK511OJhJu3no9rVMMieW8eJHrFxf2Z3tYJyBf7LKext5MgWIkjT LUHcOGdYze9CNWtax3Q+27HGwn9DEWEdyOHCb8sggooOavU5CRsjJqnp/xyqLec0IUOw 0iw/k0X9iD5zSR1Sv+TMSCwwby/aLF15xrVM5o2hK1fdtMFEliSvtRIc+EuuufhAISuI uAAXnwracH9HTxBWGb2ovPwfzUmEdCOHd9L+rSHD88TTQBd28+4lC3b/BfvKKxfQPRv3 XzaWNtP0IT9h9FImutfBoqAvcC9pFQ0mQyhEVmEzSRSejt1zBalgpkzdh9jkPgWOEKS6 scbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=TnVvBp5CvE66t59orsQS+M89VsfZfBWG2ITuei4MwH4=; b=fiAGeZLJetSwSqpSH729LFpiSnZ287LYvFvQMPQuNu5O1yCUI7tlM6H1skN5irBoMd vRVXAf2A58zE8oqotUVzn10QOagviymMzd7N1QoIiktfzZzh1/sOsbzQRTtdPdG/TOaN F34MevH+/eX9n2lAANT/EutxL/bon/R2xhfyeVNr3pFplYkR402UMz6LvJws0KfL9xEH Vx/k5M0JKBClyv3FLqhP6kkXY1qQwJgYcvEPUqwPKNqDFFlF/M/z3AZMLCkl37PzR6gi U3yQJKsvIiIkqcnb0spdwaFCUs1bdBB1DrY43fet+WLT7KvJ95xWUxiXTZjEl2z2Wm93 fgCw== X-Gm-Message-State: AFqh2kpbFZclN+s3BGQV+a5PX7MjCdVwAoU2ejJXthtY8mEGx195T8Un 9EEasMzmd766YIAab8eE7ek= X-Received: by 2002:a5d:6808:0:b0:272:3a86:29c1 with SMTP id w8-20020a5d6808000000b002723a8629c1mr26678451wru.16.1672825054733; Wed, 04 Jan 2023 01:37:34 -0800 (PST) Received: from [192.168.178.21] (p5b0ea2e7.dip0.t-ipconnect.de. [91.14.162.231]) by smtp.gmail.com with ESMTPSA id f14-20020adfe90e000000b002365730eae8sm33500867wrm.55.2023.01.04.01.37.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Jan 2023 01:37:34 -0800 (PST) Message-ID: Date: Wed, 4 Jan 2023 10:37:31 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v4 05/27] drm/amd: Add a new helper for loading/validating microcode Content-Language: en-US To: "Lazar, Lijo" , Mario Limonciello , Alex Deucher , linux-kernel@vger.kernel.org Cc: "Pan, Xinhui" , Javier Martinez Canillas , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Daniel Vetter , Carlos Soriano Sanchez , David Airlie , christian.koenig@amd.com References: <20230103221852.22813-1-mario.limonciello@amd.com> <20230103221852.22813-6-mario.limonciello@amd.com> <151bb1ab-8b2b-afaf-2976-5f60b756c4ca@amd.com> From: =?UTF-8?Q?Christian_K=c3=b6nig?= In-Reply-To: <151bb1ab-8b2b-afaf-2976-5f60b756c4ca@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,NICE_REPLY_A, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 04.01.23 um 05:53 schrieb Lazar, Lijo: > > > On 1/4/2023 3:48 AM, Mario Limonciello wrote: >> All microcode runs a basic validation after it's been loaded. Each >> IP block as part of init will run both. >> >> Introduce a wrapper for request_firmware and amdgpu_ucode_validate. >> This wrapper will also remap any error codes from request_firmware >> to -ENODEV.  This is so that early_init will fail if firmware couldn't >> be loaded instead of the IP block being disabled. >> >> Signed-off-by: Mario Limonciello >> --- >> v3-v4: >>   * New patch >> --- >>   drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 24 +++++++++++++++++++++++ >>   drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h |  1 + >>   2 files changed, 25 insertions(+) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c >> index eafcddce58d3..8c4a7b09e344 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c >> @@ -1312,3 +1312,27 @@ void amdgpu_ucode_ip_version_decode(struct >> amdgpu_device *adev, int block_type, >>         snprintf(ucode_prefix, len, "%s_%d_%d_%d", ip_name, maj, min, >> rev); >>   } >> + >> +/* >> + * amdgpu_ucode_load - Load and validate amdgpu microcode >> + * >> + * @adev: amdgpu device >> + * @fw: pointer to load firmware to >> + * @fw_name: firmware to load >> + * >> + * This is a helper that will use request_firmware and >> amdgpu_ucode_validate >> + * to load and run basic validation on firmware. If the load fails, >> remap >> + * the error code to -ENODEV, so that early_init functions will fail >> to load. >> + */ >> +int amdgpu_ucode_load(struct amdgpu_device *adev, const struct >> firmware **fw, char *fw_name) > > 'load' also takes a different meaning of loading firmware to ASIC. > Maybe keep it as 'get' and keep another corresponding common 'put' for > release_firmware? get/put are usually used for reference counting, how about sticking with request/release instead? That's used by the underlying functionality as well IIRC. Christian. > > Thanks, > Lijo > >> +{ >> +    int err = request_firmware(fw, fw_name, adev->dev); >> + >> +    if (err) >> +        return -ENODEV; >> +    err = amdgpu_ucode_validate(*fw); >> +    if (err) >> +        dev_dbg(adev->dev, "\"%s\" failed to validate\n", fw_name); >> + >> +    return err; >> +} >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h >> index 552e06929229..b9139fb44506 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h >> @@ -544,6 +544,7 @@ void amdgpu_ucode_print_sdma_hdr(const struct >> common_firmware_header *hdr); >>   void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header >> *hdr); >>   void amdgpu_ucode_print_gpu_info_hdr(const struct >> common_firmware_header *hdr); >>   int amdgpu_ucode_validate(const struct firmware *fw); >> +int amdgpu_ucode_load(struct amdgpu_device *adev, const struct >> firmware **fw, char *fw_name); >>   bool amdgpu_ucode_hdr_version(union amdgpu_firmware_header *hdr, >>                   uint16_t hdr_major, uint16_t hdr_minor);