From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.groups.io with SMTP id smtpd.web12.128.1571162842880306915 for ; Tue, 15 Oct 2019 11:07:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=C5TXHo3/; spf=pass (domain: linaro.org, ip: 209.85.221.65, mailfrom: leif.lindholm@linaro.org) Received: by mail-wr1-f65.google.com with SMTP id y18so15544521wrn.5 for ; Tue, 15 Oct 2019 11:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=sMMhL81dhCB2xBJqVheJg83OGDMcF4XxExRMIQfCPdo=; b=C5TXHo3/n8NkfI4aqciwJaXYnFU78Jp7MIyAAc4Ovj4R0EzJauShQ/+CDTAbb3abgj UmCSBw38B87uFiUkIYkppeUd52SVI3h7XTmAGRuWv9ow+AC2R1Ab/aPq+pXyYgd3ncyi i1Y25MltY21BcUd8UWyp9XdWx1UFNts4olpxMrxQq7ecce8nK5Cz3IjlRuDJZTzSyQAP eAFybpgtNG0tAMumd2piFYzVCqN7/AA81IcRDJKDRwk5bLelaWjqRYSCaMvZ20icx43B x+2eOZkDEGZWwEsx+zb79hZdszvco0aJg2NAWLpHnd719PWZR/jL4no1U9pW+GAEFBa4 vWSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=sMMhL81dhCB2xBJqVheJg83OGDMcF4XxExRMIQfCPdo=; b=ijsZD+kx8EEXtU4WJWVRaLe56kj7BBOw+tzm4NV1oLqH1Unb9T8HnOyJmr/hieveHr LzRH41xXBWgkV4EtGjl2A1ZSxlXqHQtRw7ZQ0dyn1J6hJYwm8h9RdL6oRRY4MSbu8FGO rLD/rozZ/xgJWEfbWO0+BNqqBJUAQzR7aq43FVrwN8WqyFBhTRAUAgXBQa2vdEnhCX6g /oPRP7SQ6ThtsZ0K1Irnxo9cm27nCtfKI1zj5eUlv0gjzT9tq0oI4sVBVo559Y4iQdOA j8R60VgwIdCNwwWUkMjxJNP0+bMLPxuxvoRB+PMrADjT0cdNxBh5dW6HKcgdrvCiVKUz 3ZMw== X-Gm-Message-State: APjAAAWPuiVO68rsMiIcickI9wOIvCkl6fK0Df0YzEzlsyCm3Br16fio n828bhq20F3G7AYgGJWL2j3+jQ== X-Google-Smtp-Source: APXvYqwHvtylOg0k5BflBSPVvVAE5pII7PaTb6rgVOlY8y7Km42xCnLKP728vCZVHu+iA6wyFlZ2dA== X-Received: by 2002:adf:a109:: with SMTP id o9mr6993446wro.96.1571162841171; Tue, 15 Oct 2019 11:07:21 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id p85sm10736wme.23.2019.10.15.11.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 11:07:20 -0700 (PDT) Date: Tue, 15 Oct 2019 19:07:18 +0100 From: "Leif Lindholm" To: Marcin Wojtas Cc: devel@edk2.groups.io, ard.biesheuvel@linaro.org, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com, Patryk Duda Subject: Re: [edk2-platforms: PATCH v5 8/9] Marvell/Drivers: SmbiosPlatformDxe: Load SMBIOS strings from PCD Message-ID: <20191015180718.GN25504@bivouac.eciton.net> References: <1571059504-26793-1-git-send-email-mw@semihalf.com> MIME-Version: 1.0 In-Reply-To: <1571059504-26793-1-git-send-email-mw@semihalf.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Oct 14, 2019 at 03:25:04PM +0200, Marcin Wojtas wrote: > 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 Reviewed-by: Leif Lindholm Series pushed as cd022cf92de8..48a95de81ede. Thanks! / Leif > --- > 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 >