From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA438C433FF for ; Wed, 31 Jul 2019 09:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 895CC2089E for ; Wed, 31 Jul 2019 09:03:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="T0e8J5n5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728468AbfGaJDy (ORCPT ); Wed, 31 Jul 2019 05:03:54 -0400 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:3350 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726856AbfGaJDm (ORCPT ); Wed, 31 Jul 2019 05:03:42 -0400 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: 9+u8aWnjVgRYCExzEupZhaydEIqAjth3Feq4CmcM6IDGmMg8RsKkfU71ZVzA0k2wAQD2mTDQjw MDThtSoOlScSV94DnATF3xFMC1adkpEtkELfI9bwnPWI4u1dZg8tj82O5RoSOayXIeD/8byhba XUNqbGcljYoqGWSLj9VGkWAOREfGdKvWik5XKom6RFKn3gQQBmJxIfYWm6SLKlY7X6sktOdonv FqWXPee6cysQKnrbnqjQctVrRdjwF7bhrP5owmq0brEVXcloBypXUkS9du7J9fKq2h+3bKCe/S cL8= X-IronPort-AV: E=Sophos;i="5.64,329,1559545200"; d="scan'208";a="43382572" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 31 Jul 2019 02:03:40 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.87.72) by chn-vm-ex02.mchp-main.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 31 Jul 2019 02:03:39 -0700 Received: from NAM03-DM3-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 31 Jul 2019 02:03:38 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lqh5WQSYSqCtfKaKHToN1ekb5VyFGfZasmR8DbsTcCkbuLNBSJQcJ9P5flUBXca5jRZ9fu6EErVG/5OLtHAMPk8KF6PGY+WplkbTWxCOoTFiNLwzT+LboTgY5uriI6MdMWyBgokBh1HQJYpLG7U6RHyGJFNEsT7IAiAq8FrMcrmCbW+3yV9+jwIYrgjiXxSyoD8iE0PVRFP7VC616LKur0dJDKPNzSovc23SMo8eOyIguMkHHSfy67EUch54yQySbwWqlUVBOsEaJ+SeK8csmqdBq6BpUlCK6s4bBflqICLBTKWgfUIUeaFizoOLnfx7cTE1rlawwYbAum65tl1bIg== 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=8k84iELptp/wzkjhatngTTzkW2T3oIdvRNpk5YjEAzw=; b=aBng1ZgN2TGWBpdvVUUsWEmq7P7ndqASv89T4SdMqG8T6bzlfO8Ac7vv/yVKpwik9ezJXyEmrRYgIIx9qbla4TsJ/ZI+MzIuOba8BoG4N5HuAcd3w4cB6rRhUq10xH/kFNGFkiaHNU+4T9DYOIGW8hsdgzBV4dPZPLDNEL1q3yY/EUrjESl6eJ3SdpvRGwesVL2SqKbVYrVRUxo+o7bmnYvuV20QwQhPlo2fjEy1CYdKYeUm0wMEly4lEVho7n8Azkx39zr+qiqAeKU0PfaHb+i3Fr/dgJm4Jc8faLucnA6Hgz346NUV/4DR/y7k0sd3gH3JPHSmrk0QT/TxSBsKOQ== 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=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8k84iELptp/wzkjhatngTTzkW2T3oIdvRNpk5YjEAzw=; b=T0e8J5n5qCROYkt+WYxqZEp6GzVUYuq6AqQaDWORCznU39mxknOTYo19jYhrqXNuwNJY+VvQR/pdq6bwLIAQwa/FQ8U2E8QjlvQqvJSMURKaYm6JPRkBoBeQBFjVEBet+XrHGLTmYCp08BA0RPX8uC2Pgy76O6T1JVOS7KU96WQ= Received: from MN2PR11MB4448.namprd11.prod.outlook.com (52.135.39.157) by MN2SPR01MB0050.namprd11.prod.outlook.com (10.255.239.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.15; Wed, 31 Jul 2019 09:03:37 +0000 Received: from MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::61d1:6408:89a2:8de5]) by MN2PR11MB4448.namprd11.prod.outlook.com ([fe80::61d1:6408:89a2:8de5%2]) with mapi id 15.20.2115.005; Wed, 31 Jul 2019 09:03:37 +0000 From: To: , , CC: , , , , , , , Subject: [PATCH 6/7] mtd: spi-nor: Rework the SPI NOR lock/unlock logic Thread-Topic: [PATCH 6/7] mtd: spi-nor: Rework the SPI NOR lock/unlock logic Thread-Index: AQHVR37XrXJde/MfmUq32aDZ/X2NkQ== Date: Wed, 31 Jul 2019 09:03:37 +0000 Message-ID: <20190731090315.26798-7-tudor.ambarus@microchip.com> References: <20190731090315.26798-1-tudor.ambarus@microchip.com> In-Reply-To: <20190731090315.26798-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR03CA0070.eurprd03.prod.outlook.com (2603:10a6:803:50::41) 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: [94.177.32.154] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8aeab297-0a49-444c-1593-08d71595f963 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020);SRVR:MN2SPR01MB0050; x-ms-traffictypediagnostic: MN2SPR01MB0050: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-forefront-prvs: 011579F31F x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(376002)(39860400002)(366004)(346002)(396003)(136003)(189003)(199004)(6116002)(3846002)(50226002)(53936002)(36756003)(54906003)(7416002)(305945005)(8676002)(81166006)(107886003)(2906002)(81156014)(6436002)(316002)(26005)(66476007)(66946007)(64756008)(66446008)(66556008)(6486002)(68736007)(8936002)(6512007)(86362001)(5660300002)(25786009)(1076003)(110136005)(7736002)(186003)(4326008)(11346002)(446003)(102836004)(386003)(6506007)(256004)(2616005)(476003)(52116002)(99286004)(76176011)(478600001)(2501003)(66066001)(14454004)(14444005)(486006)(71190400001)(71200400001)(2201001);DIR:OUT;SFP:1101;SCL:1;SRVR:MN2SPR01MB0050;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: u+rdyAmL/YFOaWtj4kKgTkYejO3zacTA2O5UK6sXG++7hfSYoJC+2vbltmj+7kJznDuIZyj7NYkL1zjsmNlGs51eXxfCWPnoF/PV6jW3o/iriiBEZos3tVAd1aXPFi4ml/dV4HMOhiL1kZVvcCyU0acanw8NSwzW0Kf3pF4C0rw2wNZaPXZR4h8sJ084V9puU6NyiqAh1NWQsTJc0AfgICBp/fEHPk8KdCuaT3VDOUBb6A1d91LKTZHTJDpCPHOQrY7s02+QORweFZoOZMN6Y7RkFUGNXzzuDigfp2PP6+yXVVozbQrZmlP4vF2MpXME9YyN6XnSmhYbUwGe8QihheGAbbV9So29gbsz8pR9I06dGYcH6Yn+OOx//jweFzj0ZqiOAjQ9gN2oBPgtywH4DSlXEuoz+UH9++MPNBzBl1o= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 8aeab297-0a49-444c-1593-08d71595f963 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jul 2019 09:03:37.6296 (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: tudor.ambarus@microchip.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2SPR01MB0050 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Boris Brezillon Move the locking hooks in a separate struct so that we have just one field to update when we change the locking implementation. stm_locking_ops, the legacy locking operations, can be overwritten later on by implementing manufacturer specific default_init() hooks. Signed-off-by: Boris Brezillon [tudor.ambarus@microchip.com: use ->default_init() hook] Signed-off-by: Tudor Ambarus --- drivers/mtd/spi-nor/spi-nor.c | 37 +++++++++++++++++++------------------ include/linux/mtd/spi-nor.h | 14 ++++++++++++++ 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index e35aae88d38b..95ca5dd96403 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1743,6 +1743,12 @@ static int stm_is_locked(struct spi_nor *nor, loff_t= ofs, uint64_t len) return stm_is_locked_sr(nor, ofs, len, status); } =20 +static const struct spi_nor_locking_ops stm_locking_ops =3D { + .lock =3D stm_lock, + .unlock =3D stm_unlock, + .is_locked =3D stm_is_locked, +}; + static int spi_nor_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { struct spi_nor *nor =3D mtd_to_spi_nor(mtd); @@ -1752,7 +1758,7 @@ static int spi_nor_lock(struct mtd_info *mtd, loff_t = ofs, uint64_t len) if (ret) return ret; =20 - ret =3D nor->flash_lock(nor, ofs, len); + ret =3D nor->locking_ops->lock(nor, ofs, len); =20 spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_UNLOCK); return ret; @@ -1767,7 +1773,7 @@ static int spi_nor_unlock(struct mtd_info *mtd, loff_= t ofs, uint64_t len) if (ret) return ret; =20 - ret =3D nor->flash_unlock(nor, ofs, len); + ret =3D nor->locking_ops->unlock(nor, ofs, len); =20 spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK); return ret; @@ -1782,7 +1788,7 @@ static int spi_nor_is_locked(struct mtd_info *mtd, lo= ff_t ofs, uint64_t len) if (ret) return ret; =20 - ret =3D nor->flash_is_locked(nor, ofs, len); + ret =3D nor->locking_ops->is_locked(nor, ofs, len); =20 spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK); return ret; @@ -4805,6 +4811,10 @@ int spi_nor_scan(struct spi_nor *nor, const char *na= me, nor->quad_enable =3D spansion_quad_enable; nor->set_4byte =3D spansion_set_4byte; =20 + /* Default locking operations. */ + if (info->flags & SPI_NOR_HAS_LOCK) + nor->locking_ops =3D &stm_locking_ops; + /* Init flash parameters based on flash_info struct and SFDP */ spi_nor_init_params(nor, ¶ms); =20 @@ -4819,21 +4829,6 @@ int spi_nor_scan(struct spi_nor *nor, const char *na= me, mtd->_read =3D spi_nor_read; mtd->_resume =3D spi_nor_resume; =20 - /* NOR protection support for STmicro/Micron chips and similar */ - if (JEDEC_MFR(info) =3D=3D SNOR_MFR_ST || - JEDEC_MFR(info) =3D=3D SNOR_MFR_MICRON || - info->flags & SPI_NOR_HAS_LOCK) { - nor->flash_lock =3D stm_lock; - nor->flash_unlock =3D stm_unlock; - nor->flash_is_locked =3D stm_is_locked; - } - - if (nor->flash_lock && nor->flash_unlock && nor->flash_is_locked) { - mtd->_lock =3D spi_nor_lock; - mtd->_unlock =3D spi_nor_unlock; - mtd->_is_locked =3D spi_nor_is_locked; - } - /* sst nor chips use AAI word program */ if (info->flags & SST_WRITE) mtd->_write =3D sst_write; @@ -4874,6 +4869,12 @@ int spi_nor_scan(struct spi_nor *nor, const char *na= me, if (info->flags & SPI_NOR_NO_FR) params.hwcaps.mask &=3D ~SNOR_HWCAPS_READ_FAST; =20 + if (nor->locking_ops) { + mtd->_lock =3D spi_nor_lock; + mtd->_unlock =3D spi_nor_unlock; + mtd->_is_locked =3D spi_nor_is_locked; + } + /* * Configure the SPI memory: * - select op codes for (Fast) Read, Page Program and Sector Erase. diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index a434ab7a53e6..bd68ec5a10e7 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -425,9 +425,23 @@ struct spi_nor { int (*set_4byte)(struct spi_nor *nor, bool enable); int (*clear_sr_bp)(struct spi_nor *nor); =20 + const struct spi_nor_locking_ops *locking_ops; + void *priv; }; =20 +/** + * struct spi_nor_locking_ops - SPI NOR locking methods + * @lock: lock a region of the SPI NOR + * @unlock: unlock a region of the SPI NOR + * @is_locked: check if a region of the SPI NOR is completely locked + */ +struct spi_nor_locking_ops { + int (*lock)(struct spi_nor *nor, loff_t ofs, uint64_t len); + int (*unlock)(struct spi_nor *nor, loff_t ofs, uint64_t len); + int (*is_locked)(struct spi_nor *nor, loff_t ofs, uint64_t len); +}; + static u64 __maybe_unused spi_nor_region_is_last(const struct spi_nor_erase_region *region) { --=20 2.9.5