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=-9.4 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,HTTPS_HTTP_MISMATCH, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_HTML_MOSTLY, PDS_BAD_THREAD_QP_64,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 4D3DFC433B4 for ; Wed, 28 Apr 2021 10:38:31 +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 D3D3C613CA for ; Wed, 28 Apr 2021 10:38:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3D3C613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA2186E08E; Wed, 28 Apr 2021 10:38:29 +0000 (UTC) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2057.outbound.protection.outlook.com [40.107.244.57]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB86C6E08E for ; Wed, 28 Apr 2021 10:38:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n7UVDSmbN+Zu+E4/mG9YLS5cZTR4oQ8tarMSNC1EOjNBnz0mzsFHUhAh7zk2OYj+IrKhnIy3ly4MQlWAZs1m3FYwcsLivGQ7q2zgWb7E8OcnK7lVKL9JlPO1++a2rsqCyWwngjUFCdvGYQ9cchtC/r4Qy6Y1YwHTjjDUFrbb9JD4tHo/qoKV48BkBNz4YOjBxujNwDGuS9gLc7endH2i38x6z0MsqDC3GLukOHZV5X9ZWOETCrw4o+q6wsdUkt3xDmQVaV9yj0ol2+9g5BARsUT1ULW1FagqOQTgdDn6XMtEkaaUGH+TscAebd9uByjzQQwMjJwxg21kh/0dbYWlQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yKxHPjQlks05bjclCc8lKAG5IVafltd1Qa6B+Hmkgsc=; b=VXfBKQ8OlY6QW5BGN+gn10o4/djpw98xfbN9QECdsdNO+uM+hdumcm99BbzUXmgw1Vvk7hHa1PyMeYWWEG+R80fLBW6oazrBqdYmccDV04/7Pe62JgFbQmBZcQ/ewnl7eFf3aWM/o2hHBiXCiVv8Wh3Hql7mfLv95R9fSiNVsNGN5YM2WjwYLtTi9dOclHX9nso73/q/ynl+1cnLoSyui8DAMJOVUICyh7wjM3RsVlIgus8HvegKQ951VNt/bUf9+UQ2YtARERuAMNrdj6WxKAk38ypxnM7gzS4Gr2aUcUX88gzVoSaMuNj1gFOAphxu0vGpDG2+wr/W134v0i/0tA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yKxHPjQlks05bjclCc8lKAG5IVafltd1Qa6B+Hmkgsc=; b=YgziflI3gmpRYp/GTo8W9W6i9f2FFpNSk7NrR3QgY9qsCC3ZuX66GeE/oUDfmAYlX5okMnpeT/M2qsIqJWfuTDJAsJ0rOBenIjieW7rFaXXPTkIsCwVXjUVgBzshNhZom/Ktw81oVgoHEYTBFA5JGStpsb4kbmYvCQddQEag5mU= Received: from DM6PR12MB4170.namprd12.prod.outlook.com (2603:10b6:5:219::20) by DM6PR12MB5021.namprd12.prod.outlook.com (2603:10b6:5:208::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.26; Wed, 28 Apr 2021 10:38:25 +0000 Received: from DM6PR12MB4170.namprd12.prod.outlook.com ([fe80::34da:800b:41ca:19ba]) by DM6PR12MB4170.namprd12.prod.outlook.com ([fe80::34da:800b:41ca:19ba%9]) with mapi id 15.20.4065.027; Wed, 28 Apr 2021 10:38:25 +0000 From: "Gu, JiaWei (Will)" To: =?iso-8859-1?Q?Christian_K=F6nig?= , "Nieto, David M" , "amd-gfx@lists.freedesktop.org" , "StDenis, Tom" Subject: RE: [PATCH] drm/amdgpu: Add vbios info ioctl interface Thread-Topic: [PATCH] drm/amdgpu: Add vbios info ioctl interface Thread-Index: AQHXNyAZxU02AtWA5k2SdU2Ic9ArhqrAgz4AgAACZoCAAAKEgIAA50OAgAehugCAAH0wgP//jWwAgAB6H4CAAAo+sIAAJJbQ Date: Wed, 28 Apr 2021 10:38:25 +0000 Message-ID: References: <20210422023448.24689-1-Jiawei.Gu@amd.com> <84a7de3b-b6a1-2acf-247a-0c93e84db09b@gmail.com> <0C1CB3BD-37DD-4F05-9E6E-2DED8A6CD44B@amd.com> <27103289-b51a-8e4b-ad09-0169829efeb0@gmail.com> <15f3858a-fe68-9e21-37f0-2984c465051d@gmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-Mentions: Tom.StDenis@amd.com X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Enabled=true; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SetDate=2021-04-28T10:38:09Z; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Method=Standard; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Name=Internal Use Only - Unrestricted; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ActionId=50d418cd-3a62-45d6-b076-c471ae9ad658; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ContentBits=1 msip_justification: I confirm the recipients are approved for sharing this content authentication-results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=amd.com; x-originating-ip: [180.167.199.189] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e14ce591-87b7-4040-d32f-08d90a31c0f5 x-ms-traffictypediagnostic: DM6PR12MB5021: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9e6nVcPi4pTDPTTvhfyF4KpKy2/u/cGKLPzupJoMW5wxBq2DAtw2YuihE1WB6OL294dxd4JvMZVwpoMpG3AQTBNoX4R1lSyEvvJsSHk13G+1hM4wz+IF6mDugYSAbPpvKnBMFz3HPUQS+ZtZwZ5bAM/VkPS9y/Itm7SjWt9LgDcO+UsqOjSR9rsAnJ4ekMQ/0KeUVDGu4up9n+xkwX9UuCE6jUv2Z0kly9j06T3KlAE8v80pnU54tNbQeHy9c6KlUDxLP8ASd6LK0tQBxM/C1fFp2yrXSBVVBCqsj/ucDxdlJRqfP8iRvzHpqiqEKnB5DPnIvajLSybHSfA7V30PliMkSrK96RmwKY4/kqp/lMe9wO6nPnelP+Yp26Vr3siJ1RVPkFom7PJxph2v0KfqXyQk8Q0iQM0AI9s/KpCzAFc25KJSf2efRZ84/qzhzKomsa6VDNKnQ0lyH2C/H9pWt6eOqgbGNSuo7mPwyFDS2AP8hUWjdUey5b0WoEQlNxs9HyoAcrU6B4p2Dd+lAajqdW0TXfF2xc6BQGomcnjnIkFpRQ79ZeuvXsaiYYSCyUolNwEvpKsUTt8Nqp39ZBVt+Dk0VaESq/s7QV1rr2aR9XkDjg2zzCjcho1eWu/twDFZ0a4r+ueqT2ZHh2hhHftbbA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR12MB4170.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(136003)(396003)(376002)(39860400002)(66946007)(83380400001)(71200400001)(166002)(76116006)(86362001)(38100700002)(66574015)(186003)(8936002)(52536014)(66556008)(64756008)(9686003)(122000001)(66476007)(55016002)(30864003)(8676002)(26005)(5660300002)(6636002)(4326008)(2940100002)(66446008)(110136005)(316002)(966005)(478600001)(6506007)(7696005)(33656002)(2906002)(53546011)(579004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?iso-8859-1?Q?A+P6EOxz03dPRfQ9uyDGI5zKklMQ8OxDWE3XnH1MaFXGDbbMBMb0EuyHyu?= =?iso-8859-1?Q?W5Blb5ooybTN0dGchHCgPFYoZE3LFTL2EsAS10PjQm2GoneRuJ8i+iarxm?= =?iso-8859-1?Q?lVPsS7zEHc8fzvNwtspQnmdAMzo+QOBa0VgzhoC59bT+ZwhXc4EBciuY56?= =?iso-8859-1?Q?AWy3rYJemIkZrobTS8rpS2hPGhFJkNepvjWgJplUWhUJEal7bQMk7xuaNL?= =?iso-8859-1?Q?oUKH5oI3SsF8VS5nOvUp+0zyPBKGVLwhozKngTnHBjKHusSt/zs/58QeFv?= =?iso-8859-1?Q?/Whq7Kv/d9P3IARMvWadL3/kea6/bi++e2AAPu82cJox18xzmeB1VF6dth?= =?iso-8859-1?Q?zeomcFP6JkgLwTI8mf5z8Ny2n3H+Y2q2/vf7KuSbvOdZhSdQH/g3noJ1QV?= =?iso-8859-1?Q?M9AXJQAT3eKSyeqX5VvJzqRaZgLWjzbH3iRasa/tST967wLFIB5IgYvLYP?= =?iso-8859-1?Q?YhK6c4cvKObkzokSWVPbYxngMBfyxaVbVRn2nt3uqyIa2cWyFYOiQMoUAQ?= =?iso-8859-1?Q?xq8iJ3ulr4epBKlKh3lywLyCsrQHO0WsBTqfIPBVjUJSvNWS3FEEk9G193?= =?iso-8859-1?Q?Udaa469kCkML6MqWGre9/w966f9RCZQUfzVWhjXvqEVqMON2s7W1VN0yeI?= =?iso-8859-1?Q?/54jA6obJ0y2tZLQFy9AQFkeGsuV0Tc24NUmjYJjr+SjlVQc/ooSxFoxj0?= =?iso-8859-1?Q?ffmCrtXgClm03l4RYYUdLKQ0noMg3HC7zuPvF+FmRLGGSJ7MWDHL4rKDGK?= =?iso-8859-1?Q?GSUlURJ06tWuD3GW+bSUbq9EpQa4P8Gc4Vj5sBfOiaHiFlyFPcpaF+SXyn?= =?iso-8859-1?Q?qaiS/DLWG2v0HFiW4fqxCRnyoE6j+ETvmZN77grF4N8rJKjiRCNdEdWfbw?= =?iso-8859-1?Q?pPXHiG0N+xToxlTOcWt2xFku9Nll0kJ404kCTP+ysTZZx6FIud4yQt8GUe?= =?iso-8859-1?Q?z1OKsiGnF9AtJT+TQVuTpwQ1W7lve6lPZlkp3Soq7ZDsv/wwl2+LO6PMgU?= =?iso-8859-1?Q?GJ8QTDKhHxdZX+6iQ6MF2E4pCDXYewrO159Bf0FFgJlZ58NovxQLO6HIDa?= =?iso-8859-1?Q?J4ZLZ8WzmSEUZcPB7sB6f2wsXxpIn86q7DkYZw/3SOqOD4ADrdeslaEP54?= =?iso-8859-1?Q?MVI/zpPHH/zOtioScCFSgVEz+runaaJAA4WDrUrnOttUI03PpA6w9xLhLD?= =?iso-8859-1?Q?Q0eryk5dDStU5XKZgVHhpME1VroazzfWGdNrTxzuiCnKq9mlPBwO4WHNlC?= =?iso-8859-1?Q?OlH+H/kpPzJ2OauRRMwB9MXTVBp5sRqD8JVwZc5ntHj+IYkxTS9RnhiIF1?= =?iso-8859-1?Q?YvrIoEegNJfEPfcSNJhU9QkJHtMHP09Q1xgGSFbgRbFsY8Z0ky+KPJtKRn?= =?iso-8859-1?Q?FOuwbvw/8p?= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB4170.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e14ce591-87b7-4040-d32f-08d90a31c0f5 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Apr 2021 10:38:25.4775 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: /evGfmtmkbjgEIBGA1H/0xfSNfNPEIW17mqbVNTcCOCjvFEakYix+MX4XTDX6oKRvd7fyz0J/1/uEimr45oZ/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB5021 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Deucher, Alexander" Content-Type: multipart/mixed; boundary="===============2088095799==" Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" --===============2088095799== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_DM6PR12MB4170C06A2E0C61C148F0D82BF8409DM6PR12MB4170namp_" --_000_DM6PR12MB4170C06A2E0C61C148F0D82BF8409DM6PR12MB4170namp_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable [AMD Official Use Only - Internal Distribution Only] Hi @StDenis, Tom, We have merged vbios info ioctl patch. Could you help re-merge the UMR side one again if it was reverted before? Thanks in advance! Jiawei From: Gu, JiaWei (Will) Sent: Wednesday, April 28, 2021 4:21 PM To: Christian K=F6nig ; Nieto, David M ; amd-gfx@lists.freedesktop.org Cc: Deucher, Alexander ; StDenis, Tom Subject: RE: [PATCH] drm/amdgpu: Add vbios info ioctl interface [AMD Official Use Only - Internal Distribution Only] Thanks Christian, I amended the commit message and resend the patch out. Please feel free to let me know if message is not clear enough. Best regards, Jiawei From: Christian K=F6nig > Sent: Wednesday, April 28, 2021 3:43 PM To: Nieto, David M >; Gu, J= iaWei (Will) >; amd-gfx@lists.f= reedesktop.org Cc: Deucher, Alexander >; StDenis, Tom > Subject: Re: [PATCH] drm/amdgpu: Add vbios info ioctl interface Yeah, makes sense. Please note that in the commit message. With that feel free to put an Acked-by: Christian K=F6nig on it. Regards, Christian. Am 28.04.21 um 09:25 schrieb Nieto, David M: I think this change may be orthogonal to that. Here we want to provide a wa= y for the user application to get the VBIOS information without having to p= arse the binary... And I agree that we should not have strong dependencies unless the encounte= r buggy VBIOS on the field, but I still think it is useful for the user to = be able to display in a simple way the VBIOS version in their system if the= y happen to encounter an issue. Regards, David From: Christian K=F6nig Date: Wednesday, April 28, 2021 at 12:15 AM To: "Nieto, David M" , "Gu= , JiaWei (Will)" , "amd-gfx@li= sts.freedesktop.org" Cc: "Deucher, Alexander" , "StDenis, Tom" Subject: Re: [PATCH] drm/amdgpu: Add vbios info ioctl interface Well displaying the VBIOS information along with the other firmware in user= space is certainly useful. We should just avoid making strong dependencies on that. Firmware and VBIOS must always be backward compatible and the driver must a= lways work with any released firmware and VBIOS combination. What we can do is to display a warning when we detect and/or old/buggy firm= ware. Regards, Christian. Am 28.04.21 um 08:47 schrieb Nieto, David M: Besides system management, it provides parseable details on the VBIOS versi= on and information. This is useful renderer information as the GPU behavior= depends not only on the driver version but also on the firmwares running o= n the GPU. The AMDGPU_INFO ioctl contains a method to get the versions of the ucode fo= r all the IPs, but for VBIOS, only a way to dump the entire image is provid= ed. While it Is possible to implement the whole logic of VBIOS parsing on u= serspace, it requires the application to have details on the header and tab= le formats to parse the data. Moreover there is no guarantee that the forma= t and header locations will remain constant across ASIC generations, so the= maintainance cost and complexity seems unreasonable. Providing a simple, and stable interface to the application seems to us lik= e a sensible choice. Thanks, David From: amd-gfx on behalf of "Gu, JiaWei (Will)" Date: Thursday, April 22, 2021 at 8:25 PM To: Christian K=F6nig , "amd-gfx@lists.freedesktop.org" Cc: "Deucher, Alexander" , "StDenis, Tom" , "Nieto, David M" Subject: RE: [PATCH] drm/amdgpu: Add vbios info ioctl interface [AMD Official Use Only - Internal Distribution Only] Hi Christian, It will be used by a user space SMI-lib for GPU status query. Hi David, please feel free to correct my statement since I'm not sure I hav= e a view of whole picture. Thanks, Jiawei From: Christian K=F6nig Sent: Thursday, April 22, 2021 9:27 PM To: Gu, JiaWei (Will) ; amd-gf= x@lists.freedesktop.org Cc: Deucher, Alexander ; StDenis, Tom Subject: Re: [PATCH] drm/amdgpu: Add vbios info ioctl interface Is that useful to Vulkan/OpenGL/other clients in any way? Christian. Am 22.04.21 um 15:18 schrieb Gu, JiaWei (Will): CC Tom. On Apr 22, 2021, at 21:09, Gu, JiaWei (Will) wrote: <[v2][umr]add-vbios-info-query.patch> UMR patch which calls this new IOCTL attached. Best regards, Jiawei On Apr 22, 2021, at 10:34, Jiawei Gu wrote: Add AMDGPU_INFO_VBIOS_INFO subquery id for detailed vbios info. Signed-off-by: Jiawei Gu --- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 19 +++ drivers/gpu/drm/amd/amdgpu/atom.c | 158 +++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/atom.h | 11 ++ drivers/gpu/drm/amd/include/atomfirmware.h | 16 ++- include/uapi/drm/amdgpu_drm.h | 15 ++ 5 files changed, 213 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_kms.c index 39ee88d29cca..a20b016b05ab 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -861,6 +861,25 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *da= ta, struct drm_file *filp) min((size_t)size, (size_t)(bios_size= - bios_offset))) ? -EFAULT : 0; } + case AMDGPU_INFO_VBIOS_INFO: { + struct drm_amdgpu_info_vbios vbios_info =3D {}; + struct atom_context *atom_context; + + atom_context =3D adev->mode_info.atom_context; + memcpy(vbios_info.name, atom_context->name, sizeof(atom_c= ontext->name)); + vbios_info.dbdf =3D PCI_DEVID(adev->pdev->bus->number, ad= ev->pdev->devfn); + memcpy(vbios_info.vbios_pn, atom_context->vbios_pn, sizeo= f(atom_context->vbios_pn)); + vbios_info.version =3D atom_context->version; + memcpy(vbios_info.date, atom_context->date, sizeof(atom_c= ontext->date)); + memcpy(vbios_info.serial, adev->serial, sizeof(adev->seri= al)); + vbios_info.dev_id =3D adev->pdev->device; + vbios_info.rev_id =3D adev->pdev->revision; + vbios_info.sub_dev_id =3D atom_context->sub_dev_id; + vbios_info.sub_ved_id =3D atom_context->sub_ved_id; + + return copy_to_user(out, &vbios_info, + min((size_t)size, sizeof(vbios_info))) ?= -EFAULT : 0; + } default: DRM_DEBUG_KMS("Invalid request %d\n", info->vbios_info.type); diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu= /atom.c index 3dcb8b32f48b..0e2f0ea13b40 100644 --- a/drivers/gpu/drm/amd/amdgpu/atom.c +++ b/drivers/gpu/drm/amd/amdgpu/atom.c @@ -31,6 +31,7 @@ #define ATOM_DEBUG +#include "atomfirmware.h" #include "atom.h" #include "atom-names.h" #include "atom-bits.h" @@ -1299,12 +1300,153 @@ static void atom_index_iio(struct atom_context *ct= x, int base) } } +static void atom_get_vbios_name(struct atom_context *ctx) +{ + unsigned char *p_rom; + unsigned char str_num; + unsigned short off_to_vbios_str; + unsigned char *c_ptr; + int name_size; + int i; + + const char *na =3D "--N/A--"; + char *back; + + p_rom =3D ctx->bios; + + str_num =3D *(p_rom + OFFSET_TO_GET_ATOMBIOS_NUMBER_OF_STRINGS); + if (str_num !=3D 0) { + off_to_vbios_str =3D + *(unsigned short *)(p_rom + OFFSET_TO_GET_ATOMBIOS_STRI= NG_START); + + c_ptr =3D (unsigned char *)(p_rom + off_to_vbios_str); + } else { + /* do not know where to find name */ + memcpy(ctx->name, na, 7); + ctx->name[7] =3D 0; + return; + } + + /* + * skip the atombios strings, usually 4 + * 1st is P/N, 2nd is ASIC, 3rd is PCI type, 4th is Memory type + */ + for (i =3D 0; i < str_num; i++) { + while (*c_ptr !=3D 0) + c_ptr++; + c_ptr++; + } + + /* skip the following 2 chars: 0x0D 0x0A */ + c_ptr +=3D 2; + + name_size =3D strnlen(c_ptr, STRLEN_LONG - 1); + memcpy(ctx->name, c_ptr, name_size); + back =3D ctx->name + name_size; + while ((*--back) =3D=3D ' ') + ; + *(back + 1) =3D '\0'; +} + +static void atom_get_vbios_date(struct atom_context *ctx) +{ + unsigned char *p_rom; + unsigned char *date_in_rom; + + p_rom =3D ctx->bios; + + date_in_rom =3D p_rom + OFFSET_TO_VBIOS_DATE; + + ctx->date[0] =3D '2'; + ctx->date[1] =3D '0'; + ctx->date[2] =3D date_in_rom[6]; + ctx->date[3] =3D date_in_rom[7]; + ctx->date[4] =3D '/'; + ctx->date[5] =3D date_in_rom[0]; + ctx->date[6] =3D date_in_rom[1]; + ctx->date[7] =3D '/'; + ctx->date[8] =3D date_in_rom[3]; + ctx->date[9] =3D date_in_rom[4]; + ctx->date[10] =3D ' '; + ctx->date[11] =3D date_in_rom[9]; + ctx->date[12] =3D date_in_rom[10]; + ctx->date[13] =3D date_in_rom[11]; + ctx->date[14] =3D date_in_rom[12]; + ctx->date[15] =3D date_in_rom[13]; + ctx->date[16] =3D '\0'; +} + +static unsigned char *atom_find_str_in_rom(struct atom_context *ctx, char = *str, int start, + int end, int maxlen) +{ + unsigned long str_off; + unsigned char *p_rom; + unsigned short str_len; + + str_off =3D 0; + str_len =3D strnlen(str, maxlen); + p_rom =3D ctx->bios; + + for (; start <=3D end; ++start) { + for (str_off =3D 0; str_off < str_len; ++str_off) { + if (str[str_off] !=3D *(p_rom + start + str_off)) + break; + } + + if (str_off =3D=3D str_len || str[str_off] =3D=3D 0) + return p_rom + start; + } + return NULL; +} + +static void atom_get_vbios_pn(struct atom_context *ctx) +{ + unsigned char *p_rom; + unsigned short off_to_vbios_str; + unsigned char *vbios_str; + int count; + + off_to_vbios_str =3D 0; + p_rom =3D ctx->bios; + + if (*(p_rom + OFFSET_TO_GET_ATOMBIOS_NUMBER_OF_STRINGS) !=3D 0) { + off_to_vbios_str =3D + *(unsigned short *)(p_rom + OFFSET_TO_GET_ATOMBIOS_STRI= NG_START); + + vbios_str =3D (unsigned char *)(p_rom + off_to_vbios_str); + } else { + vbios_str =3D p_rom + OFFSET_TO_VBIOS_PART_NUMBER; + } + + if (*vbios_str =3D=3D 0) { + vbios_str =3D atom_find_str_in_rom(ctx, BIOS_ATOM_PREFIX, 3, 1= 024, 64); + if (vbios_str =3D=3D NULL) + vbios_str +=3D sizeof(BIOS_ATOM_PREFIX) - 1; + } + if (vbios_str !=3D NULL && *vbios_str =3D=3D 0) + vbios_str++; + + if (vbios_str !=3D NULL) { + count =3D 0; + while ((count < BIOS_STRING_LENGTH) && vbios_str[count] >=3D '= ' && + vbios_str[count] <=3D 'z') { + ctx->vbios_pn[count] =3D vbios_str[count]; + count++; + } + + ctx->vbios_pn[count] =3D 0; + } +} + struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios) { int base; struct atom_context *ctx =3D kzalloc(sizeof(struct atom_context), GFP_KERNEL); char *str; + struct _ATOM_ROM_HEADER *atom_rom_header; + struct _ATOM_MASTER_DATA_TABLE *master_table; + struct _ATOM_FIRMWARE_INFO *atom_fw_info; u16 idx; if (!ctx) @@ -1353,6 +1495,22 @@ struct atom_context *amdgpu_atom_parse(struct card_i= nfo *card, void *bios) strlcpy(ctx->vbios_version, str, sizeof(ctx->vbios_version)); } + atom_rom_header =3D (struct _ATOM_ROM_HEADER *)CSTR(base); + ctx->sub_dev_id =3D atom_rom_header->usSubsystemVendorID; + ctx->sub_ved_id =3D atom_rom_header->usSubsystemID; + if (atom_rom_header->usMasterDataTableOffset !=3D 0) { + master_table =3D (struct _ATOM_MASTER_DATA_TABLE *) + CSTR(atom_rom_header->usMasterDataTableOffset); + if (master_table->ListOfDataTables.FirmwareInfo !=3D 0) { + atom_fw_info =3D (struct _ATOM_FIRMWARE_INFO *) + CSTR(master_table->ListOfDataTables.FirmwareInf= o); + ctx->version =3D atom_fw_info->ulFirmwareRevision; + } + } + + atom_get_vbios_name(ctx); + atom_get_vbios_pn(ctx); + atom_get_vbios_date(ctx); return ctx; } diff --git a/drivers/gpu/drm/amd/amdgpu/atom.h b/drivers/gpu/drm/amd/amdgpu= /atom.h index d279759cab47..c729f7ceba4f 100644 --- a/drivers/gpu/drm/amd/amdgpu/atom.h +++ b/drivers/gpu/drm/amd/amdgpu/atom.h @@ -112,6 +112,10 @@ struct drm_device; #define ATOM_IO_SYSIO 2 #define ATOM_IO_IIO 0x80 +#define STRLEN_NORMAL 32 +#define STRLEN_LONG 64 +#define STRLEN_VERYLONG 254 + struct card_info { struct drm_device *dev; void (* reg_write)(struct card_info *, uint32_t, uint32_t); /* fill= ed by driver */ @@ -140,6 +144,13 @@ struct atom_context { uint32_t *scratch; int scratch_size_bytes; char vbios_version[20]; + + uint8_t name[STRLEN_LONG]; + uint8_t vbios_pn[STRLEN_LONG]; + uint32_t version; + uint8_t date[STRLEN_NORMAL]; + uint32_t sub_dev_id; + uint32_t sub_ved_id; }; extern int amdgpu_atom_debug; diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/a= md/include/atomfirmware.h index c77ed38c20fb..3a8e404099b0 100644 --- a/drivers/gpu/drm/amd/include/atomfirmware.h +++ b/drivers/gpu/drm/amd/include/atomfirmware.h @@ -197,6 +197,8 @@ enum atom_dp_vs_preemph_def{ DP_VS_LEVEL0_PREEMPH_LEVEL3 =3D 0x18, }; +#define BIOS_ATOM_PREFIX "ATOMBIOS" +#define BIOS_STRING_LENGTH 43 /* enum atom_string_def{ @@ -209,12 +211,14 @@ atom_bios_string =3D "ATOM" #pragma pack(1) /* BIOS data must use byte aligmen= t*/ enum atombios_image_offset{ -OFFSET_TO_ATOM_ROM_HEADER_POINTER =3D0x00000048, -OFFSET_TO_ATOM_ROM_IMAGE_SIZE =3D0x00000002, -OFFSET_TO_ATOMBIOS_ASIC_BUS_MEM_TYPE =3D0x94, -MAXSIZE_OF_ATOMBIOS_ASIC_BUS_MEM_TYPE =3D20, /*including the termina= tor 0x0!*/ -OFFSET_TO_GET_ATOMBIOS_NUMBER_OF_STRINGS =3D0x2f, -OFFSET_TO_GET_ATOMBIOS_STRING_START =3D0x6e, + OFFSET_TO_ATOM_ROM_HEADER_POINTER =3D 0x00000048, + OFFSET_TO_ATOM_ROM_IMAGE_SIZE =3D 0x00000002, + OFFSET_TO_ATOMBIOS_ASIC_BUS_MEM_TYPE =3D 0x94, + MAXSIZE_OF_ATOMBIOS_ASIC_BUS_MEM_TYPE =3D 20, /*including the term= inator 0x0!*/ + OFFSET_TO_GET_ATOMBIOS_NUMBER_OF_STRINGS =3D 0x2f, + OFFSET_TO_GET_ATOMBIOS_STRING_START =3D 0x6e, + OFFSET_TO_VBIOS_PART_NUMBER =3D 0x80, + OFFSET_TO_VBIOS_DATE =3D 0x50, }; /**************************************************************************= ** diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index 8b832f7458f2..77980445d486 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h @@ -758,6 +758,8 @@ struct drm_amdgpu_cs_chunk_data { #define AMDGPU_INFO_VBIOS_SIZE 0x1 /* Subquery id: Query vbios image */ #define AMDGPU_INFO_VBIOS_IMAGE 0x2 + /* Subquery id: Query vbios info */ + #define AMDGPU_INFO_VBIOS_INFO 0x3 /* Query UVD handles */ #define AMDGPU_INFO_NUM_HANDLES 0x1C /* Query sensor related information */ @@ -951,6 +953,19 @@ struct drm_amdgpu_info_firmware { __u32 feature; }; +struct drm_amdgpu_info_vbios { + __u8 name[64]; + __u32 dbdf; + __u8 vbios_pn[64]; + __u32 version; + __u8 date[32]; + __u8 serial[16]; + __u32 dev_id; + __u32 rev_id; + __u32 sub_dev_id; + __u32 sub_ved_id; +}; + #define AMDGPU_VRAM_TYPE_UNKNOWN 0 #define AMDGPU_VRAM_TYPE_GDDR1 1 #define AMDGPU_VRAM_TYPE_DDR2 2 -- 2.17.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx --_000_DM6PR12MB4170C06A2E0C61C148F0D82BF8409DM6PR12MB4170namp_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

[AMD Official Use Only - I= nternal Distribution Only]

 

Hi @StDenis, Tom,

 

We have merged vbios info ioctl patch.

Could you help re-merge the UMR side one again if it= was reverted before?

 

Thanks in advance!

Jiawei

 

From: Gu, JiaWei (Will)
Sent: Wednesday, April 28, 2021 4:21 PM
To: Christian K=F6nig <ckoenig.leichtzumerken@gmail.com>; Niet= o, David M <David.Nieto@amd.com>; amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; StDenis, T= om <Tom.StDenis@amd.com>
Subject: RE: [PATCH] drm/amdgpu: Add vbios info ioctl interface=

 

[AMD Official Use Only - I= nternal Distribution Only]

 

Thanks Christian,

 

I amended the commit message and resend the patch ou= t.

Please feel free to let me know if message is not cl= ear enough.

 

Best regards,

Jiawei

 

From: Christian K=F6nig <ckoenig.leichtzumerken@gmail.com>
Sent: Wednesday, April 28, 2021 3:43 PM
To: Nieto, David M <David.= Nieto@amd.com>; Gu, JiaWei (Will) <JiaWei.Gu@amd.com>; amd-gfx@lists.freedesktop.= org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; StDenis, Tom <Tom.StDenis@amd.com>
Subject: Re: [PATCH] drm/amdgpu: Add vbios info ioctl interface=

 

Yeah, makes sense. Pl= ease note that in the commit message.

With that feel free to put an Acked-by: Christian K=F6nig <christian.koenig@amd.com> on it.

Regards,
Christian.

Am 28.04.21 um 09:25 schrieb Nieto, David M:

I think this change may be orthogonal to that. Here = we want to provide a way for the user application to get the VBIOS informat= ion without having to parse the binary…

 

And I agree that we should not have strong dependenc= ies unless the encounter buggy VBIOS on the field, but I still think it is = useful for the user to be able to display in a simple way the VBIOS version= in their system if they happen to encounter an issue.

 

Regards,

David

 

From= : Christian K=F6nig <ckoenig.leichtzumer= ken@gmail.com>
Date: Wednesday, April 28, 2021 at 12:15 AM
To: "Nieto, David M" <David.Nieto@amd.com>, "Gu, JiaWei (Will)" <JiaWei.Gu@amd.com>, "amd-gfx@lists.freedesktop.org" <amd-gfx@lists.freedesktop.org>
Cc: "Deucher, Alexander" <Alexander.Deucher@amd.com>, "StDenis, Tom" <Tom.StDenis@amd.com>
Subject: Re: [PATCH] drm/amdgpu: Add vbios info ioctl interface

 

Well displaying the V= BIOS information along with the other firmware in userspace is certainly us= eful.

We should just avoid making strong dependencies on that.

Firmware and VBIOS must always be backward compatible and the driver must a= lways work with any released firmware and VBIOS combination.

What we can do is to display a warning when we detect and/or old/buggy firm= ware.

Regards,
Christian.

Am 28.04.21 um 08:47 schrieb Nieto, David M:

Besides system management, it provides parseable det= ails on the VBIOS version and information. This is useful renderer informat= ion as the GPU behavior depends not only on the driver version but also on = the firmwares running on the GPU.

 

The AMDGPU_INFO ioctl contains a method to get the v= ersions of the ucode for all the IPs, but for VBIOS, only a way to dump the= entire image is provided. While it Is possible to implement the whole logi= c of VBIOS parsing on userspace, it requires the application to have details on the header and table formats t= o parse the data. Moreover there is no guarantee that the format and header= locations will remain constant across ASIC generations, so the maintainanc= e cost and complexity seems unreasonable.

 

Providing a simple, and stable interface to the appl= ication seems to us like a sensible choice.

 

Thanks,

David

 

From= : amd-gfx <amd-gfx-bounce= s@lists.freedesktop.org> on behalf of "Gu, JiaWei (Will)" <JiaWei.Gu@amd.com>
Date: Thursday, April 22, 2021 at 8:25 PM
To: Christian K=F6nig <ckoenig.leichtzumerken@gmail.com>, "amd-gfx@lists.freede= sktop.org" <amd-gfx@lists.freedesk= top.org>
Cc: "Deucher, Alexander" <Alexander.Deucher@amd.com>, "StDenis, Tom" <Tom.StDenis@amd.com>, &qu= ot;Nieto, David M" <David.Nieto@amd.com>
Subject: RE: [PATCH] drm/amdgpu: Add vbios info ioctl interface

 

[AMD Official Use Only - I= nternal Distribution Only]

 

Hi Christian,

It will be used by a user space SMI-lib for GPU stat= us query.

 

Hi David, please feel free to correct my statement s= ince I’m not sure I have a view of whole picture.

 

Thanks,

Jiawei

 

From: Christian K=F6nig <ckoenig.leichtzumerken@gmail.com>
Sent: Thursday, April 22, 2021 9:27 PM
To: Gu, JiaWei (Will) <JiaWe= i.Gu@amd.com>; amd-gfx@lists.freedesktop.= org
Cc: Deucher, Alexander = <Alexander.Deucher@amd.com>; StDenis, Tom <Tom.StDenis@amd.com>
Subject: Re: [PATCH] drm/amdgpu: Add vbios info ioctl interface=

 

Is that useful to Vul= kan/OpenGL/other clients in any way?

Christian.

Am 22.04.21 um 15:18 schrieb Gu, JiaWei (Will):= 

 
CC Tom.
 
On Apr 22, 2021, at 21:09, Gu, JiaWei (Will) <JiaWei.Gu@amd.com> wrote:
 
<[v2][umr]add-vbios-info-query.patch>
UMR patch which calls this new IOCTL attached.
 
Best regards,
Jiawei
 
On Apr 22, 2021, at 10:34, Jiawei Gu <JiaWei.Gu@amd.com> wrote:
 
Add AMDGPU_INFO_VBIOS_INFO subquery id for detailed vbios info.
 
Signed-off-by: Jiawei Gu <Jiaw=
ei.Gu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c    |  19 +=
++
drivers/gpu/drm/amd/amdgpu/atom.c      &=
nbsp;   | 158 +++++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/atom.h      &=
nbsp;   |  11 ++
drivers/gpu/drm/amd/include/atomfirmware.h |  16 ++-

include/uapi/drm/amdgpu_drm.h       =
;       |  15 ++


5 files changed, 213 insertions(+), 6 deletions(-)


 


diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm=
/amd/amdgpu/amdgpu_kms.c


index 39ee88d29cca..a20b016b05ab 100644


--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c


+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c


@@ -861,6 +861,25 @@ int amdgpu_info_ioctl(struct drm_device *dev, voi=
d *data, struct drm_file *filp)


           &nbs=
p;            &=
nbsp;            &nb=
sp; min((size_t)size, (size_t)(bios_size - bios_offset)))


           &nbs=
