Re: [PATCH V7 22/23] mmc: sdhci-pci: add UHS-II support framework

[Victor Shih]

Hi, Adrian

On Wed, Apr 12, 2023 at 9:12 PM Adrian Hunter <adrian.hunter@xxxxxxxxx> wrote:
>
> On 31/03/23 13:55, Victor Shih wrote:
> > From: AKASHI Takahiro <takahiro.akashi@xxxxxxxxxx>
> >
> > This patch prepares for adding UHS-II support at a specific UHS-II
> > capable sdhci-pci controller, GL9755 for now.
> >
> > Signed-off-by: Ben Chuang <ben.chuang@xxxxxxxxxxxxxxxxxxx>
> > Signed-off-by: AKASHI Takahiro <takahiro.akashi@xxxxxxxxxx>
> > ---
> >  drivers/mmc/host/sdhci-pci-core.c | 16 +++++++++++++++-
> >  drivers/mmc/host/sdhci-pci.h      |  3 +++
> >  2 files changed, 18 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
> > index 01975d145200..6b5109f7feef 100644
> > --- a/drivers/mmc/host/sdhci-pci-core.c
> > +++ b/drivers/mmc/host/sdhci-pci-core.c
> > @@ -40,6 +40,7 @@
> >  #include "sdhci.h"
> >  #include "sdhci-cqhci.h"
> >  #include "sdhci-pci.h"
> > +#include "sdhci-uhs2.h"
> >
> >  static void sdhci_pci_hw_reset(struct sdhci_host *host);
> >
> > @@ -2155,7 +2156,10 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)
> >       if (scratch == (u32)-1)
> >               dead = 1;
> >
> > -     sdhci_remove_host(slot->host, dead);
> > +     if (slot->chip->fixes && slot->chip->fixes->remove_host)
> > +             slot->chip->fixes->remove_host(slot, dead);
> > +     else
> > +             sdhci_remove_host(slot->host, dead);
> >
> >       if (slot->chip->fixes && slot->chip->fixes->remove_slot)
> >               slot->chip->fixes->remove_slot(slot, dead);
> > @@ -2163,6 +2167,16 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)
> >       sdhci_free_host(slot->host);
> >  }
> >
> > +int sdhci_pci_uhs2_add_host(struct sdhci_pci_slot *slot)
> > +{
> > +     return sdhci_uhs2_add_host(slot->host);
>
> This patch does not compile because uhs2 functions
> cannot be called yet because config MMC_SDHCI_UHS2
> is not yet selected.
>
> Please ensure all patches compile before submitting.
>

I will fix it in the V8 version.

> > +}
> > +
> > +void sdhci_pci_uhs2_remove_host(struct sdhci_pci_slot *slot, int dead)
> > +{
> > +     sdhci_uhs2_remove_host(slot->host, dead);
> > +}
> > +
> >  static void sdhci_pci_runtime_pm_allow(struct device *dev)
> >  {
> >       pm_suspend_ignore_children(dev, 1);
> > diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h
> > index 3661a224fb04..7f4a981c0e63 100644
> > --- a/drivers/mmc/host/sdhci-pci.h
> > +++ b/drivers/mmc/host/sdhci-pci.h
> > @@ -140,6 +140,7 @@ struct sdhci_pci_fixes {
> >       int                     (*probe_slot) (struct sdhci_pci_slot *);
> >       int                     (*add_host) (struct sdhci_pci_slot *);
> >       void                    (*remove_slot) (struct sdhci_pci_slot *, int);
> > +     void                    (*remove_host) (struct sdhci_pci_slot *, int);
> >
> >  #ifdef CONFIG_PM_SLEEP
> >       int                     (*suspend) (struct sdhci_pci_chip *);
> > @@ -184,6 +185,8 @@ static inline void *sdhci_pci_priv(struct sdhci_pci_slot *slot)
> >       return (void *)slot->private;
> >  }
> >
> > +int sdhci_pci_uhs2_add_host(struct sdhci_pci_slot *slot);
> > +void sdhci_pci_uhs2_remove_host(struct sdhci_pci_slot *slot, int dead);
> >  #ifdef CONFIG_PM_SLEEP
> >  int sdhci_pci_resume_host(struct sdhci_pci_chip *chip);
> >  #endif
>

Thanks, Victor Shih