From patchwork Fri Mar 4 09:48:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 63557 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp364936lbc; Fri, 4 Mar 2016 01:49:43 -0800 (PST) X-Received: by 10.98.66.157 with SMTP id h29mr10617440pfd.91.1457084983026; Fri, 04 Mar 2016 01:49:43 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id rb5si4768110pab.125.2016.03.04.01.49.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2016 01:49:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-mtd-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-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-mtd-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 1abmMK-0001nK-KD; Fri, 04 Mar 2016 09:49:20 +0000 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1abmMF-0001Zh-SE for linux-mtd@lists.infradead.org; Fri, 04 Mar 2016 09:49:17 +0000 Received: by mail-wm0-x235.google.com with SMTP id l68so26705066wml.0 for ; Fri, 04 Mar 2016 01:49:00 -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=zAwxCgWcv9Txl/87RPqAOSuwxq2HEnabcjprAsQJ37c=; b=ggnD/TueKaKHMsSOVY2ijaFHLJxDfxvgLP0p/11VU67mXba3BBBWXPU/jJ2m2IzYjK zgYHZhA8z/CNb3cNCgfIDuLKG+qgDcI/HZY5pDC8X5FLC+msmZ/cVWXelT/HmZZ7g972 14DllpXiisATEydZpJhRLZqdtv8DV30KzCkhc= 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=zAwxCgWcv9Txl/87RPqAOSuwxq2HEnabcjprAsQJ37c=; b=JNPImdSW2oL4/kpoPaUGbkzwvpOKpaYjjoRwnhBxgU7VmfxNNR9dQbuwyF3bP1D+P8 zAPG4M/UtO3UuPEgnkMV9KabFjzIrbJ2q/PpdiNIi7N8MhczZkdzXKADdy5Kx8D/lhRm JvTXxFnAAMhQdldr6wGT7KDAou4bXVJZguv3zFPxXs6JRx+lS8rCFo/vB3j3jDqP1VUS +UOxOUkFi2g4HLhbg8WM+BNRoiEWf6oAvnFZ0XRwB7ihmYTeZ3HCCPn1j7+yJMK+6MIa V5WRKPOkRQy6mvjfedyBMdMzniRWnNjDC0C3xOr6bY0OjMBV2Fzgzj0RpftJOgp+Psb0 91hA== X-Gm-Message-State: AD7BkJLV7tD6KE7FwX5IkHFQzJ79HefOhZ14pQGJR3GeI4kJWa/OAKyrHlSIRMhbVRXiA75O X-Received: by 10.28.10.149 with SMTP id 143mr3825717wmk.38.1457084939217; Fri, 04 Mar 2016 01:48:59 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id s206sm2426533wmf.23.2016.03.04.01.48.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Mar 2016 01:48:58 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-mtd@lists.infradead.org, linux@arm.linux.org.uk, dan.j.williams@intel.com Subject: [PATCH v3 2/4] mtd: pxa2xx-flash: switch back from memremap to ioremap_cached Date: Fri, 4 Mar 2016 10:48:46 +0100 Message-Id: <1457084928-21179-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457084928-21179-1-git-send-email-ard.biesheuvel@linaro.org> References: <1457084928-21179-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160304_014916_361191_BA502242 X-CRM114-Status: GOOD ( 11.73 ) 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:235 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_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: robert.jarzmik@free.fr, computersforpeace@gmail.com, dwmw2@infradead.org, Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org This reverts commit 06968a54790d ("mtd: pxa2xx-flash: switch from ioremap_cache to memremap"), since NOR with memory semantics in array mode and RAM are not necessarily the same thing, and architectures may implement ioremap_cached() and memremap() with different memory attributes. For this reason, ioremap_cached() has been brought back from the dead on the ARM side, so switch this driver back to using it instead of memremap(). Cc: David Woodhouse Cc: Brian Norris Cc: Dan Williams Signed-off-by: Ard Biesheuvel --- drivers/mtd/maps/pxa2xx-flash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.5.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index 7497090e9900..2cde28ed95c9 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_cached(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; }