p;            &=
nbsp;          ? -EFAULT : 0;<=
o:p>


           &nbs=
p; }


+            ca=
se AMDGPU_INFO_VBIOS_INFO: {


+           &nb=
sp;       struct drm_amdgpu_info_vbios vbios_=
info =3D {};


+           &nb=
sp;       struct atom_context *atom_context;<=
o:p>


+


+           &nb=
sp;       atom_context =3D adev->mode_info=
.atom_context;


+            &n=
bsp;    memcpy(vbios_info.name, atom_context->name, sizeo=
f(atom_context->name));


+            &n=
bsp;    vbios_info.dbdf =3D PCI_DEVID(adev->pdev->bus-=
>number, adev->pdev->devfn);


+            &n=
bsp;    memcpy(vbios_info.vbios_pn, atom_context->vbios_p=
n, sizeof(atom_context->vbios_pn));


+            &n=
bsp;    vbios_info.version =3D atom_context->version;


+            &n=
bsp;    memcpy(vbios_info.date, atom_context->date, sizeo=
f(atom_context->date));


+            &n=
bsp;    memcpy(vbios_info.serial, adev->serial, sizeof(ad=
ev->serial));


+            &n=
bsp;    vbios_info.dev_id =3D adev->pdev->device;=



+            &n=
bsp;    vbios_info.rev_id =3D adev->pdev->revision;


+            &n=
bsp;    vbios_info.sub_dev_id =3D atom_context->sub_dev_i=
d;


+            &n=
bsp;    vbios_info.sub_ved_id =3D atom_context->sub_ved_i=
d;


+


+           &nb=
sp;       return copy_to_user(out, &vbios=
_info,


+           &nb=
sp;            =
          min((size_t)size, si=
zeof(vbios_info))) ? -EFAULT : 0;


+            }<=
o:p>


           &nbs=
