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,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 9D841C47082 for ; Mon, 31 May 2021 15:09:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78E62610A1 for ; Mon, 31 May 2021 15:09:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231873AbhEaPKt (ORCPT ); Mon, 31 May 2021 11:10:49 -0400 Received: from so254-9.mailgun.net ([198.61.254.9]:29852 "EHLO so254-9.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233469AbhEaPIV (ORCPT ); Mon, 31 May 2021 11:08:21 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1622473601; h=Content-Transfer-Encoding: Content-Type: In-Reply-To: MIME-Version: Date: Message-ID: From: References: Cc: To: Subject: Sender; bh=FpwCQzbxxmTztD+IGG6UfeVWw9QiTo3NWz7pTi0L4w8=; b=SvQCegpDMhT9x0lSmHH2bgh2GuVjqUKp6SCa73RpcBAE6dXN4rTwXYtl7FJQRR0PegnO760B E3+Cf8Foyyd62gdCH+5M7OpZCwnEoQoOT6FgxKc08jUfJFib3xQBzCBT2HY61+lkKe2toafG LQo3w2WHKznusy0MVZDX0wws8fw= X-Mailgun-Sending-Ip: 198.61.254.9 X-Mailgun-Sid: WyI1MzIzYiIsICJsaW51eC1hcm0tbXNtQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n04.prod.us-west-2.postgun.com with SMTP id 60b4fb6aea2aacd729128620 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 31 May 2021 15:06:18 GMT Sender: akhilpo=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id C289FC4314A; Mon, 31 May 2021 15:06:18 +0000 (UTC) Received: from [192.168.1.105] (unknown [117.210.184.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: akhilpo) by smtp.codeaurora.org (Postfix) with ESMTPSA id 62AFAC433D3; Mon, 31 May 2021 15:06:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 62AFAC433D3 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=fail smtp.mailfrom=akhilpo@codeaurora.org Subject: Re: [PATCH v2 7/8] drm/msm/a6xx: update a6xx_ucode_check_version for a660 To: Jonathan Marek , freedreno@lists.freedesktop.org Cc: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Eric Anholt , Sai Prakash Ranjan , Sharat Masetty , Douglas Anderson , "open list:DRM DRIVER FOR MSM ADRENO GPU" , "open list:DRM DRIVER FOR MSM ADRENO GPU" , open list References: <20210513171431.18632-1-jonathan@marek.ca> <20210513171431.18632-8-jonathan@marek.ca> From: Akhil P Oommen Message-ID: Date: Mon, 31 May 2021 20:36:11 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <20210513171431.18632-8-jonathan@marek.ca> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 5/13/2021 10:44 PM, Jonathan Marek wrote: > Accept all SQE firmware versions for A660. > > Re-organize the function a bit and print an error message for unexpected > GPU IDs instead of failing silently. > > Signed-off-by: Jonathan Marek > --- > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 36 +++++++++++++-------------- > 1 file changed, 17 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > index 3cc23057b11d..ec66a24fc37e 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > @@ -697,6 +697,11 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, > * Targets up to a640 (a618, a630 and a640) need to check for a > * microcode version that is patched to support the whereami opcode or > * one that is new enough to include it by default. > + * > + * a650 tier targets don't need whereami but still need to be > + * equal to or newer than 0.95 for other security fixes > + * > + * a660 targets have all the critical security fixes from the start > */ > if (adreno_is_a618(adreno_gpu) || adreno_is_a630(adreno_gpu) || > adreno_is_a640(adreno_gpu)) { > @@ -720,27 +725,20 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, > DRM_DEV_ERROR(&gpu->pdev->dev, > "a630 SQE ucode is too old. Have version %x need at least %x\n", > buf[0] & 0xfff, 0x190); > - } else { > - /* > - * a650 tier targets don't need whereami but still need to be > - * equal to or newer than 0.95 for other security fixes > - */ > - if (adreno_is_a650(adreno_gpu)) { > - if ((buf[0] & 0xfff) >= 0x095) { > - ret = true; > - goto out; > - } > - > - DRM_DEV_ERROR(&gpu->pdev->dev, > - "a650 SQE ucode is too old. Have version %x need at least %x\n", > - buf[0] & 0xfff, 0x095); > + } else if (adreno_is_a650(adreno_gpu)) { > + if ((buf[0] & 0xfff) >= 0x095) { > + ret = true; > + goto out; > } > > - /* > - * When a660 is added those targets should return true here > - * since those have all the critical security fixes built in > - * from the start > - */ > + DRM_DEV_ERROR(&gpu->pdev->dev, > + "a650 SQE ucode is too old. Have version %x need at least %x\n", > + buf[0] & 0xfff, 0x095); > + } else if (adreno_is_a660(adreno_gpu)) { > + ret = true; > + } else { > + DRM_DEV_ERROR(&gpu->pdev->dev, > + "unknown GPU, add it to a6xx_ucode_check_version()!!\n"); > } > out: > msm_gem_put_vaddr(obj); > Can we squash this patch with the previous one? -Akhil.