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 32BF019995E for ; Tue, 5 May 2026 10:02:57 +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=1777975378; cv=none; b=XqCNK6HOZoyaxqdisrnJ3hw7zY2xu+et4ZwNs2+5MH0RwZGMw5qMBzH5hV3dxJOzJypHxoyJMCzZZomL649VBYPd1XKwFECe8OtKZvYp+FHy1974Ofc8xGlkGXHHcNp148b4QZstxO4BxY3Ar4L73+5FjDRXvhVCI4l5EAYXT+A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777975378; c=relaxed/simple; bh=9myt88jwkDW1S9ZWkNWTD+xWcikV3yx6e1Znu0V7EEs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HA7k4NHauzpkEcCG+8FtGlFPigFMylxi1+LDeTGObrd7Mv0AO/gA/t0bKJc4RwtDZj1WojYJzi8Avb4F/yiiJ8w//YH5V2LpOqm12clGmUAV4YRd3SFMRMFllc1mrgObu1yAJ4fx7A3vJv5ybguvSzuc8SVkEtUWZaPG4XngYy0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N7KF814v; 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="N7KF814v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7761C2BCB4; Tue, 5 May 2026 10:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777975377; bh=9myt88jwkDW1S9ZWkNWTD+xWcikV3yx6e1Znu0V7EEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N7KF814v7D1cCSXFy4uffleG/HnKAfvaL/LbDQP70/oUlFbz3trKV9gDAD7BuyA01 hj+md2PA0RXtahypLXHHGekGMm7653rDrCM2N9YJEdmbp9xpJPWKHuwNO3gRX+3wbn 419rkSbcA2f9MPWN+q2atKVQ+HiSlH9rT5exuZzn+KQsC5yGhkzCVbNOSkHfNBI/av DMncLZgie+pT634vLzDdyghlSs/dwSksVXOCwBP2NVyH9VDu90MX/GiaH6hzymW0sD R87nim/4kF0tRpqsLLNw8j1aqziE5v1c+iyxz8pjOuS8kyLy5ir5VvCaNFMVDfFYXm hmptY5YylqsJg== From: Sasha Levin To: stable@vger.kernel.org Cc: Luke Wang , Ulf Hansson , Sasha Levin Subject: [PATCH 7.0.y 3/3] mmc: core: Optimize time for secure erase/trim for some Kingston eMMCs Date: Tue, 5 May 2026 06:02:50 -0400 Message-ID: <20260505100250.522459-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260505100250.522459-1-sashal@kernel.org> References: <2026050303-jingle-ambitious-5f11@gregkh> <20260505100250.522459-1-sashal@kernel.org> 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 Signed-off-by: Sasha Levin --- drivers/mmc/core/card.h | 5 +++++ drivers/mmc/core/queue.c | 9 +++++++-- drivers/mmc/core/quirks.h | 9 +++++++++ include/linux/mmc/card.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h index a9619dd452708..a7c364d0030ad 100644 --- a/drivers/mmc/core/card.h +++ b/drivers/mmc/core/card.h @@ -311,4 +311,9 @@ static inline int mmc_card_broken_mdt(const struct mmc_card *c) return c->quirks & MMC_QUIRK_BROKEN_MDT; } +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 13000fc57e2e1..39fcb662c43fc 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -184,8 +184,13 @@ static void mmc_queue_setup_discard(struct mmc_card *card, return; lim->max_hw_discard_sectors = max_discard; - if (mmc_card_can_secure_erase_trim(card)) - lim->max_secure_erase_sectors = max_discard; + if (mmc_card_can_secure_erase_trim(card)) { + if (mmc_card_fixed_secure_erase_trim_time(card)) + lim->max_secure_erase_sectors = UINT_MAX >> card->erase_shift; + else + lim->max_secure_erase_sectors = max_discard; + } + if (mmc_card_can_trim(card) && card->erased_byte == 0) lim->max_write_zeroes_sectors = max_discard; diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index f5e8a0f6d11b9..6f727b4a60a52 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 4722dd7e46ce1..9dc4750296af9 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -330,6 +330,7 @@ struct mmc_card { #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_BROKEN_MDT (1<<19) /* Wrong manufacturing year */ +#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