p; default:


           &nbs=
p;      DRM_DEBUG_KMS("Invalid request %d\n",=



           &nbs=
p;            &=
nbsp;   info->vbios_info.type);


diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/a=
mdgpu/atom.c


index 3dcb8b32f48b..0e2f0ea13b40 100644


--- a/drivers/gpu/drm/amd/amdgpu/atom.c


+++ b/drivers/gpu/drm/amd/amdgpu/atom.c


@@ -31,6 +31,7 @@


 


#define ATOM_DEBUG


 


+#include "atomfirmware.h"


#include "atom.h"


#include "atom-names.h"


#include "atom-bits.h"


@@ -1299,12 +1300,153 @@ static void atom_index_iio(struct atom_contex=
t *ctx, int base)


     }


}


 


+static void atom_get_vbios_name(struct atom_context *ctx)<=
/pre>

+{


+    unsigned char *p_rom;


+    unsigned char str_num;


+    unsigned short off_to_vbios_str;


+    unsigned char *c_ptr;


+    int name_size;


+    int i;


+


+    const char *na =3D "--N/A--";=



+    char *back;


+


+    p_rom =3D ctx->bios;


+


+    str_num =3D *(p_rom + OFFSET_TO_GET_ATOMBIOS_NUMBE=
R_OF_STRINGS);


+    if (str_num !=3D 0) {


+            of=
f_to_vbios_str =3D


+           &nb=
sp;       *(unsigned short *)(p_rom + OFFSET_=
TO_GET_ATOMBIOS_STRING_START);


+


+            c_=
ptr =3D (unsigned char *)(p_rom + off_to_vbios_str);


+    } else {


+            /*=
 do not know where to find name */


+            me=
mcpy(ctx->name, na, 7);


+            ct=
x->name[7] =3D 0;


+            re=
turn;


+    }


+


+    /*


+     * skip the atombios strings, usually 4<=
/o:p>


+     * 1st is P/N, 2nd is ASIC, 3rd is PCI type, =
4th is Memory type


+     */


+    for (i =3D 0; i < str_num; i++) {

+            wh=
ile (*c_ptr !=3D 0)


+           &nb=
sp;       c_ptr++;


+            c_=
ptr++;


+    }


+


+    /* skip the following 2 chars: 0x0D 0x0A */


+    c_ptr +=3D 2;


+


+    name_size =3D strnlen(c_ptr, STRLEN_LONG - 1);


+    memcpy(ctx->name, c_ptr, name_size);=



+    back =3D ctx->name + name_size;

+    while ((*--back) =3D=3D ' ')


+            ;<=
o:p>


+    *(back + 1) =3D '\0';


+}


