From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::444; helo=mail-wr1-x444.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (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 47E60210D515D for ; Thu, 2 Aug 2018 10:39:31 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id j5-v6so2938210wrr.8 for ; Thu, 02 Aug 2018 10:39:31 -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=B17pn1kFEVnfhtodl3Da70FRBu7DyW3jamQlbXqxhf8=; b=hvBgJGjqPj02OHYOC5Lj8zAX+HNiAb+GrF7xZbBeLnGVTGlP+S+mhvOtDoUMcKkPr/ C8NGGBUlc8A7OaHl9HK/zdnGFLsuY2/YDafmuNGsCPkzoGBFw/eYtsUfgIQpHckQ8wTD R1rk2LmqPaFTmFHvLe59YDV/oaP2GdccrpC4U= 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=B17pn1kFEVnfhtodl3Da70FRBu7DyW3jamQlbXqxhf8=; b=l0uKRGbSpPXj0NtDGuEfiqCyUFQ1W8+pfA/AMlW1m6jd9SsqVM+lSPgGGm4r/RR9nk DsITFU/V1bY7PSsVxcCzYNoj7DuwpNTf72TBy2m3zV/J6HGFMyHz6GG7vXDtCAHpAImG w9Iiscx2zp/jew0KbYasKfZABiSBzxBb7nR4RYWO1/qj93VZWW9hCFv9kxuHlZ8Vtpgx oxkFMS+7CB8v2bZyygPV6NP9NEhg3kzRnNtE9X+GArCg/xRD5ucfdZZgg+inlo5G0NoX c+kFNyO34RL9r6Vap5RFacSGqQcV74kSEGYPF60DEM4ZvPq67X/eontRJgHobwbSfw1e pihA== X-Gm-Message-State: AOUpUlFufBBOFAMGNbXOpsmPU9+r4nE5FPVrBJA9cSOhAEHT6TBfy9+h CnPnUukEmdx4L9ml0/KzakAmyw== X-Google-Smtp-Source: AAOMgpfiR5/ZmOAIh9YPH+R1IFIjtbOAgJAKMmypru1s+7vpLlyVFI4hBmA0r1oR4XuKXuPUsUEUnQ== X-Received: by 2002:a5d:4f82:: with SMTP id d2-v6mr263125wru.261.1533231569783; Thu, 02 Aug 2018 10:39:29 -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 s2-v6sm33605wrw.52.2018.08.02.10.39.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Aug 2018 10:39:28 -0700 (PDT) Date: Thu, 2 Aug 2018 18:39:27 +0100 From: Leif Lindholm To: Ming Huang Cc: linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org, ard.biesheuvel@linaro.org, guoheyi@huawei.com, wanghuiqiang@huawei.com, huangming23@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, john.garry@huawei.com, xinliang.liu@linaro.org, Heyi Guo Message-ID: <20180802173927.p23w5bjbvvduvbkf@bivouac.eciton.net> References: <20180724070922.63362-1-ming.huang@linaro.org> <20180724070922.63362-9-ming.huang@linaro.org> MIME-Version: 1.0 In-Reply-To: <20180724070922.63362-9-ming.huang@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH edk2-platforms v1 08/38] Silicon/Hisilicon/Acpi: Unify HisiAcipPlatformDxe X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Aug 2018 17:39:31 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jul 24, 2018 at 03:08:52PM +0800, Ming Huang wrote: > The EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE struct is used by > UpdateAcpiTable.c and Srat aslc. The struct may be different > according to chips, so move some macro to PlatformArch.h. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ming Huang > Signed-off-by: Heyi Guo Drop Heyi's Signed-off-by and this one can have: Reviewed-by: Leif Lindholm / Leif > --- > Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c | 2 -- > Silicon/Hisilicon/Hi1610/Include/PlatformArch.h | 6 ++++ > Silicon/Hisilicon/Hi1616/Include/PlatformArch.h | 6 ++++ > Silicon/Hisilicon/Hi1620/Include/PlatformArch.h | 6 ++++ > Silicon/Hisilicon/Include/Library/AcpiNextLib.h | 31 ++++++++++++++------ > 5 files changed, 40 insertions(+), 11 deletions(-) > > diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c > index f5869841dc..54f49977c3 100644 > --- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c > +++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c > @@ -20,8 +20,6 @@ > #include > #include > > -#define CORE_NUM_PER_SOCKET 32 > -#define NODE_IN_SOCKET 2 > #define CORECOUNT(X) ((X) * CORE_NUM_PER_SOCKET) > > STATIC > diff --git a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h > index 45995c5893..f2e931f30b 100644 > --- a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h > +++ b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h > @@ -29,6 +29,12 @@ > // Max NUMA node number for each node type > #define MAX_NUM_PER_TYPE 8 > > +// for acpi > +#define NODE_IN_SOCKET 2 > +#define CORE_NUM_PER_SOCKET 32 > +#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT 10 > +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8 > + > #define S1_BASE 0x40000000000 > > #endif > diff --git a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h > index 45995c5893..f2e931f30b 100644 > --- a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h > +++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h > @@ -29,6 +29,12 @@ > // Max NUMA node number for each node type > #define MAX_NUM_PER_TYPE 8 > > +// for acpi > +#define NODE_IN_SOCKET 2 > +#define CORE_NUM_PER_SOCKET 32 > +#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT 10 > +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8 > + > #define S1_BASE 0x40000000000 > > #endif > diff --git a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h > index 7243a9ec35..2fc1b9219d 100644 > --- a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h > +++ b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h > @@ -30,5 +30,11 @@ > #define MAX_NUM_PER_TYPE 8 > > > +// for acpi > +#define NODE_IN_SOCKET 2 > +#define CORE_NUM_PER_SOCKET 48 > +#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT 16 > +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 1 > + > #endif > > diff --git a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > index fd05a3b960..2abffb65fc 100644 > --- a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > +++ b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > @@ -19,6 +19,21 @@ > #ifndef __ACPI_NEXT_LIB_H__ > #define __ACPI_NEXT_LIB_H__ > > +#include > + > +/// > +/// ITS Affinity Structure Definition > +/// > +#pragma pack(1) > +typedef struct { > + UINT8 Type; > + UINT8 Length; > + UINT32 ProximityDomain; > + UINT16 Reserved; > + UINT32 ItsHwId; > +} EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE; > +#pragma pack() > + > #define EFI_ACPI_6_1_GIC_ITS_INIT(GicITSHwId, GicITSBase) \ > { \ > EFI_ACPI_6_1_GIC_ITS, sizeof (EFI_ACPI_6_1_GIC_ITS_STRUCTURE), EFI_ACPI_RESERVED_WORD, \ > @@ -42,8 +57,8 @@ > #define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT( \ > ProximityDomain, ItsId) \ > { \ > - 4, sizeof (EFI_ACPI_6_2_GIC_ITS_AFFINITY_STRUCTURE), ProximityDomain, \ > - {EFI_ACPI_RESERVED_BYTE, EFI_ACPI_RESERVED_BYTE}, ItsId \ > + 4, sizeof (EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE), ProximityDomain, \ > + EFI_ACPI_RESERVED_WORD, ItsId \ > } > > #define EFI_ACPI_6_1_MEMORY_AFFINITY_STRUCTURE_INIT( \ > @@ -75,15 +90,13 @@ > // Define the number of each table type. > // This is where the table layout is modified. > // > -#define EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT 64 > -#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT 10 > -#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8 > +#define EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT (MAX_SOCKET*CORE_NUM_PER_SOCKET) > > typedef struct { > - EFI_ACPI_6_0_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER Header; > - EFI_ACPI_6_0_MEMORY_AFFINITY_STRUCTURE Memory[EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT]; > - EFI_ACPI_6_0_GICC_AFFINITY_STRUCTURE Gicc[EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT]; > - EFI_ACPI_6_2_GIC_ITS_AFFINITY_STRUCTURE Its[EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT]; > + EFI_ACPI_6_2_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER Header; > + EFI_ACPI_6_2_MEMORY_AFFINITY_STRUCTURE Memory[EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT]; > + EFI_ACPI_6_2_GICC_AFFINITY_STRUCTURE Gicc[EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT]; > + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE Its[EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT]; > } EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE; > > #pragma pack() > -- > 2.17.0 >