From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> To: linux-mmc@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>, Simon Horman <horms@verge.net.au>, Guennadi Liakhovetski <g.liakhovetski@gmx.de>, Paul Mundt <lethal@linux-sh.org> Subject: [PATCH v3 13/13] mmc: tmio: add barriers to IO operations Date: Wed, 06 Feb 2013 19:47:00 +0000 [thread overview] Message-ID: <1360180020-18555-14-git-send-email-g.liakhovetski@gmx.de> (raw) In-Reply-To: <1360180020-18555-1-git-send-email-g.liakhovetski@gmx.de> Without barriers SDIO operations fail with runtime PM enabled. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Paul Mundt <lethal@linux-sh.org> --- v3: use iowrite16_rep() and ioread16_rep() for consistency. drivers/mmc/host/tmio_mmc.h | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index d857f5c..a10ebd0 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -159,19 +159,20 @@ int tmio_mmc_host_runtime_resume(struct device *dev); static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr) { - return readw(host->ctl + (addr << host->bus_shift)); + return ioread16(host->ctl + (addr << host->bus_shift)); } static inline void sd_ctrl_read16_rep(struct tmio_mmc_host *host, int addr, u16 *buf, int count) { - readsw(host->ctl + (addr << host->bus_shift), buf, count); + wmb(); + ioread16_rep(host->ctl + (addr << host->bus_shift), buf, count); } static inline u32 sd_ctrl_read32(struct tmio_mmc_host *host, int addr) { - return readw(host->ctl + (addr << host->bus_shift)) | - readw(host->ctl + ((addr + 2) << host->bus_shift)) << 16; + return ioread16(host->ctl + (addr << host->bus_shift)) | + ioread16(host->ctl + ((addr + 2) << host->bus_shift)) << 16; } static inline void sd_ctrl_write16(struct tmio_mmc_host *host, int addr, u16 val) @@ -181,19 +182,20 @@ static inline void sd_ctrl_write16(struct tmio_mmc_host *host, int addr, u16 val */ if (host->pdata->write16_hook && host->pdata->write16_hook(host, addr)) return; - writew(val, host->ctl + (addr << host->bus_shift)); + iowrite16(val, host->ctl + (addr << host->bus_shift)); } static inline void sd_ctrl_write16_rep(struct tmio_mmc_host *host, int addr, u16 *buf, int count) { - writesw(host->ctl + (addr << host->bus_shift), buf, count); + iowrite16_rep(host->ctl + (addr << host->bus_shift), buf, count); + wmb(); } static inline void sd_ctrl_write32(struct tmio_mmc_host *host, int addr, u32 val) { - writew(val, host->ctl + (addr << host->bus_shift)); - writew(val >> 16, host->ctl + ((addr + 2) << host->bus_shift)); + iowrite16(val, host->ctl + (addr << host->bus_shift)); + iowrite16(val >> 16, host->ctl + ((addr + 2) << host->bus_shift)); } -- 1.7.2.5
WARNING: multiple messages have this Message-ID (diff)
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> To: linux-mmc@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>, Simon Horman <horms@verge.net.au>, Guennadi Liakhovetski <g.liakhovetski@gmx.de>, Paul Mundt <lethal@linux-sh.org> Subject: [PATCH v3 13/13] mmc: tmio: add barriers to IO operations Date: Wed, 6 Feb 2013 20:47:00 +0100 [thread overview] Message-ID: <1360180020-18555-14-git-send-email-g.liakhovetski@gmx.de> (raw) In-Reply-To: <1360180020-18555-1-git-send-email-g.liakhovetski@gmx.de> Without barriers SDIO operations fail with runtime PM enabled. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Paul Mundt <lethal@linux-sh.org> --- v3: use iowrite16_rep() and ioread16_rep() for consistency. drivers/mmc/host/tmio_mmc.h | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index d857f5c..a10ebd0 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -159,19 +159,20 @@ int tmio_mmc_host_runtime_resume(struct device *dev); static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr) { - return readw(host->ctl + (addr << host->bus_shift)); + return ioread16(host->ctl + (addr << host->bus_shift)); } static inline void sd_ctrl_read16_rep(struct tmio_mmc_host *host, int addr, u16 *buf, int count) { - readsw(host->ctl + (addr << host->bus_shift), buf, count); + wmb(); + ioread16_rep(host->ctl + (addr << host->bus_shift), buf, count); } static inline u32 sd_ctrl_read32(struct tmio_mmc_host *host, int addr) { - return readw(host->ctl + (addr << host->bus_shift)) | - readw(host->ctl + ((addr + 2) << host->bus_shift)) << 16; + return ioread16(host->ctl + (addr << host->bus_shift)) | + ioread16(host->ctl + ((addr + 2) << host->bus_shift)) << 16; } static inline void sd_ctrl_write16(struct tmio_mmc_host *host, int addr, u16 val) @@ -181,19 +182,20 @@ static inline void sd_ctrl_write16(struct tmio_mmc_host *host, int addr, u16 val */ if (host->pdata->write16_hook && host->pdata->write16_hook(host, addr)) return; - writew(val, host->ctl + (addr << host->bus_shift)); + iowrite16(val, host->ctl + (addr << host->bus_shift)); } static inline void sd_ctrl_write16_rep(struct tmio_mmc_host *host, int addr, u16 *buf, int count) { - writesw(host->ctl + (addr << host->bus_shift), buf, count); + iowrite16_rep(host->ctl + (addr << host->bus_shift), buf, count); + wmb(); } static inline void sd_ctrl_write32(struct tmio_mmc_host *host, int addr, u32 val) { - writew(val, host->ctl + (addr << host->bus_shift)); - writew(val >> 16, host->ctl + ((addr + 2) << host->bus_shift)); + iowrite16(val, host->ctl + (addr << host->bus_shift)); + iowrite16(val >> 16, host->ctl + ((addr + 2) << host->bus_shift)); } -- 1.7.2.5
next prev parent reply other threads:[~2013-02-06 19:47 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-02-06 19:46 [PATCH v3 00/13] mmc: core and driver DT and related development Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 19:46 ` [PATCH v3 01/13] mmc: sdhi, tmio: only check flags in tmio-mmc driver proper Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 19:46 ` [PATCH v3 02/13] mmc: detailed definition of CD and WP MMC line polarities in DT Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 22:30 ` Arnd Bergmann 2013-02-06 22:30 ` Arnd Bergmann 2013-02-06 19:46 ` [PATCH v3 03/13] mmc: provide a standard MMC device-tree binding parser centrally Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-09 13:37 ` Markus Pargmann 2013-02-09 13:37 ` Markus Pargmann 2013-02-06 19:46 ` [PATCH v3 04/13] mmc: (cosmetic) remove "extern" from function declarations Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 19:46 ` [PATCH v3 05/13] mmc: sh-mmcif: use mmc_of_parse() to parse standard MMC DT bindings Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski [not found] ` <1360180020-18555-1-git-send-email-g.liakhovetski-Mmb7MZpHnFY@public.gmane.org> 2013-02-06 19:46 ` [PATCH v3 06/13] mmc: tmio-mmc: define device-tree bindings Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski [not found] ` <1360180020-18555-7-git-send-email-g.liakhovetski-Mmb7MZpHnFY@public.gmane.org> 2013-02-06 22:24 ` Arnd Bergmann 2013-02-06 22:24 ` Arnd Bergmann 2013-02-07 0:59 ` Simon Horman 2013-02-07 0:59 ` Simon Horman 2013-02-07 8:27 ` Arnd Bergmann 2013-02-07 8:27 ` Arnd Bergmann 2013-02-13 15:59 ` Guennadi Liakhovetski 2013-02-13 15:59 ` Guennadi Liakhovetski 2013-02-14 1:42 ` Magnus Damm 2013-02-14 1:42 ` Magnus Damm 2013-02-14 1:59 ` Simon Horman 2013-02-14 1:59 ` Simon Horman 2013-02-14 2:09 ` Magnus Damm 2013-02-14 2:09 ` Magnus Damm 2013-02-14 2:24 ` Simon Horman 2013-02-14 2:24 ` Simon Horman 2013-02-14 8:28 ` Guennadi Liakhovetski 2013-02-14 8:28 ` Guennadi Liakhovetski 2013-02-14 9:12 ` Magnus Damm 2013-02-14 9:12 ` Magnus Damm 2013-02-14 9:25 ` Guennadi Liakhovetski 2013-02-14 9:25 ` Guennadi Liakhovetski 2013-02-14 15:51 ` Arnd Bergmann 2013-02-06 19:46 ` [PATCH v3 07/13] mmc: tmio-mmc: parse " Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 19:46 ` [PATCH v3 08/13] mmc: sh_mobile_sdhi: remove unused .pdata field Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 19:46 ` [PATCH v3 09/13] mmc: sh_mobile_sdhi: use managed resource allocations Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 19:46 ` [PATCH v3 10/13] mmc: tmio: remove unused and deprecated symbols Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 19:46 ` [PATCH v3 11/13] mmc: tmio: add support for the VccQ regulator Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 19:46 ` [PATCH v3 12/13] mmc: add DT bindings for more MMC capability flags Guennadi Liakhovetski 2013-02-06 19:46 ` Guennadi Liakhovetski 2013-02-06 19:47 ` Guennadi Liakhovetski [this message] 2013-02-06 19:47 ` [PATCH v3 13/13] mmc: tmio: add barriers to IO operations Guennadi Liakhovetski 2013-02-07 9:51 ` Paul Mundt 2013-02-07 9:51 ` Paul Mundt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1360180020-18555-14-git-send-email-g.liakhovetski@gmx.de \ --to=g.liakhovetski@gmx.de \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=horms@verge.net.au \ --cc=lethal@linux-sh.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=magnus.damm@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.