From patchwork Fri Jan 26 08:00:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 125924 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp156033ljd; Fri, 26 Jan 2018 00:04:48 -0800 (PST) X-Google-Smtp-Source: AH8x227PmcTMxAR/GMbi/I3eIYR1HX8h14IqNUxLYOjnZXb4/8SeiFoeI9QO3Uwxi3vTKSL8Pcuo X-Received: by 10.99.164.25 with SMTP id c25mr15026307pgf.430.1516953888135; Fri, 26 Jan 2018 00:04:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516953888; cv=none; d=google.com; s=arc-20160816; b=D63xQ2bRE80jqoBwYSZusR/mXKT5gCKY8NMPZj6cJMOZD0fwIi1bfbdg4+B6s3tWaB VBmUQbZFPOs80u6I0g0YRTF4yDgZErbcWvz8KfkmPe7E5Lc0ckCcz6b7pOuKrLg9Kix/ MbSgn2w7xTnUYS6S4uWs54N1ndOsOg5Wrrl2hgnS+a4LfrQKTNy7UR4xop7pxHk7VVoi 2ackqEsWhoCiuVC70AKNrZ0+T/4ObBtsWxwDSEc2QkdzUEUcJzsD2O/bRh/pIFQk9agB p3rZIwm6MNCikl3XD+nPsLQ7YhdZFq0Lw2heGAsu+GQ9hC8GNVeySYXICojRVlqPilnv BHxA== 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=Q7DInzHvGj1DNmi3ywCFpCNE13M02flf8B15u7UNzieh5cTiwhn5OitWMHGhziUf35 9GKhNCwLIzbhm3xFWnF0PgE/VfyuQoBcgF2R8VQnAweTGlHe9z3QsQ0gE1vcGVJbllz2 8+XenWkTv7ynGVElKuLdIrAL3n7vmgUtyMyJ9GHREAYt6awd1hOe/jU/5jJ2aBc+QEPt He4WF5fKFbjT1SJFWoMUncSVF1EB7Hjkbr/aTeqalsMjGvcKXKvJkOrafwT2lApXSpbp qE0QruZ8558jQP3dQ4ryb2RAFgl/SJpYpWbQh6MfbYQFxZeayQ6yz/IdNc/UoPDuLACl pRiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=QAn/+kYI; 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 z21si2682190pgu.773.2018.01.26.00.04.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jan 2018 00:04:48 -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=QAn/+kYI; 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 354F22222C256; Thu, 25 Jan 2018 23:59:17 -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:c05::243; helo=mail-pg0-x243.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::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 892292222C23C for ; Thu, 25 Jan 2018 23:59:15 -0800 (PST) Received: by mail-pg0-x243.google.com with SMTP id m136so6788398pga.12 for ; Fri, 26 Jan 2018 00:04:45 -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=QAn/+kYINfltLbWXJdnNWCPIcw8WHyRqrtht/CAsnH+NHjgD3XiUcff9IkPwJ1m3ew w99sFW25DROXTDv18oTtwDSOHrbde3TSY+T3/n4dwpNRqpjluOdVg1G5B0Mhz01tMUIr glO8YN6fUzZTL9YhozHa0x0KjKjiNqtFD/w+s= 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=Ie2Ijyo9vcRXOdl4vGICy7SsSCDPgAuCzAHFTg887v6b5Kf5mx77KpauSTJa2t3Jam YmVQ9UinJb50BvkKgYwzIlnH2kLrNGCY4fUUkELQe2EbGRKuCogM3tBPyGpDblR71Eha hTj9OXUNhvmLzTRK55BhCDYaSEKRNhFWyuRJAPqjrNcurq3LhhU9T4UKvP+fp6lP0xxU NlsCtsv7r0PsiN/Iyiy9lfQ6yo6Xhk32pftEjNb0Dk1/i3fnFbug3jfE6ou/rS2A8sPl Admf8v7iTvAYFGY/Lam/cqFmlT/HULZCl/k4z1GjImJRMIRgsFPkWFK9cMXpoFee+hmB r3nQ== X-Gm-Message-State: AKwxytfROwBAAHsQWGryVxZTdDrJW9OV9iWM4AWe8qRAAHNGOAeIMaJ2 QrGfMqO36vvj7wxBK5sZ2Vl2yg== X-Received: by 2002:a17:902:bd05:: with SMTP id p5-v6mr13406663pls.250.1516953885624; Fri, 26 Jan 2018 00:04:45 -0800 (PST) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id k71sm18406091pfg.52.2018.01.26.00.04.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Jan 2018 00:04:44 -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: Fri, 26 Jan 2018 16:00:48 +0800 Message-Id: <1516953650-57980-14-git-send-email-huangming23@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516953650-57980-1-git-send-email-huangming23@huawei.com> References: <1516953650-57980-1-git-send-email-huangming23@huawei.com> Subject: [edk2] [PATCH edk2-platforms v2 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, 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 --- 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: Graeme Gregory 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()