From patchwork Thu May 19 16:15:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 68171 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp3293636qge; Thu, 19 May 2016 09:17:14 -0700 (PDT) X-Received: by 10.66.221.167 with SMTP id qf7mr20940822pac.94.1463674634365; Thu, 19 May 2016 09:17:14 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t8si20934130pay.32.2016.05.19.09.17.14; Thu, 19 May 2016 09:17:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932701AbcESQQ4 (ORCPT + 30 others); Thu, 19 May 2016 12:16:56 -0400 Received: from mail-lf0-f46.google.com ([209.85.215.46]:36692 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932577AbcESQQx (ORCPT ); Thu, 19 May 2016 12:16:53 -0400 Received: by mail-lf0-f46.google.com with SMTP id e130so4448813lfe.3 for ; Thu, 19 May 2016 09:16:52 -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=eSErC/vTD9A6Fp23m62IgoLrCPCMAa1D4rPLNo0iSsM=; b=HNV2M+x84hebipFOC3aK90HqWXOBDBSRicDpMC+83xWyXUjNUTcDqmU9bK0s37iS/B kfFET7vjF6ONu53mBk8HUmzbQcNxg2ui4Ex4ZJZnJdngrgMsZRo+ZDT8JdFaRqchYc5g LaOxuaWpRuebH93E2bupoq3jSrAUUbmACrIC0= 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=eSErC/vTD9A6Fp23m62IgoLrCPCMAa1D4rPLNo0iSsM=; b=cWVeg+fZkXxuy2IY6//c0+KpbJBRPWGdxK44luAfcSSCDfGYKV+hWPuLZjepR1w3ba iwe+OLCCfp3K+2s+XvRi9b/aFRmizJFn8vTde8IoKyf+OA9Aiou8leBf/wEY/fJ9rxuc tM1kqs+q50CCDYLgEAS3wrILS5K0WzVxbgelWT53b9u+Ra/Npa1wOOzvf1wwBigDKdPG Ca50N1KTMPzUOzEoCALXgeGoW8TF2QurOZNHSCvtrCMRrTFDRTagiRItp1vwlRLiH2OO HnFFtGFtsZe2fPuiGwrRI25RKpNzEaZ/1HvPe5wAj6OXTs3ZzQNhP9U6mURxYidQfA5a jfLA== X-Gm-Message-State: AOPr4FUWDfZGcaHALAgSsUlYMGa2cGyhr+YNVJlZBguTrWLBGWLbSo3Eys1ze30acvfb+cNS X-Received: by 10.25.136.137 with SMTP id k131mr5009636lfd.88.1463674611582; Thu, 19 May 2016 09:16:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 May 2016 09:16:50 -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 Subject: [PATCH v2 1/5] ACPI: table upgrade: use cacheable map for tables Date: Thu, 19 May 2016 19:15:12 +0300 Message-Id: <1463674518-22477-2-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new memory allocated in acpi_table_initrd_init() is used to copy the upgraded tables to it. So it should be mapped with early_memunmap() instead of early_ioremap(). This is critical for ARM. Signed-off-by: Aleksey Makarov Acked-by: Lv Zheng --- drivers/acpi/tables.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.8.2 diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index a372f9e..f829e6a 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -578,10 +578,10 @@ static void __init acpi_table_initrd_init(void *data, size_t size) clen = size; if (clen > MAP_CHUNK_SIZE - slop) clen = MAP_CHUNK_SIZE - slop; - dest_p = early_ioremap(dest_addr & PAGE_MASK, - clen + slop); + dest_p = early_memremap(dest_addr & PAGE_MASK, + clen + slop); memcpy(dest_p + slop, src_p, clen); - early_iounmap(dest_p, clen + slop); + early_memunmap(dest_p, clen + slop); src_p += clen; dest_addr += clen; size -= clen;