From patchwork Wed Jul 30 04:21:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zheng, Lv" X-Patchwork-Id: 34496 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5C9FD20DCC for ; Wed, 30 Jul 2014 04:22:18 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id rl12sf3854379iec.1 for ; Tue, 29 Jul 2014 21:22:17 -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=KeqJ3DyYTMhAreUxnAS/XdAo/taN1uR15MATpywbOBc=; b=WVg7DzRniXVjU8DQpz5yi5ycZY+Xv5BdR8C+mbxmT7PqZHk+FTOsALTgfhSppsRJpH 5U7nNIXhMCwcC/+tIqqc2MKf78/8suKUSLOb++2ORohm8XruXztock65WXZQ50MRQ/yL Wje7eiTplCOYXutGV8KaHmHHkmpvkJLBooMhyxUQ150rtgS/l3oBBcLgE755Z49OkKWf AZBj9m1HaGS46t6lIKDZiRM4kt8ZBitx4aXxJR/zxKL/gSYbGzVc5n1Ip9h6n3oM+o/O ffm8mYkZQ3CMAPCSggaVvYxBsYDGD8Z/0qC16FdVcV7YvLPpnEWyZ4TYtlK2gmw2a35I AWOQ== X-Gm-Message-State: ALoCoQnHzOPd4WG908p5bJPJj6iLXbmX+ALC5pX02obeBLDNovysFJ2LqIdCNcHNuerRp9Q13Tld X-Received: by 10.182.118.228 with SMTP id kp4mr773504obb.42.1406694137560; Tue, 29 Jul 2014 21:22:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.76 with SMTP id 70ls403236qgu.92.gmail; Tue, 29 Jul 2014 21:22:17 -0700 (PDT) X-Received: by 10.220.192.129 with SMTP id dq1mr1202785vcb.57.1406694137377; Tue, 29 Jul 2014 21:22:17 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id z9si768035veu.47.2014.07.29.21.22.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Jul 2014 21:22:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so1003233vcb.36 for ; Tue, 29 Jul 2014 21:22:17 -0700 (PDT) X-Received: by 10.52.185.72 with SMTP id fa8mr5189993vdc.4.1406694137289; Tue, 29 Jul 2014 21:22:17 -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.221.37.5 with SMTP id tc5csp293544vcb; Tue, 29 Jul 2014 21:22:16 -0700 (PDT) X-Received: by 10.68.225.105 with SMTP id rj9mr1635899pbc.108.1406694136376; Tue, 29 Jul 2014 21:22:16 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lf13si947266pab.199.2014.07.29.21.22.15 for ; Tue, 29 Jul 2014 21:22:16 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932073AbaG3EWJ (ORCPT + 26 others); Wed, 30 Jul 2014 00:22:09 -0400 Received: from mga02.intel.com ([134.134.136.20]:39356 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750728AbaG3EWE (ORCPT ); Wed, 30 Jul 2014 00:22:04 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 29 Jul 2014 21:22:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,762,1400050800"; d="scan'208";a="580994593" Received: from lvzheng-z530.sh.intel.com ([10.239.37.16]) by orsmga002.jf.intel.com with ESMTP; 29 Jul 2014 21:22:01 -0700 From: Lv Zheng To: "Rafael J. Wysocki" , Len Brown Cc: Lv Zheng , Lv Zheng , , linux-acpi@vger.kernel.org, Tomasz Nowicki , Hanjun Guo , Bob Moore Subject: [PATCH 14/17] ACPICA/ARM: ACPI 5.1: Update for MADT changes. Date: Wed, 30 Jul 2014 12:21:50 +0800 Message-Id: <8af3474e252b02a86e882775c675699eea1468bd.1406689494.git.lv.zheng@intel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lv.zheng@intel.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 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 New subtables and changes to other subtables. Tomasz Nowicki. tomasz.nowicki@linaro.org Signed-off-by: Tomasz Nowicki Signed-off-by: Hanjun Guo Signed-off-by: Bob Moore Signed-off-by: Lv Zheng --- include/acpi/actbl1.h | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 9613e8e..7626bfe 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -671,7 +671,9 @@ enum acpi_madt_type { ACPI_MADT_TYPE_LOCAL_X2APIC_NMI = 10, ACPI_MADT_TYPE_GENERIC_INTERRUPT = 11, ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR = 12, - ACPI_MADT_TYPE_RESERVED = 13 /* 13 and greater are reserved */ + ACPI_MADT_TYPE_GENERIC_MSI_FRAME = 13, + ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14, + ACPI_MADT_TYPE_RESERVED = 15 /* 15 and greater are reserved */ }; /* @@ -797,15 +799,26 @@ struct acpi_madt_local_x2apic_nmi { struct acpi_madt_generic_interrupt { struct acpi_subtable_header header; u16 reserved; /* reserved - must be zero */ - u32 gic_id; + u32 cpu_interface_number; u32 uid; u32 flags; u32 parking_version; u32 performance_interrupt; u64 parked_address; u64 base_address; + u64 gicv_base_address; + u64 gich_base_address; + u32 vgic_interrupt; + u64 gicr_base_address; + u64 arm_mpidr; }; +/* Masks for Flags field above */ + +/* ACPI_MADT_ENABLED (1) Processor is usable if set */ +#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) */ struct acpi_madt_generic_distributor { @@ -817,11 +830,36 @@ struct acpi_madt_generic_distributor { u32 reserved2; /* reserved - must be zero */ }; +/* 13: Generic MSI Frame (ACPI 5.1) */ + +struct acpi_madt_generic_msi_frame { + struct acpi_subtable_header header; + u16 reserved; /* reserved - must be zero */ + u32 msi_frame_id; + u64 base_address; + u32 flags; + u16 spi_count; + u16 spi_base; +}; + +/* Masks for Flags field above */ + +#define ACPI_MADT_OVERRIDE_SPI_VALUES (1) + +/* 14: Generic Redistributor (ACPI 5.1) */ + +struct acpi_madt_generic_redistributor { + struct acpi_subtable_header header; + u16 reserved; /* reserved - must be zero */ + u64 base_address; + u32 length; +}; + /* * Common flags fields for MADT subtables */ -/* MADT Local APIC flags (lapic_flags) and GIC flags */ +/* MADT Local APIC flags */ #define ACPI_MADT_ENABLED (1) /* 00: Processor is usable if set */