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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 7AF52C433B4 for ; Wed, 28 Apr 2021 21:18:21 +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 F1CFC6143D for ; Wed, 28 Apr 2021 21:18:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F1CFC6143D 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 53A236EC42; Wed, 28 Apr 2021 21:18:20 +0000 (UTC) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2070.outbound.protection.outlook.com [40.107.237.70]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3DB836EC42 for ; Wed, 28 Apr 2021 21:18:17 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JYSH4DzXpJjRkMXoBLQ51FJDJyoWYaO9J9hdxbBHBkUABKMUXtgwpT6AULjH63vXs4y+zYhP1qwvuyymPZqrV5P1lJyBVsUyqDj8h10VXXGuBj6Hpo0LPt9h1KMlq7bPJ/ecqJc0Ri7L/Pv6nPPD3dkTmtzzehGfzztaNuZv1mrHXI5y+pZuqoN1YfnXK3PaS1OerfGPLZ+iJbk8Zxy77UfIG+vRyqS3GBnAmYIMqUYyFqFdzlgyvTWJ23hhaq2b99p5AIMihlt4hKnx3KciYa7NsPXPEo7XVfn8jwuchR3gVm7tJ15KgHCDLVhxFB6FhJC8XXWoP4eo30biNt+MdQ== 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=QfZYUbWyk0SCJATiusV4E4o1nGBjp3u4CxDQqZlhpko=; b=Y+EpfSvn6EeF3LjOjPaOG03gPsfUrDzvCck/9SIDqQqzRrgJCChG+TUalqRX7ihjgwJOLpATbveC0EDZx0I4PGViUPyOH2GsyCMEWeQSwaRlw2KLWZAWg9TABhSLKfnWNXuNewXlt4nkM499AbnWhVM923n/BEGNTLv6tNlmfDBfZiVXfAz2yjuU/9ndbpS4mBgVrsTyR7c8haZ/SawW+bQPRaPHsyz3EMj3EgTavP86o7R9EYgcDcdPXU9kUY7QewjJTLJiJqCW3dxX0QKCH0VJfmkb19Sr4p3Ntc3iLm3wPwwteoOkeEkKr9U205D/KZb0xCCCve+4IlEhCMON2w== 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=QfZYUbWyk0SCJATiusV4E4o1nGBjp3u4CxDQqZlhpko=; b=zyzRfRMa0x9omgotoIfEDPDbU5HLiP9v6ZqzCf2c+7FiUPIcM9sc4EvTC6zmoMG89X2/3mjHklEY7HGY6lgFMJV2VoT4Xa2mSk7U8NkuYtRePoIHyXSVHKvghZt9pOphfty+AOC87MosOkVLnY+XoxQa/2eY55Zag5rkRUqjFUI= Received: from DM6PR12MB3547.namprd12.prod.outlook.com (2603:10b6:5:18a::20) by DM5PR12MB1739.namprd12.prod.outlook.com (2603:10b6:3:111::8) 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 21:18:13 +0000 Received: from DM6PR12MB3547.namprd12.prod.outlook.com ([fe80::6c1d:e14b:dc15:7e56]) by DM6PR12MB3547.namprd12.prod.outlook.com ([fe80::6c1d:e14b:dc15:7e56%2]) with mapi id 15.20.4065.027; Wed, 28 Apr 2021 21:18:13 +0000 From: "StDenis, Tom" To: Alex Deucher Subject: Re: [PATCH] drm/amdgpu: Add vbios info ioctl interface Thread-Topic: [PATCH] drm/amdgpu: Add vbios info ioctl interface Thread-Index: AQHXNyAZxU02AtWA5k2SdU2Ic9ArhqrAgz4AgAACZoCAAAKEgIAA50OAgAehugCAAH0wgP//jWwAgAB6H4CAAAo+sIAAJJbQgAAQmTiAAJ2eAIAABs/P Date: Wed, 28 Apr 2021 21:18:13 +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-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_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SetDate=2021-04-28T21:18:13.048Z; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Name=Internal Distribution Only; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ContentBits=0; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Method=Standard; 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: [2607:f2c0:e4c0:b2::8] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f9285799-dc41-4054-d177-08d90a8b21fb x-ms-traffictypediagnostic: DM5PR12MB1739: 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: s9hSAxPDGWrnnlqtk06Ct9BLHfF78Ss4+T9x5+8AyCBwTZS3JqbbjuUpD/gTfqz/w1trNcGU2wMbm6vb+Uxp4qhk6R+7VINdfLART1hxu6fIVYtDqWSyNUPpjeb4svT0f3aTfhaUp5P6JvTF1ctkILX2s90GmhKw0LiafNgBS+FzXsLIlvfWaMxHYXaUjYzv9E5zVRCsJlhhn8f/2ZdgfKFOM+rd7cadqnCDeCJ2KM/Pdqb3ENewI65hH7fSFtGiOtbtYQih5lzRFB2RXo2plq6PJ9KIeNO8hi39A6ITByqteGDZB8ICRSd7AeN7UBEjcUUOnDuOiv+CC7jvLmFLNg7pHi+lDbL3fHM2+Tjcmb7v8wFz55DY83+LGVv/RSqswRwVyzo+2SNlRqByKYbB00tZGp3puxjavDAeyypmC8tE0NGwlvVl4Sxfwb9sHIZeG3u7drp9ggetuhuarTx+QM3OgPkH2kDq4Qiys4tjHoHWbt2vjGh8Rw3ZqdIuxpxmrmT6oHf6slNtyNDm1JsdAyj0szrP0XSlHeU3fG9dmGXVeIg9HhcZK6l1dugfdE48QQ5DsRrIJQQwnLjbUitOCtBDOYqMUw76wbzDX8yLd2rc1+IqChUriqCOvCJN1HtWedX3/SJ/fhxLiaFPeUJL7g== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR12MB3547.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(39860400002)(346002)(376002)(366004)(396003)(53546011)(186003)(2906002)(6916009)(66574015)(8676002)(64756008)(66556008)(66446008)(91956017)(83380400001)(6506007)(66946007)(66476007)(52536014)(54906003)(478600001)(38100700002)(55016002)(86362001)(5660300002)(30864003)(7696005)(9686003)(316002)(966005)(45080400002)(4326008)(71200400001)(122000001)(8936002)(76116006)(33656002)(579004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?Windows-1252?Q?SQ+AsRLELZ8m6BNk28T1ZTD9qHK6u8BHtAKL8eL8lPy+mfthGboIU71u?= =?Windows-1252?Q?PJJSq53wMUKqrrTVuDVI2xNGOkqKYQGdo4+ylEdEU2/9BPi6KMvFp/eX?= =?Windows-1252?Q?wVQV0CWF21PZ8u3OQ0d0IR0iQg/V6WpjDMwmCiYY9PHgE5F9FRKpPq9O?= =?Windows-1252?Q?oeRUQV0i2qXOTwKg1UJe4BeH3UkwlA9RS98A9TE4Dc8ypqp1MhjLLCju?= =?Windows-1252?Q?z1nIkSlmQSz1Nn+6supcZprbgQdUxgITbdgHTKmO2Mkn63tcfoBctI7G?= =?Windows-1252?Q?h1bxeZAVLeIEHgRL9a6FOnTelTAHC2jcE/E3wLmAZBqfyHhkMP/giat/?= =?Windows-1252?Q?EJ0wiSXG7VHeibcmdeTXtEj0bLtu9H0qGj/GB8HzpgSnKRANapvdFf5i?= =?Windows-1252?Q?iGENa9n9hYaXzJ3bOGYHgrQV7ADgoaIN6c8mZQmlqXvat9omgTw1zlOv?= =?Windows-1252?Q?5rWkiPWW/G43kXYu/cYppEPynb3dn+O/0ZDLu+6fiBopXI+4R3lNBE0a?= =?Windows-1252?Q?7lNrDduzLtQvpbcDVpPpKhYX2c0gS6AJiiLOmrdti9upcTIaKuCiDdZA?= =?Windows-1252?Q?7Vu2D2yBzcOCtEMFDQLwQF6ukbdFSmiITcM2YDGv2Rf8PNSL50MvYfbZ?= =?Windows-1252?Q?1naYmhHYXXgQcakw9+UMGoZ8nmOT2gWhhmJPHorlM4PZM7gtegoU3yGP?= =?Windows-1252?Q?hLIWSNbNXUdNHc3Xrcs7jjDrvkF20Xpgtr1lKpNDsBfwJ8KzcvBQuFKS?= =?Windows-1252?Q?Yicr80j4TaFyiNIm414l3Rri6fnnnmmedtirDbzIwU1hXeQx0RNIX6xS?= =?Windows-1252?Q?zUpE5sp+RxwLpBnpPQm6lbJmUhQs1K8nRZVw1RPQkQ0ZZZ1ucHmFzCeP?= =?Windows-1252?Q?FRd6byD+1URWR85XAve7r7daWH+fIVXMn2dZ/JiejuE/9yv2s1qRzrSn?= =?Windows-1252?Q?ZGD577ljV5sUIoXQ7M6vqLD8eiRQLEno363np4Ws28+AW5yYBenXjax2?= =?Windows-1252?Q?p6I1qmT/Q+MIwnR8MKJLxn4OyRABKe93VEISmpdP/2RVi5XY+ecpGhTX?= =?Windows-1252?Q?s6AI2bmYpYb0ODUnepUlEiZ07RshtdrZtoBYQ1dx7/k4ZYRG3kvepYH2?= =?Windows-1252?Q?z7WWT1HGS1/SiJJhO3EbJeFpawv5xQ55WTQRa/LZSNBxoFk9zJYEUKJw?= =?Windows-1252?Q?/uAo+W5k6ENfNuYt2ipMJ+pvkd+l099eCeGWBEyLktZ1j9mil1AgEPiw?= =?Windows-1252?Q?IjhhGFaP4lM8tR3kEV0vcLjRpbaVcDPhbhZ1znGRVUXPAT3znRxDldLP?= =?Windows-1252?Q?Ttkx/aZlSIIl8zToWzedfQrGIFtcgQ2IeheS4Dtj+7nSxKhWKXk1+r4j?= =?Windows-1252?Q?7Q2FT1x2ET3udHGUrbJjJVRcitPxFRw1ckJZhiCi46iUQNeEtW25+QMO?= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3547.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9285799-dc41-4054-d177-08d90a8b21fb X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Apr 2021 21:18:13.4889 (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: XvavXBwDFFMYnNoz3Dzm0dKailaYXynhYI+K02xJ3DRpw5MngjN9QfYWRfQNk/2C8hLh/3jbt0Laz6ZCOTyAog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1739 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" , =?Windows-1252?Q?Christian_K=F6nig?= , "Gu, JiaWei \(Will\)" , "amd-gfx@lists.freedesktop.org" , "Nieto, David M" Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" [AMD Official Use Only - Internal Distribution Only] Done. ________________________________________ From: Alex Deucher Sent: Wednesday, April 28, 2021 16:53 To: StDenis, Tom Cc: Gu, JiaWei (Will); Christian K=F6nig; Nieto, David M; amd-gfx@lists.fre= edesktop.org; Deucher, Alexander Subject: Re: [PATCH] drm/amdgpu: Add vbios info ioctl interface Please revert the patch in umr until the kernel side lands in upstream drm-= next. Alex On Wed, Apr 28, 2021 at 7:30 AM StDenis, Tom wrote: > > [AMD Official Use Only - Internal Distribution Only] > > Hi Will, > > I've merged in your v2 patch last week. If that's still the latest you s= hould be good to go. > > Tom > > ________________________________________ > From: Gu, JiaWei (Will) > Sent: Wednesday, April 28, 2021 06:38 > To: Christian K=F6nig; Nieto, David M; amd-gfx@lists.freedesktop.org; StD= enis, Tom > Cc: Deucher, Alexander > Subject: RE: [PATCH] drm/amdgpu: Add vbios info ioctl interface > > [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,= JiaWei (Will) >; amd-gfx@lists= .freedesktop.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 = way for the user application to get the VBIOS information without having to= parse the binary=85 > > And I agree that we should not have strong dependencies unless the encoun= ter buggy VBIOS on the field, but I still think it is useful for the user t= o be able to display in a simple way the VBIOS version in their system if t= hey 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@= lists.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 us= erspace is certainly useful. > > We should just avoid making strong dependencies on that. > > Firmware and VBIOS must always be backward compatible and the driver must= always work with any released firmware and VBIOS combination. > > What we can do is to display a warning when we detect and/or old/buggy fi= rmware. > > Regards, > Christian. > Am 28.04.21 um 08:47 schrieb Nieto, David M: > Besides system management, it provides parseable details on the VBIOS ver= sion and information. This is useful renderer information as the GPU behavi= or 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 versions of the ucode = for all the IPs, but for VBIOS, only a way to dump the entire image is prov= ided. While it Is possible to implement the whole logic of VBIOS parsing on= userspace, it requires the application to have details on the header and t= able formats to parse the data. Moreover there is no guarantee that the for= mat and header locations will remain constant across ASIC generations, so t= he maintainance cost and complexity seems unreasonable. > > Providing a simple, and stable interface to the application seems to us l= ike 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=92m not sure I= have a view of whole picture. > > Thanks, > Jiawei > > From: Christian K=F6nig > Sent: Thursday, April 22, 2021 9:27 PM > To: Gu, JiaWei (Will) ; amd-= gfx@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/am= d/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 *= data, struct drm_file *filp) > > min((size_t)size, (size_t)(bios_si= ze - 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= _context->name)); > > + vbios_info.dbdf =3D PCI_DEVID(adev->pdev->bus->number, = adev->pdev->devfn); > > + memcpy(vbios_info.vbios_pn, atom_context->vbios_pn, siz= eof(atom_context->vbios_pn)); > > + vbios_info.version =3D atom_context->version; > > + memcpy(vbios_info.date, atom_context->date, sizeof(atom= _context->date)); > > + memcpy(vbios_info.serial, adev->serial, sizeof(adev->se= rial)); > > + 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/amdg= pu/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 *= ctx, 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_ST= RING_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, cha= r *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_ST= RING_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,= 1024, 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= _info *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.FirmwareI= nfo); > > + 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/amdg= pu/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); /* fi= lled 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" > > +#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 aligm= ent*/ > > > > 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 termi= nator 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 te= rminator 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://nam11.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Flists= .freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=3D04%7C01%7CTom.St= Denis%40amd.com%7C2e21345be22a4d33287208d90a87bfba%7C3dd8961fe4884e608e11a8= 2d994e183d%7C0%7C0%7C637552400421234036%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4= wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3D= tpz4dELQMPbVYCGy66Jko8wonptkM%2BWL2zNXxxDxrXQ%3D&reserved=3D0 > > > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://nam11.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Flists= .freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=3D04%7C01%7CTom.St= Denis%40amd.com%7C2e21345be22a4d33287208d90a87bfba%7C3dd8961fe4884e608e11a8= 2d994e183d%7C0%7C0%7C637552400421234036%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4= wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3D= tpz4dELQMPbVYCGy66Jko8wonptkM%2BWL2zNXxxDxrXQ%3D&reserved=3D0 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx