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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 F2FB4C4338F for ; Sat, 7 Aug 2021 16:26:14 +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 9668960EBC for ; Sat, 7 Aug 2021 16:26:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9668960EBC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 733C289CF7; Sat, 7 Aug 2021 16:26:13 +0000 (UTC) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6173489CE0; Sat, 7 Aug 2021 16:26:10 +0000 (UTC) Received: by mail-pj1-x102a.google.com with SMTP id lw7-20020a17090b1807b029017881cc80b7so1276023pjb.3; Sat, 07 Aug 2021 09:26:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EoZd5bCD6hQUjG2ezN1/qV9+Adnx68YyNczYkEr+W54=; b=OUAgzTqrOCa/ja7X/Q3pwsCmjUGKCTe1R0IQ9AUZNsujvliCU2Zop0xQ2wulgAe0K0 GeBdFpig0gHMECKUXkbi4xpLExGQWsTlx276+2XScB2hptnoNJ/zbeMlAhEz5IroYM9s y5tWxy1pFb6pCN+7TdJQwJECzp5hnQ8F2LAD4SJgM7YogoGr1qoencmT7ih5a5JXiLHQ gV2QdX0BoHf7r/X1pD8oT4ULr0dTr4NI3ge7xlFkhVB6FAJn6DEa8Ar7nvXhkyTePY5x JKqScN9tSmYpbHIFax3cWFGvPdfRDAJmAKc3EYxIXZHuJYNBs/b0iA4O1q634FXvY/Uh 6/Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EoZd5bCD6hQUjG2ezN1/qV9+Adnx68YyNczYkEr+W54=; b=E81D0FoJuyyt3Lz9mWQysntbJUlH4fOuPhpCr3gha+5xsT09Rof0XPY1oZL+gwMv1v xjdeOxxadSK1caaiwRAkvchanmJN0j4UguFfPyHjWqh7okzTqMG1LkdOTdrG6nKNO41V I4m3+hLmt0/EYw/4HZyVXvEGTL+tY9OmejNq34aBxO1tp+TYFAqZabV1yoRe8l3HTfYG 6UKsld2zq2t1w1b8+44PcgoHx2ImTBPZdRtAlomFl2+/HVwC8SF4HUmYtlNX5JNN3zRC xDUM+NRXyU1rLVeCc3U45kexQzte5Xhvm+Pdjxk8KvZKIV3h96oapOzM6b/04WMe2zUf 5rfg== X-Gm-Message-State: AOAM533VdBDARBcKCglZsK+9jBfuWURx57jB+WbmGHEZ8S2DK6YY/CZj dIfCF8UZXFpIgEOZmf4P5FlW5oFl1MKVOA== X-Google-Smtp-Source: ABdhPJxobPiRLfgh2lKypDIM0XSVkzLuoDzXHNbRb2TM01sKb/ba4z99V1pQQjbuCigNxgMu73zU4Q== X-Received: by 2002:a17:90a:2942:: with SMTP id x2mr25799687pjf.95.1628353569520; Sat, 07 Aug 2021 09:26:09 -0700 (PDT) Received: from localhost ([2601:1c0:5200:a6:307:a401:7b76:c6e5]) by smtp.gmail.com with ESMTPSA id d9sm13735881pfv.161.2021.08.07.09.26.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Aug 2021 09:26:07 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Rob Clark , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Akhil P Oommen , Jonathan Marek , Sai Prakash Ranjan , Sharat Masetty , Douglas Anderson , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] drm/msm: Rework SQE version check Date: Sat, 7 Aug 2021 09:30:12 -0700 Message-Id: <20210807163019.379003-2-robdclark@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210807163019.379003-1-robdclark@gmail.com> References: <20210807163019.379003-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark This check is really about which SQE firmware, rather than which GPU. Rework to match minimum version based on firmware name, so it doesn't need to be updated when adding additional GPUs using the same fw. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index be62f492538c..0e8238f58721 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -747,6 +747,7 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, { struct adreno_gpu *adreno_gpu = &a6xx_gpu->base; struct msm_gpu *gpu = &adreno_gpu->base; + const char *sqe_name = adreno_gpu->info->fw[ADRENO_FW_SQE]; u32 *buf = msm_gem_get_vaddr(obj); bool ret = false; @@ -763,8 +764,7 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, * * 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_family(adreno_gpu)) { + if (!strcmp(sqe_name, "a630_sqe.fw")) { /* * If the lowest nibble is 0xa that is an indication that this * microcode has been patched. The actual version is in dword @@ -785,7 +785,7 @@ 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 if (adreno_is_a650(adreno_gpu)) { + } else if (!strcmp(sqe_name, "a650_sqe.fw")) { if ((buf[0] & 0xfff) >= 0x095) { ret = true; goto out; @@ -794,7 +794,7 @@ static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, 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_family(adreno_gpu)) { + } else if (!strcmp(sqe_name, "a660_sqe.fw")) { ret = true; } else { DRM_DEV_ERROR(&gpu->pdev->dev, -- 2.31.1