From nobody Thu Nov 14 07:07:52 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59A6CC64EC6 for ; Thu, 2 Feb 2023 15:28:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232717AbjBBP2C (ORCPT ); Thu, 2 Feb 2023 10:28:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232891AbjBBP1p (ORCPT ); Thu, 2 Feb 2023 10:27:45 -0500 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20614.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::614]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD2317E069; Thu, 2 Feb 2023 07:27:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l0kw1nFEn9a/WTpgTPx3dVsLhEXpyMWKyZhmxkPUw8+NIP+pnZnQ3Nmm86ZY8WYlvSNJ2BO5m1gDO6S/HuOljTXVndhUVY7DUqa9vYo5WyNOF3wcd/HfHewPGrArYRUq5kYjzreCNLB7gnIa2VUrYctKmOD/88LeLvhd0iA+24FwIsZARV1ZN8LTVb6pIbKXKopG3Pi/BgufY6NMyw1Zx7XRHprbUQClfYq5tqu0J0BHNeWwew8ax9CRCs6AoYVzx5A7KwZ4wNig1zbJZfNIisvrmRVQh6ZpyDxCiMsSIJDHSydaQmommmQAkSaTiZIidCYGnE3oe96zm+rKZ4eUeA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oftp4s23ROlIj9/OkQ+pi8TJcpelkfto8C8grnhKfN4=; b=OCeiEzS8B+ysgt7XgaZ0DiEP+yJ9clYvNriubmI8owMxJz+5hfg5O093qVSB2T2EJ5bD50Lyosm13fYq9LWN0JAaua5F/KtXZN4lxfm0sZpHuX0nGyhO6IpAx5pTkC7GLcv4UtP56OmC1kPSAcTaUBNHDwcEUMJC20xOCEcSBmUjKOzUsJ2Vj/i+M2FUke8BbNMYYGVUo938RxtXzLX8SNxsxDgtQeZpYW1Fuct1mzHlxN+qzwqDgN8kW6kCMDMSI6mZ2124KX0TWT+Lt390qii8IO4VHhwJdXiYyNp2Z/qVa49YrYRPKgbAFEEqaHjpjQ4FCSHgmVX4/eQNeTpAHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oftp4s23ROlIj9/OkQ+pi8TJcpelkfto8C8grnhKfN4=; b=W2o9QSw0L3/UJIVYIFOObaKvWkmDalWeVdkr4VFlJpw8c978cXAsg2+5gMr4HL/EGI1j2N+KUzlWp/6CukcilyF+ASlxC7LXvO1QeFcNRXVq/ZjCjP7IzXlMuEtvBKPF/MqxfAMFfsiPsnSv9XcpQphdNve5PbL0FOxTFSJ22aE= Received: from BN9PR03CA0990.namprd03.prod.outlook.com (2603:10b6:408:109::35) by BN9PR12MB5033.namprd12.prod.outlook.com (2603:10b6:408:132::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27; Thu, 2 Feb 2023 15:26:56 +0000 Received: from BL02EPF000108EB.namprd05.prod.outlook.com (2603:10b6:408:109:cafe::e6) by BN9PR03CA0990.outlook.office365.com (2603:10b6:408:109::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.27 via Frontend Transport; Thu, 2 Feb 2023 15:26:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF000108EB.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.21 via Frontend Transport; Thu, 2 Feb 2023 15:26:55 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 2 Feb 2023 09:26:55 -0600 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 2 Feb 2023 07:26:54 -0800 Received: from xhdsgoud40.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Thu, 2 Feb 2023 09:26:32 -0600 From: Amit Kumar Mahapatra To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , "Amit Kumar Mahapatra" Subject: [PATCH v3 09/13] mtd: spi-nor: Add APIs to set/get nor->params Date: Thu, 2 Feb 2023 20:52:54 +0530 Message-ID: <20230202152258.512973-10-amit.kumar-mahapatra@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230202152258.512973-1-amit.kumar-mahapatra@amd.com> References: <20230202152258.512973-1-amit.kumar-mahapatra@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF000108EB:EE_|BN9PR12MB5033:EE_ X-MS-Office365-Filtering-Correlation-Id: ed51a13b-5297-4b22-7f1b-08db0531eb40 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: td1d+6/gJAv4GIhxulE8eb7nMLbRWC5xklIev+tgchcWaxdDIfp4vnWUYAlKEGj9JcCsyIRuFYum7+8OWJKZ6Y77yhQ9uWBSPliUkJryLCrfMDMpBBvTeGZCnRew31Jl+8H94U6SWEa0oUXeu0zRK3sSdhH05dOF73kAampMJTmXy8OeCpb702oeONMA+RXfW9tGnIVS0K/41hLmQwN/r6BYAqdz5IrVe3ap0BkVsh1XwCPlxBghKngrwGw1NSKcsG6x8m5MiY9/sEvhc622Kw6A5bHG3OFgSG8xJYPK/jpKQLgZgQVOqwd+FW9ppuT5KfXtevwoYimFUiaQ5bIkSf/0g1sd8i4rlGcNCfIptD1Xl0zVtsEP6O7MfwMdfwzbgNQCyFU1QbpDQjZS2mgZdoujNRTtdcNl5tn/VWUHwUgRDAetDcPfZPTXL81J1nnDGOtQ9H/VCrev21DSZImmtuhcvcrYAiLeh+yuwFGkuiHIT51TSUAGU0TaicX0BSaDlX7vDOmv6LAJLxEIyV1p8SKaOVhZmVR+dVWThVr2t6OzzIwlA1/IFvPC2PZUoqiu1ewcmv/H5pFTlhsibHYP5x1xbRfqgd9rHY8Cm4F4rCVolH4GIp6V3xjrBolBh7HciDpNm+rQtPHfAn0oahXLoEgNOUr+a8ECKdjTANdezAEtbPt9xgHNw2RBWNkeZ+iCQ4mlVvur1Byf++THu2bdABbvuj4t5nzecFzkYinljW5MH3JAEdf3UM+3rBnzb6G6u93UA3sikmMqDkbPpSZCvSp7STwcDb+U2PgAT/M5Me42IKkWNSK1e/UbW0UTnLEF8uNqKbOuc3sIBB6JkTJkDeb6zh+gjkBjZGRCjbII2Fo= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(346002)(136003)(376002)(451199018)(46966006)(36840700001)(40470700004)(70206006)(70586007)(8676002)(921005)(356005)(86362001)(36756003)(40460700003)(81166007)(336012)(6666004)(426003)(83380400001)(186003)(26005)(36860700001)(1076003)(2616005)(8936002)(41300700001)(82310400005)(5660300002)(110136005)(54906003)(4326008)(316002)(47076005)(82740400003)(7416002)(7336002)(478600001)(7366002)(2906002)(7276002)(7406005)(30864003)(40480700001)(36900700001)(41080700001)(83996005)(2101003)(579004)(559001)(309714004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 15:26:55.9903 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed51a13b-5297-4b22-7f1b-08db0531eb40 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF000108EB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5033 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Supporting multi-cs in spi-nor would require the *params member of struct spi_nor to be an array. To make the transition smoother introduced spi_nor_get_params() & spi_nor_set_params() APIs to get & set nor->params, added a new local variable (struct spi_nor_flash_parameter *params) to hold the return value of the spi_nor_get_params() function call and replaced all nor->params references with the "params". While adding multi-cs support in further patches the *params member of the spi_nor structure would be converted to arrays & the "idx" parameter of the APIs would be used as array index i.e., nor->params[idx]. Signed-off-by: Amit Kumar Mahapatra --- drivers/mtd/spi-nor/atmel.c | 17 ++-- drivers/mtd/spi-nor/core.c | 129 ++++++++++++++++++++----------- drivers/mtd/spi-nor/debugfs.c | 4 +- drivers/mtd/spi-nor/gigadevice.c | 4 +- drivers/mtd/spi-nor/issi.c | 11 ++- drivers/mtd/spi-nor/macronix.c | 6 +- drivers/mtd/spi-nor/micron-st.c | 34 +++++--- drivers/mtd/spi-nor/otp.c | 29 ++++--- drivers/mtd/spi-nor/sfdp.c | 29 ++++--- drivers/mtd/spi-nor/spansion.c | 50 +++++++----- drivers/mtd/spi-nor/sst.c | 7 +- drivers/mtd/spi-nor/swp.c | 22 ++++-- drivers/mtd/spi-nor/winbond.c | 10 ++- drivers/mtd/spi-nor/xilinx.c | 18 +++-- include/linux/mtd/spi-nor.h | 10 +++ 15 files changed, 254 insertions(+), 126 deletions(-) diff --git a/drivers/mtd/spi-nor/atmel.c b/drivers/mtd/spi-nor/atmel.c index 656dd80a0be7..57ca9f5ee205 100644 --- a/drivers/mtd/spi-nor/atmel.c +++ b/drivers/mtd/spi-nor/atmel.c @@ -23,10 +23,11 @@ static int at25fs_nor_lock(struct spi_nor *nor, loff_t = ofs, uint64_t len) =20 static int at25fs_nor_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; =20 /* We only support unlocking the whole flash array */ - if (ofs || len !=3D nor->params->size) + if (ofs || len !=3D params->size) return -EINVAL; =20 /* Write 0x00 to the status register to disable write protection */ @@ -50,7 +51,9 @@ static const struct spi_nor_locking_ops at25fs_nor_lockin= g_ops =3D { =20 static void at25fs_nor_late_init(struct spi_nor *nor) { - nor->params->locking_ops =3D &at25fs_nor_locking_ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->locking_ops =3D &at25fs_nor_locking_ops; } =20 static const struct spi_nor_fixups at25fs_nor_fixups =3D { @@ -69,11 +72,12 @@ static const struct spi_nor_fixups at25fs_nor_fixups = =3D { static int atmel_nor_set_global_protection(struct spi_nor *nor, loff_t ofs, uint64_t len, bool is_protect) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; u8 sr; =20 /* We only support locking the whole flash array */ - if (ofs || len !=3D nor->params->size) + if (ofs || len !=3D params->size) return -EINVAL; =20 ret =3D spi_nor_read_sr(nor, nor->bouncebuf); @@ -131,9 +135,10 @@ static int atmel_nor_global_unprotect(struct spi_nor *= nor, loff_t ofs, static int atmel_nor_is_global_protected(struct spi_nor *nor, loff_t ofs, uint64_t len) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; =20 - if (ofs >=3D nor->params->size || (ofs + len) > nor->params->size) + if (ofs >=3D params->size || (ofs + len) > params->size) return -EINVAL; =20 ret =3D spi_nor_read_sr(nor, nor->bouncebuf); @@ -151,7 +156,9 @@ static const struct spi_nor_locking_ops atmel_nor_globa= l_protection_ops =3D { =20 static void atmel_nor_global_protection_late_init(struct spi_nor *nor) { - nor->params->locking_ops =3D &atmel_nor_global_protection_ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->locking_ops =3D &atmel_nor_global_protection_ops; } =20 static const struct spi_nor_fixups atmel_nor_global_protection_fixups =3D { diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index d8703d7dfd0a..8a4a54bf2d0e 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -448,14 +448,15 @@ int spi_nor_read_id(struct spi_nor *nor, u8 naddr, u8= ndummy, u8 *id, */ int spi_nor_read_sr(struct spi_nor *nor, u8 *sr) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; =20 if (nor->spimem) { struct spi_mem_op op =3D SPI_NOR_RDSR_OP(sr); =20 if (nor->reg_proto =3D=3D SNOR_PROTO_8_8_8_DTR) { - op.addr.nbytes =3D nor->params->rdsr_addr_nbytes; - op.dummy.nbytes =3D nor->params->rdsr_dummy; + op.addr.nbytes =3D params->rdsr_addr_nbytes; + op.dummy.nbytes =3D params->rdsr_dummy; /* * We don't want to read only one byte in DTR mode. So, * read 2 and then discard the second byte. @@ -596,9 +597,11 @@ int spi_nor_sr_ready(struct spi_nor *nor) */ static int spi_nor_ready(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + /* Flashes might override the standard routine. */ - if (nor->params->ready) - return nor->params->ready(nor); + if (params->ready) + return params->ready(nor); =20 return spi_nor_sr_ready(nor); } @@ -760,6 +763,7 @@ static int spi_nor_write_sr1_and_check(struct spi_nor *= nor, u8 sr1) */ static int spi_nor_write_16bit_sr_and_check(struct spi_nor *nor, u8 sr1) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; u8 *sr_cr =3D nor->bouncebuf; u8 cr_written; @@ -769,7 +773,7 @@ static int spi_nor_write_16bit_sr_and_check(struct spi_= nor *nor, u8 sr1) ret =3D spi_nor_read_cr(nor, &sr_cr[1]); if (ret) return ret; - } else if (nor->params->quad_enable) { + } else if (params->quad_enable) { /* * If the Status Register 2 Read command (35h) is not * supported, we should at least be sure we don't @@ -777,7 +781,7 @@ static int spi_nor_write_16bit_sr_and_check(struct spi_= nor *nor, u8 sr1) * * We can safely assume that when the Quad Enable method is * set, the value of the QE bit is one, as a consequence of the - * nor->params->quad_enable() call. + * params->quad_enable() call. * * We can safely assume that the Quad Enable bit is present in * the Status Register 2 at BIT(1). According to the JESD216 @@ -1048,17 +1052,21 @@ static u8 spi_nor_convert_3to4_erase(u8 opcode) =20 static bool spi_nor_has_uniform_erase(const struct spi_nor *nor) { - return !!nor->params->erase_map.uniform_erase_type; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + return !!params->erase_map.uniform_erase_type; } =20 static void spi_nor_set_4byte_opcodes(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + nor->read_opcode =3D spi_nor_convert_3to4_read(nor->read_opcode); nor->program_opcode =3D spi_nor_convert_3to4_program(nor->program_opcode); nor->erase_opcode =3D spi_nor_convert_3to4_erase(nor->erase_opcode); =20 if (!spi_nor_has_uniform_erase(nor)) { - struct spi_nor_erase_map *map =3D &nor->params->erase_map; + struct spi_nor_erase_map *map =3D ¶ms->erase_map; struct spi_nor_erase_type *erase; int i; =20 @@ -1095,10 +1103,12 @@ void spi_nor_unlock_and_unprep(struct spi_nor *nor) =20 static u32 spi_nor_convert_addr(struct spi_nor *nor, loff_t addr) { - if (!nor->params->convert_addr) + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + if (!params->convert_addr) return addr; =20 - return nor->params->convert_addr(nor, addr); + return params->convert_addr(nor, addr); } =20 /* @@ -1318,7 +1328,8 @@ static int spi_nor_init_erase_cmd_list(struct spi_nor= *nor, struct list_head *erase_list, u64 addr, u32 len) { - const struct spi_nor_erase_map *map =3D &nor->params->erase_map; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + const struct spi_nor_erase_map *map =3D ¶ms->erase_map; const struct spi_nor_erase_type *erase, *prev_erase =3D NULL; struct spi_nor_erase_region *region; struct spi_nor_erase_command *cmd =3D NULL; @@ -1746,12 +1757,16 @@ static int spi_nor_write(struct mtd_info *mtd, loff= _t to, size_t len, size_t *retlen, const u_char *buf) { struct spi_nor *nor =3D mtd_to_spi_nor(mtd); + struct spi_nor_flash_parameter *params; size_t page_offset, page_remain, i; ssize_t ret; - u32 page_size =3D nor->params->page_size; + u32 page_size; =20 dev_dbg(nor->dev, "to 0x%08x, len %zd\n", (u32)to, len); =20 + params =3D spi_nor_get_params(nor, 0); + page_size =3D params->page_size; + ret =3D spi_nor_lock_and_prep(nor); if (ret) return ret; @@ -1903,6 +1918,8 @@ int spi_nor_hwcaps_pp2cmd(u32 hwcaps) static int spi_nor_spimem_check_op(struct spi_nor *nor, struct spi_mem_op *op) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + /* * First test with 4 address bytes. The opcode itself might * be a 3B addressing opcode but we don't care, because @@ -1911,7 +1928,7 @@ static int spi_nor_spimem_check_op(struct spi_nor *no= r, */ op->addr.nbytes =3D 4; if (!spi_mem_supports_op(nor->spimem, op)) { - if (nor->params->size > SZ_16M) + if (params->size > SZ_16M) return -EOPNOTSUPP; =20 /* If flash size <=3D 16MB, 3 address bytes are sufficient */ @@ -1975,7 +1992,7 @@ static int spi_nor_spimem_check_pp(struct spi_nor *no= r, static void spi_nor_spimem_adjust_hwcaps(struct spi_nor *nor, u32 *hwcaps) { - struct spi_nor_flash_parameter *params =3D nor->params; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); unsigned int cap; =20 /* X-X-X modes are not supported yet, mask them all. */ @@ -2067,6 +2084,7 @@ static int spi_nor_select_read(struct spi_nor *nor, u32 shared_hwcaps) { int cmd, best_match =3D fls(shared_hwcaps & SNOR_HWCAPS_READ_MASK) - 1; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); const struct spi_nor_read_command *read; =20 if (best_match < 0) @@ -2076,7 +2094,7 @@ static int spi_nor_select_read(struct spi_nor *nor, if (cmd < 0) return -EINVAL; =20 - read =3D &nor->params->reads[cmd]; + read =3D ¶ms->reads[cmd]; nor->read_opcode =3D read->opcode; nor->read_proto =3D read->proto; =20 @@ -2097,6 +2115,7 @@ static int spi_nor_select_read(struct spi_nor *nor, static int spi_nor_select_pp(struct spi_nor *nor, u32 shared_hwcaps) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int cmd, best_match =3D fls(shared_hwcaps & SNOR_HWCAPS_PP_MASK) - 1; const struct spi_nor_pp_command *pp; =20 @@ -2107,7 +2126,7 @@ static int spi_nor_select_pp(struct spi_nor *nor, if (cmd < 0) return -EINVAL; =20 - pp =3D &nor->params->page_programs[cmd]; + pp =3D ¶ms->page_programs[cmd]; nor->program_opcode =3D pp->opcode; nor->write_proto =3D pp->proto; return 0; @@ -2176,7 +2195,8 @@ spi_nor_select_uniform_erase(struct spi_nor_erase_map= *map, =20 static int spi_nor_select_erase(struct spi_nor *nor) { - struct spi_nor_erase_map *map =3D &nor->params->erase_map; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + struct spi_nor_erase_map *map =3D ¶ms->erase_map; const struct spi_nor_erase_type *erase =3D NULL; struct mtd_info *mtd =3D &nor->mtd; u32 wanted_size =3D nor->info->sector_size; @@ -2225,7 +2245,7 @@ static int spi_nor_select_erase(struct spi_nor *nor) static int spi_nor_default_setup(struct spi_nor *nor, const struct spi_nor_hwcaps *hwcaps) { - struct spi_nor_flash_parameter *params =3D nor->params; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); u32 ignored_mask, shared_mask; int err; =20 @@ -2285,8 +2305,10 @@ static int spi_nor_default_setup(struct spi_nor *nor, =20 static int spi_nor_set_addr_nbytes(struct spi_nor *nor) { - if (nor->params->addr_nbytes) { - nor->addr_nbytes =3D nor->params->addr_nbytes; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + if (params->addr_nbytes) { + nor->addr_nbytes =3D params->addr_nbytes; } else if (nor->read_proto =3D=3D SNOR_PROTO_8_8_8_DTR) { /* * In 8D-8D-8D mode, one byte takes half a cycle to transfer. So @@ -2307,7 +2329,7 @@ static int spi_nor_set_addr_nbytes(struct spi_nor *no= r) nor->addr_nbytes =3D 3; } =20 - if (nor->addr_nbytes =3D=3D 3 && nor->params->size > 0x1000000) { + if (nor->addr_nbytes =3D=3D 3 && params->size > 0x1000000) { /* enable 4-byte addressing if the device exceeds 16MiB */ nor->addr_nbytes =3D 4; } @@ -2329,10 +2351,11 @@ static int spi_nor_set_addr_nbytes(struct spi_nor *= nor) static int spi_nor_setup(struct spi_nor *nor, const struct spi_nor_hwcaps *hwcaps) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; =20 - if (nor->params->setup) - ret =3D nor->params->setup(nor, hwcaps); + if (params->setup) + ret =3D params->setup(nor, hwcaps); else ret =3D spi_nor_default_setup(nor, hwcaps); if (ret) @@ -2367,7 +2390,7 @@ static void spi_nor_manufacturer_init_params(struct s= pi_nor *nor) */ static void spi_nor_no_sfdp_init_params(struct spi_nor *nor) { - struct spi_nor_flash_parameter *params =3D nor->params; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_nor_erase_map *map =3D ¶ms->erase_map; const u8 no_sfdp_flags =3D nor->info->no_sfdp_flags; u8 i, erase_mask; @@ -2492,6 +2515,8 @@ static void spi_nor_init_fixup_flags(struct spi_nor *= nor) */ static void spi_nor_late_init_params(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + if (nor->manufacturer && nor->manufacturer->fixups && nor->manufacturer->fixups->late_init) nor->manufacturer->fixups->late_init(nor); @@ -2506,7 +2531,7 @@ static void spi_nor_late_init_params(struct spi_nor *= nor) * NOR protection support. When locking_ops are not provided, we pick * the default ones. */ - if (nor->flags & SNOR_F_HAS_LOCK && !nor->params->locking_ops) + if (nor->flags & SNOR_F_HAS_LOCK && !params->locking_ops) spi_nor_init_default_locking_ops(nor); } =20 @@ -2520,12 +2545,13 @@ static void spi_nor_late_init_params(struct spi_nor= *nor) */ static void spi_nor_sfdp_init_params_deprecated(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_nor_flash_parameter sfdp_params; =20 - memcpy(&sfdp_params, nor->params, sizeof(sfdp_params)); + memcpy(&sfdp_params, params, sizeof(sfdp_params)); =20 if (spi_nor_parse_sfdp(nor)) { - memcpy(nor->params, &sfdp_params, sizeof(*nor->params)); + memcpy(params, &sfdp_params, sizeof(*params)); nor->flags &=3D ~SNOR_F_4B_OPCODES; } } @@ -2560,7 +2586,7 @@ static void spi_nor_init_params_deprecated(struct spi= _nor *nor) */ static void spi_nor_init_default_params(struct spi_nor *nor) { - struct spi_nor_flash_parameter *params =3D nor->params; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); const struct flash_info *info =3D nor->info; struct device_node *np =3D spi_nor_get_flash_node(nor); =20 @@ -2646,12 +2672,15 @@ static void spi_nor_init_default_params(struct spi_= nor *nor) */ static int spi_nor_init_params(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; =20 - nor->params =3D devm_kzalloc(nor->dev, sizeof(*nor->params), GFP_KERNEL); - if (!nor->params) + params =3D devm_kzalloc(nor->dev, sizeof(*params), GFP_KERNEL); + if (!params) return -ENOMEM; =20 + spi_nor_set_params(nor, 0, params); + spi_nor_init_default_params(nor); =20 if (nor->info->parse_sfdp) { @@ -2679,9 +2708,10 @@ static int spi_nor_init_params(struct spi_nor *nor) */ static int spi_nor_octal_dtr_enable(struct spi_nor *nor, bool enable) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; =20 - if (!nor->params->octal_dtr_enable) + if (!params->octal_dtr_enable) return 0; =20 if (!(nor->read_proto =3D=3D SNOR_PROTO_8_8_8_DTR && @@ -2691,7 +2721,7 @@ static int spi_nor_octal_dtr_enable(struct spi_nor *n= or, bool enable) if (!(nor->flags & SNOR_F_IO_MODE_EN_VOLATILE)) return 0; =20 - ret =3D nor->params->octal_dtr_enable(nor, enable); + ret =3D params->octal_dtr_enable(nor, enable); if (ret) return ret; =20 @@ -2711,18 +2741,21 @@ static int spi_nor_octal_dtr_enable(struct spi_nor = *nor, bool enable) */ static int spi_nor_quad_enable(struct spi_nor *nor) { - if (!nor->params->quad_enable) + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + if (!params->quad_enable) return 0; =20 if (!(spi_nor_get_protocol_width(nor->read_proto) =3D=3D 4 || spi_nor_get_protocol_width(nor->write_proto) =3D=3D 4)) return 0; =20 - return nor->params->quad_enable(nor); + return params->quad_enable(nor); } =20 static int spi_nor_init(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int err; =20 err =3D spi_nor_octal_dtr_enable(nor, true); @@ -2764,7 +2797,7 @@ static int spi_nor_init(struct spi_nor *nor) */ WARN_ONCE(nor->flags & SNOR_F_BROKEN_RESET, "enabling reset hack; may not recover from unexpected reboots\n"); - err =3D nor->params->set_4byte_addr_mode(nor, true); + err =3D params->set_4byte_addr_mode(nor, true); if (err && err !=3D -ENOTSUPP) return err; } @@ -2880,12 +2913,14 @@ static void spi_nor_put_device(struct mtd_info *mtd) =20 void spi_nor_restore(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params; int ret; =20 /* restore the addressing mode */ if (nor->addr_nbytes =3D=3D 4 && !(nor->flags & SNOR_F_4B_OPCODES) && nor->flags & SNOR_F_BROKEN_RESET) { - ret =3D nor->params->set_4byte_addr_mode(nor, false); + params =3D spi_nor_get_params(nor, 0); + ret =3D params->set_4byte_addr_mode(nor, false); if (ret) /* * Do not stop the execution in the hope that the flash @@ -2957,6 +2992,7 @@ static const struct flash_info *spi_nor_get_flash_inf= o(struct spi_nor *nor, =20 static void spi_nor_set_mtd_info(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct mtd_info *mtd =3D &nor->mtd; struct device *dev =3D nor->dev; =20 @@ -2972,9 +3008,9 @@ static void spi_nor_set_mtd_info(struct spi_nor *nor) mtd->flags |=3D MTD_NO_ERASE; else mtd->_erase =3D spi_nor_erase; - mtd->writesize =3D nor->params->writesize; - mtd->writebufsize =3D nor->params->page_size; - mtd->size =3D nor->params->size; + mtd->writesize =3D params->writesize; + mtd->writebufsize =3D params->page_size; + mtd->size =3D params->size; mtd->_read =3D spi_nor_read; /* Might be already set by some SST flashes. */ if (!mtd->_write) @@ -3028,7 +3064,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *nam= e, * We need the bounce buffer early to read/write registers when going * through the spi-mem layer (buffers have to be DMA-able). * For spi-mem drivers, we'll reallocate a new buffer if - * nor->params->page_size turns out to be greater than PAGE_SIZE (which + * params->page_size turns out to be greater than PAGE_SIZE (which * shouldn't happen before long since NOR pages are usually less * than 1KB) after spi_nor_scan() returns. */ @@ -3099,13 +3135,14 @@ EXPORT_SYMBOL_GPL(spi_nor_scan); =20 static int spi_nor_create_read_dirmap(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_mem_dirmap_info info =3D { .op_tmpl =3D SPI_MEM_OP(SPI_MEM_OP_CMD(nor->read_opcode, 0), SPI_MEM_OP_ADDR(nor->addr_nbytes, 0, 0), SPI_MEM_OP_DUMMY(nor->read_dummy, 0), SPI_MEM_OP_DATA_IN(0, NULL, 0)), .offset =3D 0, - .length =3D nor->params->size, + .length =3D params->size, }; struct spi_mem_op *op =3D &info.op_tmpl; =20 @@ -3130,13 +3167,14 @@ static int spi_nor_create_read_dirmap(struct spi_no= r *nor) =20 static int spi_nor_create_write_dirmap(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_mem_dirmap_info info =3D { .op_tmpl =3D SPI_MEM_OP(SPI_MEM_OP_CMD(nor->program_opcode, 0), SPI_MEM_OP_ADDR(nor->addr_nbytes, 0, 0), SPI_MEM_OP_NO_DUMMY, SPI_MEM_OP_DATA_OUT(0, NULL, 0)), .offset =3D 0, - .length =3D nor->params->size, + .length =3D params->size, }; struct spi_mem_op *op =3D &info.op_tmpl; =20 @@ -3159,6 +3197,7 @@ static int spi_nor_create_write_dirmap(struct spi_nor= *nor) =20 static int spi_nor_probe(struct spi_mem *spimem) { + struct spi_nor_flash_parameter *params; struct spi_device *spi =3D spimem->spi; struct flash_platform_data *data =3D dev_get_platdata(&spi->dev); struct spi_nor *nor; @@ -3205,13 +3244,15 @@ static int spi_nor_probe(struct spi_mem *spimem) =20 spi_nor_debugfs_register(nor); =20 + params =3D spi_nor_get_params(nor, 0); + /* * None of the existing parts have > 512B pages, but let's play safe * and add this logic so that if anyone ever adds support for such * a NOR we don't end up with buffer overflows. */ - if (nor->params->page_size > PAGE_SIZE) { - nor->bouncebuf_size =3D nor->params->page_size; + if (params->page_size > PAGE_SIZE) { + nor->bouncebuf_size =3D params->page_size; devm_kfree(nor->dev, nor->bouncebuf); nor->bouncebuf =3D devm_kmalloc(nor->dev, nor->bouncebuf_size, diff --git a/drivers/mtd/spi-nor/debugfs.c b/drivers/mtd/spi-nor/debugfs.c index ff895f6758ea..5689bfda1f2c 100644 --- a/drivers/mtd/spi-nor/debugfs.c +++ b/drivers/mtd/spi-nor/debugfs.c @@ -73,7 +73,7 @@ static void spi_nor_print_flags(struct seq_file *s, unsig= ned long flags, static int spi_nor_params_show(struct seq_file *s, void *data) { struct spi_nor *nor =3D s->private; - struct spi_nor_flash_parameter *params =3D nor->params; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_nor_erase_map *erase_map =3D ¶ms->erase_map; struct spi_nor_erase_region *region; const struct flash_info *info =3D nor->info; @@ -181,7 +181,7 @@ static void spi_nor_print_pp_cmd(struct seq_file *s, static int spi_nor_capabilities_show(struct seq_file *s, void *data) { struct spi_nor *nor =3D s->private; - struct spi_nor_flash_parameter *params =3D nor->params; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); u32 hwcaps =3D params->hwcaps.mask; int i, cmd; =20 diff --git a/drivers/mtd/spi-nor/gigadevice.c b/drivers/mtd/spi-nor/gigadev= ice.c index d57ddaf1525b..643f131d3916 100644 --- a/drivers/mtd/spi-nor/gigadevice.c +++ b/drivers/mtd/spi-nor/gigadevice.c @@ -13,6 +13,8 @@ gd25q256_post_bfpt(struct spi_nor *nor, const struct sfdp_parameter_header *bfpt_header, const struct sfdp_bfpt *bfpt) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + /* * GD25Q256C supports the first version of JESD216 which does not define * the Quad Enable methods. Overwrite the default Quad Enable method. @@ -24,7 +26,7 @@ gd25q256_post_bfpt(struct spi_nor *nor, */ if (bfpt_header->major =3D=3D SFDP_JESD216_MAJOR && bfpt_header->minor =3D=3D SFDP_JESD216_MINOR) - nor->params->quad_enable =3D spi_nor_sr1_bit6_quad_enable; + params->quad_enable =3D spi_nor_sr1_bit6_quad_enable; =20 return 0; } diff --git a/drivers/mtd/spi-nor/issi.c b/drivers/mtd/spi-nor/issi.c index a0ddad2afffc..ccd13b73a75f 100644 --- a/drivers/mtd/spi-nor/issi.c +++ b/drivers/mtd/spi-nor/issi.c @@ -13,6 +13,8 @@ is25lp256_post_bfpt_fixups(struct spi_nor *nor, const struct sfdp_parameter_header *bfpt_header, const struct sfdp_bfpt *bfpt) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + /* * IS25LP256 supports 4B opcodes, but the BFPT advertises * BFPT_DWORD1_ADDRESS_BYTES_3_ONLY. @@ -20,7 +22,7 @@ is25lp256_post_bfpt_fixups(struct spi_nor *nor, */ if ((bfpt->dwords[BFPT_DWORD(1)] & BFPT_DWORD1_ADDRESS_BYTES_MASK) =3D=3D BFPT_DWORD1_ADDRESS_BYTES_3_ONLY) - nor->params->addr_nbytes =3D 4; + params->addr_nbytes =3D 4; =20 return 0; } @@ -31,7 +33,8 @@ static const struct spi_nor_fixups is25lp256_fixups =3D { =20 static void pm25lv_nor_late_init(struct spi_nor *nor) { - struct spi_nor_erase_map *map =3D &nor->params->erase_map; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + struct spi_nor_erase_map *map =3D ¶ms->erase_map; int i; =20 /* The PM25LV series has a different 4k sector erase opcode */ @@ -91,7 +94,9 @@ static const struct flash_info issi_nor_parts[] =3D { =20 static void issi_nor_default_init(struct spi_nor *nor) { - nor->params->quad_enable =3D spi_nor_sr1_bit6_quad_enable; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->quad_enable =3D spi_nor_sr1_bit6_quad_enable; } =20 static const struct spi_nor_fixups issi_fixups =3D { diff --git a/drivers/mtd/spi-nor/macronix.c b/drivers/mtd/spi-nor/macronix.c index d81a4cb2812b..b78d0f57075c 100644 --- a/drivers/mtd/spi-nor/macronix.c +++ b/drivers/mtd/spi-nor/macronix.c @@ -104,8 +104,10 @@ static const struct flash_info macronix_nor_parts[] = =3D { =20 static void macronix_nor_default_init(struct spi_nor *nor) { - nor->params->quad_enable =3D spi_nor_sr1_bit6_quad_enable; - nor->params->set_4byte_addr_mode =3D spi_nor_set_4byte_addr_mode; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->quad_enable =3D spi_nor_sr1_bit6_quad_enable; + params->set_4byte_addr_mode =3D spi_nor_set_4byte_addr_mode; } =20 static const struct spi_nor_fixups macronix_nor_fixups =3D { diff --git a/drivers/mtd/spi-nor/micron-st.c b/drivers/mtd/spi-nor/micron-s= t.c index 7bb86df52f0b..b93e16094b6c 100644 --- a/drivers/mtd/spi-nor/micron-st.c +++ b/drivers/mtd/spi-nor/micron-st.c @@ -49,10 +49,11 @@ =20 static int micron_st_nor_octal_dtr_en(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_mem_op op; u8 *buf =3D nor->bouncebuf; int ret; - u8 addr_mode_nbytes =3D nor->params->addr_mode_nbytes; + u8 addr_mode_nbytes =3D params->addr_mode_nbytes; =20 /* Use 20 dummy cycles for memory array reads. */ *buf =3D 20; @@ -128,27 +129,31 @@ static int micron_st_nor_octal_dtr_enable(struct spi_= nor *nor, bool enable) =20 static void mt35xu512aba_default_init(struct spi_nor *nor) { - nor->params->octal_dtr_enable =3D micron_st_nor_octal_dtr_enable; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->octal_dtr_enable =3D micron_st_nor_octal_dtr_enable; } =20 static void mt35xu512aba_post_sfdp_fixup(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + /* Set the Fast Read settings. */ - nor->params->hwcaps.mask |=3D SNOR_HWCAPS_READ_8_8_8_DTR; - spi_nor_set_read_settings(&nor->params->reads[SNOR_CMD_READ_8_8_8_DTR], + params->hwcaps.mask |=3D SNOR_HWCAPS_READ_8_8_8_DTR; + spi_nor_set_read_settings(¶ms->reads[SNOR_CMD_READ_8_8_8_DTR], 0, 20, SPINOR_OP_MT_DTR_RD, SNOR_PROTO_8_8_8_DTR); =20 nor->cmd_ext_type =3D SPI_NOR_EXT_REPEAT; - nor->params->rdsr_dummy =3D 8; - nor->params->rdsr_addr_nbytes =3D 0; + params->rdsr_dummy =3D 8; + params->rdsr_addr_nbytes =3D 0; =20 /* * The BFPT quad enable field is set to a reserved value so the quad * enable function is ignored by spi_nor_parse_bfpt(). Make sure we * disable it. */ - nor->params->quad_enable =3D NULL; + params->quad_enable =3D NULL; } =20 static const struct spi_nor_fixups mt35xu512aba_fixups =3D { @@ -336,14 +341,15 @@ static int micron_st_nor_set_4byte_addr_mode(struct s= pi_nor *nor, bool enable) */ static int micron_st_nor_read_fsr(struct spi_nor *nor, u8 *fsr) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; =20 if (nor->spimem) { struct spi_mem_op op =3D MICRON_ST_RDFSR_OP(fsr); =20 if (nor->reg_proto =3D=3D SNOR_PROTO_8_8_8_DTR) { - op.addr.nbytes =3D nor->params->rdsr_addr_nbytes; - op.dummy.nbytes =3D nor->params->rdsr_dummy; + op.addr.nbytes =3D params->rdsr_addr_nbytes; + op.dummy.nbytes =3D params->rdsr_dummy; /* * We don't want to read only one byte in DTR mode. So, * read 2 and then discard the second byte. @@ -446,16 +452,20 @@ static int micron_st_nor_ready(struct spi_nor *nor) =20 static void micron_st_nor_default_init(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + nor->flags |=3D SNOR_F_HAS_LOCK; nor->flags &=3D ~SNOR_F_HAS_16BIT_SR; - nor->params->quad_enable =3D NULL; - nor->params->set_4byte_addr_mode =3D micron_st_nor_set_4byte_addr_mode; + params->quad_enable =3D NULL; + params->set_4byte_addr_mode =3D micron_st_nor_set_4byte_addr_mode; } =20 static void micron_st_nor_late_init(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + if (nor->info->mfr_flags & USE_FSR) - nor->params->ready =3D micron_st_nor_ready; + params->ready =3D micron_st_nor_ready; } =20 static const struct spi_nor_fixups micron_st_nor_fixups =3D { diff --git a/drivers/mtd/spi-nor/otp.c b/drivers/mtd/spi-nor/otp.c index 3d75899de303..5b0319ea7f96 100644 --- a/drivers/mtd/spi-nor/otp.c +++ b/drivers/mtd/spi-nor/otp.c @@ -19,7 +19,9 @@ */ static inline unsigned int spi_nor_otp_region_len(struct spi_nor *nor) { - return nor->params->otp.org->len; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + return params->otp.org->len; } =20 /** @@ -30,7 +32,9 @@ static inline unsigned int spi_nor_otp_region_len(struct = spi_nor *nor) */ static inline unsigned int spi_nor_otp_n_regions(struct spi_nor *nor) { - return nor->params->otp.org->n_regions; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + return params->otp.org->n_regions; } =20 /** @@ -241,7 +245,8 @@ int spi_nor_otp_is_locked_sr2(struct spi_nor *nor, unsi= gned int region) =20 static loff_t spi_nor_otp_region_start(const struct spi_nor *nor, unsigned= int region) { - const struct spi_nor_otp_organization *org =3D nor->params->otp.org; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + const struct spi_nor_otp_organization *org =3D params->otp.org; =20 return org->base + region * org->offset; } @@ -266,7 +271,8 @@ static int spi_nor_mtd_otp_info(struct mtd_info *mtd, s= ize_t len, size_t *retlen, struct otp_info *buf) { struct spi_nor *nor =3D mtd_to_spi_nor(mtd); - const struct spi_nor_otp_ops *ops =3D nor->params->otp.ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + const struct spi_nor_otp_ops *ops =3D params->otp.ops; unsigned int n_regions =3D spi_nor_otp_n_regions(nor); unsigned int i; int ret, locked; @@ -303,7 +309,8 @@ static int spi_nor_mtd_otp_info(struct mtd_info *mtd, s= ize_t len, static int spi_nor_mtd_otp_range_is_locked(struct spi_nor *nor, loff_t ofs, size_t len) { - const struct spi_nor_otp_ops *ops =3D nor->params->otp.ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + const struct spi_nor_otp_ops *ops =3D params->otp.ops; unsigned int region; int locked; =20 @@ -328,7 +335,8 @@ static int spi_nor_mtd_otp_read_write(struct mtd_info *= mtd, loff_t ofs, const u8 *buf, bool is_write) { struct spi_nor *nor =3D mtd_to_spi_nor(mtd); - const struct spi_nor_otp_ops *ops =3D nor->params->otp.ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + const struct spi_nor_otp_ops *ops =3D params->otp.ops; const size_t rlen =3D spi_nor_otp_region_len(nor); loff_t rstart, rofs; unsigned int region; @@ -414,7 +422,8 @@ static int spi_nor_mtd_otp_write(struct mtd_info *mtd, = loff_t to, size_t len, static int spi_nor_mtd_otp_erase(struct mtd_info *mtd, loff_t from, size_t= len) { struct spi_nor *nor =3D mtd_to_spi_nor(mtd); - const struct spi_nor_otp_ops *ops =3D nor->params->otp.ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + const struct spi_nor_otp_ops *ops =3D params->otp.ops; const size_t rlen =3D spi_nor_otp_region_len(nor); unsigned int region; loff_t rstart; @@ -467,7 +476,8 @@ static int spi_nor_mtd_otp_erase(struct mtd_info *mtd, = loff_t from, size_t len) static int spi_nor_mtd_otp_lock(struct mtd_info *mtd, loff_t from, size_t = len) { struct spi_nor *nor =3D mtd_to_spi_nor(mtd); - const struct spi_nor_otp_ops *ops =3D nor->params->otp.ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + const struct spi_nor_otp_ops *ops =3D params->otp.ops; const size_t rlen =3D spi_nor_otp_region_len(nor); unsigned int region; int ret; @@ -501,9 +511,10 @@ static int spi_nor_mtd_otp_lock(struct mtd_info *mtd, = loff_t from, size_t len) =20 void spi_nor_set_mtd_otp_ops(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct mtd_info *mtd =3D &nor->mtd; =20 - if (!nor->params->otp.ops) + if (!params->otp.ops) return; =20 if (WARN_ON(!is_power_of_2(spi_nor_otp_region_len(nor)))) diff --git a/drivers/mtd/spi-nor/sfdp.c b/drivers/mtd/spi-nor/sfdp.c index 8434f654eca1..09814adf8620 100644 --- a/drivers/mtd/spi-nor/sfdp.c +++ b/drivers/mtd/spi-nor/sfdp.c @@ -431,7 +431,7 @@ static void spi_nor_regions_sort_erase_types(struct spi= _nor_erase_map *map) static int spi_nor_parse_bfpt(struct spi_nor *nor, const struct sfdp_parameter_header *bfpt_header) { - struct spi_nor_flash_parameter *params =3D nor->params; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_nor_erase_map *map =3D ¶ms->erase_map; struct spi_nor_erase_type *erase_type =3D map->erase_type; struct sfdp_bfpt bfpt; @@ -645,6 +645,8 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor, */ static u8 spi_nor_smpt_addr_nbytes(const struct spi_nor *nor, const u32 se= ttings) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + switch (settings & SMPT_CMD_ADDRESS_LEN_MASK) { case SMPT_CMD_ADDRESS_LEN_0: return 0; @@ -654,7 +656,7 @@ static u8 spi_nor_smpt_addr_nbytes(const struct spi_nor= *nor, const u32 settings return 4; case SMPT_CMD_ADDRESS_LEN_USE_CURRENT: default: - return nor->params->addr_mode_nbytes; + return params->addr_mode_nbytes; } } =20 @@ -806,7 +808,8 @@ spi_nor_region_check_overlay(struct spi_nor_erase_regio= n *region, static int spi_nor_init_non_uniform_erase_map(struct spi_nor *nor, const u32 *smpt) { - struct spi_nor_erase_map *map =3D &nor->params->erase_map; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + struct spi_nor_erase_map *map =3D ¶ms->erase_map; struct spi_nor_erase_type *erase =3D map->erase_type; struct spi_nor_erase_region *region; u64 offset; @@ -894,6 +897,7 @@ static int spi_nor_init_non_uniform_erase_map(struct sp= i_nor *nor, static int spi_nor_parse_smpt(struct spi_nor *nor, const struct sfdp_parameter_header *smpt_header) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); const u32 *sector_map; u32 *smpt; size_t len; @@ -924,7 +928,7 @@ static int spi_nor_parse_smpt(struct spi_nor *nor, if (ret) goto out; =20 - spi_nor_regions_sort_erase_types(&nor->params->erase_map); + spi_nor_regions_sort_erase_types(¶ms->erase_map); /* fall through */ out: kfree(smpt); @@ -964,7 +968,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor, { 0u /* not used */, BIT(11) }, { 0u /* not used */, BIT(12) }, }; - struct spi_nor_flash_parameter *params =3D nor->params; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_nor_pp_command *params_pp =3D params->page_programs; struct spi_nor_erase_map *map =3D ¶ms->erase_map; struct spi_nor_erase_type *erase_type =3D map->erase_type; @@ -1127,6 +1131,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor, static int spi_nor_parse_profile1(struct spi_nor *nor, const struct sfdp_parameter_header *profile1_header) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); u32 *dwords, addr; size_t len; int ret; @@ -1149,14 +1154,14 @@ static int spi_nor_parse_profile1(struct spi_nor *n= or, =20 /* Set the Read Status Register dummy cycles and dummy address bytes. */ if (dwords[0] & PROFILE1_DWORD1_RDSR_DUMMY) - nor->params->rdsr_dummy =3D 8; + params->rdsr_dummy =3D 8; else - nor->params->rdsr_dummy =3D 4; + params->rdsr_dummy =3D 4; =20 if (dwords[0] & PROFILE1_DWORD1_RDSR_ADDR_BYTES) - nor->params->rdsr_addr_nbytes =3D 4; + params->rdsr_addr_nbytes =3D 4; else - nor->params->rdsr_addr_nbytes =3D 0; + params->rdsr_addr_nbytes =3D 0; =20 /* * We don't know what speed the controller is running at. Find the @@ -1182,8 +1187,8 @@ static int spi_nor_parse_profile1(struct spi_nor *nor, dummy =3D round_up(dummy, 2); =20 /* Update the fast read settings. */ - nor->params->hwcaps.mask |=3D SNOR_HWCAPS_READ_8_8_8_DTR; - spi_nor_set_read_settings(&nor->params->reads[SNOR_CMD_READ_8_8_8_DTR], + params->hwcaps.mask |=3D SNOR_HWCAPS_READ_8_8_8_DTR; + spi_nor_set_read_settings(¶ms->reads[SNOR_CMD_READ_8_8_8_DTR], 0, dummy, opcode, SNOR_PROTO_8_8_8_DTR); =20 @@ -1191,7 +1196,7 @@ static int spi_nor_parse_profile1(struct spi_nor *nor, * Page Program is "Required Command" in the xSPI Profile 1.0. Update * the params->hwcaps.mask here. */ - nor->params->hwcaps.mask |=3D SNOR_HWCAPS_PP_8_8_8_DTR; + params->hwcaps.mask |=3D SNOR_HWCAPS_PP_8_8_8_DTR; =20 out: kfree(dwords); diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c index b621cdfd506f..30bfe9db6210 100644 --- a/drivers/mtd/spi-nor/spansion.c +++ b/drivers/mtd/spi-nor/spansion.c @@ -46,10 +46,11 @@ =20 static int cypress_nor_octal_dtr_en(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_mem_op op; u8 *buf =3D nor->bouncebuf; int ret; - u8 addr_mode_nbytes =3D nor->params->addr_mode_nbytes; + u8 addr_mode_nbytes =3D params->addr_mode_nbytes; =20 /* Use 24 dummy cycles for memory array reads. */ *buf =3D SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24; @@ -136,8 +137,9 @@ static int cypress_nor_octal_dtr_dis(struct spi_nor *no= r) */ static int cypress_nor_quad_enable_volatile(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_mem_op op; - u8 addr_mode_nbytes =3D nor->params->addr_mode_nbytes; + u8 addr_mode_nbytes =3D params->addr_mode_nbytes; u8 cfr1v_written; int ret; =20 @@ -195,8 +197,9 @@ static int cypress_nor_quad_enable_volatile(struct spi_= nor *nor) */ static int cypress_nor_set_page_size(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_mem_op op =3D - CYPRESS_NOR_RD_ANY_REG_OP(nor->params->addr_mode_nbytes, + CYPRESS_NOR_RD_ANY_REG_OP(params->addr_mode_nbytes, SPINOR_REG_CYPRESS_CFR3V, nor->bouncebuf); int ret; @@ -206,9 +209,9 @@ static int cypress_nor_set_page_size(struct spi_nor *no= r) return ret; =20 if (nor->bouncebuf[0] & SPINOR_REG_CYPRESS_CFR3V_PGSZ) - nor->params->page_size =3D 512; + params->page_size =3D 512; else - nor->params->page_size =3D 256; + params->page_size =3D 256; =20 return 0; } @@ -218,16 +221,19 @@ s25hx_t_post_bfpt_fixup(struct spi_nor *nor, const struct sfdp_parameter_header *bfpt_header, const struct sfdp_bfpt *bfpt) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + /* Replace Quad Enable with volatile version */ - nor->params->quad_enable =3D cypress_nor_quad_enable_volatile; + params->quad_enable =3D cypress_nor_quad_enable_volatile; =20 return cypress_nor_set_page_size(nor); } =20 static void s25hx_t_post_sfdp_fixup(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct spi_nor_erase_type *erase_type =3D - nor->params->erase_map.erase_type; + params->erase_map.erase_type; unsigned int i; =20 /* @@ -250,7 +256,7 @@ static void s25hx_t_post_sfdp_fixup(struct spi_nor *nor) =20 static void s25hx_t_late_init(struct spi_nor *nor) { - struct spi_nor_flash_parameter *params =3D nor->params; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); =20 /* Fast Read 4B requires mode cycles */ params->reads[SNOR_CMD_READ_FAST].num_mode_clocks =3D 8; @@ -283,22 +289,24 @@ static int cypress_nor_octal_dtr_enable(struct spi_no= r *nor, bool enable) =20 static void s28hx_t_post_sfdp_fixup(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + /* * On older versions of the flash the xSPI Profile 1.0 table has the * 8D-8D-8D Fast Read opcode as 0x00. But it actually should be 0xEE. */ - if (nor->params->reads[SNOR_CMD_READ_8_8_8_DTR].opcode =3D=3D 0) - nor->params->reads[SNOR_CMD_READ_8_8_8_DTR].opcode =3D + if (params->reads[SNOR_CMD_READ_8_8_8_DTR].opcode =3D=3D 0) + params->reads[SNOR_CMD_READ_8_8_8_DTR].opcode =3D SPINOR_OP_CYPRESS_RD_FAST; =20 /* This flash is also missing the 4-byte Page Program opcode bit. */ - spi_nor_set_pp_settings(&nor->params->page_programs[SNOR_CMD_PP], + spi_nor_set_pp_settings(¶ms->page_programs[SNOR_CMD_PP], SPINOR_OP_PP_4B, SNOR_PROTO_1_1_1); /* * Since xSPI Page Program opcode is backward compatible with * Legacy SPI, use Legacy SPI opcode there as well. */ - spi_nor_set_pp_settings(&nor->params->page_programs[SNOR_CMD_PP_8_8_8_DTR= ], + spi_nor_set_pp_settings(¶ms->page_programs[SNOR_CMD_PP_8_8_8_DTR], SPINOR_OP_PP_4B, SNOR_PROTO_8_8_8_DTR); =20 /* @@ -306,7 +314,7 @@ static void s28hx_t_post_sfdp_fixup(struct spi_nor *nor) * address bytes needed for Read Status Register command as 0 but the * actual value for that is 4. */ - nor->params->rdsr_addr_nbytes =3D 4; + params->rdsr_addr_nbytes =3D 4; } =20 static int s28hx_t_post_bfpt_fixup(struct spi_nor *nor, @@ -318,8 +326,10 @@ static int s28hx_t_post_bfpt_fixup(struct spi_nor *nor, =20 static void s28hx_t_late_init(struct spi_nor *nor) { - nor->params->octal_dtr_enable =3D cypress_nor_octal_dtr_enable; - nor->params->writesize =3D 16; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->octal_dtr_enable =3D cypress_nor_octal_dtr_enable; + params->writesize =3D 16; } =20 static const struct spi_nor_fixups s28hx_t_fixups =3D { @@ -333,13 +343,15 @@ s25fs_s_nor_post_bfpt_fixups(struct spi_nor *nor, const struct sfdp_parameter_header *bfpt_header, const struct sfdp_bfpt *bfpt) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + /* * The S25FS-S chip family reports 512-byte pages in BFPT but * in reality the write buffer still wraps at the safe default * of 256 bytes. Overwrite the page size advertised by BFPT * to get the writes working. */ - nor->params->page_size =3D 256; + params->page_size =3D 256; =20 return 0; } @@ -541,7 +553,9 @@ static int spansion_nor_sr_ready_and_clear(struct spi_n= or *nor) =20 static void spansion_nor_late_init(struct spi_nor *nor) { - if (nor->params->size > SZ_16M) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + if (params->size > SZ_16M) { nor->flags |=3D SNOR_F_4B_OPCODES; /* No small sector erase for 4-byte command set */ nor->erase_opcode =3D SPINOR_OP_SE; @@ -549,7 +563,7 @@ static void spansion_nor_late_init(struct spi_nor *nor) } =20 if (nor->info->mfr_flags & USE_CLSR) - nor->params->ready =3D spansion_nor_sr_ready_and_clear; + params->ready =3D spansion_nor_sr_ready_and_clear; } =20 static const struct spi_nor_fixups spansion_nor_fixups =3D { diff --git a/drivers/mtd/spi-nor/sst.c b/drivers/mtd/spi-nor/sst.c index 63bcc97bf978..6b91a32804ad 100644 --- a/drivers/mtd/spi-nor/sst.c +++ b/drivers/mtd/spi-nor/sst.c @@ -20,10 +20,11 @@ static int sst26vf_nor_lock(struct spi_nor *nor, loff_t= ofs, uint64_t len) =20 static int sst26vf_nor_unlock(struct spi_nor *nor, loff_t ofs, uint64_t le= n) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; =20 /* We only support unlocking the entire flash array. */ - if (ofs !=3D 0 || len !=3D nor->params->size) + if (ofs !=3D 0 || len !=3D params->size) return -EINVAL; =20 ret =3D spi_nor_read_cr(nor, nor->bouncebuf); @@ -51,7 +52,9 @@ static const struct spi_nor_locking_ops sst26vf_nor_locki= ng_ops =3D { =20 static void sst26vf_nor_late_init(struct spi_nor *nor) { - nor->params->locking_ops =3D &sst26vf_nor_locking_ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->locking_ops =3D &sst26vf_nor_locking_ops; } =20 static const struct spi_nor_fixups sst26vf_nor_fixups =3D { diff --git a/drivers/mtd/spi-nor/swp.c b/drivers/mtd/spi-nor/swp.c index 1f178313ba8f..88eaed2c40fe 100644 --- a/drivers/mtd/spi-nor/swp.c +++ b/drivers/mtd/spi-nor/swp.c @@ -340,11 +340,14 @@ static const struct spi_nor_locking_ops spi_nor_sr_lo= cking_ops =3D { =20 void spi_nor_init_default_locking_ops(struct spi_nor *nor) { - nor->params->locking_ops =3D &spi_nor_sr_locking_ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->locking_ops =3D &spi_nor_sr_locking_ops; } =20 static int spi_nor_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { + struct spi_nor_flash_parameter *params; struct spi_nor *nor =3D mtd_to_spi_nor(mtd); int ret; =20 @@ -352,7 +355,8 @@ static int spi_nor_lock(struct mtd_info *mtd, loff_t of= s, uint64_t len) if (ret) return ret; =20 - ret =3D nor->params->locking_ops->lock(nor, ofs, len); + params =3D spi_nor_get_params(nor, 0); + ret =3D params->locking_ops->lock(nor, ofs, len); =20 spi_nor_unlock_and_unprep(nor); return ret; @@ -360,6 +364,7 @@ static int spi_nor_lock(struct mtd_info *mtd, loff_t of= s, uint64_t len) =20 static int spi_nor_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) { + struct spi_nor_flash_parameter *params; struct spi_nor *nor =3D mtd_to_spi_nor(mtd); int ret; =20 @@ -367,7 +372,8 @@ static int spi_nor_unlock(struct mtd_info *mtd, loff_t = ofs, uint64_t len) if (ret) return ret; =20 - ret =3D nor->params->locking_ops->unlock(nor, ofs, len); + params =3D spi_nor_get_params(nor, 0); + ret =3D params->locking_ops->unlock(nor, ofs, len); =20 spi_nor_unlock_and_unprep(nor); return ret; @@ -375,6 +381,7 @@ static int spi_nor_unlock(struct mtd_info *mtd, loff_t = ofs, uint64_t len) =20 static int spi_nor_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t le= n) { + struct spi_nor_flash_parameter *params; struct spi_nor *nor =3D mtd_to_spi_nor(mtd); int ret; =20 @@ -382,7 +389,8 @@ static int spi_nor_is_locked(struct mtd_info *mtd, loff= _t ofs, uint64_t len) if (ret) return ret; =20 - ret =3D nor->params->locking_ops->is_locked(nor, ofs, len); + params =3D spi_nor_get_params(nor, 0); + ret =3D params->locking_ops->is_locked(nor, ofs, len); =20 spi_nor_unlock_and_unprep(nor); return ret; @@ -402,6 +410,7 @@ static int spi_nor_is_locked(struct mtd_info *mtd, loff= _t ofs, uint64_t len) */ void spi_nor_try_unlock_all(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); int ret; =20 if (!(nor->flags & SNOR_F_HAS_LOCK)) @@ -409,16 +418,17 @@ void spi_nor_try_unlock_all(struct spi_nor *nor) =20 dev_dbg(nor->dev, "Unprotecting entire flash array\n"); =20 - ret =3D spi_nor_unlock(&nor->mtd, 0, nor->params->size); + ret =3D spi_nor_unlock(&nor->mtd, 0, params->size); if (ret) dev_dbg(nor->dev, "Failed to unlock the entire flash memory array\n"); } =20 void spi_nor_set_mtd_locking_ops(struct spi_nor *nor) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); struct mtd_info *mtd =3D &nor->mtd; =20 - if (!nor->params->locking_ops) + if (!params->locking_ops) return; =20 mtd->_lock =3D spi_nor_lock; diff --git a/drivers/mtd/spi-nor/winbond.c b/drivers/mtd/spi-nor/winbond.c index ca39acf4112c..ce321e40d2f4 100644 --- a/drivers/mtd/spi-nor/winbond.c +++ b/drivers/mtd/spi-nor/winbond.c @@ -218,13 +218,17 @@ static const struct spi_nor_otp_ops winbond_nor_otp_o= ps =3D { =20 static void winbond_nor_default_init(struct spi_nor *nor) { - nor->params->set_4byte_addr_mode =3D winbond_nor_set_4byte_addr_mode; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->set_4byte_addr_mode =3D winbond_nor_set_4byte_addr_mode; } =20 static void winbond_nor_late_init(struct spi_nor *nor) { - if (nor->params->otp.org->n_regions) - nor->params->otp.ops =3D &winbond_nor_otp_ops; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + if (params->otp.org->n_regions) + params->otp.ops =3D &winbond_nor_otp_ops; } =20 static const struct spi_nor_fixups winbond_nor_fixups =3D { diff --git a/drivers/mtd/spi-nor/xilinx.c b/drivers/mtd/spi-nor/xilinx.c index 5723157739fc..6c5da0e0f9a4 100644 --- a/drivers/mtd/spi-nor/xilinx.c +++ b/drivers/mtd/spi-nor/xilinx.c @@ -55,7 +55,8 @@ static const struct flash_info xilinx_nor_parts[] =3D { */ static u32 s3an_nor_convert_addr(struct spi_nor *nor, u32 addr) { - u32 page_size =3D nor->params->page_size; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + u32 page_size =3D params->page_size; u32 offset, page; =20 offset =3D addr % page_size; @@ -115,6 +116,7 @@ static int xilinx_nor_sr_ready(struct spi_nor *nor) static int xilinx_nor_setup(struct spi_nor *nor, const struct spi_nor_hwcaps *hwcaps) { + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); u32 page_size; int ret; =20 @@ -140,14 +142,14 @@ static int xilinx_nor_setup(struct spi_nor *nor, */ if (nor->bouncebuf[0] & XSR_PAGESIZE) { /* Flash in Power of 2 mode */ - page_size =3D (nor->params->page_size =3D=3D 264) ? 256 : 512; - nor->params->page_size =3D page_size; + page_size =3D (params->page_size =3D=3D 264) ? 256 : 512; + params->page_size =3D page_size; nor->mtd.writebufsize =3D page_size; - nor->params->size =3D 8 * page_size * nor->info->n_sectors; + params->size =3D 8 * page_size * nor->info->n_sectors; nor->mtd.erasesize =3D 8 * page_size; } else { /* Flash in Default addressing mode */ - nor->params->convert_addr =3D s3an_nor_convert_addr; + params->convert_addr =3D s3an_nor_convert_addr; nor->mtd.erasesize =3D nor->info->sector_size; } =20 @@ -156,8 +158,10 @@ static int xilinx_nor_setup(struct spi_nor *nor, =20 static void xilinx_nor_late_init(struct spi_nor *nor) { - nor->params->setup =3D xilinx_nor_setup; - nor->params->ready =3D xilinx_nor_sr_ready; + struct spi_nor_flash_parameter *params =3D spi_nor_get_params(nor, 0); + + params->setup =3D xilinx_nor_setup; + params->ready =3D xilinx_nor_sr_ready; } =20 static const struct spi_nor_fixups xilinx_nor_fixups =3D { diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 25765556223a..728674ea3c22 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -421,6 +421,16 @@ static inline struct device_node *spi_nor_get_flash_no= de(struct spi_nor *nor) return mtd_get_of_node(&nor->mtd); } =20 +static inline struct spi_nor_flash_parameter *spi_nor_get_params(const str= uct spi_nor *nor, u8 idx) +{ + return nor->params; +} + +static inline void spi_nor_set_params(struct spi_nor *nor, u8 idx, + struct spi_nor_flash_parameter *params) +{ + nor->params =3D params; +} /** * spi_nor_scan() - scan the SPI NOR * @nor: the spi_nor structure --=20 2.25.1