From patchwork Wed Jun 6 10:13:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 925793 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=infinera.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="osJdBM0w"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="C7UVHJy8"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 4114Ls0GF3zB3h4 for ; Wed, 6 Jun 2018 20:15:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Ftp7Qd2SeGsscE1xQiuMgzbImJMZSh/+1Id3l6ZxttA=; b=osJdBM0wk3dQVO5/wFqKnaSIfq PPAkKFPA8EL70OV5pWQd6OtfwJHwCU5Iy4BjxiCG+dIL1rGWxiniurELs/8pGxpcx+ID/MXe+bU2a u0I7m8iWN0v7Br1UdjRurIQkFwfY/8JQgKc662/9C80y3tAyghQXu2DwzF7ZkoQVaIILD+x6aDPSi HwcaiiPxSIsIwctW00MzyHs/ECB8oUmO56GSuRozsJ3AMLHtYKjJfYDkYBHoD2mUON4kwCmbCHxTp 1DjbHVZiDZEpBRX3wHJ31wRf6dWRxQwTeRzw2Z/OuZw4VBirm/lV8C/G3X2YVo3JTDAR71pMZkvUO sn5pSc+Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fQVTi-0008Jp-PV; Wed, 06 Jun 2018 10:15:42 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fQVSQ-00067o-P6 for linux-mtd@bombadil.infradead.org; Wed, 06 Jun 2018 10:14:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=emame6Pfma7DNe7ENxBczDJJHjml1N9dFnUnsc6GCYY=; b=C7UVHJy8PWnmerenlQjuwrgsf 2iCZ4cZxxTl4w0GobzKv+mZam31bOtTzLgV8t+cKcZnnkmqu0kG29uRZmEh0pzoAiQx3SJ2UhI9CI 0XqLuInaYZoa/lsG3g8nJ6fGCKn2Xt3Vyuao4lNbEY5QxCx7bVpyy8nG4X+TB364aQtqGOl9OtcAd 1Ai4i59BfPwBmlJIpAXgKoWsFTevFdHuzNqEsSJpvzYOzhvV20dXzw8W775VDl4L1DExR5xBKZZ0X UC87+Ovfd9e3dkaLquk8KnsxraL8i79mLfkmbJVI129V6x1uaCLOrt3r+Js9DQKIs5b9+cRSHtcsT YOxcrJlUg==; Received: from smtp.transmode.se ([31.15.61.139]) by merlin.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fQVSI-0005qx-13 for linux-mtd@lists.infradead.org; Wed, 06 Jun 2018 10:14:20 +0000 Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [10.210.72.209]) by smtp.transmode.se (Postfix) with ESMTP id E5732118A718; Wed, 6 Jun 2018 12:13:43 +0200 (CEST) Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [127.0.0.1]) by gentoo-jocke.infinera.com (8.14.9/8.14.9) with ESMTP id w56ADhBr011239; Wed, 6 Jun 2018 12:13:43 +0200 Received: (from jocke@localhost) by gentoo-jocke.infinera.com (8.14.9/8.14.9/Submit) id w56ADhnM011238; Wed, 6 Jun 2018 12:13:43 +0200 From: Joakim Tjernlund To: "linux-mtd @ lists . infradead . org" , Boris Brezillon Subject: [PATCH v2 3/4] mtd: cfi_cmdset_0002: Avoid point less unlocking/locking Date: Wed, 6 Jun 2018 12:13:29 +0200 Message-Id: <20180606101330.11071-3-joakim.tjernlund@infinera.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180606101330.11071-1-joakim.tjernlund@infinera.com> References: <20180605172607.50acb34f@bbrezillon> <20180606101330.11071-1-joakim.tjernlund@infinera.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180606_061414_283907_ED71EF56 X-CRM114-Status: GOOD ( 21.07 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 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: Joakim Tjernlund , stable@vger.kernel.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org cfi_ppb_unlock() walks all flash chips when unlocking sectors. testing lock status on each chip which causes relocking of already locked sectors. Test against offset to aviod this aliasing. Fixes: 1648eaaa1575 ("mtd: cfi_cmdset_0002: Support Persistent Protection Bits (PPB) locking") Cc: stable@vger.kernel.org Signed-off-by: Joakim Tjernlund --- v2 - Spilt into several patches drivers/mtd/chips/cfi_cmdset_0002.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index cb85cccc48c1..b6273ce83de7 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -2670,7 +2670,7 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs, * sectors shall be unlocked, so lets keep their locking * status at "unlocked" (locked=0) for the final re-locking. */ - if ((adr < ofs) || (adr >= (ofs + len))) { + if ((offset < ofs) || (offset >= (ofs + len))) { sect[sectors].chip = &cfi->chips[chipnum]; sect[sectors].adr = adr; sect[sectors].locked = do_ppb_xxlock(