+


+static void atom_get_vbios_date(struct atom_context *ctx)<=
/pre>

+{


+    unsigned char *p_rom;


+    unsigned char *date_in_rom;


+


+    p_rom =3D ctx->bios;


+


+    date_in_rom =3D p_rom + OFFSET_TO_VBIOS_DATE;=



+


+    ctx->date[0] =3D '2';


+    ctx->date[1] =3D '0';


+    ctx->date[2] =3D date_in_rom[6];

+    ctx->date[3] =3D date_in_rom[7];

+    ctx->date[4] =3D '/';


+    ctx->date[5] =3D date_in_rom[0];

+    ctx->date[6] =3D date_in_rom[1];

+    ctx->date[7] =3D '/';


+    ctx->date[8] =3D date_in_rom[3];

+    ctx->date[9] =3D date_in_rom[4];

+    ctx->date[10] =3D ' ';


+    ctx->date[11] =3D date_in_rom[9];

+    ctx->date[12] =3D date_in_rom[10];

+    ctx->date[13] =3D date_in_rom[11];

+    ctx->date[14] =3D date_in_rom[12];

+    ctx->date[15] =3D date_in_rom[13];

+    ctx->date[16] =3D '\0';


+}


+


+static unsigned char *atom_find_str_in_rom(struct atom_context *ctx, =
char *str, int start,


+           &nb=
sp;            =
             int end=
, int maxlen)


