From patchwork Sat Nov 2 11:23:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 1188343 X-Patchwork-Delegate: tudor.ambarus@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=fail (p=none dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="q6v6vyGj"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="BqeEYrgE"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 474xbc6PMVz9sP4 for ; Sat, 2 Nov 2019 22:26:52 +1100 (AEDT) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: 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=q9Y40OrSQ3tIZo6d6LK/ZnrmjWM+ARlmvsk3YPTSQNA=; b=q6v6vyGjk1r+Ou g4Z8uPRCi4ZqxYWDfngXJcB2J8URvgRZhm4nUYb0gAW4pXOEFckLcAO1nPcyd2PuT/R7TR7rfEuxA YLOQ6X5VKkEL3IQXDR1Px5RRGiLBJzGP6TFtGh03aaVkuqWd+Qppko1Dyt7rgQyXUW0Vk9mfKY1vB rn2dOYSUNCxIKh+RGMvwoLW3PbMQAzmpMAuy/Z86SJwrwhfunswPdYqU0Z58cGmg2SNNNsfbCmMBy 0gEtnlas6q1BNA2hXrpQxL5KnyqJxeNNBdQU6QmjjsLZ9sIyGIvAQIDASybifZycurXa93xIwDDOC ak6H52672fJWzfWW7COg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iQrYQ-0006B8-2s; Sat, 02 Nov 2019 11:26:50 +0000 Received: from esa2.microchip.iphmx.com ([68.232.149.84]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iQrVR-0002M1-Ac for linux-mtd@lists.infradead.org; Sat, 02 Nov 2019 11:23:46 +0000 Received-SPF: Pass (esa2.microchip.iphmx.com: domain of Tudor.Ambarus@microchip.com designates 198.175.253.82 as permitted sender) identity=mailfrom; client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com; envelope-from="Tudor.Ambarus@microchip.com"; x-sender="Tudor.Ambarus@microchip.com"; x-conformance=spf_only; x-record-type="v=spf1"; x-record-text="v=spf1 mx a:ushub1.microchip.com a:smtpout.microchip.com a:mx1.microchip.iphmx.com a:mx2.microchip.iphmx.com include:servers.mcsv.net include:mktomail.com include:spf.protection.outlook.com ~all" Received-SPF: None (esa2.microchip.iphmx.com: no sender authenticity information available from domain of postmaster@email.microchip.com) identity=helo; client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com; envelope-from="Tudor.Ambarus@microchip.com"; x-sender="postmaster@email.microchip.com"; x-conformance=spf_only Authentication-Results: esa2.microchip.iphmx.com; spf=Pass smtp.mailfrom=Tudor.Ambarus@microchip.com; spf=None smtp.helo=postmaster@email.microchip.com; dkim=pass (signature verified) header.i=@microchiptechnology.onmicrosoft.com; dmarc=pass (p=none dis=none) d=microchip.com IronPort-SDR: Dj//6Oxnayc4DCHDgH3dH71+AAfKyrBlWKEa1u2wbE9TU+0HCWjfs5VDyZU/k8Dlx3FlcK7L/X 2xmLFoz2SRpD11FWdeWAC4aEiRX+fDbzPOFj1h9cvRZlLslpTYCLHGvcAExU62QggYd40hFGNx +o7VRa1GI1sPSlCJW4mSmC+71sT0JMxWdePaFOhcYwlwPFn246vYfE4gXfpSXmSSTQvQPqRh+d gM6+kzN6NSPMwwD4c0llJtmflOdVFiHRByv3kV9ReD4MGi4oO4mjJs8Dyzm2LLozdz254GwtOI hKE= X-IronPort-AV: E=Sophos;i="5.68,259,1569308400"; d="scan'208";a="55071977" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 02 Nov 2019 04:23:44 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sat, 2 Nov 2019 04:23:44 -0700 Received: from NAM05-CO1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Sat, 2 Nov 2019 04:23:44 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OxG3/0LJABosrbXv9jFlZQcrFwjhCY7EgYLfQtmrOW657bkwmBBcEIra+B0xzasDhXtCbqTQvnam/SzhMDeV1GzTeAgyBK+/uKFmwrphGGBhXqnCDhd1yak8y8vhcRIVh5btAwa+LhZXrZu9VhZbpnzV2ZL3np/OsLLH7TX68RjUdGIEM0dRK8CAiqFEdq7wRSCgW+dwQ4Van+dPSfsDyHWpYCQq7oQTl/DjfYoGcrc2MfhSKKU5JQkDET6Ok2yIxBOtmfvJbZW33rqxo0RHa+opKdNccw+dtNnG/FGcb3H+tY8o1hiJiyT+hm6xbMDAd8pKlT6oLgzxhjq/VrwiOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M+sI1YE0Xpkt0FhPi2anjmKX7Nszb3bufasL7As83SE=; b=ivULqCptvaHNvEEbNyilizDNgeL5K0Z3ItYBH6sR4o1RYWT/GDDjTEN+IleOvJkWvjCtFzXFbeoZ0q9AnJlCpZnvjFhwX3TRTTyqtZbkKLo6VVHC9w6/DZpWnCmPyniglb6xOBQ11ZluZxTPY0LOQxCzn7801y//khAAeRu29xjAouJXq1gvi08AmYgerc/k+lsv7KzLN5HrXDpvRUbZP4OTbfXqNoiL8ZhanQMMqLAZe2Z4W6VkJpb5D9Cv4I6m2397VYswdmtUrcTWk78p3rS/Vvk824cb46UQ8kKTBN4yvwBMipnhUEA4rje0Z1CbD1kE4JuQ+a1eWohYPdpTCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microchip.com; dmarc=pass action=none header.from=microchip.com; dkim=pass header.d=microchip.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector2-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M+sI1YE0Xpkt0FhPi2anjmKX7Nszb3bufasL7As83SE=; b=BqeEYrgEfFImwsKh0OVUtTmFQJu+0ByLxLR2T6Q3Hqyn+bra2QT6Y6rIX3pscz1z7MdHqPVN4m/Mwt1M1FlDFL/G8PBPuATU2p7UF3XmDdGDovNhEsZNSGTuQqXqXiJhUi4clnMrdcz3kYY9w4cOge/nhq2kNzkGJcy6MqsgP88= Received: from MN2PR11MB4448.namprd11.prod.outlook.com (52.135.39.157) by MN2PR11MB3711.namprd11.prod.outlook.com (20.178.254.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2387.20; Sat, 2 Nov 2019 11:23:43 +0000 Received: from MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::c09c:36c8:3301:4457]) by MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::c09c:36c8:3301:4457%5]) with mapi id 15.20.2408.018; Sat, 2 Nov 2019 11:23:43 +0000 From: To: , Subject: [PATCH v4 11/20] mtd: spi-nor: Check all the bits written, not just the BP ones Thread-Topic: [PATCH v4 11/20] mtd: spi-nor: Check all the bits written, not just the BP ones Thread-Index: AQHVkW/7jY3VsbPeikC7kuRKBX87MA== Date: Sat, 2 Nov 2019 11:23:43 +0000 Message-ID: <20191102112316.20715-12-tudor.ambarus@microchip.com> References: <20191102112316.20715-1-tudor.ambarus@microchip.com> In-Reply-To: <20191102112316.20715-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR07CA0143.eurprd07.prod.outlook.com (2603:10a6:802:16::30) To MN2PR11MB4448.namprd11.prod.outlook.com (2603:10b6:208:193::29) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.9.5 x-originating-ip: [86.120.239.29] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 202ae619-a42d-4edf-f821-08d75f871e31 x-ms-traffictypediagnostic: MN2PR11MB3711: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-forefront-prvs: 0209425D0A x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(39860400002)(346002)(376002)(396003)(189003)(199004)(64756008)(386003)(316002)(446003)(4326008)(5660300002)(81166006)(6506007)(2616005)(76176011)(81156014)(11346002)(110136005)(476003)(25786009)(54906003)(8936002)(86362001)(486006)(14454004)(8676002)(102836004)(26005)(66476007)(50226002)(2906002)(6116002)(1076003)(2501003)(7736002)(3846002)(99286004)(71200400001)(36756003)(71190400001)(66556008)(256004)(305945005)(6486002)(6436002)(66946007)(66066001)(6512007)(66446008)(478600001)(186003)(52116002)(14444005)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR11MB3711; H:MN2PR11MB4448.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 0f+W7Ic821I+ao4zW8ZMSluLES3vfdKNbqCyZDuruoIS8uowXNvmgMY4ChFI1zrlpJeEL9EUvT/iec4C3N8/quAXvCDbG/lHhnU7kyHPqwueC1h6PLq7qLwkX8wYEVuC+d3Wu+3fKpc7Fj6rku60yZN7dIb37oeZPbDQOAEQPM9PTELUIu3ooOoMPkBZ9v0LWMckTA6Tw8zhWb1RqsRMhNAbbxFuzRORuIsV9cxyVT7ebXKriyIi2JxkUOHCu3FnBI2sgiMWFuvJNovYul6thVwzrdm0/qG+dGQX78CkDaWtNeZHko8hx6S0LBFJtv1MClurVDHubUniaMiU8PrY7UM/eKeWk50dliDFBtkulkq3xvaQWsQ01MdyYmc6wp/KCnnzWCuNyFnmyQtYTQmN5RZ1T7HPiRsiCVaJ9lIdnL1s+kU6QbpfnniI6aetSDN6 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 202ae619-a42d-4edf-f821-08d75f871e31 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Nov 2019 11:23:43.0408 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: nu38qv3MB1tfz/S9mJS/vk59djsJNfrfZ7Eu1+tD9j7gc1uTU3p8Tbb6eaAJ0hwOAYr7DR7JrzarqKt/nJW0sRuw6vaGPtKvxawgGWnMQyA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3711 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191102_042345_407586_ED0896C7 X-CRM114-Status: UNSURE ( 8.68 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [68.232.149.84 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard@nod.at, Tudor.Ambarus@microchip.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, miquel.raynal@bootlin.com Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Tudor Ambarus Check that all the bits written in the write_sr_and_check() method match the status_new received value. Failing to write the other bits is dangerous too, extend the check. Signed-off-by: Tudor Ambarus Reviewed-by: Vignesh Raghavendra --- drivers/mtd/spi-nor/spi-nor.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 14146619bf19..8f5e9833081b 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -960,8 +960,7 @@ static int spi_nor_write_sr(struct spi_nor *nor, const u8 *sr, size_t len) } /* Write status register and ensure bits in mask match written values */ -static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new, - u8 mask) +static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new) { int ret; @@ -975,7 +974,7 @@ static int spi_nor_write_sr_and_check(struct spi_nor *nor, u8 status_new, if (ret) return ret; - return ((nor->bouncebuf[0] & mask) != (status_new & mask)) ? -EIO : 0; + return (nor->bouncebuf[0] != status_new) ? -EIO : 0; } /** @@ -1774,7 +1773,7 @@ static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len) if ((status_new & mask) < (status_old & mask)) return -EINVAL; - return spi_nor_write_sr_and_check(nor, status_new, mask); + return spi_nor_write_sr_and_check(nor, status_new); } /* @@ -1859,7 +1858,7 @@ static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) if ((status_new & mask) > (status_old & mask)) return -EINVAL; - return spi_nor_write_sr_and_check(nor, status_new, mask); + return spi_nor_write_sr_and_check(nor, status_new); } /*