From nobody Thu Jun 18 08:02:42 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C297F1A9F8D for ; Fri, 17 Apr 2026 07:18:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776410306; cv=none; b=s6EYjLwQorxu6zTA7cx2XZeNmqxMJaDaV+htZGcs1tHgdrnyoFkwiVP9HUNLPf48PwZvd5ILE7+EB4MdVIMKqzPIli/bWhYd7g6Gbgymg1V7wxiKx+OWYkhJ2c4ME9L7LzqAjlywdZg94kJ1SbEeLhoyuewt8k7Qij7atn/aTXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776410306; c=relaxed/simple; bh=LerVkNK/yNdCSw9cKUg/+jIUIU7bF7pZH1Cx8GtU32E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=ivHjbx/y21Qzvtthvln71Us6XdAgX5RodWplPa5La3qKHWlj4JVl9JDSIYi2RfwW8E9KwUddNKMGJcX7gXxfMb3+THK0HcYl2/1eUO/8Uyo/jQdIU8V7xzwT2XSU+JpKSIgYSzFNRPMyXXYRI5TlolVaarxWqdTcJq4VpU6WoZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JULB6/cV; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JULB6/cV" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-35fb7f51171so413405a91.1 for ; Fri, 17 Apr 2026 00:18:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776410305; x=1777015105; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=YhZKwkDddkG02lE9ffrMMhNbwk/eqif/cLCr1QKCry8=; b=JULB6/cVP+kaZhj3QHDs9/VL6LPPzk4bk3ltUv4tTfWbzPX7r3tj+YbGveSf6cgqYY fBIq+wT6tIXkzCX1PnlYYq7wGRH/cbvGskZyyHyktTLMQI2RYAHiG5zsR+xbu7QFOXZP YPxGPT5dL5HcvkNmCGIwEsvg4N2Qo73mbzASkrPWhL24yK38coA6+A91uMKpu33l+NoU rg4kTbzL4HMdIqM/JHHh2T46Blhu5PoxaLPA03Jyb8rf0h6UyeQw4aqBKE22iREDcqEo yrLX9TsjXKUi4KS5+TolsthZoWF0E34IJF+eP79900NRpLEmUn+p5I7FO+tAyvlX8VYi pXLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776410305; x=1777015105; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YhZKwkDddkG02lE9ffrMMhNbwk/eqif/cLCr1QKCry8=; b=lq+jly3pgTqixT2xMLQpbfLuibdghDaR/bbqHi1asF4Ls8aeL/cCZndCehMInmSbF6 fW58RWe6qtbs1zFNWoKi60b7wEiTlTbmEXWAUgSQOUOk+0hpRYNLfvQcfphx257lxuKR AJmlpZc7OqSjI7zkB5fukjBaTtJsHgWcTXsEEwU6w+/hTc/8sK2tNzAeNfdomcL1keZH wrslsaiymd36f4cNYrT6PHYfNYTXTA8z8rshow8E7GifLVQ4Vk1ynLBz1GpYR50rCIep tuFLJA0Z+fQU6dGDs8ZaQwfLhtHZ9UFTcTMnqW3tEQc0dMH8co5FR2Puk968QuzMgJvC m06Q== X-Forwarded-Encrypted: i=1; AFNElJ+VTvZDPbP8LHoxYR3+aD4eiu9fT7Gp37d18FDzp3fhOWw8h1TPh1XmgyakT4dFATa17weP+EDsVRyDgTI=@vger.kernel.org X-Gm-Message-State: AOJu0YyH3LFMtHg8ZvN7VIvBF8axA+qGUEZ5clq99Jnq+0v4Bj6jKlWe 6FnLSxvEFM+mDwZx2K+r5YD6Yn+IULgQE0a1Yt0KqazTc+F5y9/HZBGq X-Gm-Gg: AeBDieu9DPR+6VaSf7uzdkIpoKoTv3E4IHXrC6wi6kUpIrO7U3FG3Ft0/zIOEM/vxkj c4Lx90x8mwaCtt/bT1Z+HKBvYBopbCXMhUQZh7kx/AToYXFw+Mif3hd75GwATlTWGDxgSU+eelf iZMhVu4y/M32KaNHYhn7HybL7WXvitwFiL5udkRQMagaM8oXaVsApTAJTm10GnP631zu4A5aLlN +2fLmZcYNjUJ/heQpuLW+yW1xnhOgODXlx3jAVB1A4QA+Y/pgH4lbLCDsXW+492Bk12efOfOrRu 7CLJFVSsesWlX+WNt2W6cI3wtlusus4EyPIgBWrSL0ZNJ9qAkW/T+BAoPatApsw5BH7IHQm3jJz Idbewo8joPOfQ5Tt8M4SphI/2sVDliNpxLbEHdBsnxnveUpYFEGXNZ+sKb0Nwf3EoT3Q6trBgRa TmSOZy5X6+uzuoyzyls5EJYkoSAms/hLfftyk350MREajk+33fzACGHvYMSlhcSJWz9y7KmirL9 0jer9MqelkFc8Od6QEy7PqieC40AA== X-Received: by 2002:a17:90b:3903:b0:35f:b86f:6ae6 with SMTP id 98e67ed59e1d1-3614049332cmr1922742a91.22.1776410304949; Fri, 17 Apr 2026 00:18:24 -0700 (PDT) Received: from ISCN5CG2520RPD.infineon.com (KD106168128197.ppp-bb.dion.ne.jp. [106.168.128.197]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36141975515sm979122a91.15.2026.04.17.00.18.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 00:18:24 -0700 (PDT) From: tkuw584924@gmail.com X-Google-Original-From: takahiro.kuwano@infineon.com Date: Fri, 17 Apr 2026 16:17:15 +0900 Subject: [PATCH v2] mtd: spi-nor: remove unused NO_OP_CHIP_ERASE flag Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260417-die-erase-fix-v2-1-73bb7004ebad@infineon.com> X-B4-Tracking: v=1; b=H4sIAHre4WkC/x2MwQqAIBAFfyX23IJu2aFfiQ6Wz9pLhUIE4b8nH Wdg5qWMpMg0Ni8l3Jr1PCpI29C6+2MDa6hMYmQwvR04KBjJZ3DUh9E570RsDIuh2lwJVf+/aS7 lA7gi53hfAAAA X-Change-ID: 20260416-die-erase-fix-e35a5221fdb0 To: Tudor Ambarus , Pratyush Yadav , Michael Walle , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, Takahiro Kuwano X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1776410300; l=2965; i=takahiro.kuwano@infineon.com; s=20250227; h=from:subject:message-id; bh=/6gzxVb9k3gCr76tL2LHtdUfksZ/2sUJRHx5ao+kSHc=; b=oUNE+8CHJQ6zZPc8jLaCnF8rIhrfH2QX0dzSlR+05T1U8iLWVDTNK0BvOL/21NcRFdLVILhUt 1yJdvfVI3pWCGqJMhLBuJMDHKS94XqqCpdJKc67cY828VgmpIw4bXmh X-Developer-Key: i=takahiro.kuwano@infineon.com; a=ed25519; pk=aS8V9WLuMUkl0vmgD0xJU19ZajdJmuyFBnBfVj0dfDs= From: Takahiro Kuwano NO_OP_CHIP_ERASE flag is no longer used. Remove definition and references of the flag in core and debugfs. Reviewed-by: Tudor Ambarus Signed-off-by: Takahiro Kuwano Reviewed-by: Michael Walle Reviewed-by: Miquel Raynal --- Changes in v2: - Collect R-b from Tudor - Just drop NO_OP_CHIP_ERASE and leave the rest of bit assignment as is - Copy to --- drivers/mtd/spi-nor/core.c | 3 +-- drivers/mtd/spi-nor/core.h | 6 ++++-- drivers/mtd/spi-nor/debugfs.c | 7 ++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index e6c1fda61f57..278b3fd0996e 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -1787,8 +1787,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct= erase_info *instr) return ret; =20 /* chip (die) erase? */ - if ((len =3D=3D mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) || - multi_die_erase) { + if (len =3D=3D mtd->size || multi_die_erase) { ret =3D spi_nor_erase_dice(nor, addr, len, die_size); if (ret) goto erase_err; diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index e838c40a2589..fd9475ca4530 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h @@ -121,10 +121,12 @@ SPI_MEM_OP_NO_ADDR, \ SPI_MEM_OP_NO_DATA) =20 -/* Keep these in sync with the list in debugfs.c */ +/* + * This could contain holes, if adding a new flag use the first free spot. + * Keep the flags in sync with the list in debugfs.c + */ enum spi_nor_option_flags { SNOR_F_HAS_SR_TB =3D BIT(0), - SNOR_F_NO_OP_CHIP_ERASE =3D BIT(1), SNOR_F_BROKEN_RESET =3D BIT(2), SNOR_F_4B_OPCODES =3D BIT(3), SNOR_F_HAS_4BAIT =3D BIT(4), diff --git a/drivers/mtd/spi-nor/debugfs.c b/drivers/mtd/spi-nor/debugfs.c index fa6956144d2e..7505cbab75d6 100644 --- a/drivers/mtd/spi-nor/debugfs.c +++ b/drivers/mtd/spi-nor/debugfs.c @@ -12,7 +12,6 @@ #define SNOR_F_NAME(name) [ilog2(SNOR_F_##name)] =3D #name static const char *const snor_f_names[] =3D { SNOR_F_NAME(HAS_SR_TB), - SNOR_F_NAME(NO_OP_CHIP_ERASE), SNOR_F_NAME(BROKEN_RESET), SNOR_F_NAME(4B_OPCODES), SNOR_F_NAME(HAS_4BAIT), @@ -136,10 +135,8 @@ static int spi_nor_params_show(struct seq_file *s, voi= d *data) } } =20 - if (!(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) { - string_get_size(params->size, 1, STRING_UNITS_2, buf, sizeof(buf)); - seq_printf(s, " %02x (%s)\n", nor->params->die_erase_opcode, buf); - } + string_get_size(params->size, 1, STRING_UNITS_2, buf, sizeof(buf)); + seq_printf(s, " %02x (%s)\n", nor->params->die_erase_opcode, buf); =20 seq_puts(s, "\nsector map\n"); seq_puts(s, " region (in hex) | erase mask | overlaid\n"); --- base-commit: ed7f4ffeda2d93a97bdfd11f5c9b2d3fe9c3e837 change-id: 20260416-die-erase-fix-e35a5221fdb0 Best regards, -- =20 Takahiro Kuwano