+{


+    unsigned long str_off;


+    unsigned char *p_rom;


+    unsigned short str_len;


+


+    str_off =3D 0;


+    str_len =3D strnlen(str, maxlen);


+    p_rom =3D ctx->bios;


+


+    for (; start <=3D end; ++start) {

+            fo=
r (str_off =3D 0; str_off < str_len; ++str_off) {


+           &nb=
sp;       if (str[str_off] !=3D *(p_rom + sta=
rt + str_off))


+           &nb=
sp;            break;


+            }<=
o:p>


+


+            if=
 (str_off =3D=3D str_len || str[str_off] =3D=3D 0)


+           &nb=
sp;       return p_rom + start;

+    }


+    return NULL;


+}


+


+static void atom_get_vbios_pn(struct atom_context *ctx)

+{


+    unsigned char *p_rom;


+    unsigned short off_to_vbios_str;


+    unsigned char *vbios_str;


+    int count;


+


+    off_to_vbios_str =3D 0;


+    p_rom =3D ctx->bios;


+


+    if (*(p_rom + OFFSET_TO_GET_ATOMBIOS_NUMBER_OF_STR=
INGS) !=3D 0) {


+            of=
f_to_vbios_str =3D


+           &nb=
sp;       *(unsigned short *)(p_rom + OFFSET_=
TO_GET_ATOMBIOS_STRING_START);


+


+            vb=
ios_str =3D (unsigned char *)(p_rom + off_to_vbios_str);


+    } else {


+            vb=
ios_str =3D p_rom + OFFSET_TO_VBIOS_PART_NUMBER;


+    }


+


+    if (*vbios_str =3D=3D 0) {


+            vb=
ios_str =3D atom_find_str_in_rom(ctx, BIOS_ATOM_PREFIX, 3, 1024, 64);<=
/o:p>


+            if=
 (vbios_str =3D=3D NULL)


+           &nb=
sp;       vbios_str +=3D sizeof(BIOS_ATOM_PRE=
FIX) - 1;


+    }


+    if (vbios_str !=3D NULL && *vbios_str =3D=
=3D 0)


+            vb=
ios_str++;


+


+    if (vbios_str !=3D NULL) {


+            co=
unt =3D 0;


+            wh=
ile ((count < BIOS_STRING_LENGTH) && vbios_str[count] >=3D ' =
' &&


+            &n=
bsp;      vbios_str[count] <=3D 'z') {


+            &n=
bsp;    ctx->vbios_pn[count] =3D vbios_str[count];


+           &nb=
sp;       count++;


+            }<=
o:p>


+


+            ct=
x->vbios_pn[count] =3D 0;


+    }


+}


