Re: [PATCH v2] mmc: core: SD: Add BROKEN-SD-DISCARD quirk

[Ulf Hansson]

On Tue, 4 Oct 2022 at 00:01, Avri Altman <Avri.Altman@xxxxxxx> wrote:
>
> Ulf hi,
> I would appreciate if you could take a 2nd look at this,
> So it would make it to 6.1.

I am preparing the pull request for v6.1-rc1, so this won't be part of that.

Although, we can still queue this as a fix for v6.1-rc2 - and we
should also tag this for stable kernels, right!?

>
> Thanks,
> Avri
>

Kind regards
Uffe


> > v1 -> v2:
> >  - Address Ulf's suggestions
> >
> > Some SD-cards 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.
> >
> > While at it, add SD MID for SANDISK. This is because eMMC MID is assign
> > by JEDEC and SD MID is assigned by SD 3c-LLC.
> >
> > Signed-off-by: Avri Altman <avri.altman@xxxxxxx>
> > ---
> >  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 ce89611a136e..54cd009aee50 100644
> > --- a/drivers/mmc/core/block.c
> > +++ b/drivers/mmc/core/block.c
> > @@ -1140,8 +1140,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 99045e138ba4..cfdd1ff40b86 100644
> > --- a/drivers/mmc/core/card.h
> > +++ b/drivers/mmc/core/card.h
> > @@ -73,6 +73,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
> > @@ -258,4 +259,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 be4393988086..29b9497936df 100644
> > --- a/drivers/mmc/core/quirks.h
> > +++ b/drivers/mmc/core/quirks.h
> > @@ -100,6 +100,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 8a30de08e913..c726ea781255 100644
> > --- a/include/linux/mmc/card.h
> > +++ b/include/linux/mmc/card.h
> > @@ -293,6 +293,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.17.1
>