From patchwork Fri Nov 30 09:47:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gong X-Patchwork-Id: 1824271 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A271CDF24C for ; Fri, 30 Nov 2012 09:55:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752599Ab2K3JzP (ORCPT ); Fri, 30 Nov 2012 04:55:15 -0500 Received: from mga02.intel.com ([134.134.136.20]:62830 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479Ab2K3JzO (ORCPT ); Fri, 30 Nov 2012 04:55:14 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 30 Nov 2012 01:55:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,191,1355126400"; d="scan'208";a="227080601" Received: from gchen-sby.bj.intel.com (HELO localhost) ([10.238.158.72]) by orsmga001.jf.intel.com with ESMTP; 30 Nov 2012 01:54:57 -0800 From: Chen Gong To: tony.luck@intel.com Cc: ying.huang@intel.com, linux-acpi@vger.kernel.org, Chen Gong Subject: [PATCH] ACPI, APEI, EINJ: Add missed ACPI5 support error trigger table Date: Fri, 30 Nov 2012 04:47:59 -0500 Message-Id: <1354268879-5408-1-git-send-email-gong.chen@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org To handle error trigger table correctly, memory region must be removed from request region. We ever have a patch to do this work (commit id: b4e008dc5) but at that time ACPI5 is unrevealed so this option is missed. When using EINJ table on an ACPI5 enabled machine, we get following error: APEI: Can not request [mem 0x526b80000-0x526b80007] for APEI EINJ Trigger registers This patch fixes this issue. Signed-off-by: Chen Gong --- drivers/acpi/apei/einj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 8e17936..8d457b5 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -367,7 +367,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type, * This will cause resource conflict with regular memory. So * remove it from trigger table resources. */ - if (param_extension && (type & 0x0038) && param2) { + if ((param_extension || acpi5) && (type & 0x0038) && param2) { struct apei_resources addr_resources; apei_resources_init(&addr_resources); trigger_param_region = einj_get_trigger_parameter_region(