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: 48685 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 86D722121F for ; Mon, 18 May 2015 13:00:15 +0000 (UTC) Received: by wgtl5 with SMTP id l5sf53760371wgt.1 for ; Mon, 18 May 2015 06:00:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=e3KoLrJPFYSWiGS3o3gM4ek8x+PApN9Mpl7Jh3fQVxk=; b=Q9CySss+GRV/OZGvn1zK/xvCnfLy+eEZ7IGp2BlTt6ncflApLRSOHRLQrqeStYzkk7 dvmHvwV7aynJZhp8BgAgyxjEBhPRDt3goWbvRahpeDZkHY2pcwrYyfb9uuGeZhMEQmmT FbOVSShVfpnWTG5UBQUMzpDMEud+3GN91XG6DZFn75JJoX6YHmkdnimhtxln8DheIZdW 87Nqd3Drq1PZvcDaMdndTh1oB0z8YGTFeTrGu5jqKhhTFYgleDxZHv4U2lv2fK92j/dz sFuZ4GgjR0fVClBPNpErFU2axmzSWQNhIJBohT8X6jQfqmZD82IJ5VF1t+f2JVeGZZLW fW+A== X-Gm-Message-State: ALoCoQn1HUjo3ur0ozHLt23zTDEGfrzipZkB/7D9ETzdhl5nQdlfOqOnC82fG8tymuUJUdYxsWG2 X-Received: by 10.180.7.138 with SMTP id j10mr9875943wia.2.1431954014849; Mon, 18 May 2015 06:00:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.116.38 with SMTP id jt6ls826991lab.101.gmail; Mon, 18 May 2015 06:00:14 -0700 (PDT) X-Received: by 10.112.157.100 with SMTP id wl4mr17366864lbb.20.1431954014688; Mon, 18 May 2015 06:00:14 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id yi7si6667646lbb.14.2015.05.18.06.00.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 May 2015 06:00:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by laat2 with SMTP id t2so218264513laa.1 for ; Mon, 18 May 2015 06:00:14 -0700 (PDT) X-Received: by 10.112.204.72 with SMTP id kw8mr17347131lbc.88.1431954014307; Mon, 18 May 2015 06:00:14 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp67459lbb; Mon, 18 May 2015 06:00:13 -0700 (PDT) X-Received: by 10.70.0.67 with SMTP id 3mr43577626pdc.152.1431954012550; Mon, 18 May 2015 06:00:12 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dt10si15932790pdb.120.2015.05.18.06.00.11; Mon, 18 May 2015 06:00:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752763AbbERNAE (ORCPT + 7 others); Mon, 18 May 2015 09:00:04 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:33357 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752152AbbERM7s (ORCPT ); Mon, 18 May 2015 08:59:48 -0400 Received: by pdbqa5 with SMTP id qa5so148747598pdb.0 for ; Mon, 18 May 2015 05:59:48 -0700 (PDT) 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" Cc: Jiang Liu , Lorenzo Pieralisi , Arnd Bergmann , Tomasz Nowicki , Grant Likely , Thomas Gleixner , Olof Johansson , linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo 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> Sender: linux-acpi-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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) */