From patchwork Tue Nov 17 09:40:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 7634481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4407D9F1C2 for ; Tue, 17 Nov 2015 09:48:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5CD1B20465 for ; Tue, 17 Nov 2015 09:48:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 72D3020454 for ; Tue, 17 Nov 2015 09:48:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zycqc-00022u-Tu; Tue, 17 Nov 2015 09:46:46 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZycnZ-00069Q-88 for linux-arm-kernel@lists.infradead.org; Tue, 17 Nov 2015 09:43:48 +0000 Received: by wmww144 with SMTP id w144so17191976wmw.0 for ; Tue, 17 Nov 2015 01:43:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5RRRJQlo8lfpdbH93LZ1jCUukubyqLWqXH+p1jSp1nI=; b=emoyO2duF+NL7dHDHVEtICpgHEOyi9BMbn7L9oM/WOYpm1ourOHk9zDqjeBnM5MTtx u28zZ5rs1xsv+KeQYHgQIwoXBw7REJK/R/YW81O024atHO1yOJ7CjgNMS0C9UgXsmT5q 2HHeIEXOFJJGXGfq4K+jdUqpsHnKI5tlLG6cWqG077JCGprEeK9j+k+8CipHqZ1wh0Aw ONrdTf7bUf8z8qYoaH8qjn6+2M8WA0+FqTkHReCa3BGF6QmlFclUFv7sKdxOBCvhoQZO mRkt+K5gmUE/l02dwoXt9Ufy/xVVXabhwJv3ID2db/sMlSEZJPz4pre6yDJOS1BRTVdb FqUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5RRRJQlo8lfpdbH93LZ1jCUukubyqLWqXH+p1jSp1nI=; b=cKDvuBJg91cNCImuGeKceVXEdovXihoFpViW0tX4C4TcdarFC5iPcClI1dpUwCqHqK UEZWfKLGcJjki9ijI9/yaQc4O2v7HJAh+1mZRQUzoweeL6Qc8KoK1HBVNDZ+aQSQJv64 JhYiyIC6ysIrnm2/K8kgKoHWPRS578/nA2WyvODqAimsHW8kmmPpEToozhP31JgYb5EB Te85vkxJJpAHgS0urNsek+aEe2mvXR4JbfirGYO1QL8FZBITfD/tJeMD50T3DX1PE0Qv QD5B3brzXLb33K6wO4x6THpwYFWLdRHGJjZ9j/I1+KBqUI8N59RmUJ1vHe5fsx8/iuc/ PWmA== X-Gm-Message-State: ALoCoQl/XEwIrL/PsSr+CWQVcDPa6q9wxw9fkrKlwplRn2NtKjY//xg9EFG7FcLcFIgKV0gitxz1 X-Received: by 10.28.30.208 with SMTP id e199mr1540276wme.22.1447753398400; Tue, 17 Nov 2015 01:43:18 -0800 (PST) Received: from localhost ([78.129.251.54]) by smtp.gmail.com with ESMTPSA id jt9sm39003747wjc.24.2015.11.17.01.43.16 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Nov 2015 01:43:17 -0800 (PST) From: shannon.zhao@linaro.org To: ian.campbell@citrix.com, stefano.stabellini@citrix.com, keir@xen.org, jbeulich@suse.com, andrew.cooper3@citrix.com, julien.grall@citrix.com, xen-devel@lists.xen.org Subject: [PATCH v3 15/62] ACPICA: ACPI 6.0: Add changes for MADT table. Date: Tue, 17 Nov 2015 17:40:14 +0800 Message-Id: <1447753261-7552-16-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1447753261-7552-1-git-send-email-shannon.zhao@linaro.org> References: <1447753261-7552-1-git-send-email-shannon.zhao@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151117_014337_883524_B4DE7877 X-CRM114-Status: GOOD ( 11.86 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, hangaohuai@huawei.com, ard.biesheuvel@linaro.org, shannon.zhao@linaro.org, christoffer.dall@linaro.org, peter.huangpeng@huawei.com, david.vrabel@citrix.com, zhaoshenglong@huawei.com, linux-arm-kernel@lists.infradead.org, roger.pau@citrix.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bob Moore ACPICA commit 02cbb41232bccf7a91967140cab95d5f48291f21 New subtable type. Some additions to existing subtables. Link: https://github.com/acpica/acpica/commit/02cbb412 Signed-off-by: Bob Moore Signed-off-by: Lv Zheng Signed-off-by: Rafael J. Wysocki [Linux commit 0cff8dc0099f6d4f7431181918b37a472bcd1bbb] Signed-off-by: Shannon Zhao Acked-by: Stefano Stabellini --- xen/include/acpi/actbl1.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/xen/include/acpi/actbl1.h b/xen/include/acpi/actbl1.h index 2fb2ad7..7dd6960 100644 --- a/xen/include/acpi/actbl1.h +++ b/xen/include/acpi/actbl1.h @@ -643,7 +643,8 @@ enum acpi_madt_type { ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR = 12, ACPI_MADT_TYPE_GENERIC_MSI_FRAME = 13, ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14, - ACPI_MADT_TYPE_RESERVED = 15 /* 15 and greater are reserved */ + ACPI_MADT_TYPE_GENERIC_TRANSLATOR = 15, + ACPI_MADT_TYPE_RESERVED = 16 /* 16 and greater are reserved */ }; /* @@ -764,7 +765,7 @@ struct acpi_madt_local_x2apic_nmi { u8 reserved[3]; }; -/* 11: Generic Interrupt (ACPI 5.0) */ +/* 11: Generic Interrupt (ACPI 5.0 + ACPI 6.0 changes) */ struct acpi_madt_generic_interrupt { struct acpi_subtable_header header; @@ -781,6 +782,8 @@ struct acpi_madt_generic_interrupt { u32 vgic_interrupt; u64 gicr_base_address; u64 arm_mpidr; + u8 efficiency_class; + u8 reserved2[3]; }; /* Masks for Flags field above */ @@ -789,7 +792,7 @@ struct acpi_madt_generic_interrupt { #define ACPI_MADT_PERFORMANCE_IRQ_MODE (1<<1) /* 01: Performance Interrupt Mode */ #define ACPI_MADT_VGIC_IRQ_MODE (1<<2) /* 02: VGIC Maintenance Interrupt mode */ -/* 12: Generic Distributor (ACPI 5.0) */ +/* 12: Generic Distributor (ACPI 5.0 + ACPI 6.0 changes) */ struct acpi_madt_generic_distributor { struct acpi_subtable_header header; @@ -797,7 +800,8 @@ struct acpi_madt_generic_distributor { u32 gic_id; u64 base_address; u32 global_irq_base; - u32 reserved2; /* reserved - must be zero */ + u8 version; + u8 reserved2[3]; /* reserved - must be zero */ }; /* 13: GIC MSI Frame (ACPI 5.1) */ @@ -825,6 +829,16 @@ struct acpi_madt_generic_redistributor { u32 length; }; +/* 15: Generic Translator (ACPI 6.0) */ + +struct acpi_madt_generic_translator { + struct acpi_subtable_header header; + u16 reserved; /* reserved - must be zero */ + u32 translation_id; + u64 base_address; + u32 reserved2; +}; + /* * Common flags fields for MADT subtables */