+


struct atom_context *amdgpu_atom_parse(struct card_info *card, void *b=
ios)


{


     int base;


     struct atom_context *ctx =3D


         kzalloc(sizeof(struct atom=
_context), GFP_KERNEL);


     char *str;


+    struct _ATOM_ROM_HEADER *atom_rom_header;


+    struct _ATOM_MASTER_DATA_TABLE *master_table;=



+    struct _ATOM_FIRMWARE_INFO *atom_fw_info;


     u16 idx;


 


     if (!ctx)


@@ -1353,6 +1495,22 @@ struct atom_context *amdgpu_atom_parse(struct c=
ard_info *card, void *bios)


          strlcpy(ctx->vbio=
s_version, str, sizeof(ctx->vbios_version));


     }


 


+    atom_rom_header =3D (struct _ATOM_ROM_HEADER *)CST=
R(base);


+    ctx->sub_dev_id =3D atom_rom_header->usSubsy=
stemVendorID;


+    ctx->sub_ved_id =3D atom_rom_header->usSubsy=
stemID;


+    if (atom_rom_header->usMasterDataTableOffset !=
=3D 0) {


+            ma=
ster_table =3D (struct _ATOM_MASTER_DATA_TABLE *)


+           &nb=
sp;        CSTR(atom_rom_header->usMa=
sterDataTableOffset);


+            if=
 (master_table->ListOfDataTables.FirmwareInfo !=3D 0) {


+           &nb=
sp;       atom_fw_info =3D (struct _ATOM_FIRM=
WARE_INFO *)


+           &nb=
sp;            =
   CSTR(master_table->ListOfDataTables.FirmwareInfo);


+           &nb=
sp;       ctx->version =3D atom_fw_info-&g=
t;ulFirmwareRevision;


+            }<=
o:p>


+    }


