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 (esa6.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=esa6.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 (esa6.microchip.iphmx.com: no sender
  authenticity information available from domain of
  postmaster@email.microchip.com) identity=helo;
  client-ip=198.175.253.82; receiver=esa6.microchip.iphmx.com;
  envelope-from="Tudor.Ambarus@microchip.com";
  x-sender="postmaster@email.microchip.com";
  x-conformance=spf_only
IronPort-SDR: +cWE3UK4kxADAkXwkfd3ldxdvBkWTYAefW9na6aoou0f4hTJF5hISjnrpJRzoJq5J9Xi3/HYrq
 q22jd8vUUvViPKfrCRkiSsrRa1ykR0RairRw7Vln0ROAya/YavyeH69FQaM4ICvvZto6Y7WTe+
 drXn/zuMZ7AH8S8/lXOyIWvgWz8ssFiy5oQu0/6J1YwZfZHmNOgJVLDApZ+BrtKuxv9pFI0iUA
 LDltls/0IIk1mCS0rQbbnwVP8pc9tr2f2fyLMsN3eMtD4Qw201exzz5xibaE1gWPOkN7McprPb
 WrQ=
From:   <Tudor.Ambarus@microchip.com>
To:     <boris.brezillon@collabora.com>, <marek.vasut@gmail.com>,
        <vigneshr@ti.com>, <miquel.raynal@bootlin.com>, <richard@nod.at>,
        <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>
CC:     <Tudor.Ambarus@microchip.com>
Subject: [RESEND PATCH v3 15/20] mtd: spi-nor: Add s3an_post_sfdp_fixups()
Thread-Topic: [RESEND PATCH v3 15/20] mtd: spi-nor: Add
 s3an_post_sfdp_fixups()
Thread-Index: AQHVXAcLGug0TlbN8kamSzLVrzO6ow==
Date:   Mon, 26 Aug 2019 12:09:00 +0000
Message-ID: <20190826120821.16351-16-tudor.ambarus@microchip.com>
References: <20190826120821.16351-1-tudor.ambarus@microchip.com>
In-Reply-To: <20190826120821.16351-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: [94.177.32.156]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: c7e0b2f3-6486-42fb-336c-08d72a1e2d9f
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020);SRVR:MN2PR11MB3678;
x-ms-traffictypediagnostic: MN2PR11MB3678:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <MN2PR11MB3678A0E4E465C8EA58E2DCF6F0A10@MN2PR11MB3678.namprd11.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:7691;
x-forefront-prvs: 01415BB535
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(376002)(396003)(366004)(346002)(39860400002)(136003)(189003)(199004)(186003)(86362001)(305945005)(2906002)(7736002)(2201001)(6486002)(6436002)(6116002)(3846002)(66556008)(66946007)(66476007)(2501003)(66446008)(64756008)(5660300002)(71190400001)(14444005)(256004)(71200400001)(1076003)(6506007)(386003)(14454004)(107886003)(316002)(99286004)(76176011)(110136005)(52116002)(6666004)(2616005)(476003)(486006)(53936002)(66066001)(8676002)(8936002)(81166006)(6512007)(4326008)(25786009)(36756003)(478600001)(81156014)(102836004)(50226002)(446003)(11346002)(26005);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2PR11MB3678;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-message-info: RXC6BUH0PS89gCigq/42s5pMGWHujVUrypQA2rOWFeUZxbNgitlkPgxWqoEmp2JJNpQsyWNkHrzil6QuBhBsOSyD3dQMdnuLJ+RKApVFjXIvvDR17pCMyOYT7Ole6u7dPRnx8CYOOM5YVj5EpYu3VzqvgmAhXQ9VTBnKdb/t6Va/ldxwSowLXSvS7ankdHdrVPrdl/y0VY1Rz6TZONV757o+qdn9zRLvgcMSLRV/8F8xw23FIGxzLbJ54ne57DLTJA17WQhlT0/enWQ9Hxap6NAkn9MgP/pPmU/8ZA+HiputxrNAocbdXeCMPFfIWmS9Bs5byE5vQ7mTuxG14uLdT/B5a57J845Wd7MsSS+YowMoW9JUT1InJc4oSFFH62FL7QZNW0ziw0xs0wu+xyMfOJ32jc7NkSYE+ljGbvT9F60=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: c7e0b2f3-6486-42fb-336c-08d72a1e2d9f
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Aug 2019 12:09:00.0897
 (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: ra4WiIgyXE0fuTtc3GD/4b1Viy851cgyALWbSuJzhOoIjdp6nLIArOsgz/D1LqaiW8Ixm0sFuP5u4Emk8qKHIp8rMSu11uGeD41gCwGlmQU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB3678
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>

s3an_nor_scan() was overriding the opcode selection done in
spi_nor_default_setup(). Set nor->setup() method in order to
avoid the unnecessary call to spi_nor_default_setup().

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
---
v3: no changes, rebase on previous commits

 drivers/mtd/spi-nor/spi-nor.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 2aca56e07341..edf1c8badac9 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2718,7 +2718,8 @@ static int spi_nor_check(struct spi_nor *nor)
 	return 0;
 }
=20
-static int s3an_nor_scan(struct spi_nor *nor)
+static int s3an_nor_setup(struct spi_nor *nor,
+			  const struct spi_nor_hwcaps *hwcaps)
 {
 	int ret;
=20
@@ -4530,6 +4531,11 @@ static void spansion_post_sfdp_fixups(struct spi_nor=
 *nor)
 	nor->mtd.erasesize =3D nor->info->sector_size;
 }
=20
+static void s3an_post_sfdp_fixups(struct spi_nor *nor)
+{
+	nor->params.setup =3D s3an_nor_setup;
+}
+
 /**
  * spi_nor_post_sfdp_fixups() - Updates the flash's parameters and setting=
s
  * after SFDP has been parsed (is also called for SPI NORs that do not
@@ -4551,6 +4557,9 @@ static void spi_nor_post_sfdp_fixups(struct spi_nor *=
nor)
 		break;
 	}
=20
+	if (nor->info->flags & SPI_S3AN)
+		s3an_post_sfdp_fixups(nor);
+
 	if (nor->info->fixups && nor->info->fixups->post_sfdp)
 		nor->info->fixups->post_sfdp(nor);
 }
@@ -4899,12 +4908,6 @@ int spi_nor_scan(struct spi_nor *nor, const char *na=
me,
 		return -EINVAL;
 	}
=20
-	if (info->flags & SPI_S3AN) {
-		ret =3D s3an_nor_scan(nor);
-		if (ret)
-			return ret;
-	}
-
 	/* Send all the required SPI flash commands to initialize device */
 	ret =3D spi_nor_init(nor);
 	if (ret)
--=20
2.9.5