From patchwork Fri Feb 2 12:05:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 126652 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp576975ljc; Fri, 2 Feb 2018 04:06:35 -0800 (PST) X-Google-Smtp-Source: AH8x2249QXrh9whG7sCr7x3Sr/VP5LErnN1pWnEreCCKQI3hJreo0ONwX9gqsHDn947kjjPyLIzC X-Received: by 10.98.152.208 with SMTP id d77mr4573178pfk.108.1517573194929; Fri, 02 Feb 2018 04:06:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517573194; cv=none; d=google.com; s=arc-20160816; b=x+LqiltYuNJhobsy35bNEli5zQqXty+ZdHHuDsbew2CgJngBTXb8mE9b4QzbXx5yxs epxytCoOj64PbFVWZqUlDG0ZYRbWbuLZqiFpR3ARTIKrKQUtDfeFiF5uoUwtzi8C5HZv 1jPRxU/L4WtV5PHvkCsB2m/hRjynCaO+5b92BLAgsM5P6En6nC9HAZsVmXa6Z9M+T+rD dKpuc3La33CVdlr6S5FLKjrKPYxPr3JtigCsT3hslwRfth7wVorgvjsjegBRFILSM9QE CfqfWNA0GUonWeyucicnxNqN0+5xWRdEvbSmOAKWu2nXzicaIMgmJe7ikrlkg0hDMDz4 e5KA== 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=pJlTnxJwl4JBF/84Br3UFEwlr01xvx7E76zW0Zkbe5U=; b=jWvwmeGQJ6AJzWMo3YoLHh5uY0jujc7cIKe49YC85V5weA1SaAdZpx1013wPqLtS+F Y3v/DXas+OePuG1mk2A9pSP7bASxbDeNkHvHJCGpxgTdP1HdRDHGmAssuQyTKJCp0vMU 0xQjuh8yrHldKUx3QETUMTZc+4DIStmauOfAgxw7hfWAMZO3ca4fwPpW46tD4VwxgTJT OnSqFMrZW6SYi+Mqv/Oyl7BUkFoMUnnpMD0wg44Gq2OxmdktqgOzWmAOmhuYMfauiSGC MPeV8OYfNJYzcjB91RzJa8URINlybKsRXqslc1r6HHYXgjRHPgR6brBNoxMheVV3sccN iyzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RVahBwvN; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id g7-v6si1688765plo.380.2018.02.02.04.06.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Feb 2018 04:06:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RVahBwvN; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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 10EF3223AF836; Fri, 2 Feb 2018 04:00:56 -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::243; helo=mail-pf0-x243.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::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 95A5322393624 for ; Fri, 2 Feb 2018 04:00:54 -0800 (PST) Received: by mail-pf0-x243.google.com with SMTP id g17so2977224pfh.1 for ; Fri, 02 Feb 2018 04:06:32 -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=hKMz0YgvDAbU1DQ5bEdKKOVBuWnyM/jOwLKSysIOB9U=; b=RVahBwvNO0BHUonZDRarYQltIa/51Frv1gDtuBhWe5B6ZLd/HmV3pfKlwwQFm1zdDo CT/6okbFkKB7JpmySwDF3ZJbckRDIhSlAMqG3y+7TULczpBrC/ud98XSbZCxCwjLEn9A 427kfmo3ckCC6xKAdlwvEOOnjecvtaceS+grc= 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=hKMz0YgvDAbU1DQ5bEdKKOVBuWnyM/jOwLKSysIOB9U=; b=fBzVOyZSRNSitatdvxpb0j4yIJRSqKNJXv7lIl2696Dqh+iWOWDItjSKmju17HSIMx S1jyaUfSy9rg7gPhJs0KgKMS0Hqf/HUzclKEJMBfCjz9DeUlrdT+k7WYASAIX32q8u00 WmK+DEaUsdjkV/mKT9KdWltvk2zvzLZ6hg+aRAnKIunCuRExT5fv4LEVXJEi9xO2swTv AsiwPfW28lGH2dWdOoPeWCNlYJwDdMvYY1rjIWlKPvvcrTY5Qy0hmNPFdz6lKoipXOPw V6e/0BzOV6NMVFwv+0ViLM1UQtpeXWm8QsGvsgm/J0pnmsfOoYvcxB7YLP9cEaqa/sP1 KISA== X-Gm-Message-State: AKwxytdt2UfWZxlEy0XuneJcE6ITUqFgCEM4d2TKTYJb1pCLcrSi05eh jEDDn+6idACwpLvCyMacQMwvww== X-Received: by 10.101.80.69 with SMTP id k5mr14944397pgo.447.1517573192700; Fri, 02 Feb 2018 04:06:32 -0800 (PST) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id b8sm3673047pff.31.2018.02.02.04.06.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Feb 2018 04:06:32 -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: Fri, 2 Feb 2018 20:05:41 +0800 Message-Id: <1517573143-11451-14-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1517573143-11451-1-git-send-email-heyi.guo@linaro.org> References: <1517573143-11451-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 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: 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 Reviewed-by: Leif Lindholm 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()