On 13/12/22 11:00, Victor Shih wrote:
> Dump UHS-II specific registers, if available, in sdhci_dumpregs()
> for informative/debugging use.
>
> Signed-off-by: Ben Chuang <ben.chuang@xxxxxxxxxxxxxxxxxxx>
> Signed-off-by: AKASHI Takahiro <takahiro.akashi@xxxxxxxxxx>
> Signed-off-by: Victor Shih <victor.shih@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/mmc/host/sdhci-uhs2.c | 30 ++++++++++++++++++++++++++++++
> drivers/mmc/host/sdhci-uhs2.h | 4 ++++
> drivers/mmc/host/sdhci.c | 3 +++
> drivers/mmc/host/sdhci.h | 1 +
> 4 files changed, 38 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
> index 8e15bd0dadee..7ea15f06fa99 100644
> --- a/drivers/mmc/host/sdhci-uhs2.c
> +++ b/drivers/mmc/host/sdhci-uhs2.c
> @@ -18,6 +18,36 @@
> #define DRIVER_NAME "sdhci_uhs2"
> #define DBG(f, x...) \
> pr_debug(DRIVER_NAME " [%s()]: " f, __func__, ## x)
> +#define SDHCI_UHS2_DUMP(f, x...) \
> + pr_err("%s: " DRIVER_NAME ": " f, mmc_hostname(host->mmc), ## x)
> +
> +void sdhci_uhs2_dump_regs(struct sdhci_host *host)
> +{
> + if (!(host->mmc->flags & MMC_UHS2_SUPPORT))
Could make use of sdhci_uhs2_mode()
> + return;
> +
> + SDHCI_UHS2_DUMP("==================== UHS2 ==================\n");
> + SDHCI_UHS2_DUMP("Blk Size: 0x%08x | Blk Cnt: 0x%08x\n",
> + sdhci_readw(host, SDHCI_UHS2_BLOCK_SIZE),
> + sdhci_readl(host, SDHCI_UHS2_BLOCK_COUNT));
> + SDHCI_UHS2_DUMP("Cmd: 0x%08x | Trn mode: 0x%08x\n",
> + sdhci_readw(host, SDHCI_UHS2_CMD),
> + sdhci_readw(host, SDHCI_UHS2_TRANS_MODE));
> + SDHCI_UHS2_DUMP("Int Stat: 0x%08x | Dev Sel : 0x%08x\n",
> + sdhci_readw(host, SDHCI_UHS2_DEV_INT_STATUS),
> + sdhci_readb(host, SDHCI_UHS2_DEV_SELECT));
> + SDHCI_UHS2_DUMP("Dev Int Code: 0x%08x\n",
> + sdhci_readb(host, SDHCI_UHS2_DEV_INT_CODE));
> + SDHCI_UHS2_DUMP("Reset: 0x%08x | Timer: 0x%08x\n",
> + sdhci_readw(host, SDHCI_UHS2_SW_RESET),
> + sdhci_readw(host, SDHCI_UHS2_TIMER_CTRL));
> + SDHCI_UHS2_DUMP("ErrInt: 0x%08x | ErrIntEn: 0x%08x\n",
> + sdhci_readl(host, SDHCI_UHS2_INT_STATUS),
> + sdhci_readl(host, SDHCI_UHS2_INT_STATUS_ENABLE));
> + SDHCI_UHS2_DUMP("ErrSigEn: 0x%08x\n",
> + sdhci_readl(host, SDHCI_UHS2_INT_SIGNAL_ENABLE));
> +}
> +EXPORT_SYMBOL_GPL(sdhci_uhs2_dump_regs);
>
> /*****************************************************************************\
> * *
> diff --git a/drivers/mmc/host/sdhci-uhs2.h b/drivers/mmc/host/sdhci-uhs2.h
> index 29cd91f12b9e..a1fcd7899829 100644
> --- a/drivers/mmc/host/sdhci-uhs2.h
> +++ b/drivers/mmc/host/sdhci-uhs2.h
> @@ -172,4 +172,8 @@
> #define SDHCI_UHS2_EMBED_CTRL_PTR 0xE6
> #define SDHCI_UHS2_VENDOR_PTR 0xE8
>
> +struct sdhci_host;
> +
> +void sdhci_uhs2_dump_regs(struct sdhci_host *host);
> +
> #endif /* __SDHCI_UHS2_H */
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index f3af1bd0f7b9..9b66b9a32c72 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -110,6 +110,9 @@ void sdhci_dumpregs(struct sdhci_host *host)
> }
> }
>
> + if (host->ops->dump_uhs2_regs)
> + host->ops->dump_uhs2_regs(host);
> +
> if (host->ops->dump_vendor_regs)
> host->ops->dump_vendor_regs(host);
>
> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
> index 40125ecd4e3f..f41c19c76994 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -723,6 +723,7 @@ struct sdhci_ops {
> void (*request_done)(struct sdhci_host *host,
> struct mmc_request *mrq);
> void (*dump_vendor_regs)(struct sdhci_host *host);
> + void (*dump_uhs2_regs)(struct sdhci_host *host);
> };
>
> #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
