From patchwork Tue Mar 29 07:18:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 64570 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1849962lbc; Tue, 29 Mar 2016 00:20:17 -0700 (PDT) X-Received: by 10.98.87.72 with SMTP id l69mr1058104pfb.111.1459236017660; Tue, 29 Mar 2016 00:20:17 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id qo2si4584148pac.229.2016.03.29.00.20.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2016 00:20:17 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@linaro.org; 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 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 1aknvq-0001MH-9G; Tue, 29 Mar 2016 07:19:18 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aknvH-0000kc-Gm for linux-arm-kernel@lists.infradead.org; Tue, 29 Mar 2016 07:18:45 +0000 Received: by mail-wm0-x231.google.com with SMTP id 20so12524461wmh.1 for ; Tue, 29 Mar 2016 00:18:23 -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=Bd4aIGMV1PdtpoO47V7AVEYhMFsxvTiBDB2G8qS3nB0=; b=eMsm6y6RoC5VsKygeKJTEeItzveRb7+irYKXPkZRyHOwoIeuPW3i9WCgMYXBs5lsCi ic8hbwwyKxLS4s20QQI44pNsHZjgckgb0NCpfjLyRTSYwYsfRU3nOpEJbfqjJ46Rf6BJ FEfa1QBA2yURaRkR2/pTnxmzXMhHb+bUvzRL8= 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=Bd4aIGMV1PdtpoO47V7AVEYhMFsxvTiBDB2G8qS3nB0=; b=GvPMd/WYWVqnNg5/LffYykPN3IoOlX8dPzWOL/Z4a0wGYEs0Nv0ceYbiVYtZePib0+ Lp2S/+FwfsQWa/pCenQB3tNAtDs6yfP24Z0AcIVymzq0Zck6Ua0fhBJDrHKwbGRlwMal Fn21x1MkKpwMzUFsTnJ5T8c2FC9643laxtCRB77G0LSIak++Tatw4F5oJD1eyBxPrWYr 5vf6jxZ13bWGxVmydaFv70jLZCOqgH76S1UFGx61cEvdtmydhmE+xWjSagcilpYcc57Y ouyrovE1Y1nBelcSB96XQvQu6tqN3HlVhaAC0npGHmQ3VOG9sCn9HrAt2YenU4v74Xuu rvqw== X-Gm-Message-State: AD7BkJLIzdBtkmSG9K25URkR1OXHescYk7h8O/Eq73HcA8EpfIGKVJzjtkiHSKum17bvMBni X-Received: by 10.28.16.141 with SMTP id 135mr1364195wmq.67.1459235901989; Tue, 29 Mar 2016 00:18:21 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id av3sm27921427wjc.44.2016.03.29.00.18.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Mar 2016 00:18:21 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk, linux+pull@arm.linux.org.uk Subject: [PULL 2/4] mtd: pxa2xx-flash: switch back from memremap to ioremap_cached Date: Tue, 29 Mar 2016 09:18:02 +0200 Message-Id: <1459235884-24318-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459235884-24318-1-git-send-email-ard.biesheuvel@linaro.org> References: <1459235884-24318-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160329_001843_882607_3B5B3906 X-CRM114-Status: GOOD ( 12.60 ) 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:231 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: matt@codeblueprint.co.uk, dan.j.williams@intel.com, David Woodhouse , 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 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 Acked-by: Brian Norris Acked-by: 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-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..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; }