From patchwork Fri Jan 20 09:33:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastien Decourriere X-Patchwork-Id: 717564 X-Patchwork-Delegate: computersforpeace@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v4bD33ntFz9sDg for ; Fri, 20 Jan 2017 20:35:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EJLiFvWu"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cUVbQ-0000XW-8X; Fri, 20 Jan 2017 09:35:24 +0000 Received: from mail-wm0-f68.google.com ([74.125.82.68]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cUVb0-0000Ly-OC for linux-mtd@lists.infradead.org; Fri, 20 Jan 2017 09:35:00 +0000 Received: by mail-wm0-f68.google.com with SMTP id r126so5284416wmr.3 for ; Fri, 20 Jan 2017 01:34:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Cf6Wqyl+kdIu/IyuyIA2qGz7TzyBnmtCuQV0nUFww1M=; b=EJLiFvWuPggElFOclS9u2kTC0uZlONiBhOQ0wVPqnxDlAGxJPQjE33bvZ/9x0kr88/ 5M5EJcV+pQs8rCeNCk5e//f4T4g2xTuTVhZs43kbHoeWgQit4NDnlVPHA9VGA1cdyAca CKXYCy4wqa3Lg1ny+ljdMjul8PFEGgmza02SJmAFjgNVWjtYisxveJHjnTewnkE2Q1Ml qmJl2pYigDd3l8G5DBqqvce6dtiQS/iFM6MrWNy3pfzCad3KEh6hWNqo0MyAZ+mf4t2H grOpJnDTeGSRGgUOPTljUHBWesSKLHPFPJ7P1zDHLGUWDzgi0Dt+vC0V9vzdRFCUCyg7 CVqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Cf6Wqyl+kdIu/IyuyIA2qGz7TzyBnmtCuQV0nUFww1M=; b=rUqIYmaMsMygq0AH1p/tkG9f7DmefX8lsKOfauGHanAH/gLpg8hyFEunsy1KoQZY1/ 6L2x6hjZzDlpf80gbOGLvO2xYsiKt0mG0EPYGm0yvBu9NHTxmC2Bl/Uhx8NRzxDG5CEq pj4goRFU3HGd/yiASssJ9jE9dQ8AXpawZdRYZh9vBfhT03jT9LhGdx1U47qZnvTEf8l+ KwKo+s7t3B/URdgKOhfnjHmQwbcQIRj7OpxoCupN46NJW04SDXgqVWisyl338Ua0j+IA mD7xiCom/yB2nErph3njCQKfAN8klfqz1gNhQ64OEBCo8X1yt8KlppO9zCKxSl/IMhji KDjw== X-Gm-Message-State: AIkVDXIvERsbAo44iSqE55gBYgYONa+alagHpfstfNRdXd/g6GKgMfsBiXuoXjlmY4EygQ== X-Received: by 10.223.143.45 with SMTP id p42mr10578653wrb.120.1484904816097; Fri, 20 Jan 2017 01:33:36 -0800 (PST) Received: from serveurQA.phonesystems.net ([62.39.136.157]) by smtp.gmail.com with ESMTPSA id z134sm4786325wmc.20.2017.01.20.01.33.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jan 2017 01:33:35 -0800 (PST) From: Sebastien Decourriere To: linux-mtd@lists.infradead.org Subject: [PATCH] mtd: maps: lantiq-flash: Check if the EBU endianness swap is enabled Date: Fri, 20 Jan 2017 10:33:54 +0100 Message-Id: <1484904834-14980-1-git-send-email-sebtx452@gmail.com> X-Mailer: git-send-email 2.1.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170120_013458_948907_93379F65 X-CRM114-Status: GOOD ( 13.24 ) X-Spam-Score: -1.3 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [74.125.82.68 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [74.125.82.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sebtx452[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.68 listed in wl.mailspike.net] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (sebtx452[at]gmail.com) -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_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, Sebastien Decourriere MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The purpose of this patch is to enable the software address endianness swapping only when the in SoC EBU endianness swapping is disabled. To perform this check, I look at Bit 30 of the EBU_CON_0 register. Actually, the driver expects that the in SoC swapping is disabled. This is the case with current bootloaders shuch as U-boot. This applies only to vr9 (xrx200) rev 1.2 and ar10 (xrx300). I have a router which uses a proprietary bootloader which keeps the in SoC swapping enabled. The SoC in this router is a vrx200 v1.2. In this SoC version, I can keep the in SoC swapping without any problem. This patch replaces my previous broken patch. Signed-off-by: Sebastien Decourriere Acked-by: Ralf Baechle --- .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 1 + drivers/mtd/maps/lantiq-flash.c | 29 +++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h index 17b41bb..0ed0896 100644 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h @@ -87,6 +87,7 @@ extern __iomem void *ltq_cgu_membase; #define LTQ_EBU_PCC_ISTAT 0x00A0 #define LTQ_EBU_BUSCON1 0x0064 #define LTQ_EBU_ADDRSEL1 0x0024 +#define EBU_FLASH_ENDIAN_SWAP 0x40000000 #define EBU_WRDIS 0x80000000 /* WDT */ diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c index c8febb3..8d628d2 100644 --- a/drivers/mtd/maps/lantiq-flash.c +++ b/drivers/mtd/maps/lantiq-flash.c @@ -113,6 +113,24 @@ ltq_mtd_probe(struct platform_device *pdev) struct ltq_mtd *ltq_mtd; struct cfi_private *cfi; int err; + bool mtd_addr_swap = true; + +#ifdef CONFIG_SOC_TYPE_XWAY + /* If SoC is vr9 rev 1.2 or ar10 and EBU endian swap + * is enabled, we don't need to do software address swap + */ + if (ltq_ebu_r32(LTQ_EBU_BUSCON0) & EBU_FLASH_ENDIAN_SWAP) { + switch (ltq_soc_type()) { + case SOC_TYPE_VR9_2: + case SOC_TYPE_AR10: + mtd_addr_swap = false; + break; + default: + mtd_addr_swap = true; + break; + } + } +#endif if (of_machine_is_compatible("lantiq,falcon") && (ltq_boot_select() != BS_FLASH)) { @@ -150,7 +168,10 @@ ltq_mtd_probe(struct platform_device *pdev) ltq_mtd->map->copy_from = ltq_copy_from; ltq_mtd->map->copy_to = ltq_copy_to; - ltq_mtd->map->map_priv_1 = LTQ_NOR_PROBING; + if (mtd_addr_swap) + ltq_mtd->map->map_priv_1 = LTQ_NOR_PROBING; + else + ltq_mtd->map->map_priv_1 = LTQ_NOR_NORMAL; ltq_mtd->mtd = do_map_probe("cfi_probe", ltq_mtd->map); ltq_mtd->map->map_priv_1 = LTQ_NOR_NORMAL; @@ -163,8 +184,10 @@ ltq_mtd_probe(struct platform_device *pdev) mtd_set_of_node(ltq_mtd->mtd, pdev->dev.of_node); cfi = ltq_mtd->map->fldrv_priv; - cfi->addr_unlock1 ^= 1; - cfi->addr_unlock2 ^= 1; + if (mtd_addr_swap) { + cfi->addr_unlock1 ^= 1; + cfi->addr_unlock2 ^= 1; + } err = mtd_device_register(ltq_mtd->mtd, NULL, 0); if (err) {