From patchwork Fri Sep 8 10:16:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 13805 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp534620vqo; Fri, 8 Sep 2023 06:15:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG1Fg3quYVJW/L0hs+2Zc+0XX3nYp54pui+Uqsd18rpjlJoSXQFPteOW+E1hCG9DdnzMb+y X-Received: by 2002:a05:6a00:1825:b0:68e:2dad:13a5 with SMTP id y37-20020a056a00182500b0068e2dad13a5mr2531967pfa.10.1694178949936; Fri, 08 Sep 2023 06:15:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694178949; cv=none; d=google.com; s=arc-20160816; b=OtNbBEGKqnp1sc5gUISDFKqc6W3/hfhZkPNO9HPHmsZ5S6wWu3hueFtR470gsNJk8P e2J1XfqM9vFDHCMS9JnVd6Xt0yboLbTbBXtEc4ueR1Mso1+sU2IvVtavnkFihHaqPRx1 evw7pFDIiEV1nzqDBxCbvA9WJ5+IYahINnvcTRqjcqJeoGTyw6VX0o4vT8XI7hJUur4r vjvZNUBvv73nxLRyY0oH0pbCOIbQUj/sTlV7A+eRoDnXAivzF0lhToeU5KHC3J6QoHg5 r3Dl+9UZk+yldnBRTp3T5/0tmQLhQp3mtKXHG8z0MVe82hGqxqB1qA8hmoOkDOVp3Pj/ i7KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:content-transfer-encoding:mime-version :message-id:date:subject:from:dkim-signature; bh=OEhUB2u+NLf74ccMndkQAKAqlYxO5yre047HscCpPN8=; fh=LuNSX3JVG+htsysoJ/xF51pAKitwHo02H/zRZAOLqDw=; b=MHSZNqvzVCkFriTVJHVYo3KHfjsjJHTdRryRaw8iQq99uFuQjEjGiG/91zfrl7L7oP EsTiaWsiPeJYvjB0eerDp54kJOITUqhgYqnqi4DDOh4lIkZey3fkBXnn+LEiyIKYBwjt x0t8N8X2361AaQejEIq11W1/kEuTw7GcVzTiz2U1FUuZU9YYJUBNjaRdhfu37U8v2zpi QIHxPt2hfbLKsSkiJkY2ietc4WLnp5mtS0b8fpDb5YK0eLXScifJ7feWk4uc58/3ZU8w X9l101kRy9AKFAqRyulVHhKfJfeLJb3XUltO/8yyXP4XPgrygS6ZJbL0gga0VpHDimnd ddMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tDy1edto; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c2-20020a656182000000b00573efae0ee1si1346610pgv.515.2023.09.08.06.15.18; Fri, 08 Sep 2023 06:15:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tDy1edto; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238690AbjIHKQf (ORCPT + 95 others); Fri, 8 Sep 2023 06:16:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232231AbjIHKQd (ORCPT ); Fri, 8 Sep 2023 06:16:33 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2020B1BC8 for ; Fri, 8 Sep 2023 03:16:29 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E96CFC433C7; Fri, 8 Sep 2023 10:16:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694168188; bh=S/q4smJJ7/INJBrXh4MRxKgr/QAJ7megxoPk+A6O628=; h=From:Subject:Date:To:Cc:From; b=tDy1edtog4fiOy7637bCFNdRpelP9vqCOOqd/Dap8xJiXPQVnJfidYOKtHyU8fFIY 24Eum4QllGvr3BxbNeB5QOqTSRb6f+zETAeDMoF3AZog0YZnn9CgLEqfXl8cG7Ykfe l9DBwzP05anaz/W0brsrXqsibIHGlczSy/gSdMQjY6kjpXyeJuBfnNTvYRUZ+WgNxa De3Wvtk+TEtgU3J8SS78ri4d7fsNMI81yzwUEFwz2rK0QVzwIf53eWRk7iy2JWzSiS twZpOSB8ThCMPEx7xqLb5uQahjltovgtFa0tDX2HTEvsbwnnfRKfOGLLecFAdORXRv isRkWPVhv3omQ== From: Michael Walle Subject: [PATCH v3 00/41] mtd: spi-nor: clean the flash_info database up Date: Fri, 08 Sep 2023 12:16:18 +0200 Message-Id: <20230807-mtd-flash-info-db-rework-v3-0-e60548861b10@kernel.org> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAHL0+mQC/42OQQ6CMBBFr0K6dkxpQcGV9zAuWjqFBmzNlKCGc HcLOxcmLN/k/zd/ZhHJYWSXbGaEk4su+ATykLGmU75FcCYxE1xIXvEzPEYDdlCxA+dtAKOB8BW oh0qVwpy45SnJUl2riKBJ+aZbBf96a/RJaN17W3G7J+5cHAN9tlFTvl53/J9y4CCNNKVGW2hVX Hskj8MxUMtW6yT2mkQyiTpX3MraVqb6MS3L8gXU6GC5NgEAAA== To: Tudor Ambarus , Pratyush Yadav , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra Cc: linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Michael Walle X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776475386380332200 X-GMAIL-MSGID: 1776475386380332200 The goal is to have slim entries for *new* entries and to have a flexible macro to specify the flash ID and get rid of the former INFOx() macros with the hardcoded ID length. Here is are some examples how an entry of flash_info will look like after the conversion: { .id = SNOR_ID(0xef, 0x80, 0x20), .name = "w25q512nwm", .otp = SNOR_OTP(256, 3, 0x1000, 0x1000), } { .id = SNOR_ID(0x01, 0x02, 0x19, 0x4d, 0x00, 0x80), .name = "s25fl256s0", .size = SZ_32M, .sector_size = SZ_256K, .no_sfdp_flags = SPI_NOR_SKIP_SFDP | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, .mfr_flags = USE_CLSR, } Please note that the second entry might even be slimmed down if the flash supports SFDP, which is very likely. But apart from one exception, this patchset shouldn't change any information in the flash_info database. The exception is the removal of very old SPI EEPROMs and a Fujitsu MRAM. Both should use the at25 EEPROM driver. The latter even has device tree bindings for the at25 driver. To make the entries as slim as possible, we introduce sane default values so the actual flash_info entries, doesn't need to specify them. This mostly applies to old non-SFDP flashes anyway. Patches 01-02 remove the old catalyst EEPROMs and the Fujitsu MRAM. Patches 03-16 are preparation patches to either convert properties (like .n_sectors) or to make properties optional. These patches will also modify the old INFOx() macros. This is important because with this we can actually make sure, the conversion doesn't have any unwanted changes. We can compare the .rodata segment before and after the conversion to make sure, there are no mistakes in the patches, because they are impossible to review. To make sure there are no changes you can compare the output of objdump -j.rodata -s drivers/mtd/spi-nor/built-in.a (or individual objects like drivers/mtd/spi-nor/winbond.o) before and after the conversion, that is before patch 17 and after patch 30. FWIW, before the conversion it was impossible to use coccinelle, eg. "spatch --parse-c winbond.c" flagged almost all lines in the flash_info structure as bad. Now after the conversion is completed, patches 31-39 sort the entries by their IDs. Patch 40 removes a duplicate entry in atmel which surfaced during the sorting. Patch 41 then finally removes the old INFOx() macros. Tested with the following flashes: - w25q32dw/layerscape spi - w25q32dw (with empty size and empty no_sfdp_flags)/layerscape spi - w25q16dw/mediatek spi Signed-off-by: Michael Walle --- Changes in v3: - rebase to latest next - collected tags - fixed parse_sfdp logic - also see individual patches for changes - Link to v2: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v2-0-291a0f39f8d8@kernel.org Changes in v1: - rebase to latest next, esp. include the sst26vf032b changes - fixed the makefiles found by the kernel test robot - fixed small typos and nitpicks noticed by Miquel - collected Rb tags - Link to v1: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v1-0-3d3d5bef4ba4@kernel.org --- Michael Walle (41): mtd: spi-nor: remove catalyst 'flashes' mtd: spi-nor: remove Fujitsu MB85RS1MT support mtd: spi-nor: xilinx: use SPI_NOR_ID() in S3AN_INFO() mtd: spi-nor: xilinx: remove addr_nbytes from S3AN_INFO() mtd: spi-nor: convert .n_sectors to .size mtd: spi-nor: default page_size to 256 bytes mtd: spi-nor: store .n_banks in struct spi_nor_flash_parameter mtd: spi-nor: default .n_banks to 1 mtd: spi-nor: push 4k SE handling into spi_nor_select_uniform_erase() mtd: spi-nor: make sector_size optional mtd: spi-nor: drop .parse_sfdp mtd: spi-nor: introduce (temporary) INFO0() mtd: spi-nor: move the .id and .id_len into an own structure mtd: spi-nor: rename .otp_org to .otp and make it a pointer mtd: spi-nor: add SNOR_ID() and SNOR_OTP() mtd: spi-nor: remove or move flash_info comments mtd: spi-nor: atmel: convert flash_info to new format mtd: spi-nor: eon: convert flash_info to new format mtd: spi-nor: esmt: convert flash_info to new format mtd: spi-nor: everspin: convert flash_info to new format mtd: spi-nor: gigadevice: convert flash_info to new format mtd: spi-nor: intel: convert flash_info to new format mtd: spi-nor: issi: convert flash_info to new format mtd: spi-nor: macronix: convert flash_info to new format mtd: spi-nor: micron-st: convert flash_info to new format mtd: spi-nor: spansion: convert flash_info to new format mtd: spi-nor: sst: convert flash_info to new format mtd: spi-nor: winbond: convert flash_info to new format mtd: spi-nor: xilinx: use new macros in S3AN_INFO() mtd: spi-nor: xmc: convert flash_info to new format mtd: spi-nor: atmel: sort flash_info database mtd: spi-nor: eon: sort flash_info database mtd: spi-nor: gigadevice: sort flash_info database mtd: spi-nor: issi: sort flash_info database mtd: spi-nor: macronix: sort flash_info database mtd: spi-nor: micron-st: sort flash_info database mtd: spi-nor: spansion: sort flash_info database mtd: spi-nor: sst: sort flash_info database mtd: spi-nor: winbond: sort flash_info entries mtd: spi-nor: atmel: drop duplicate entry mtd: spi-nor: core: get rid of the INFOx() macros drivers/mtd/spi-nor/Makefile | 2 - drivers/mtd/spi-nor/atmel.c | 116 +++++++---- drivers/mtd/spi-nor/catalyst.c | 24 --- drivers/mtd/spi-nor/core.c | 63 +++--- drivers/mtd/spi-nor/core.h | 138 ++++++------- drivers/mtd/spi-nor/eon.c | 74 +++++-- drivers/mtd/spi-nor/esmt.c | 29 ++- drivers/mtd/spi-nor/everspin.c | 34 +++- drivers/mtd/spi-nor/fujitsu.c | 21 -- drivers/mtd/spi-nor/gigadevice.c | 82 ++++---- drivers/mtd/spi-nor/intel.c | 23 ++- drivers/mtd/spi-nor/issi.c | 118 +++++++---- drivers/mtd/spi-nor/macronix.c | 220 ++++++++++++++------- drivers/mtd/spi-nor/micron-st.c | 411 ++++++++++++++++++++++++++------------- drivers/mtd/spi-nor/spansion.c | 389 ++++++++++++++++++++++-------------- drivers/mtd/spi-nor/sst.c | 164 ++++++++++------ drivers/mtd/spi-nor/swp.c | 13 +- drivers/mtd/spi-nor/sysfs.c | 6 +- drivers/mtd/spi-nor/winbond.c | 288 +++++++++++++++++---------- drivers/mtd/spi-nor/xilinx.c | 32 ++- drivers/mtd/spi-nor/xmc.c | 19 +- 21 files changed, 1394 insertions(+), 872 deletions(-) --- base-commit: 66d9573193967138cd12e232d4b5bc2b57e0d1ac change-id: 20230807-mtd-flash-info-db-rework-8a52d60f0023