Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2147523pxb; Thu, 11 Feb 2021 05:43:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJxvcjtut7Q7swMR3p7bWjdMQviLT8MycLdpTysbJ3/ylV760TnZ/rNk7lQJBaAFJmeugtX7 X-Received: by 2002:a17:906:488:: with SMTP id f8mr8183876eja.311.1613051032159; Thu, 11 Feb 2021 05:43:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613051032; cv=none; d=google.com; s=arc-20160816; b=QaAvscHGzo5J4uyMLaFVaXi32d0CdEP1WpUQ+O/zJTM15ExYATKNzo5G3G4TmJbOMJ nilSOtFIG7qhB6NGyAj2KVoPGCtX7N205o7UnZwH5V2OzLeVlrD7m1gkCylbORCWbh7l YUaKpdmzT9g3LUYPUO7Ra2bNYgUsABZukL2UQsPgftoA11KVYRwBziCw7jsTbzRAykKu o6xOGdBk+DQN7Q2sT9wz1OmOotV179vr56oaaldMkeRSLhGTYHegGAa/SJQVW3yXEfNc J7SZGy+F+85i+JbVUm2SOHjC+hWd19HZWY4hDJEZcadBPWffqTq/qDc0b7PKvTkVSHo+ TiVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dmarc-filter:sender:dkim-signature; bh=Y/PupSDFI54PfGk5fJZwK971L/Lu0319ZmiSaKec4xM=; b=TTDOUnQuHj//66b3OaXV581ADlThCldJXSfEElOPIEdWWMr5e6nq8SrWVadIdSbYJv YnzQcGv4Nx7IspPP8tNw8TLvcunF9yq8dgcV6qpewOY4Nzm0naoS4lCXZLaHlUKWM/I3 EEisYOSJpDp3vU3HjBWmI+8nxpSvIV00FD4WM9Ppp9mmPxX4kV1KIX4CNsbrhaod4Is8 PNvlcB+fRybVNCsGpBTbul7up7tepMDrqdCdXtFQyWU0JRY/7zVPW87N7bBrzU7FVk7r fjqL7wQs9M1nZbPIEIFayqxuCHMQb4Fj1ZSp/FSElMaU7xqRm+wM/PhKaBTi7PkUSB4Q iyIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b=KiDDtato; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id kl24si3910970ejc.100.2021.02.11.05.43.25; Thu, 11 Feb 2021 05:43:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b=KiDDtato; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231653AbhBKNla (ORCPT + 99 others); Thu, 11 Feb 2021 08:41:30 -0500 Received: from so15.mailgun.net ([198.61.254.15]:32454 "EHLO so15.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231913AbhBKNVd (ORCPT ); Thu, 11 Feb 2021 08:21:33 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1613049666; h=Content-Transfer-Encoding: Content-Type: In-Reply-To: MIME-Version: Date: Message-ID: From: References: Cc: To: Subject: Sender; bh=Y/PupSDFI54PfGk5fJZwK971L/Lu0319ZmiSaKec4xM=; b=KiDDtato9jxyGaU468WnKjn5WUFBLnX1fwqUdGPL8dtbwuTsEsA0QCjH1Bt0LvDNzpsjGwUP A2A65kwz9ogcob9DPa3lJPiVyvS8MUqY11CWw/ftaLq9FTVD2JNWKAyE0Xe8cyLAVTt5kkGG MLgVRp4uPJRMXcM4C+GrxweB/Hg= X-Mailgun-Sending-Ip: 198.61.254.15 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n03.prod.us-west-2.postgun.com with SMTP id 60252f26f112b7872cf19191 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Thu, 11 Feb 2021 13:20:38 GMT Sender: akhilpo=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id DDEDDC433CA; Thu, 11 Feb 2021 13:20:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=ALL_TRUSTED,BAYES_00, NICE_REPLY_A,SPF_FAIL,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from [192.168.1.105] (unknown [117.210.187.64]) (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 00002C433C6; Thu, 11 Feb 2021 13:20:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 00002C433C6 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] drm/msm: a6xx: Make sure the SQE microcode is safe To: Jordan Crouse , linux-arm-msm@vger.kernel.org Cc: Daniel Vetter , David Airlie , Eric Anholt , Jonathan Marek , Rob Clark , Sai Prakash Ranjan , Sean Paul , Sharat Masetty , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20210210005205.783377-1-jcrouse@codeaurora.org> From: Akhil P Oommen Message-ID: <8aa916f9-238a-779c-bcaf-51bfb2b761d2@codeaurora.org> Date: Thu, 11 Feb 2021 18:50:28 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210210005205.783377-1-jcrouse@codeaurora.org> 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-kernel@vger.kernel.org On 2/10/2021 6:22 AM, Jordan Crouse wrote: > Most a6xx targets have security issues that were fixed with new versions > of the microcode(s). Make sure that we are booting with a safe version of > the microcode for the target and print a message and error if not. > > v2: Add more informative error messages and fix typos > > Signed-off-by: Jordan Crouse > --- > > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 77 ++++++++++++++++++++++----- > 1 file changed, 64 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > index ba8e9d3cf0fe..064b7face504 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > @@ -522,28 +522,73 @@ static int a6xx_cp_init(struct msm_gpu *gpu) > return a6xx_idle(gpu, ring) ? 0 : -EINVAL; > } > > -static void a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, > +/* > + * Check that the microcode version is new enough to include several key > + * security fixes. Return true if the ucode is safe. > + */ > +static bool a6xx_ucode_check_version(struct a6xx_gpu *a6xx_gpu, > struct drm_gem_object *obj) > { > + struct adreno_gpu *adreno_gpu = &a6xx_gpu->base; > + struct msm_gpu *gpu = &adreno_gpu->base; > u32 *buf = msm_gem_get_vaddr(obj); > + bool ret = false; > > if (IS_ERR(buf)) > - return; > + return false; > > /* > - * If the lowest nibble is 0xa that is an indication that this microcode > - * has been patched. The actual version is in dword [3] but we only care > - * about the patchlevel which is the lowest nibble of dword [3] > - * > - * Otherwise check that the firmware is greater than or equal to 1.90 > - * which was the first version that had this fix built in > + * 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. > */ > - if (((buf[0] & 0xf) == 0xa) && (buf[2] & 0xf) >= 1) > - a6xx_gpu->has_whereami = true; > - else if ((buf[0] & 0xfff) > 0x190) > - a6xx_gpu->has_whereami = true; > + if (adreno_is_a618(adreno_gpu) || adreno_is_a630(adreno_gpu) || > + adreno_is_a640(adreno_gpu)) { > + /* > + * If the lowest nibble is 0xa that is an indication that this > + * microcode has been patched. The actual version is in dword > + * [3] but we only care about the patchlevel which is the lowest > + * nibble of dword [3] > + * > + * Otherwise check that the firmware is greater than or equal > + * to 1.90 which was the first version that had this fix built > + * in > + */ > + if ((((buf[0] & 0xf) == 0xa) && (buf[2] & 0xf) >= 1) || > + (buf[0] & 0xfff) >= 0x190) { > + a6xx_gpu->has_whereami = true; > + ret = true; > + goto out; > + } > > + 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 1.95 for other security fixes > + */ > + if (adreno_is_a650(adreno_gpu)) { > + if ((buf[0] & 0xfff) >= 0x195) { > + 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, 0x195); > + } > + > + /* > + * When a660 is added those targets should return true here > + * since those have all the critical security fixes built in > + * from the start > + */ Or we can just initialize 'ret' as true. -Akhil > + } > +out: > msm_gem_put_vaddr(obj); > + return ret; > } > > static int a6xx_ucode_init(struct msm_gpu *gpu) > @@ -566,7 +611,13 @@ static int a6xx_ucode_init(struct msm_gpu *gpu) > } > > msm_gem_object_set_name(a6xx_gpu->sqe_bo, "sqefw"); > - a6xx_ucode_check_version(a6xx_gpu, a6xx_gpu->sqe_bo); > + if (!a6xx_ucode_check_version(a6xx_gpu, a6xx_gpu->sqe_bo)) { > + msm_gem_unpin_iova(a6xx_gpu->sqe_bo, gpu->aspace); > + drm_gem_object_put(a6xx_gpu->sqe_bo); > + > + a6xx_gpu->sqe_bo = NULL; > + return -EPERM; > + } > } > > gpu_write64(gpu, REG_A6XX_CP_SQE_INSTR_BASE_LO, >