From patchwork Wed Jun 6 10:13:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 925790 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="KO8uKy8D"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="kvPV0u/a"; 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 4114KC3kNDzB3h4 for ; Wed, 6 Jun 2018 20:14:23 +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=k3PS5vqCHccT2Iqp+3lLxwijL+9noEjrP6LxTQ8Tv1U=; b=KO8uKy8D09fa3zrSGLTjz+Hh2O 3ILkF12MKoXiqYyI9ungz+2AoUeNhboeVEmg4fcbYq5ICH/6K1qZS39ZknpVsKfz7ez4KrnX0Wwpx r5Eerf27FewFuMEwOyGiEmSi9QLrOjNhy5j+JKpOaEJyZq6+XzZ3apk6Y8csgbC4+zrFQYzaY8SQX e/okjb3ZVqIinADJ594RkpHc5QN3jSH/2B9vPB/MyqgjKzMGCIKOu4G0EOZ9VII7X+ifdpwl69yjD mnPiBE9u1e0JnSkyLd5tD931eRVxl5anj1WM9t9bPmaz6YRqXNDje47uD7Ce6zmfh6BIoF6+W8ErI lCBMt+6Q==; 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 1fQVSN-00065h-5G; Wed, 06 Jun 2018 10:14:19 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fQVSK-00060C-FG for linux-mtd@bombadil.infradead.org; Wed, 06 Jun 2018 10:14:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=ZkLentKNCHX0cJHotETwYft6PcR0VyqI+ndolTum4rc=; b=kvPV0u/ayKu7RZXXrlFIbZJ8O bVCIwh2DgRTRXNT9qRwH5gADWOUbUTkZwzmQVg85o7NjDef5scgjTbiUOT8IFa2IJ8JXFHH41Hcay qH8hEluSlrrsJriAq8DRkyNiOOJtiOsekGzIWT3t0Bkfk7M91ug89aPHMtLI+ebWcBrqtFLXul1C7 z1HagIdS6HfCK9SAfJgb2TtHxbDyux545JoYfAxEf2MMpYzIXYsYy/js1vZRlrjMK1ts7jlQ2ZR/A LozrZmnDXdTd5jQq9Dvr4qLKJTY0GtfFshcUV9XB6HGj35bPw36j21cm6gRTMCOdR47NIRtUqiJ0o yhqg9izag==; Received: from smtp.transmode.se ([31.15.61.139]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fQVSH-0003vu-3N for linux-mtd@lists.infradead.org; Wed, 06 Jun 2018 10:14:15 +0000 Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [10.210.72.209]) by smtp.transmode.se (Postfix) with ESMTP id F271A118ACD8; Wed, 6 Jun 2018 12:13:44 +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 w56ADinU011245; Wed, 6 Jun 2018 12:13:44 +0200 Received: (from jocke@localhost) by gentoo-jocke.infinera.com (8.14.9/8.14.9/Submit) id w56ADiuW011244; Wed, 6 Jun 2018 12:13:44 +0200 From: Joakim Tjernlund To: "linux-mtd @ lists . infradead . org" , Boris Brezillon Subject: [PATCH v2 4/4] mtd: cfi_cmdset_0002: Avoid walking all chips when unlocking. Date: Wed, 6 Jun 2018 12:13:30 +0200 Message-Id: <20180606101330.11071-4-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_111413_185755_E12F733A X-CRM114-Status: GOOD ( 19.42 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (1.0 points, 5.0 required) 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, avoid walking chips unaffected by the unlock operation. 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, 2 insertions(+) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index b6273ce83de7..62cd4ee280b3 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -2686,6 +2686,8 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs, i++; if (adr >> cfi->chipshift) { + if (offset >= (ofs + len)) + break; adr = 0; chipnum++;