From patchwork Fri Feb 26 17:34:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 63094 Delivered-To: patch@linaro.org Received: by 10.112.235.234 with SMTP id up10csp894lbc; Fri, 26 Feb 2016 09:36:20 -0800 (PST) X-Received: by 10.98.33.131 with SMTP id o3mr3769367pfj.97.1456508177280; Fri, 26 Feb 2016 09:36:17 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id f77si21136263pfd.94.2016.02.26.09.36.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Feb 2016 09:36:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aZMIJ-0008PW-4A; Fri, 26 Feb 2016 17:35:11 +0000 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aZMHq-0007YE-0E for linux-arm-kernel@lists.infradead.org; Fri, 26 Feb 2016 17:34:42 +0000 Received: by mail-wm0-x232.google.com with SMTP id a4so79160040wme.1 for ; Fri, 26 Feb 2016 09:34:20 -0800 (PST) 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=AfAydXv4k1hihuTsJFkiENv3CFTFjEtJrAZGx0IkQuw=; b=agv0Pt2rAW7XR5SY7ZH3Z20nXNLWUxz35GfEpYcu1DHdF+PwkZdCG5Gvnkwjdz40XO KlQLwgMU0zpas6h+GYzCl/0y4S9KM+QAAQ79Ws1OJp2DLcOFc4cETal3wnoyZUhuhhp3 HMtTUtNloehE9zOL0kFK2V+NHjs3O8rQBg6lI= 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=AfAydXv4k1hihuTsJFkiENv3CFTFjEtJrAZGx0IkQuw=; b=hGfIz5ikbDxshDo/Q3qrcxLyE9KE4ns2i4XbxQXeH438Qj7esQASlvtnqvMXo/qpHL aIXapIZeMIhA1fNImKxuf8a5Zcs5LledRn69mcrtsuiFA4p901ccnv10gEQKlO9U71FS CXXMEJahvQm5YwFuInfLZRDS9bpGdGh458LJ5Gs1qiRQfjn06ltXeulIsFTbcRIBy03i ENK1fI6pp72FkQz7NaFOAMc0GW1Xiba7k8OavE5KekMeLsLg7S/DkOoogSj41hTXuYxl YIZ/xsKctffo6TLBqWvbxzV2VS4C04dLi3H08uDZmzIw+aFcw7Oy7zcq4qFptWZ+jvCl dY2w== X-Gm-Message-State: AD7BkJL5Z7D5pt5LSvEAZFgSSHrmrwzaHAvER+wZ4ZL/NjZhckJQVKk/AoGPJDppLFyD4WA4 X-Received: by 10.194.61.19 with SMTP id l19mr2850599wjr.148.1456508059403; Fri, 26 Feb 2016 09:34:19 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id ei9sm13337802wjd.40.2016.02.26.09.34.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Feb 2016 09:34:18 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-mtd@lists.infradead.org, dan.j.williams@intel.com, linux@arm.linux.org.uk Subject: [PATCH v2 1/3] Revert "mtd: pxa2xx-flash: switch from ioremap_cache to memremap" Date: Fri, 26 Feb 2016 18:34:11 +0100 Message-Id: <1456508053-15015-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456508053-15015-1-git-send-email-ard.biesheuvel@linaro.org> References: <1456508053-15015-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160226_093442_257735_BC5DC745 X-CRM114-Status: GOOD ( 10.75 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:232 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: robert.jarzmik@free.fr, Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org This reverts commit 06968a54790d9dd87a5bb68e8197b5094eff63c3, since NOR with memory semantics in array mode and RAM are not necessarily the same thing, and architectures may implement ioremap_cache() and memremap() with different memory attributes. Signed-off-by: Ard Biesheuvel --- drivers/mtd/maps/pxa2xx-flash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.5.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index 7497090e9900..9adc4ef30891 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c @@ -71,8 +71,8 @@ static int pxa2xx_flash_probe(struct platform_device *pdev) info->map.name); return -ENOMEM; } - info->map.cached = memremap(info->map.phys, info->map.size, - MEMREMAP_WB); + info->map.cached = + ioremap_cache(info->map.phys, info->map.size); if (!info->map.cached) printk(KERN_WARNING "Failed to ioremap cached %s\n", info->map.name); @@ -111,7 +111,7 @@ static int pxa2xx_flash_remove(struct platform_device *dev) map_destroy(info->mtd); iounmap(info->map.virt); if (info->map.cached) - memunmap(info->map.cached); + iounmap(info->map.cached); kfree(info); return 0; }