From patchwork Thu Jan 18 15:01:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 124984 Delivered-To: patch@linaro.org Received: by 10.80.140.226 with SMTP id r31csp3637134edr; Thu, 18 Jan 2018 07:02:49 -0800 (PST) X-Google-Smtp-Source: ACJfBotIi5cTjSDf0xUyjCoiQ4eKR7+s0IqoCMI+wep8aArASRuY7IfUpqmT0p8rykd2e0pCI4gt X-Received: by 10.99.96.23 with SMTP id u23mr33743134pgb.199.1516287769062; Thu, 18 Jan 2018 07:02:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516287769; cv=none; d=google.com; s=arc-20160816; b=lBknWMMA/WSHOMsfDkH0Ei67czQ5SthBqfWXKx5leJuPu9n/afamu+hF3u4pFnSIpe anh+/2owzCMGzy2+CtEsLk5xBVe4IaSO3XD+3j54NM5nVTlfYDenQS2vwNw2OBCNcHep MtqJJxbpob6JHbK5TAfBsg2B1rsMiO4zjR+fzRHXknAzIeWbXdrX5c9j9fdJ1eLVeR8u 16REfaG62TiwO7I1Y4QmpWFygOEu0RDzKcE/ZRrYgsc8b3afPEGDWd5SXmfQipzZmex0 95Jms8YcLWupgIzFNdbzfx1kfnTM0olmzqisviY5VYYqPyX7EXBaGKNRcTR1/mag9DUq YKBQ== 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=Wyo+DTx30EDQrsUhQIyzQAwOMVR7xGggWKHahtX1eQM=; b=oQMU4O/aPJRHc46DZOlAUlBZiha57h27LHh2JdaHT/PNuKrx76KtmicWO5wwKPJU/G qukbVANoNsipsoGbQCHpEElU09kS3mnAbwpjSRxNV0P6O1paxo4/R89XJCivd2e3s6Kp Qly1NZhDonE4zmzJLxiithaGVczSF3O94xQP47xH+f8/JwKw4AFuMbWoGidrXHWs5yL1 s+KyViNGNYrHnmcaKalfvXZeQkhufJNLFv3OjO6tDPYGdRRlqPnZQWhWfyLgqOTufYm5 7psaBxIS2iQquDkzICsXdJKDzJpwfXvfb2peMUljUK0WU5nm5t5h9UXGLG1h+bje+5sV FMcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MOEP6/Yl; 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 p65si7058162pfg.280.2018.01.18.07.02.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 07:02:49 -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=MOEP6/Yl; 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 CFC492238B584; Thu, 18 Jan 2018 06:57:06 -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:c00::244; helo=mail-pf0-x244.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) (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 233EC2238B582 for ; Thu, 18 Jan 2018 06:57:05 -0800 (PST) Received: by mail-pf0-x244.google.com with SMTP id b25so8497606pfd.9 for ; Thu, 18 Jan 2018 07:02:26 -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=tVhNRW/HU/+F8k69pRqO0YBhRcrjUwVC90Z17TlAXgQ=; b=MOEP6/YlP6NC8zWJsCAnu5qoZNJ4uljwlfzD4tcva/EU7MUTwM/NNC3YM/ytyGd2g6 VexQvBiX3yZ6XOLP3FCe9ea1ZwsBZZxVkEbDAb6XJa25LpkaCmV4prArlAlCaHkvaf7b KSKHMsqi6if5SFGmACatbQk2Sbus3zD8sqP00= 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=tVhNRW/HU/+F8k69pRqO0YBhRcrjUwVC90Z17TlAXgQ=; b=nwj2Z2IKYpsTfjIqRoC/8rO1IAj4dY7p9IVvsk9tJ+XX4znZWWCQroNp4lXoPqFtUm wsVizwwgxev4ZNSHqB30EGD5ZPIIQt1e/Qznkp5kU6CRDystp9DNtxvl7Ixv5QFFSPVi hsamVqUn6ZG4Ou82aL2DGn0qBy2xedn5tKVPSakn0P25txCYZ4AeGYbcjxUSTRvlJQIT oOQSb8bV5Uo2IQxZMIl6IKE5F8QoD3sMiSkw1pOabh4pO7MF3W+sqLPilfVUEeRocZNJ JgpsxFW58FCLhDs8lGYL0TcCT3j8b7KxldiqAmOC+rn1T0kI+IknNYJ5EifSUuk3oy0M lg2w== X-Gm-Message-State: AKGB3mJfBsMmK7olELr98kuPj+2G/DAcqqSJ4NqybO1hvAVxn1JqC2Ns /f+jLijJxTJinYEqVESNGBqysw== X-Received: by 10.99.94.193 with SMTP id s184mr37142167pgb.311.1516287746586; Thu, 18 Jan 2018 07:02:26 -0800 (PST) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j14sm13621815pfh.94.2018.01.18.07.02.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jan 2018 07:02:26 -0800 (PST) From: Ming Huang X-Google-Original-From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 18 Jan 2018 23:01:40 +0800 Message-Id: <1516287703-35516-12-git-send-email-huangming23@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516287703-35516-1-git-send-email-huangming23@huawei.com> References: <1516287703-35516-1-git-send-email-huangming23@huawei.com> Subject: [edk2] [PATCH edk2-platforms v1 11/14] 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, zhangjinsong2@huawei.com, Heyi Guo , wanghuiqiang@huawei.com, guoheyi@huawei.com, waip23@126.com, mengfanrong@huawei.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 --- 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 Reviewed-by: Ard Biesheuvel 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()