From patchwork Mon May 18 12:59:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 6429031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AE7E6C0432 for ; Mon, 18 May 2015 13:04:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E662C205BA for ; Mon, 18 May 2015 13:04:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17C6320340 for ; Mon, 18 May 2015 13:04:20 +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 1YuKfr-0005W5-AZ; Mon, 18 May 2015 13:01:39 +0000 Received: from mail-pd0-f169.google.com ([209.85.192.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YuKeR-0003NV-3m for linux-arm-kernel@lists.infradead.org; Mon, 18 May 2015 13:00:12 +0000 Received: by pdea3 with SMTP id a3so147684574pde.2 for ; Mon, 18 May 2015 05:59:48 -0700 (PDT) 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=EOJm9q17jWgqXw8OxlE6/oeC21xGO3a4ZYAVQnZ9zdo=; b=G3llgZ03Uj6LF/Np01b7DCTn+vgCxgWVoP74iPdA3cfs5o9eNuJqJxNw2CV2XfqSIv Y4JBYoUHxG8Vle4wTmYd9wa5IOiOhVefJE4ZhPGXLg7mXFjnJguJDK5NBsb+28X7Qxrm 3v0teU1XCCKDUof8+I2anM2trpD+C3Tx/pxvIm/02+1UZggMN6BN+zeT59kWS+t+xc3d ZJyAEvCNpOsOrhuinss9nUkPPr+UHX6bVRA1iRNxQn0Q1fRGhvX/Qoya+OLbqeG3sCpw AwwYk+n32CcRQ0n7Bmak9G/4MDeWsnX66enI9jIVGC8+4E4hgi07P6j/wuMVCKxH9GvF Zt6g== X-Gm-Message-State: ALoCoQkCQjhRKa20ZTqIsNtMO6A6X0YTL7daqMzznwZasNKMRMRUY07q9FL62yd9QPouD+KyhBU0 X-Received: by 10.66.250.131 with SMTP id zc3mr44073844pac.136.1431953987931; Mon, 18 May 2015 05:59:47 -0700 (PDT) Received: from localhost ([180.150.148.224]) by mx.google.com with ESMTPSA id je2sm10049033pbd.14.2015.05.18.05.59.46 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 18 May 2015 05:59:47 -0700 (PDT) From: Hanjun Guo To: Marc Zyngier , Jason Cooper , Will Deacon , Catalin Marinas , "Rafael J. Wysocki" Subject: [PATCH 01/11] ACPICA: Introduce GIC version for arm based system Date: Mon, 18 May 2015 20:59:11 +0800 Message-Id: <1431953961-22706-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431953961-22706-1-git-send-email-hanjun.guo@linaro.org> References: <1431953961-22706-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150518_060011_251120_06B053DA X-CRM114-Status: GOOD ( 11.22 ) X-Spam-Score: -1.8 (-) Cc: Lorenzo Pieralisi , Arnd Bergmann , linux-acpi@vger.kernel.org, linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, Tomasz Nowicki , Olof Johansson , Hanjun Guo , Grant Likely , Thomas Gleixner , Jiang Liu , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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: Tomasz Nowicki A new field is added in GIC distributor to indication the GIC version, support it in ACPICA for later use Will upstreamed by Lv Zheng after ACPICA supporting ACPI 6.0 is released. Signed-off-by: Tomasz Nowicki Signed-off-by: Hanjun Guo --- include/acpi/actbl1.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index b80b0e6..b4f0f74 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -819,7 +819,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 6.0) */ struct acpi_madt_generic_distributor { struct acpi_subtable_header header; @@ -827,7 +827,20 @@ struct acpi_madt_generic_distributor { u32 gic_id; u64 base_address; u32 global_irq_base; - u32 reserved2; /* reserved - must be zero */ + u8 gic_version; + u8 reserved2[3]; /* reserved - must be zero */ +}; + +/* Values for gic_version in Generic Distributor (ACPI 6.0) */ + +enum acpi_madt_gic_ver_type +{ + ACPI_MADT_GIC_VER_UNKNOWN = 0, + ACPI_MADT_GIC_VER_V1 = 1, + ACPI_MADT_GIC_VER_V2 = 2, + ACPI_MADT_GIC_VER_V3 = 3, + ACPI_MADT_GIC_VER_V4 = 4, + ACPI_MADT_GIC_VER_RESERVED = 5 /* 5 and greater are reserved */ }; /* 13: Generic MSI Frame (ACPI 5.1) */