| Message ID | 1384560086-11994-17-git-send-email-taras.kondratiuk@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/16/2013 02:01 AM, Taras Kondratiuk wrote: > From: Victor Kamensky <victor.kamensky@linaro.org> > > All OMAP IP blocks expect LE data, but CPU may operate in BE mode. > Need to use endian neutral functions to read/write h/w registers. > I.e instead of __raw_read[lw] and __raw_write[lw] functions code > need to use read[lw]_relaxed and write[lw]_relaxed functions. > If the first simply reads/writes register, the second will byteswap > it if host operates in BE mode. > > Changes are trivial sed like replacement of __raw_xxx functions > with xxx_relaxed variant. > > Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> > Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org> > --- > sound/soc/omap/mcbsp.c | 12 ++++++------ > sound/soc/omap/omap-dmic.c | 4 ++-- > sound/soc/omap/omap-mcpdm.c | 4 ++-- > 3 files changed, 10 insertions(+), 10 deletions(-) > Looks ok to me by looking at the _relaxed definitions in arch/arm/include/asm/io.h. Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
At Sat, 16 Nov 2013 18:09:51 +0200, Jarkko Nikula wrote: > > On 11/16/2013 02:01 AM, Taras Kondratiuk wrote: > > From: Victor Kamensky <victor.kamensky@linaro.org> > > > > All OMAP IP blocks expect LE data, but CPU may operate in BE mode. > > Need to use endian neutral functions to read/write h/w registers. > > I.e instead of __raw_read[lw] and __raw_write[lw] functions code > > need to use read[lw]_relaxed and write[lw]_relaxed functions. > > If the first simply reads/writes register, the second will byteswap > > it if host operates in BE mode. > > > > Changes are trivial sed like replacement of __raw_xxx functions > > with xxx_relaxed variant. > > > > Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> > > Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org> > > --- > > sound/soc/omap/mcbsp.c | 12 ++++++------ > > sound/soc/omap/omap-dmic.c | 4 ++-- > > sound/soc/omap/omap-mcpdm.c | 4 ++-- > > 3 files changed, 10 insertions(+), 10 deletions(-) > > > Looks ok to me by looking at the _relaxed definitions in > arch/arm/include/asm/io.h. > > Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> > What's the reason to use _relaxed version in all places? I understand this patch is to fix the endianess, so this can be applied as is, as long as the original code works. But, still in general, I wonder how the concurrency is guaranteed by this driver code... thanks, Takashi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/16/2013 02:01 AM, Taras Kondratiuk wrote: > From: Victor Kamensky <victor.kamensky@linaro.org> > > All OMAP IP blocks expect LE data, but CPU may operate in BE mode. > Need to use endian neutral functions to read/write h/w registers. > I.e instead of __raw_read[lw] and __raw_write[lw] functions code > need to use read[lw]_relaxed and write[lw]_relaxed functions. > If the first simply reads/writes register, the second will byteswap > it if host operates in BE mode. > > Changes are trivial sed like replacement of __raw_xxx functions > with xxx_relaxed variant. > > Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> > Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > --- > sound/soc/omap/mcbsp.c | 12 ++++++------ > sound/soc/omap/omap-dmic.c | 4 ++-- > sound/soc/omap/omap-mcpdm.c | 4 ++-- > 3 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c > index 83433fd..86c7538 100644 > --- a/sound/soc/omap/mcbsp.c > +++ b/sound/soc/omap/mcbsp.c > @@ -36,10 +36,10 @@ static void omap_mcbsp_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val) > > if (mcbsp->pdata->reg_size == 2) { > ((u16 *)mcbsp->reg_cache)[reg] = (u16)val; > - __raw_writew((u16)val, addr); > + writew_relaxed((u16)val, addr); > } else { > ((u32 *)mcbsp->reg_cache)[reg] = val; > - __raw_writel(val, addr); > + writel_relaxed(val, addr); > } > } > > @@ -48,22 +48,22 @@ static int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, bool from_cache) > void __iomem *addr = mcbsp->io_base + reg * mcbsp->pdata->reg_step; > > if (mcbsp->pdata->reg_size == 2) { > - return !from_cache ? __raw_readw(addr) : > + return !from_cache ? readw_relaxed(addr) : > ((u16 *)mcbsp->reg_cache)[reg]; > } else { > - return !from_cache ? __raw_readl(addr) : > + return !from_cache ? readl_relaxed(addr) : > ((u32 *)mcbsp->reg_cache)[reg]; > } > } > > static void omap_mcbsp_st_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val) > { > - __raw_writel(val, mcbsp->st_data->io_base_st + reg); > + writel_relaxed(val, mcbsp->st_data->io_base_st + reg); > } > > static int omap_mcbsp_st_read(struct omap_mcbsp *mcbsp, u16 reg) > { > - return __raw_readl(mcbsp->st_data->io_base_st + reg); > + return readl_relaxed(mcbsp->st_data->io_base_st + reg); > } > > #define MCBSP_READ(mcbsp, reg) \ > diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c > index 12e566b..1bd531d 100644 > --- a/sound/soc/omap/omap-dmic.c > +++ b/sound/soc/omap/omap-dmic.c > @@ -61,12 +61,12 @@ struct omap_dmic { > > static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val) > { > - __raw_writel(val, dmic->io_base + reg); > + writel_relaxed(val, dmic->io_base + reg); > } > > static inline int omap_dmic_read(struct omap_dmic *dmic, u16 reg) > { > - return __raw_readl(dmic->io_base + reg); > + return readl_relaxed(dmic->io_base + reg); > } > > static inline void omap_dmic_start(struct omap_dmic *dmic) > diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c > index 90d2a7c..653ba1c 100644 > --- a/sound/soc/omap/omap-mcpdm.c > +++ b/sound/soc/omap/omap-mcpdm.c > @@ -74,12 +74,12 @@ struct omap_mcpdm { > > static inline void omap_mcpdm_write(struct omap_mcpdm *mcpdm, u16 reg, u32 val) > { > - __raw_writel(val, mcpdm->io_base + reg); > + writel_relaxed(val, mcpdm->io_base + reg); > } > > static inline int omap_mcpdm_read(struct omap_mcpdm *mcpdm, u16 reg) > { > - return __raw_readl(mcpdm->io_base + reg); > + return readl_relaxed(mcpdm->io_base + reg); > } > > #ifdef DEBUG >
On Sat, Nov 16, 2013 at 02:01:19AM +0200, Taras Kondratiuk wrote: > From: Victor Kamensky <victor.kamensky@linaro.org> > > All OMAP IP blocks expect LE data, but CPU may operate in BE mode. > Need to use endian neutral functions to read/write h/w registers. > I.e instead of __raw_read[lw] and __raw_write[lw] functions code > need to use read[lw]_relaxed and write[lw]_relaxed functions. > If the first simply reads/writes register, the second will byteswap > it if host operates in BE mode. Applied, thanks.
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c index 83433fd..86c7538 100644 --- a/sound/soc/omap/mcbsp.c +++ b/sound/soc/omap/mcbsp.c @@ -36,10 +36,10 @@ static void omap_mcbsp_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val) if (mcbsp->pdata->reg_size == 2) { ((u16 *)mcbsp->reg_cache)[reg] = (u16)val; - __raw_writew((u16)val, addr); + writew_relaxed((u16)val, addr); } else { ((u32 *)mcbsp->reg_cache)[reg] = val; - __raw_writel(val, addr); + writel_relaxed(val, addr); } } @@ -48,22 +48,22 @@ static int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, bool from_cache) void __iomem *addr = mcbsp->io_base + reg * mcbsp->pdata->reg_step; if (mcbsp->pdata->reg_size == 2) { - return !from_cache ? __raw_readw(addr) : + return !from_cache ? readw_relaxed(addr) : ((u16 *)mcbsp->reg_cache)[reg]; } else { - return !from_cache ? __raw_readl(addr) : + return !from_cache ? readl_relaxed(addr) : ((u32 *)mcbsp->reg_cache)[reg]; } } static void omap_mcbsp_st_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val) { - __raw_writel(val, mcbsp->st_data->io_base_st + reg); + writel_relaxed(val, mcbsp->st_data->io_base_st + reg); } static int omap_mcbsp_st_read(struct omap_mcbsp *mcbsp, u16 reg) { - return __raw_readl(mcbsp->st_data->io_base_st + reg); + return readl_relaxed(mcbsp->st_data->io_base_st + reg); } #define MCBSP_READ(mcbsp, reg) \ diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 12e566b..1bd531d 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -61,12 +61,12 @@ struct omap_dmic { static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val) { - __raw_writel(val, dmic->io_base + reg); + writel_relaxed(val, dmic->io_base + reg); } static inline int omap_dmic_read(struct omap_dmic *dmic, u16 reg) { - return __raw_readl(dmic->io_base + reg); + return readl_relaxed(dmic->io_base + reg); } static inline void omap_dmic_start(struct omap_dmic *dmic) diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index 90d2a7c..653ba1c 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -74,12 +74,12 @@ struct omap_mcpdm { static inline void omap_mcpdm_write(struct omap_mcpdm *mcpdm, u16 reg, u32 val) { - __raw_writel(val, mcpdm->io_base + reg); + writel_relaxed(val, mcpdm->io_base + reg); } static inline int omap_mcpdm_read(struct omap_mcpdm *mcpdm, u16 reg) { - return __raw_readl(mcpdm->io_base + reg); + return readl_relaxed(mcpdm->io_base + reg); } #ifdef DEBUG