From patchwork Thu May 19 16:15:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 9127951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8EED76048B for ; Thu, 19 May 2016 16:17:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82BE128117 for ; Thu, 19 May 2016 16:17:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7561C281D3; Thu, 19 May 2016 16:17:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C0E5281A8 for ; Thu, 19 May 2016 16:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932299AbcESQRA (ORCPT ); Thu, 19 May 2016 12:17:00 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:33968 "EHLO mail-lb0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932725AbcESQQ7 (ORCPT ); Thu, 19 May 2016 12:16:59 -0400 Received: by mail-lb0-f173.google.com with SMTP id n11so26437792lbh.1 for ; Thu, 19 May 2016 09:16:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0IMbdUQXC5eYYtL65utF9418Pq1ehbERRhApGZ4X90E=; b=gN+O0lmbE8Jy30eCkatX+DkFp3qO69stgRLJWbsfJiuH+yT9XzmCtS282ihuJzc3+e DJyZfMCQGSjTW/CvVxPgz+aDc7qTssQWx5ET1BndnyoVpL+0PSOQFIeK6Sxb/63yHhpN THhwEGrF4I79MkkwLG0TrwPAvXKY9zoqeKH9A= 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=0IMbdUQXC5eYYtL65utF9418Pq1ehbERRhApGZ4X90E=; b=OetdL11/SjVhBrQy+GjwiybqT5FjShWdo6AOelXDpfgQQ3k9c4zKTyj0z1mB0ANdIi trD5ijUu1HgOpJKq6goFhOQYm+9qxln1u7xAqmphKWuEs9rfEI6+x2WqgSDcMtCr+ji1 +a4Ps+/yQwYs12Jcx8FviCmFTIKfJEEM9s8/SWgimVwDDz7FGiprNppuJxNWoiAL2TiX iTLWg+dOqrIak26p3JDCKLi2QY9DJpG/JxOUBU0zMYFb4NfMc7o+z3AUDigNrvKVJyNQ t+E/KGKnGgv6eBO6uzLcOPhihgt98/TjMFOqFsuyIpA3IZu8LjW7zQzNrDHQMMQXH5nY O15A== X-Gm-Message-State: AOPr4FVtCm89N3C9Ln7n1zfCaVImelzqiSMfzFALGD/NBPTfYp3ygegiR6nEnD+6oEK5/qax X-Received: by 10.112.62.138 with SMTP id y10mr4950945lbr.37.1463674617578; Thu, 19 May 2016 09:16:57 -0700 (PDT) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id yf9sm2396538lbb.34.2016.05.19.09.16.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 May 2016 09:16:56 -0700 (PDT) From: Aleksey Makarov To: Russell King , "Rafael J . Wysocki" , Len Brown Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Aleksey Makarov , Graeme Gregory , Jon Masters , "Zheng, Lv" , Mark Rutland , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH v2 3/5] ACPI: table upgrade: move arch-specific symbol to asm/acpi.h Date: Thu, 19 May 2016 19:15:14 +0300 Message-Id: <1463674518-22477-4-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1463674518-22477-1-git-send-email-aleksey.makarov@linaro.org> References: <1463674518-22477-1-git-send-email-aleksey.makarov@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The constant that defines max phys address where the new upgraded ACPI table should be allocated is arch-specific. Move it to Signed-off-by: Aleksey Makarov --- arch/x86/include/asm/acpi.h | 2 ++ drivers/acpi/tables.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 94c18eb..c24c070 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -170,4 +170,6 @@ static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) } #endif +#define ACPI_TABLE_UPGRADE_MAX_PHYS (max_low_pfn_mapped << PAGE_SHIFT) + #endif /* _ASM_X86_ACPI_H */ diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index b05df13..9f0ad6e 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "internal.h" #ifdef CONFIG_ACPI_CUSTOM_DSDT @@ -543,7 +544,7 @@ void __init acpi_table_upgrade(void) return; acpi_tables_addr = - memblock_find_in_range(0, max_low_pfn_mapped << PAGE_SHIFT, + memblock_find_in_range(0, ACPI_TABLE_UPGRADE_MAX_PHYS, all_tables_size, PAGE_SIZE); if (!acpi_tables_addr) { WARN_ON(1);