From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by mx.groups.io with SMTP id smtpd.web10.3199.1571059528144056846 for ; Mon, 14 Oct 2019 06:25:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=GrVoKzj5; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.208.179, mailfrom: mw@semihalf.com) Received: by mail-lj1-f179.google.com with SMTP id l21so16655174lje.4 for ; Mon, 14 Oct 2019 06:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=4JfGnE/6KosalTE3s4VtBp5WqUpCQXf9klTDdhP7CII=; b=GrVoKzj5sNvh3Vmh0PQsrBxDJMhTBKNlGDklS5gxFfoOMlFPvKAuQHkB5e1itM01xs V1ibuMXbNQsxIy6f9g3x6lhQmlxbyxKKb2al7YRO2pBwx+/HmfG17DDGNZk+mvM3rrZ2 9/+BhmEWlNPIpBzh2TwT48MsBZHBmITi+O+NXcDef5QxrH+aPODOeb9er9Fz1csNGlZ2 IF5OXfWFbxNIGO5zz79Wh94HX3myr6i+Gr+vjKIysVDjxFHKJ1LAfh7Q7esn26YtQFly 5Alj0VlqhGgblXA8o1VZpLSlk2cPIvQ/ivFhzaFjZLjZHDYkujJDn1n/p0ThXJesGeje axgg== 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; bh=4JfGnE/6KosalTE3s4VtBp5WqUpCQXf9klTDdhP7CII=; b=nGRl9Veqp0/C6JuwkYpxWextGwpVXHoy4VIcOOdF5fTIudMOhnibd4PCluTuB7jmLI yCEVNJ33JGNVOip993hMlG324Ii45R/36hyrXbBzaA2lmXQwtw4hvJB2zjlie3WU4X8e CYACqU3//GvIKGRwmQ/1FnWFCSEWTvn4FfOfQJBxenzrfpAs4P4nxNq0eaC+KB0A8qV+ oHwEvOUzduoS003ed7zJbCvB2NE99b325VAAx1fgUc3M6gjwlQu5GyBNmZoYFX4CwJwL VzivNImvhNRpeghdUdvxycW+YcUuJss5fq0zGfjPZIzHS+ZgdkF4zBDsYDcwP28hiFkJ WfiA== X-Gm-Message-State: APjAAAVBYmRc2gQHZL1HtVGzf3dDTkxSwJp/8PSIr4Ow0XzNJbfjeC55 ftth7GX+gFdvhbizzyY+PniYQ6cp72aDiw== X-Google-Smtp-Source: APXvYqxyBhLZbYneSXFEgLldEwLcaV0pm4YYXKqe6KBa6PPkrTLRa0nLHu/3TmTatkJrlASf56m/CQ== X-Received: by 2002:a2e:6a04:: with SMTP id f4mr18569026ljc.97.1571059525945; Mon, 14 Oct 2019 06:25:25 -0700 (PDT) Return-Path: Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id 207sm4942583lfn.0.2019.10.14.06.25.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Oct 2019 06:25:25 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com, Patryk Duda Subject: [edk2-platforms: PATCH v5 8/9] Marvell/Drivers: SmbiosPlatformDxe: Load SMBIOS strings from PCD Date: Mon, 14 Oct 2019 15:25:04 +0200 Message-Id: <1571059504-26793-1-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 From: Patryk Duda This patch implements convenient way of changing strings included in SMBIOS Table1, Table2, Table3. Strings can be altered by defining following PCDs: gMarvellTokenSpaceGuid.PcdProductManufacturer gMarvellTokenSpaceGuid.PcdProductPlatformName gMarvellTokenSpaceGuid.PcdProductSerial gMarvellTokenSpaceGuid.PcdProductVersion Signed-off-by: Patryk Duda --- Changelog: v4->v5 * Cast PCD strings as 'CONST CHAR *' The updated branch with entire patchset was pushed to the github: https://github.com/MarvellEmbeddedProcessors/edk2-open-platform/commits/cn913x-upstream-r20191014 Silicon/Marvell/Marvell.dec | 6 ++++++ Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 4 ++++ Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 22 ++++++++++---------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Silicon/Marvell/Marvell.dec b/Silicon/Marvell/Marvell.dec index d337d3e..cdf8154 100644 --- a/Silicon/Marvell/Marvell.dec +++ b/Silicon/Marvell/Marvell.dec @@ -169,6 +169,12 @@ gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x0 }|VOID*|0x3000034 gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x0 }|VOID*|0x3000035 +#Platform description + gMarvellTokenSpaceGuid.PcdProductManufacturer|"Marvell"|VOID*|0x50000100 + gMarvellTokenSpaceGuid.PcdProductPlatformName|"Marvell Development Board"|VOID*|0x50000101 + gMarvellTokenSpaceGuid.PcdProductSerial|"Serial Not Set"|VOID*|0x50000103 + gMarvellTokenSpaceGuid.PcdProductVersion|"Revision unknown"|VOID*|0x50000102 + #RTC gMarvellTokenSpaceGuid.PcdRtcBaseAddress|0x0|UINT64|0x40000052 diff --git a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf index 8b4586c..7722146 100644 --- a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf @@ -36,6 +36,10 @@ [FixedPcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision + gMarvellTokenSpaceGuid.PcdProductManufacturer + gMarvellTokenSpaceGuid.PcdProductPlatformName + gMarvellTokenSpaceGuid.PcdProductSerial + gMarvellTokenSpaceGuid.PcdProductVersion [Protocols] gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c index 08f4fa7..3b909f3 100644 --- a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c +++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c @@ -101,10 +101,10 @@ STATIC SMBIOS_TABLE_TYPE1 mArmadaDefaultType1 = { }; STATIC CHAR8 CONST *mArmadaDefaultType1Strings[] = { - "Marvell \0",/* Manufacturer */ - "Armada 7k/8k Family Board \0",/* Product Name placeholder*/ - "Revision unknown \0",/* Version placeholder */ - " \0",/* 32 character buffer */ + (CHAR8 CONST *)PcdGetPtr (PcdProductManufacturer), + (CHAR8 CONST *)PcdGetPtr (PcdProductPlatformName), + (CHAR8 CONST *)PcdGetPtr (PcdProductVersion), + (CHAR8 CONST *)PcdGetPtr (PcdProductSerial), NULL }; @@ -129,10 +129,10 @@ STATIC SMBIOS_TABLE_TYPE2 mArmadaDefaultType2 = { }; STATIC CHAR8 CONST *mArmadaDefaultType2Strings[] = { - "Marvell \0",/* Manufacturer */ - "Armada 7k/8k Family Board \0",/* Product Name placeholder*/ - "Revision unknown \0",/* Version placeholder */ - "Serial Not Set \0",/* Serial */ + (CHAR8 CONST *)PcdGetPtr (PcdProductManufacturer), + (CHAR8 CONST *)PcdGetPtr (PcdProductPlatformName), + (CHAR8 CONST *)PcdGetPtr (PcdProductVersion), + (CHAR8 CONST *)PcdGetPtr (PcdProductSerial), "Base of Chassis \0",/* Board location */ NULL }; @@ -160,9 +160,9 @@ STATIC SMBIOS_TABLE_TYPE3 mArmadaDefaultType3 = { }; STATIC CHAR8 CONST *mArmadaDefaultType3Strings[] = { - "Marvell \0",/* Manufacturer placeholder */ - "Revision unknown \0",/* Version placeholder */ - "Serial Not Set \0",/* Serial placeholder */ + (CHAR8 CONST *)PcdGetPtr (PcdProductManufacturer), + (CHAR8 CONST *)PcdGetPtr (PcdProductVersion), + (CHAR8 CONST *)PcdGetPtr (PcdProductSerial), NULL }; -- 2.7.4