+


+    atom_get_vbios_name(ctx);


+    atom_get_vbios_pn(ctx);


+    atom_get_vbios_date(ctx);


 


     return ctx;


}


diff --git a/drivers/gpu/drm/amd/amdgpu/atom.h b/drivers/gpu/drm/amd/a=
mdgpu/atom.h


index d279759cab47..c729f7ceba4f 100644


--- a/drivers/gpu/drm/amd/amdgpu/atom.h


+++ b/drivers/gpu/drm/amd/amdgpu/atom.h


@@ -112,6 +112,10 @@ struct drm_device;


#define ATOM_IO_SYSIO        &=
nbsp;     2


#define ATOM_IO_IIO         0x=
80


 


+#define STRLEN_NORMAL        =
     32


+#define STRLEN_LONG        64=



+#define STRLEN_VERYLONG       &nbs=
p;   254


+


struct card_info {


     struct drm_device *dev;


     void (* reg_write)(struct card_info *, uint32=
_t, uint32_t);   /*  filled by driver */


@@ -140,6 +144,13 @@ struct atom_context {


     uint32_t *scratch;


     int scratch_size_bytes;


     char vbios_version[20];


+


+    uint8_t name[STRLEN_LONG];


+    uint8_t vbios_pn[STRLEN_LONG];


+    uint32_t version;


+    uint8_t date[STRLEN_NORMAL];


+    uint32_t sub_dev_id;


+    uint32_t sub_ved_id;


};


 


extern int amdgpu_atom_debug;


diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/=
drm/amd/include/atomfirmware.h


index c77ed38c20fb..3a8e404099b0 100644


--- a/drivers/gpu/drm/amd/include/atomfirmware.h


+++ b/drivers/gpu/drm/amd/include/atomfirmware.h


@@ -197,6 +197,8 @@ enum atom_dp_vs_preemph_def{


 DP_VS_LEVEL0_PREEMPH_LEVEL3 =3D 0x18,


};


 


+#define BIOS_ATOM_PREFIX   "ATOMBIOS"<=
/pre>

+#define BIOS_STRING_LENGTH 43


 


/*


enum atom_string_def{


@@ -209,12 +211,14 @@ atom_bios_string     &n=
bsp;    =3D "ATOM"


#pragma pack(1)         &=
nbsp;            &nb=
sp;   /* BIOS data must use byte aligment*/


 


enum atombios_image_offset{


-OFFSET_TO_ATOM_ROM_HEADER_POINTER      =
    =3D0x00000048,


-OFFSET_TO_ATOM_ROM_IMAGE_SIZE      &nbs=
p;       =3D0x00000002,


-OFFSET_TO_ATOMBIOS_ASIC_BUS_MEM_TYPE     &nb=
sp; =3D0x94,


-MAXSIZE_OF_ATOMBIOS_ASIC_BUS_MEM_TYPE      =
=3D20,  /*including the terminator 0x0!*/


-OFFSET_TO_GET_ATOMBIOS_NUMBER_OF_STRINGS   =3D0x2f,


-OFFSET_TO_GET_ATOMBIOS_STRING_START     &nbs=
p;  =3D0x6e,


+  OFFSET_TO_ATOM_ROM_HEADER_POINTER     =
;     =3D 0x00000048,


+  OFFSET_TO_ATOM_ROM_IMAGE_SIZE     &nb=
sp;        =3D 0x00000002,

+  OFFSET_TO_ATOMBIOS_ASIC_BUS_MEM_TYPE    &n=
bsp;  =3D 0x94,


+  MAXSIZE_OF_ATOMBIOS_ASIC_BUS_MEM_TYPE    &=
nbsp; =3D 20,  /*including the terminator 0x0!*/


+  OFFSET_TO_GET_ATOMBIOS_NUMBER_OF_STRINGS   =3D 0x2f,=



+  OFFSET_TO_GET_ATOMBIOS_STRING_START    &nb=
sp;   =3D 0x6e,


+  OFFSET_TO_VBIOS_PART_NUMBER      =
;          =3D 0x80,


+  OFFSET_TO_VBIOS_DATE       =
            &nb=
sp;   =3D 0x50,


};


 


/*********************************************************************=
*******   


diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_d=
rm.h


index 8b832f7458f2..77980445d486 100644


--- a/include/uapi/drm/amdgpu_drm.h


+++ b/include/uapi/drm/amdgpu_drm.h


@@ -758,6 +758,8 @@ struct drm_amdgpu_cs_chunk_data {


     #define AMDGPU_INFO_VBIOS_SIZE  &nb=
sp;          0x1

     /* Subquery id: Query vbios image */


     #define AMDGPU_INFO_VBIOS_IMAGE  &n=
bsp;         0x2


+    /* Subquery id: Query vbios info */

+    #define AMDGPU_INFO_VBIOS_INFO   &n=
bsp;         0x3


/* Query UVD handles */


#define AMDGPU_INFO_NUM_HANDLES      &nb=
sp;            =
 0x1C


/* Query sensor related information */


@@ -951,6 +953,19 @@ struct drm_amdgpu_info_firmware {

     __u32 feature;


};


 


+struct drm_amdgpu_info_vbios {


+    __u8 name[64];


+    __u32 dbdf;


+    __u8 vbios_pn[64];


+    __u32 version;


+    __u8 date[32];


+    __u8 serial[16];


+    __u32 dev_id;


+    __u32 rev_id;


+    __u32 sub_dev_id;


+    __u32 sub_ved_id;


+};


+


#define AMDGPU_VRAM_TYPE_UNKNOWN 0


#define AMDGPU_VRAM_TYPE_GDDR1 1


#define AMDGPU_VRAM_TYPE_DDR2  2


-- 


2.17.1


 


 
 

 

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedes=
ktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx=

 

 

 

--_000_DM6PR12MB4170C06A2E0C61C148F0D82BF8409DM6PR12MB4170namp_-- --===============2088095799== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx --===============2088095799==--