From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 49880210D8503 for ; Fri, 15 Jun 2018 03:22:37 -0700 (PDT) Received: by mail-wr0-x242.google.com with SMTP id w7-v6so9393443wrn.6 for ; Fri, 15 Jun 2018 03:22:37 -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=sixsIX/Ylchuc1h/cPbmM5xpeRT/8szT+ijQRNJpQXQ=; b=FnmvdBHNSS+Oy4vsSL/PjnW7cLsD3f8ElSftJCQt5QvDoAxzsoK6bug96/gZPeINAI 79ruXJ9l6TlpvMBeHEdINONJcP3l9DClq0vzwc08UjQeZhEdpsBoe8jTSQnOVABkKpVw JzaPPdVd4z7LY5HY+aqBSleZ1Iof+/wSTF/4o= 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=sixsIX/Ylchuc1h/cPbmM5xpeRT/8szT+ijQRNJpQXQ=; b=HP+ZmurffxwkTKG5NsdPds+5/KiiK53SYqluvRDYQBDF00JiUISnjG34CsvJA8BUnL yW5IM3WhybGo8veBreKZdMMUgZlZU+xe/zXFQyyt5yu8JFuoihCl5RTv7kD1PHvS7INg ttMqQInlfT4tCpt7JDkbO5pLUCCQM1jQWmYtWem9OZysyjyZ3Ok4tQ59YrLqeJiDKS14 EXDL6BpPZzzuQCrMy1KsQx85tPXrZmRY61Za4mPZa6pjvhI5NzEPRbnS1tUK5DcW3su5 CZ6vLCzGcnqxEsBFBwgPC9jM3eDBBU849bR9XCT30T5FOm1eT4gH+fNiW8t8MbR4gT0Z Kdmw== X-Gm-Message-State: APt69E1poZOOB3PtW5PqEfwd83QExNr3LZVBgbf30STifV1FmZGW8ve0 2BwM8acYpf/NqMNlx+xpSE6POw== X-Google-Smtp-Source: ADUXVKIVzYxgiRlCKE8pRezNR8Uw5mvXVhY5PreLNDHdNYdZOwBRE4zL9y6/AhuMzOjWfoLStP6g+A== X-Received: by 2002:adf:8142:: with SMTP id 60-v6mr1081140wrm.192.1529058155837; Fri, 15 Jun 2018 03:22:35 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id d5-v6sm9309418wrp.64.2018.06.15.03.22.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 03:22:34 -0700 (PDT) Date: Fri, 15 Jun 2018 11:22:32 +0100 From: Leif Lindholm To: Chandni Cherukuri Cc: edk2-devel@lists.01.org, ard.biesheuvel@linaro.org Message-ID: <20180615102232.ry2mv4wbbw7kls4g@bivouac.eciton.net> References: <1529042132-29377-1-git-send-email-chandni.cherukuri@arm.com> <1529042132-29377-3-git-send-email-chandni.cherukuri@arm.com> MIME-Version: 1.0 In-Reply-To: <1529042132-29377-3-git-send-email-chandni.cherukuri@arm.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH 2/2] Platform/ARM/Sgi: Pick ACPI tables to install based on platform ID X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 10:22:37 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jun 15, 2018 at 11:25:32AM +0530, Chandni Cherukuri wrote: > Use the platform ID and config ID values from the platform ID > HOB to choose the right set of ACPI tables to be installed. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Chandni Cherukuri > --- > .../ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c | 33 ++++++++++++++++++---- > .../ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf | 2 ++ > Platform/ARM/SgiPkg/Include/SgiPlatform.h | 24 ++++++++++++++-- > Platform/ARM/SgiPkg/SgiPlatform.dsc | 1 + > Platform/ARM/SgiPkg/SgiPlatform.fdf | 1 + > 5 files changed, 53 insertions(+), 8 deletions(-) > > diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c > index edaae5b..d0d5808 100644 > --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c > +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c > @@ -14,6 +14,8 @@ > > #include > #include > +#include > +#include > > EFI_STATUS > InitVirtioBlockIo ( > @@ -28,20 +30,41 @@ ArmSgiPkgEntryPoint ( > ) > { > EFI_STATUS Status; > + VOID *PlatformIdHob; > + SGI_PLATFORM_DESCRIPTOR *HobData; > + UINT32 ConfigId; > + UINT32 PartNum; > > - Status = LocateAndInstallAcpiFromFv (&gSgi575AcpiTablesiFileGuid); > - if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a: Failed to install ACPI tables\n", __FUNCTION__)); > - return Status; > + PlatformIdHob = GetFirstGuidHob (&gArmSgiPlatformIdDescriptorGuid); > + if (PlatformIdHob == NULL) { > + DEBUG ((DEBUG_ERROR, "Platform ID Hob is NULL\n")); HOB > + return EFI_INVALID_PARAMETER; > + } > + > + HobData = (SGI_PLATFORM_DESCRIPTOR *)(GET_GUID_HOB_DATA (PlatformIdHob)); > + > + PartNum = (HobData->PlatformId & SGI_PART_NUM_MASK); > + ConfigId = ((HobData->PlatformId >> SGI_CONFIG_SHIFT) & SGI_CONFIG_MASK); > + > + if ((PartNum == SGI575_PART_NUM) && (ConfigId == SGI575_CONF_NUM)) { > + Status = LocateAndInstallAcpiFromFv (&gSgi575AcpiTablesiFileGuid); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "%a: Failed to install ACPI tables\n", __FUNCTION__)); > + return Status; > + } > + } else { > + DEBUG ((DEBUG_ERROR, "PlatformDxe: Unsupported Platform Id\n")); > + return EFI_UNSUPPORTED; > } > > - Status = EFI_REQUEST_UNLOAD_IMAGE; > if (FeaturePcdGet (PcdVirtioSupported)) { > Status = InitVirtioBlockIo (ImageHandle); > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "%a: Failed to install Virtio Block device\n", > __FUNCTION__)); > } > + } else { > + Status = EFI_REQUEST_UNLOAD_IMAGE; > } > > return Status; > diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf > index 51ad22f..b6b8209 100644 > --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf > +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf > @@ -30,10 +30,12 @@ > > [LibraryClasses] > AcpiLib > + HobLib > UefiDriverEntryPoint > VirtioMmioDeviceLib > > [Guids] > + gArmSgiPlatformIdDescriptorGuid > gSgi575AcpiTablesiFileGuid > > [FeaturePcd] > diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h > index 00ca7e9..756954c 100644 > --- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h > +++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h > @@ -12,8 +12,8 @@ > * > **/ > > -#ifndef __SGI_PLATFORM_H__ > -#define __SGI_PLATFORM_H__ > +#ifndef SGI_PLATFORM_H_ > +#define SGI_PLATFORM_H_ Non-functional change. Please submit as separate change or not at all. / Leif > > /*********************************************************************************** > // Platform Memory Map > @@ -68,4 +68,22 @@ > #define SGI_SYSPH_SYS_REG_FLASH 0x4C > #define SGI_SYSPH_SYS_REG_FLASH_RWEN 0x1 > > -#endif // __SGI_PLATFORM_H__ > +// SGI575_VERSION values > +#define SGI575_CONF_NUM 0x3 > +#define SGI575_PART_NUM 0x783 > + > +#define SGI_CONFIG_MASK 0x0F > +#define SGI_CONFIG_SHIFT 0x1C > +#define SGI_PART_NUM_MASK 0xFFF > + > +//HwConfig DT structure^M > +typedef struct { > + UINT64 *HwConfigDtAddr; > +} SGI_HW_CONFIG_INFO_PPI; > + > +// ARM platform description data. > +typedef struct { > + UINTN PlatformId; > +} SGI_PLATFORM_DESCRIPTOR; > + > +#endif // SGI_PLATFORM_H_ > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc > index a56175e..f571897 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc > +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc > @@ -199,6 +199,7 @@ > > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > } > + Platform/ARM/SgiPkg/Library/SgiPlatformPeiLib/SgiPlatformPeiLib.inf > > # > # DXE > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf > index 17cdf48..05203a8 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf > +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf > @@ -220,6 +220,7 @@ READ_LOCK_STATUS = TRUE > INF MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf > INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf > INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf > + INF Platform/ARM/SgiPkg/Library/SgiPlatformPeiLib/SgiPlatformPeiLib.inf > > FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { > SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { > -- > 2.7.4 >