Messages in this thread Patch in this message | | | From | Evan Green <> | Date | Tue, 22 May 2018 11:10:23 -0700 | Subject | Re: [PATCH V1 2/3] mmc: sdhci-msm: Add msm version specific ops and data structures |
| |
On Thu, May 17, 2018 at 3:30 AM Vijay Viswanath <vviswana@codeaurora.org> wrote:
> In addition to offsets of certain registers changing, the registers in > core_mem have been shifted to HC mem as well. To access these registers, > define msm version specific functions. These functions can be loaded > into the function pointers at the time of probe based on the msm version > detected.
> Also defind new data structure to hold version specific Ops and register > addresses.
> Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org> > Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org> > --- > drivers/mmc/host/sdhci-msm.c | 112 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 112 insertions(+)
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c > index 2524455..bb2bb59 100644 > --- a/drivers/mmc/host/sdhci-msm.c > +++ b/drivers/mmc/host/sdhci-msm.c > @@ -226,6 +226,25 @@ struct sdhci_msm_offset { > .core_ddr_config_2 = 0x1BC, > };
> +struct sdhci_msm_variant_ops { > + u8 (*msm_readb_relaxed)(struct sdhci_host *host, u32 offset);
I don't see any uses of msm_readb_relaxed or msm_writeb_relaxed in this patch or the next one. Are these needed?
> + u32 (*msm_readl_relaxed)(struct sdhci_host *host, u32 offset); > + void (*msm_writeb_relaxed)(u8 val, struct sdhci_host *host, u32 offset); > + void (*msm_writel_relaxed)(u32 val, struct sdhci_host *host, > + u32 offset); > +}; > + > +/* > + * From V5, register spaces have changed. Wrap this info in a structure > + * and choose the data_structure based on version info mentioned in DT. > + */ > +struct sdhci_msm_variant_info { > + bool mci_removed; > + const struct sdhci_msm_variant_ops *var_ops; > + const struct sdhci_msm_offset *offset; > +}; > + > +
Remove extra blank line.
> struct sdhci_msm_host { > struct platform_device *pdev; > void __iomem *core_mem; /* MSM SDCC mapped address */ > @@ -245,8 +264,75 @@ struct sdhci_msm_host { > wait_queue_head_t pwr_irq_wait; > bool pwr_irq_flag; > u32 caps_0; > + bool mci_removed; > + const struct sdhci_msm_variant_ops *var_ops; > + const struct sdhci_msm_offset *offset; > };
> +/* > + * APIs to read/write to vendor specific registers which were there in the > + * core_mem region before MCI was removed. > + */ > +static u8 sdhci_msm_mci_variant_readb_relaxed(struct sdhci_host *host, > + u32 offset) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); > + > + return readb_relaxed(msm_host->core_mem + offset); > +} > + > +static u8 sdhci_msm_v5_variant_readb_relaxed(struct sdhci_host *host, > + u32 offset) > +{ > + return readb_relaxed(host->ioaddr + offset); > +} > + > +static u32 sdhci_msm_mci_variant_readl_relaxed(struct sdhci_host *host, > + u32 offset) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); > + > + return readl_relaxed(msm_host->core_mem + offset); > +} > + > +static u32 sdhci_msm_v5_variant_readl_relaxed(struct sdhci_host *host, > + u32 offset) > +{ > + return readl_relaxed(host->ioaddr + offset); > +} > + > +static void sdhci_msm_mci_variant_writeb_relaxed(u8 val, > + struct sdhci_host *host, u32 offset) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); > + > + writeb_relaxed(val, msm_host->core_mem + offset); > +} > + > +static void sdhci_msm_v5_variant_writeb_relaxed(u8 val, struct sdhci_host *host, > + u32 offset) > +{ > + writeb_relaxed(val, host->ioaddr + offset); > +} > + > +static void sdhci_msm_mci_variant_writel_relaxed(u32 val, > + struct sdhci_host *host, u32 offset) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); > + > + writel_relaxed(val, msm_host->core_mem + offset); > +} > + > +static void sdhci_msm_v5_variant_writel_relaxed(u32 val, struct sdhci_host *host,
You squeaked over 80 characters here. Move the second parameter down with the third.
-Evan
| |