+++ /dev/null
-From 3e2553510c2410a41e71de7c48c969021996b5da Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 28 Sep 2022 12:57:44 +0300
-Subject: mmc: core: Add SD card quirk for broken discard
-
-From: Avri Altman <avri.altman@wdc.com>
-
-[ Upstream commit 07d2872bf4c864eb83d034263c155746a2fb7a3b ]
-
-Some SD-cards from Sandisk that are SDA-6.0 compliant reports they supports
-discard, while they actually don't. This might cause mk2fs to fail while
-trying to format the card and revert it to a read-only mode.
-
-To fix this problem, let's add a card quirk (MMC_QUIRK_BROKEN_SD_DISCARD)
-to indicate that we shall fall-back to use the legacy erase command
-instead.
-
-Signed-off-by: Avri Altman <avri.altman@wdc.com>
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/20220928095744.16455-1-avri.altman@wdc.com
-[Ulf: Updated the commit message]
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/mmc/core/block.c | 6 +++++-
- drivers/mmc/core/card.h | 6 ++++++
- drivers/mmc/core/quirks.h | 6 ++++++
- include/linux/mmc/card.h | 1 +
- 4 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
-index a9f9a45eafe4..cdf43f790f92 100644
---- a/drivers/mmc/core/block.c
-+++ b/drivers/mmc/core/block.c
-@@ -1100,8 +1100,12 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
- {
- struct mmc_blk_data *md = mq->blkdata;
- struct mmc_card *card = md->queue.card;
-+ unsigned int arg = card->erase_arg;
-
-- mmc_blk_issue_erase_rq(mq, req, MMC_BLK_DISCARD, card->erase_arg);
-+ if (mmc_card_broken_sd_discard(card))
-+ arg = SD_ERASE_ARG;
-+
-+ mmc_blk_issue_erase_rq(mq, req, MMC_BLK_DISCARD, arg);
- }
-
- static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,
-diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h
-index 7bd392d55cfa..5c6986131faf 100644
---- a/drivers/mmc/core/card.h
-+++ b/drivers/mmc/core/card.h
-@@ -70,6 +70,7 @@ struct mmc_fixup {
- #define EXT_CSD_REV_ANY (-1u)
-
- #define CID_MANFID_SANDISK 0x2
-+#define CID_MANFID_SANDISK_SD 0x3
- #define CID_MANFID_ATP 0x9
- #define CID_MANFID_TOSHIBA 0x11
- #define CID_MANFID_MICRON 0x13
-@@ -222,4 +223,9 @@ static inline int mmc_card_broken_hpi(const struct mmc_card *c)
- return c->quirks & MMC_QUIRK_BROKEN_HPI;
- }
-
-+static inline int mmc_card_broken_sd_discard(const struct mmc_card *c)
-+{
-+ return c->quirks & MMC_QUIRK_BROKEN_SD_DISCARD;
-+}
-+
- #endif
-diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
-index d68e6e513a4f..c8c0f50a2076 100644
---- a/drivers/mmc/core/quirks.h
-+++ b/drivers/mmc/core/quirks.h
-@@ -99,6 +99,12 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = {
- MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc,
- MMC_QUIRK_TRIM_BROKEN),
-
-+ /*
-+ * Some SD cards reports discard support while they don't
-+ */
-+ MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,
-+ MMC_QUIRK_BROKEN_SD_DISCARD),
-+
- END_FIXUP
- };
-
-diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
-index 42df06c6b19c..ef870d1f4f5f 100644
---- a/include/linux/mmc/card.h
-+++ b/include/linux/mmc/card.h
-@@ -270,6 +270,7 @@ struct mmc_card {
- #define MMC_QUIRK_BROKEN_IRQ_POLLING (1<<11) /* Polling SDIO_CCCR_INTx could create a fake interrupt */
- #define MMC_QUIRK_TRIM_BROKEN (1<<12) /* Skip trim */
- #define MMC_QUIRK_BROKEN_HPI (1<<13) /* Disable broken HPI support */
-+#define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14) /* Disable broken SD discard support */
-
- bool reenable_cmdq; /* Re-enable Command Queue */
-
---
-2.35.1
-
+++ /dev/null
-From 264f7b493a2cd529c07fb76d3679e16665aae18f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 29 Apr 2022 17:21:18 +0200
-Subject: mmc: core: Support zeroout using TRIM for eMMC
-
-From: Vincent Whitchurch <vincent.whitchurch@axis.com>
-
-[ Upstream commit f7b6fc327327698924ef3afa0c3e87a5b7466af3 ]
-
-If an eMMC card supports TRIM and indicates that it erases to zeros, we can
-use it to support hardware offloading of REQ_OP_WRITE_ZEROES, so let's add
-support for this.
-
-Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
-Reviewed-by: Avri Altman <Avri.Altman@wdc.com>
-Link: https://lore.kernel.org/r/20220429152118.3617303-1-vincent.whitchurch@axis.com
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Stable-dep-of: 07d2872bf4c8 ("mmc: core: Add SD card quirk for broken discard")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/mmc/core/block.c | 26 ++++++++++++++++++++++----
- drivers/mmc/core/queue.c | 2 ++
- 2 files changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
-index 66a00b7c751f..a9f9a45eafe4 100644
---- a/drivers/mmc/core/block.c
-+++ b/drivers/mmc/core/block.c
-@@ -118,6 +118,7 @@ struct mmc_blk_data {
- #define MMC_BLK_DISCARD BIT(2)
- #define MMC_BLK_SECDISCARD BIT(3)
- #define MMC_BLK_CQE_RECOVERY BIT(4)
-+#define MMC_BLK_TRIM BIT(5)
-
- /*
- * Only set in main mmc_blk_data associated
-@@ -1052,12 +1053,13 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req)
- blk_mq_end_request(req, ret ? BLK_STS_IOERR : BLK_STS_OK);
- }
-
--static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
-+static void mmc_blk_issue_erase_rq(struct mmc_queue *mq, struct request *req,
-+ int type, unsigned int erase_arg)
- {
- struct mmc_blk_data *md = mq->blkdata;
- struct mmc_card *card = md->queue.card;
- unsigned int from, nr;
-- int err = 0, type = MMC_BLK_DISCARD;
-+ int err = 0;
- blk_status_t status = BLK_STS_OK;
-
- if (!mmc_can_erase(card)) {
-@@ -1073,13 +1075,13 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
- if (card->quirks & MMC_QUIRK_INAND_CMD38) {
- err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
- INAND_CMD38_ARG_EXT_CSD,
-- card->erase_arg == MMC_TRIM_ARG ?
-+ erase_arg == MMC_TRIM_ARG ?
- INAND_CMD38_ARG_TRIM :
- INAND_CMD38_ARG_ERASE,
- card->ext_csd.generic_cmd6_time);
- }
- if (!err)
-- err = mmc_erase(card, from, nr, card->erase_arg);
-+ err = mmc_erase(card, from, nr, erase_arg);
- } while (err == -EIO && !mmc_blk_reset(md, card->host, type));
- if (err)
- status = BLK_STS_IOERR;
-@@ -1089,6 +1091,19 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
- blk_mq_end_request(req, status);
- }
-
-+static void mmc_blk_issue_trim_rq(struct mmc_queue *mq, struct request *req)
-+{
-+ mmc_blk_issue_erase_rq(mq, req, MMC_BLK_TRIM, MMC_TRIM_ARG);
-+}
-+
-+static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
-+{
-+ struct mmc_blk_data *md = mq->blkdata;
-+ struct mmc_card *card = md->queue.card;
-+
-+ mmc_blk_issue_erase_rq(mq, req, MMC_BLK_DISCARD, card->erase_arg);
-+}
-+
- static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,
- struct request *req)
- {
-@@ -2227,6 +2242,9 @@ enum mmc_issued mmc_blk_mq_issue_rq(struct mmc_queue *mq, struct request *req)
- case REQ_OP_SECURE_ERASE:
- mmc_blk_issue_secdiscard_rq(mq, req);
- break;
-+ case REQ_OP_WRITE_ZEROES:
-+ mmc_blk_issue_trim_rq(mq, req);
-+ break;
- case REQ_OP_FLUSH:
- mmc_blk_issue_flush(mq, req);
- break;
-diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
-index 002426e3cf76..ae235828e909 100644
---- a/drivers/mmc/core/queue.c
-+++ b/drivers/mmc/core/queue.c
-@@ -193,6 +193,8 @@ static void mmc_queue_setup_discard(struct request_queue *q,
- q->limits.discard_granularity = SECTOR_SIZE;
- if (mmc_can_secure_erase_trim(card))
- blk_queue_flag_set(QUEUE_FLAG_SECERASE, q);
-+ if (mmc_can_trim(card) && card->erased_byte == 0)
-+ blk_queue_max_write_zeroes_sectors(q, max_discard);
- }
-
- static unsigned int mmc_get_max_segments(struct mmc_host *host)
---
-2.35.1
-
tracing-do-not-free-snapshot-if-tracer-is-on-cmdline.patch
xen-assume-xenfeat_gnttab_map_avail_bits-being-set-f.patch
xen-gntdev-accommodate-vma-splitting.patch
-mmc-core-support-zeroout-using-trim-for-emmc.patch
-mmc-core-add-sd-card-quirk-for-broken-discard.patch
mmc-sdhci-tegra-use-actual-clock-rate-for-sw-tuning-.patch
riscv-add-machine-name-to-kernel-boot-log-and-stack-.patch
riscv-always-honor-the-config_cmdline_force-when-par.patch
+++ /dev/null
-From e217fcafe46e9a283ca9deb43e4beeb707d4870a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 28 Sep 2022 12:57:44 +0300
-Subject: mmc: core: Add SD card quirk for broken discard
-
-From: Avri Altman <avri.altman@wdc.com>
-
-[ Upstream commit 07d2872bf4c864eb83d034263c155746a2fb7a3b ]
-
-Some SD-cards from Sandisk that are SDA-6.0 compliant reports they supports
-discard, while they actually don't. This might cause mk2fs to fail while
-trying to format the card and revert it to a read-only mode.
-
-To fix this problem, let's add a card quirk (MMC_QUIRK_BROKEN_SD_DISCARD)
-to indicate that we shall fall-back to use the legacy erase command
-instead.
-
-Signed-off-by: Avri Altman <avri.altman@wdc.com>
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/20220928095744.16455-1-avri.altman@wdc.com
-[Ulf: Updated the commit message]
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/mmc/core/block.c | 6 +++++-
- drivers/mmc/core/card.h | 6 ++++++
- drivers/mmc/core/quirks.h | 6 ++++++
- include/linux/mmc/card.h | 1 +
- 4 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
-index e3af3e3224e4..6024faa6f745 100644
---- a/drivers/mmc/core/block.c
-+++ b/drivers/mmc/core/block.c
-@@ -1138,8 +1138,12 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
- {
- struct mmc_blk_data *md = mq->blkdata;
- struct mmc_card *card = md->queue.card;
-+ unsigned int arg = card->erase_arg;
-
-- mmc_blk_issue_erase_rq(mq, req, MMC_BLK_DISCARD, card->erase_arg);
-+ if (mmc_card_broken_sd_discard(card))
-+ arg = SD_ERASE_ARG;
-+
-+ mmc_blk_issue_erase_rq(mq, req, MMC_BLK_DISCARD, arg);
- }
-
- static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,
-diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h
-index 7bd392d55cfa..5c6986131faf 100644
---- a/drivers/mmc/core/card.h
-+++ b/drivers/mmc/core/card.h
-@@ -70,6 +70,7 @@ struct mmc_fixup {
- #define EXT_CSD_REV_ANY (-1u)
-
- #define CID_MANFID_SANDISK 0x2
-+#define CID_MANFID_SANDISK_SD 0x3
- #define CID_MANFID_ATP 0x9
- #define CID_MANFID_TOSHIBA 0x11
- #define CID_MANFID_MICRON 0x13
-@@ -222,4 +223,9 @@ static inline int mmc_card_broken_hpi(const struct mmc_card *c)
- return c->quirks & MMC_QUIRK_BROKEN_HPI;
- }
-
-+static inline int mmc_card_broken_sd_discard(const struct mmc_card *c)
-+{
-+ return c->quirks & MMC_QUIRK_BROKEN_SD_DISCARD;
-+}
-+
- #endif
-diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
-index d68e6e513a4f..c8c0f50a2076 100644
---- a/drivers/mmc/core/quirks.h
-+++ b/drivers/mmc/core/quirks.h
-@@ -99,6 +99,12 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = {
- MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc,
- MMC_QUIRK_TRIM_BROKEN),
-
-+ /*
-+ * Some SD cards reports discard support while they don't
-+ */
-+ MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,
-+ MMC_QUIRK_BROKEN_SD_DISCARD),
-+
- END_FIXUP
- };
-
-diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
-index 37f975875102..12c7f2d3e210 100644
---- a/include/linux/mmc/card.h
-+++ b/include/linux/mmc/card.h
-@@ -292,6 +292,7 @@ struct mmc_card {
- #define MMC_QUIRK_BROKEN_IRQ_POLLING (1<<11) /* Polling SDIO_CCCR_INTx could create a fake interrupt */
- #define MMC_QUIRK_TRIM_BROKEN (1<<12) /* Skip trim */
- #define MMC_QUIRK_BROKEN_HPI (1<<13) /* Disable broken HPI support */
-+#define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14) /* Disable broken SD discard support */
-
- bool reenable_cmdq; /* Re-enable Command Queue */
-
---
-2.35.1
-
+++ /dev/null
-From d3cc702e4a9f80cf1ae41399593d843d4c509e08 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 29 Apr 2022 17:21:18 +0200
-Subject: mmc: core: Support zeroout using TRIM for eMMC
-
-From: Vincent Whitchurch <vincent.whitchurch@axis.com>
-
-[ Upstream commit f7b6fc327327698924ef3afa0c3e87a5b7466af3 ]
-
-If an eMMC card supports TRIM and indicates that it erases to zeros, we can
-use it to support hardware offloading of REQ_OP_WRITE_ZEROES, so let's add
-support for this.
-
-Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
-Reviewed-by: Avri Altman <Avri.Altman@wdc.com>
-Link: https://lore.kernel.org/r/20220429152118.3617303-1-vincent.whitchurch@axis.com
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Stable-dep-of: 07d2872bf4c8 ("mmc: core: Add SD card quirk for broken discard")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/mmc/core/block.c | 26 ++++++++++++++++++++++----
- drivers/mmc/core/queue.c | 2 ++
- 2 files changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
-index 3222a9d0c245..e3af3e3224e4 100644
---- a/drivers/mmc/core/block.c
-+++ b/drivers/mmc/core/block.c
-@@ -126,6 +126,7 @@ struct mmc_blk_data {
- #define MMC_BLK_DISCARD BIT(2)
- #define MMC_BLK_SECDISCARD BIT(3)
- #define MMC_BLK_CQE_RECOVERY BIT(4)
-+#define MMC_BLK_TRIM BIT(5)
-
- /*
- * Only set in main mmc_blk_data associated
-@@ -1090,12 +1091,13 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req)
- blk_mq_end_request(req, ret ? BLK_STS_IOERR : BLK_STS_OK);
- }
-
--static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
-+static void mmc_blk_issue_erase_rq(struct mmc_queue *mq, struct request *req,
-+ int type, unsigned int erase_arg)
- {
- struct mmc_blk_data *md = mq->blkdata;
- struct mmc_card *card = md->queue.card;
- unsigned int from, nr;
-- int err = 0, type = MMC_BLK_DISCARD;
-+ int err = 0;
- blk_status_t status = BLK_STS_OK;
-
- if (!mmc_can_erase(card)) {
-@@ -1111,13 +1113,13 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
- if (card->quirks & MMC_QUIRK_INAND_CMD38) {
- err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
- INAND_CMD38_ARG_EXT_CSD,
-- card->erase_arg == MMC_TRIM_ARG ?
-+ erase_arg == MMC_TRIM_ARG ?
- INAND_CMD38_ARG_TRIM :
- INAND_CMD38_ARG_ERASE,
- card->ext_csd.generic_cmd6_time);
- }
- if (!err)
-- err = mmc_erase(card, from, nr, card->erase_arg);
-+ err = mmc_erase(card, from, nr, erase_arg);
- } while (err == -EIO && !mmc_blk_reset(md, card->host, type));
- if (err)
- status = BLK_STS_IOERR;
-@@ -1127,6 +1129,19 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
- blk_mq_end_request(req, status);
- }
-
-+static void mmc_blk_issue_trim_rq(struct mmc_queue *mq, struct request *req)
-+{
-+ mmc_blk_issue_erase_rq(mq, req, MMC_BLK_TRIM, MMC_TRIM_ARG);
-+}
-+
-+static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
-+{
-+ struct mmc_blk_data *md = mq->blkdata;
-+ struct mmc_card *card = md->queue.card;
-+
-+ mmc_blk_issue_erase_rq(mq, req, MMC_BLK_DISCARD, card->erase_arg);
-+}
-+
- static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,
- struct request *req)
- {
-@@ -2320,6 +2335,9 @@ enum mmc_issued mmc_blk_mq_issue_rq(struct mmc_queue *mq, struct request *req)
- case REQ_OP_SECURE_ERASE:
- mmc_blk_issue_secdiscard_rq(mq, req);
- break;
-+ case REQ_OP_WRITE_ZEROES:
-+ mmc_blk_issue_trim_rq(mq, req);
-+ break;
- case REQ_OP_FLUSH:
- mmc_blk_issue_flush(mq, req);
- break;
-diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
-index b15c034b42fb..a72431703e52 100644
---- a/drivers/mmc/core/queue.c
-+++ b/drivers/mmc/core/queue.c
-@@ -191,6 +191,8 @@ static void mmc_queue_setup_discard(struct request_queue *q,
- q->limits.discard_granularity = SECTOR_SIZE;
- if (mmc_can_secure_erase_trim(card))
- blk_queue_flag_set(QUEUE_FLAG_SECERASE, q);
-+ if (mmc_can_trim(card) && card->erased_byte == 0)
-+ blk_queue_max_write_zeroes_sectors(q, max_discard);
- }
-
- static unsigned short mmc_get_max_segments(struct mmc_host *host)
---
-2.35.1
-
ksmbd-fix-incorrect-handling-of-iterate_dir.patch
tracing-simplify-conditional-compilation-code-in-tra.patch
tracing-do-not-free-snapshot-if-tracer-is-on-cmdline.patch
-mmc-core-support-zeroout-using-trim-for-emmc.patch
-mmc-core-add-sd-card-quirk-for-broken-discard.patch
mmc-sdhci-tegra-use-actual-clock-rate-for-sw-tuning-.patch
drm-amd-display-parse-and-check-psr-su-caps.patch
drm-amd-display-explicitly-disable-psr_feature_enabl.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
