Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (esa5.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=esa5.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 (esa5.microchip.iphmx.com: no sender
  authenticity information available from domain of
  postmaster@email.microchip.com) identity=helo;
  client-ip=198.175.253.82; receiver=esa5.microchip.iphmx.com;
  envelope-from="Tudor.Ambarus@microchip.com";
  x-sender="postmaster@email.microchip.com";
  x-conformance=spf_only
IronPort-SDR: fAD8nx1o1uN79GuSyGQTgU4D34mLvnZSrvM0ruXef5249hfGaiqvCCozI+3xYquSqqpKrBy/c0
 ytUM7AlzHXag0FAiOGaQWOIMphx9/wJpHo4I43HxId71x5+TKAqbvlk7VlQ+1XYkwcaWq82g0q
 fzQ/OVobaWIScrHyV8/C2UbzTTxVds1IqduABF/wOlyyi6PJa3obuaAJUUvddNUghwHiUZo6la
 hOOteHBZnA7CT4Krp43jBRJhajie9dYtFcSGi5xCUV4Lil+Qg7nV7ngQEFH5lrN1z4/+W47e46
 DTs=
From:   <Tudor.Ambarus@microchip.com>
To:     <miquel.raynal@bootlin.com>, <richard@nod.at>, <vigneshr@ti.com>,
        <boris.brezillon@collabora.com>
CC:     <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
        <Tudor.Ambarus@microchip.com>
Subject: [PATCH v3 23/32] mtd: spi-nor: Check all the bits written, not just
 the BP ones
Thread-Topic: [PATCH v3 23/32] mtd: spi-nor: Check all the bits written, not
 just the BP ones
Thread-Index: AQHVjkpx863xm7AhdUG2gmkUJjOvGg==
Date:   Tue, 29 Oct 2019 11:17:25 +0000
Message-ID: <20191029111615.3706-24-tudor.ambarus@microchip.com>
References: <20191029111615.3706-1-tudor.ambarus@microchip.com>
In-Reply-To: <20191029111615.3706-1-tudor.ambarus@microchip.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.9.5
x-originating-ip: [83.166.207.93]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: de62ffc1-2b02-4eb5-aecc-08d75c6193ae
x-ms-traffictypediagnostic: MN2PR11MB3823:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <MN2PR11MB3823E7463321F96E1C48ED41F0610@MN2PR11MB3823.namprd11.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:5236;
x-forefront-prvs: 0205EDCD76
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(39860400002)(346002)(136003)(376002)(396003)(189003)(199004)(478600001)(8676002)(4326008)(8936002)(66066001)(14454004)(36756003)(6512007)(107886003)(86362001)(11346002)(2616005)(476003)(486006)(6436002)(1076003)(2201001)(71200400001)(71190400001)(446003)(81156014)(81166006)(6486002)(50226002)(99286004)(66946007)(386003)(316002)(52116002)(6506007)(102836004)(76176011)(26005)(2501003)(305945005)(186003)(6116002)(110136005)(25786009)(2906002)(14444005)(256004)(54906003)(3846002)(64756008)(66446008)(66556008)(66476007)(5660300002)(7736002);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR11MB3823;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: VTS1oBQ5oFRH551HTvUT4Ra7KtsIOyLCxrWpNbQwIhOu9CiISwUvIGpN+SHlWxW0curQniHLNvIIWjg8ciUUMIMDq3/sXMX0TGRld6N5aYfYseNzBbd9/K1f/TLTvwyIhZI476BtyOiWUdJP3GxBo5iZJDYY2CYX3v1ibRAQGGUrnFv4WJXnCt5qArcit3levVRE2n5sMLgSP4KINjH4lELkIubVxY2gqMqJctLt38W4AtSnA1EyjtToEuXBuRD4AgEnGgKN3folXSBtB5L9NL/8a0hMIUW17vEy0eiOLKIAjIcbTW1nGiFRUwquA2Mbi1JH63ixlfZO+VMmdwp+1/H9YcZcuntqS2O98ZDi9qN0wPbsm49cs6iRqhzrPJS6a4xFSn7BpGavAGckHh2dRtMMldmRG5cqNfXi5g2AYSHKQpOHBTaDXVy70MTbL171
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: de62ffc1-2b02-4eb5-aecc-08d75c6193ae
X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Oct 2019 11:17:25.7465
 (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: omwbmU6RYQYVzWOuKW1jtXeXP/6OOT0keKiJho3e7eklTXesEIPnkhhgeiKZsnDA2k/G43BtBco6/ojGnqBrQyZm0iZGX9etvOcbeLkWRbs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3823
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Tudor Ambarus <tudor.ambarus@microchip.com>

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 <tudor.ambarus@microchip.com>
---
 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 21a974b88c3b..5b30fc73fdba 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)
 }
=20
 /* 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;
=20
@@ -975,7 +974,7 @@ static int spi_nor_write_sr_and_check(struct spi_nor *n=
or, u8 status_new,
 	if (ret)
 		return ret;
=20
-	return ((nor->bouncebuf[0] & mask) !=3D (status_new & mask)) ? -EIO : 0;
+	return (nor->bouncebuf[0] !=3D status_new) ? -EIO : 0;
 }
=20
 /**
@@ -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;
=20
-	return spi_nor_write_sr_and_check(nor, status_new, mask);
+	return spi_nor_write_sr_and_check(nor, status_new);
 }
=20
 /*
@@ -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;
=20
-	return spi_nor_write_sr_and_check(nor, status_new, mask);
+	return spi_nor_write_sr_and_check(nor, status_new);
 }
=20
 /*
--=20
2.9.5