From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B339837CD50 for ; Fri, 8 May 2026 14:52:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778251944; cv=none; b=CEdS95S//dTMVvSHLRnJPH8mRLmooCXC2ie0UEZtpHfHbucS8awJWPoWSc12GMqe696To2Om2lwXtU+hh9eEFW2HgyDDlnkmiphvpoFN8f0usVjRqCClQfI4AYpAea3NFJoT1AoEneetlrn3M6FGTQ7WxN+tumiSjDYJnIyq3fQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778251944; c=relaxed/simple; bh=WzVsZWp6ChPASY8/Hp6Wkjd6UnQ3YAyUAT5UtkJYIpA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HK/7k20S4u4Axooh2Xp0WaB1oqLgBRG+NNpqW8HTk4MKLUslYayFnqdgBTqFYL5pBOQ8D7iHEqN8tDJb5vk+3o9lk28opm33ADSETBHNY8yomqpwajgCUOZQ+4JSJkEGFVpYKIviUBWXOP05AnerXr/cxVWQAjZrHzZLWJ8A2U0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YPV35vUr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YPV35vUr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E63B4C2BCB0; Fri, 8 May 2026 14:52:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778251944; bh=WzVsZWp6ChPASY8/Hp6Wkjd6UnQ3YAyUAT5UtkJYIpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YPV35vUrwo59e5CusY5ClUhN44sb3wyr74BAEDXt/1qOku+XZpShcmgoDHjOyAf5s ORKihIh6CnxKDo4YCglaCKLL4Ap+xWJCIAjlaSkpbZj2Bg5R/KOGZgueuAuQIIkyqq t4M6SrIUiFBcqv/VirWqZT8hhiOY6Hqy+MAIih3Hj6w0P9Y7jrD1+pqLVOhJrngAfk 5SwbHaus07uwN4Scp356DL6+iYhbYJSeBUXWZ24amLvEeU9uxXPAc4/ofcUieSw0+W tFvj3YtoJKHJcw2mq5mPWuPU0iuI0gd6FachUCDe2ow/S3duLcUJwVcSgiaNzyZKOn 45+Rzi/oLzHvA== From: Sasha Levin To: stable@vger.kernel.org Cc: Luke Wang , Ulf Hansson , Sasha Levin Subject: [PATCH 6.6.y] mmc: core: Optimize time for secure erase/trim for some Kingston eMMCs Date: Fri, 8 May 2026 10:52:22 -0400 Message-ID: <20260508145222.1512925-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050304-childlike-mustiness-d6ea@gregkh> References: <2026050304-childlike-mustiness-d6ea@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Luke Wang [ Upstream commit d6bf2e64dec87322f2b11565ddb59c0e967f96e3 ] Kingston eMMC IY2964 and IB2932 takes a fixed ~2 seconds for each secure erase/trim operation regardless of size - that is, a single secure erase/trim operation of 1MB takes the same time as 1GB. With default calculated 3.5MB max discard size, secure erase 1GB requires ~300 separate operations taking ~10 minutes total. Add a card quirk, MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME, to set maximum secure erase size for those devices. This allows 1GB secure erase to complete in a single operation, reducing time from 10 minutes to just 2 seconds. Signed-off-by: Luke Wang Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson [ adapted `lim->max_secure_erase_sectors =` assignment to `blk_queue_max_secure_erase_sectors(q, ...)` setter and used pre-rename `mmc_can_secure_erase_trim`/`mmc_can_trim` helpers ] Signed-off-by: Sasha Levin --- drivers/mmc/core/card.h | 5 +++++ drivers/mmc/core/queue.c | 8 ++++++-- drivers/mmc/core/quirks.h | 9 +++++++++ include/linux/mmc/card.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h index fe0b2fa3bb89d..4af43f9f14767 100644 --- a/drivers/mmc/core/card.h +++ b/drivers/mmc/core/card.h @@ -297,4 +297,9 @@ static inline int mmc_card_no_uhs_ddr50_tuning(const struct mmc_card *c) return c->quirks & MMC_QUIRK_NO_UHS_DDR50_TUNING; } +static inline int mmc_card_fixed_secure_erase_trim_time(const struct mmc_card *c) +{ + return c->quirks & MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME; +} + #endif diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index b396e39007177..9eed7562e2672 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -188,8 +188,12 @@ static void mmc_queue_setup_discard(struct request_queue *q, /* granularity must not be greater than max. discard */ if (card->pref_erase > max_discard) q->limits.discard_granularity = SECTOR_SIZE; - if (mmc_can_secure_erase_trim(card)) - blk_queue_max_secure_erase_sectors(q, max_discard); + if (mmc_can_secure_erase_trim(card)) { + if (mmc_card_fixed_secure_erase_trim_time(card)) + blk_queue_max_secure_erase_sectors(q, UINT_MAX >> card->erase_shift); + else + blk_queue_max_secure_erase_sectors(q, max_discard); + } if (mmc_can_trim(card) && card->erased_byte == 0) blk_queue_max_write_zeroes_sectors(q, max_discard); } diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index c417ed34c0576..1f7406c0ab03d 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -153,6 +153,15 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = { MMC_FIXUP("M62704", CID_MANFID_KINGSTON, 0x0100, add_quirk_mmc, MMC_QUIRK_TRIM_BROKEN), + /* + * On Some Kingston eMMCs, secure erase/trim time is independent + * of erase size, fixed at approximately 2 seconds. + */ + MMC_FIXUP("IY2964", CID_MANFID_KINGSTON, 0x0100, add_quirk_mmc, + MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME), + MMC_FIXUP("IB2932", CID_MANFID_KINGSTON, 0x0100, add_quirk_mmc, + MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME), + END_FIXUP }; diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 7c6da19fff9f0..d9fbd389dce2e 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -298,6 +298,7 @@ struct mmc_card { #define MMC_QUIRK_BROKEN_CACHE_FLUSH (1<<16) /* Don't flush cache until the write has occurred */ #define MMC_QUIRK_BROKEN_SD_POWEROFF_NOTIFY (1<<17) /* Disable broken SD poweroff notify support */ #define MMC_QUIRK_NO_UHS_DDR50_TUNING (1<<18) /* Disable DDR50 tuning */ +#define MMC_QUIRK_FIXED_SECURE_ERASE_TRIM_TIME (1<<20) /* Secure erase/trim time is fixed regardless of size */ bool written_flag; /* Indicates eMMC has been written since power on */ bool reenable_cmdq; /* Re-enable Command Queue */ -- 2.53.0