From patchwork Wed Jul 30 04:21:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zheng, Lv" X-Patchwork-Id: 34495 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 287BF20DCC for ; Wed, 30 Jul 2014 04:22:15 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id v10sf1865373qac.8 for ; Tue, 29 Jul 2014 21:22:15 -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=waqcOEsWdl4aoZCMZBv3cNIQIHVOA1PmNH/zJskcvts=; b=Q4P7ju65Ch7T1805cnlDvC1y3ey2IYmJRmi8N5xJTLabyrt0oFtY81VPPH7y8F3YJz CdkunmXjDWRZr7FgiOWpfSqzps/YvvWkeMkuyY7K2L+dvW0QneIfCqpdjUA4WngBQAjF bO7kXyF4U5Pe5GYSedXq9N+hDQW7uMC6b/++esri4tyVu60CQ20ETdghebFTj/C7MbmO DFgcf6qZ2IIE4Z1sy9WMEUZupI7tEIib8TJMJzRTQzVZ9hcq5NT845nyxNHMnC6Wdw6y qsIiebbIpzccObiFQs0pmhwe2XcygBDkjR8oTvEbhhYwN/vN2IulhugqcD4rX4LzBqXZ jQyg== X-Gm-Message-State: ALoCoQmph3Q8jHtNPeBOl4hQ8EgruXenb2h/CBlexzhQLfHylrMYMR0isOtt5rfKym6NpY1jlQaN X-Received: by 10.236.19.7 with SMTP id m7mr564749yhm.35.1406694135016; Tue, 29 Jul 2014 21:22:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.38 with SMTP id j35ls437648qge.89.gmail; Tue, 29 Jul 2014 21:22:14 -0700 (PDT) X-Received: by 10.53.10.65 with SMTP id dy1mr22703vdd.92.1406694134929; Tue, 29 Jul 2014 21:22:14 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id ir5si752604vcb.82.2014.07.29.21.22.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Jul 2014 21:22:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so985108vcb.7 for ; Tue, 29 Jul 2014 21:22:14 -0700 (PDT) X-Received: by 10.52.9.199 with SMTP id c7mr5171722vdb.50.1406694134845; Tue, 29 Jul 2014 21:22: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.221.37.5 with SMTP id tc5csp293539vcb; Tue, 29 Jul 2014 21:22:14 -0700 (PDT) X-Received: by 10.68.186.97 with SMTP id fj1mr1523576pbc.37.1406694133989; Tue, 29 Jul 2014 21:22:13 -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.12 for ; Tue, 29 Jul 2014 21:22:13 -0700 (PDT) Received-SPF: none (google.com: linux-acpi-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 S1755147AbaG3EV6 (ORCPT + 8 others); Wed, 30 Jul 2014 00:21:58 -0400 Received: from mga02.intel.com ([134.134.136.20]:39334 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755145AbaG3EV4 (ORCPT ); Wed, 30 Jul 2014 00:21:56 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 29 Jul 2014 21:21:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,762,1400050800"; d="scan'208";a="551068182" Received: from lvzheng-z530.sh.intel.com ([10.239.37.16]) by orsmga001.jf.intel.com with ESMTP; 29 Jul 2014 21:21:53 -0700 From: Lv Zheng To: "Rafael J. Wysocki" , Len Brown Cc: Lv Zheng , Lv Zheng , , linux-acpi@vger.kernel.org, Graeme Gregory , Hanjun Guo , Bob Moore Subject: [PATCH 13/17] ACPICA/ARM: ACPI 5.1: Update for FADT changes. Date: Wed, 30 Jul 2014 12:21:43 +0800 Message-Id: <856d166e85fa39e9110b85aaf2e742d055c7375e.1406689494.git.lv.zheng@intel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: References: 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: 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.176 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: Graeme Gregory Adds ARM flags and FADT minor revision. Graeme Gregory. graeme.gregory@linaro.org Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo Signed-off-by: Bob Moore Signed-off-by: Lv Zheng --- include/acpi/actbl.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h index 1cc7ef1..bee19d8 100644 --- a/include/acpi/actbl.h +++ b/include/acpi/actbl.h @@ -270,7 +270,8 @@ struct acpi_table_fadt { u32 flags; /* Miscellaneous flag bits (see below for individual flags) */ struct acpi_generic_address reset_register; /* 64-bit address of the Reset register */ u8 reset_value; /* Value to write to the reset_register port to reset the system */ - u8 reserved4[3]; /* Reserved, must be zero */ + u16 arm_boot_flags; /* ARM-Specific Boot Flags (see below for individual flags) (ACPI 5.1) */ + u8 minor_revision; /* FADT Minor Revision (ACPI 5.1) */ u64 Xfacs; /* 64-bit physical address of FACS */ u64 Xdsdt; /* 64-bit physical address of DSDT */ struct acpi_generic_address xpm1a_event_block; /* 64-bit Extended Power Mgt 1a Event Reg Blk address */ @@ -285,7 +286,7 @@ struct acpi_table_fadt { struct acpi_generic_address sleep_status; /* 64-bit Sleep Status register (ACPI 5.0) */ }; -/* Masks for FADT Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */ +/* Masks for FADT IA-PC Boot Architecture Flags (boot_flags) [Vx]=Introduced in this FADT revision */ #define ACPI_FADT_LEGACY_DEVICES (1) /* 00: [V2] System has LPC or ISA bus devices */ #define ACPI_FADT_8042 (1<<1) /* 01: [V3] System has an 8042 controller on port 60/64 */ @@ -296,6 +297,11 @@ struct acpi_table_fadt { #define FADT2_REVISION_ID 3 +/* Masks for FADT ARM Boot Architecture Flags (arm_boot_flags) ACPI 5.1 */ + +#define ACPI_FADT_PSCI_COMPLIANT (1) /* 00: [V5+] PSCI 0.2+ is implemented */ +#define ACPI_FADT_PSCI_USE_HVC (1<<1) /* 01: [V5+] HVC must be used instead of SMC as the PSCI conduit */ + /* Masks for FADT flags */ #define ACPI_FADT_WBINVD (1) /* 00: [V1] The WBINVD instruction works properly */ @@ -399,7 +405,7 @@ struct acpi_table_desc { * FADT V5 size: 0x10C */ #define ACPI_FADT_V1_SIZE (u32) (ACPI_FADT_OFFSET (flags) + 4) -#define ACPI_FADT_V2_SIZE (u32) (ACPI_FADT_OFFSET (reserved4[0]) + 3) +#define ACPI_FADT_V2_SIZE (u32) (ACPI_FADT_OFFSET (minor_revision) + 1) #define ACPI_FADT_V3_SIZE (u32) (ACPI_FADT_OFFSET (sleep_control)) #define ACPI_FADT_V5_SIZE (u32) (sizeof (struct acpi_table_fadt))