From f3db4bc40c5abc3ee0496cd5e8979c4522476a9b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 29 Dec 2023 15:48:49 +0100 Subject: [PATCH] Fix RPI compilation --- ...0113-MMC-added-alternative-MMC-driver.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/6.1/target/linux/bcm27xx/patches-6.1/950-0113-MMC-added-alternative-MMC-driver.patch b/6.1/target/linux/bcm27xx/patches-6.1/950-0113-MMC-added-alternative-MMC-driver.patch index 9d33f245..a74b2cd6 100644 --- a/6.1/target/linux/bcm27xx/patches-6.1/950-0113-MMC-added-alternative-MMC-driver.patch +++ b/6.1/target/linux/bcm27xx/patches-6.1/950-0113-MMC-added-alternative-MMC-driver.patch @@ -1,4 +1,4 @@ -From ad3220a823c154937685522d9af69025ce7c2ce5 Mon Sep 17 00:00:00 2001 +From c9b2c57e7fbfbebf73f96e58fb783bba83c50bd9 Mon Sep 17 00:00:00 2001 From: gellert Date: Fri, 15 Aug 2014 16:35:06 +0100 Subject: [PATCH] MMC: added alternative MMC driver @@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, -@@ -2994,6 +3001,8 @@ static int mmc_blk_probe(struct mmc_card +@@ -2998,6 +3005,8 @@ static int mmc_blk_probe(struct mmc_card { struct mmc_blk_data *md; int ret = 0; @@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell /* * Check that the card supports the command class(es) we need. -@@ -3001,7 +3010,16 @@ static int mmc_blk_probe(struct mmc_card +@@ -3005,7 +3014,16 @@ static int mmc_blk_probe(struct mmc_card if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -3016,6 +3034,17 @@ static int mmc_blk_probe(struct mmc_card +@@ -3020,6 +3038,17 @@ static int mmc_blk_probe(struct mmc_card goto out_free; } @@ -313,7 +313,7 @@ Signed-off-by: Phil Elwell goto out; --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c -@@ -1814,7 +1814,8 @@ EXPORT_SYMBOL(mmc_erase); +@@ -1819,7 +1819,8 @@ EXPORT_SYMBOL(mmc_erase); int mmc_can_erase(struct mmc_card *card) { @@ -325,7 +325,7 @@ Signed-off-by: Phil Elwell } --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h -@@ -129,6 +129,14 @@ static const struct mmc_fixup __maybe_un +@@ -130,6 +130,14 @@ static const struct mmc_fixup __maybe_un MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd, MMC_QUIRK_BROKEN_SD_DISCARD), @@ -2007,12 +2007,12 @@ Signed-off-by: Phil Elwell sdhci_dumpregs(host); --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h -@@ -296,6 +296,8 @@ struct mmc_card { - #define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14) /* Disable broken SD discard support */ +@@ -297,6 +297,8 @@ struct mmc_card { #define MMC_QUIRK_BROKEN_SD_CACHE (1<<15) /* Disable broken SD cache support */ + #define MMC_QUIRK_BROKEN_CACHE_FLUSH (1<<16) /* Don't flush cache until the write has occurred */ +#define MMC_QUIRK_ERASE_BROKEN (1<<31) /* Skip erase */ + + bool written_flag; /* Indicates eMMC has been written since power on */ bool reenable_cmdq; /* Re-enable Command Queue */ - unsigned int erase_size; /* erase size in sectors */