From patchwork Wed Feb 7 08:22:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 127128 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp242100ljc; Wed, 7 Feb 2018 00:25:58 -0800 (PST) X-Google-Smtp-Source: AH8x22414t5Xw3OGdbEdPTA95kN0n/MjP8BbYKajRdjr1dibZ8mvZj2b86rymycAd2vkbDLdz4p0 X-Received: by 2002:a17:902:5269:: with SMTP id z96-v6mr5330262plh.392.1517991958785; Wed, 07 Feb 2018 00:25:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517991958; cv=none; d=google.com; s=arc-20160816; b=C8K2UBGuE213Nfg1BoYxOuWTodz9a1LEpl9/KwBwepDqelePKEG4tBYFB93CJvWifM CNQQYjfQxxPeDIBrzlrdqOd7M7P88aL71c+rHUg6D0r+iFG19oOaw+KQ1nKLyvGubPI0 4IlOMQuF6Z9LemyvaBWih/2TRIVXOKCGqBSdRPbFS06p2n2wnwsAv6JHD/XuaJjo80Ir RhqVtaH+xwW2sx2aCm4vtqmj40E5RQjJb5WEGXYH4qG6zvIjOBoAKWz1xWrjtAAgvynq aMkBj8ycgBCyh2G5/CMvVrFQq+Z8bAr8JSPGH/63fob4coNHHrQwqwVaghNapvUeqjJx PxXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=nxRJBz2WIHdhRGcfITC6tRNGZzL33+xm0rRJ90hJTz4=; b=AMAI/2cqhz6zDG2AZXedvnDMlzgDvGkeNGBW3yMSXfdkC1fEX9bAP0FJD/UQFwT45k 7hF80WA8CvdrXPWRDeai+vx51ZR93dT3/LEE/Pgn/9WowGiC3AkRilJUi7uSZnVQSZ1y X0XUVODbWTBvXpVDYYyZnysV++WSvVSvjFaPBBMygHgMZbjtNrh/1UbVugTSDQcB7hju s+3NLjQu6mtHoANKGeUsWlb7In0g+a8cXXSxkgUQDAFTQDa7m8ltU9VO6weptqazjN5Q c2s13xa+chSeulcEDlTa9bfvGnpGPeKCFoPdKsDaYhgY0FR58LSGaHKeSRDEIHoFszAr XDfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DG2Z5Wlb; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id i11-v6si759527plr.671.2018.02.07.00.25.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2018 00:25:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DG2Z5Wlb; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8CF1021F0DA79; Wed, 7 Feb 2018 00:20:14 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c01::243; helo=mail-pl0-x243.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl0-x243.google.com (mail-pl0-x243.google.com [IPv6:2607:f8b0:400e:c01::243]) (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 7C48D223972A1 for ; Wed, 7 Feb 2018 00:20:13 -0800 (PST) Received: by mail-pl0-x243.google.com with SMTP id v3so45809plg.3 for ; Wed, 07 Feb 2018 00:25:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nsv04fFWCfcu+Lx1MR+6pQj5FFu41KZAH7SKtQlwvE0=; b=DG2Z5WlbYHDlPAF5FM+OmTcAlfhR2D6MJsx7On6xqI5Gtfuy0Tz2UgMI0jQLwmiOQZ IRDAbQH9OZo4aah4pUNYQS6JnDdYUDiKQm7jpOHKYhwI6CUNrmVbfZY4z5/bftl0160b mhsUqvQCtp96u/EV9pxVuhhnCaw8UWS16oDZE= 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:in-reply-to :references; bh=nsv04fFWCfcu+Lx1MR+6pQj5FFu41KZAH7SKtQlwvE0=; b=FAFnYczY160AX6/rUnL/hBtbcpJBcWmQxB2nXrfRqA5hz21i1kwM6upJR/ua5BdghY D4vvtiJy05z3/motDgezIIw+PNaUNiTlHEYf8gUBe3DSkRCRtloLqmnQPcj4iuagp0Qz t4NnrV/nEvNq0feQi2yQ1+Nea235MTbzInUFu1P5zQ3NQcSwIJqc2u4HEbAioOvfE/fb YlYLxq5NDBzU3Pc9LDDCiqIDuuJPNoNu34jNNCi62593qRN5XOjCM9ltlS9h6TFw8zP0 2bmaa4i2V0Wdahr152sdIS30/9yYT0GQvZW7NImURZ4UZYd06kyuGxwb0of1qipUUo7f NHXg== X-Gm-Message-State: APf1xPAHV/su8tSkMmCrIKA554GC18qcN6YrEJbiKTjCjNOar6belJyd zZwkctrXI35yVDXpIzGZYAvIPg== X-Received: by 2002:a17:902:788c:: with SMTP id q12-v6mr5282806pll.259.1517991956798; Wed, 07 Feb 2018 00:25:56 -0800 (PST) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id k127sm1984999pga.92.2018.02.07.00.25.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Feb 2018 00:25:56 -0800 (PST) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 7 Feb 2018 16:22:47 +0800 Message-Id: <1517991769-5485-14-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1517991769-5485-1-git-send-email-heyi.guo@linaro.org> References: <1517991769-5485-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v4 13/15] Hisilicon/D05/ACPI: Add ITS PXM X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, Heyi Guo , wanghuiqiang@huawei.com, guoheyi@huawei.com, waip23@126.com, mengfanrong@huawei.com, huangdaode@hisilicon.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Add ITS affinity structure in SRAT. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Signed-off-by: Heyi Guo Reviewed-by: Ard Biesheuvel Reviewed-by: Leif Lindholm Reviewed-by: Graeme Gregory --- Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc | 10 ++++++++++ Silicon/Hisilicon/Include/Library/AcpiNextLib.h | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc index b448a29..8ea0c4b 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc @@ -121,6 +121,16 @@ EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE Srat = { EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000003E,0x00000001,0x00000000), //GICC Affinity Processor 62 EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000003F,0x00000001,0x00000000) //GICC Affinity Processor 63 }, + { + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000000, 0x00000000), + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000001, 0x00000001), + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000000, 0x00000002), + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000001, 0x00000003), + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000002, 0x00000004), + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000003, 0x00000005), + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000002, 0x00000006), + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000003, 0x00000007) + }, }; // diff --git a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h index 60f9925..fd05a3b 100644 --- a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h +++ b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h @@ -39,6 +39,13 @@ ACPIProcessorUID, Flags, ClockDomain \ } +#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 \ + } + #define EFI_ACPI_6_1_MEMORY_AFFINITY_STRUCTURE_INIT( \ ProximityDomain, AddressBaseLow, AddressBaseHigh, LengthLow, LengthHigh, Flags) \ { \ @@ -70,12 +77,13 @@ // #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 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_STATIC_RESOURCE_AFFINITY_TABLE; #pragma pack()