| Message ID | 20160911210328.30641-3-chris.brandt@renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hello. On 9/12/2016 12:03 AM, Chris Brandt wrote: > For the r7s72100 SOC, the DATA_PORT register was changed to be 32-bits wide. > Therefore a new flag has been created that will allow 32-bit reads/writes > to the DATA_PORT register instead of 16-bit (because 16-bits accesses are > not supported). > > Signed-off-by: Chris Brandt <chris.brandt@renesas.com> > --- > v2: > * changed 'data * 0xFF' to 'data & 0xFF' > * added 'const' for sd_ctrl_write32_rep [...] > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c > index 017a4dc..66a25ec 100644 > --- a/drivers/mmc/host/tmio_mmc_pio.c > +++ b/drivers/mmc/host/tmio_mmc_pio.c > @@ -439,10 +439,45 @@ static void tmio_mmc_transfer_data(struct tmio_mmc_host *host, > { > int is_read = host->data->flags & MMC_DATA_READ; > u8 *buf8; > + u32 data; > > /* > * Transfer the data > */ > + if (host->pdata->flags & TMIO_MMC_32BIT_DATA_PORT) { > + if (is_read) > + sd_ctrl_read32_rep(host, CTL_SD_DATA_PORT, (u32 *)buf, > + count >> 2); > + else > + sd_ctrl_write32_rep(host, CTL_SD_DATA_PORT, (u32 *)buf, > + count >> 2); > + > + /* if count was multiple of 4 */ > + if (!(count & 0x3)) > + return; > + > + buf8 = (u8 *)(buf + (count >> 2)); > + count %= 4; > + > + if (is_read) { > + sd_ctrl_read32_rep(host, CTL_SD_DATA_PORT, &data, 1); > + while (count--) { > + *buf8 = data & 0xFF; > + data = data >> 8; data >>= 8; > + buf8++; > + } > + } else { > + data = *buf8++; > + if (count > 1) > + data |= (*buf8++ << 8); Parens not needed. > + if (count > 2) > + data |= (*buf8++ << 16); Here as well. Dunno how I missed it in the previous review... BTW, you could use memcpy() and thus avoid all the loops and shifts, see ata_sff_data_xfer32() in drivers/ata/libata-sff.c. [...] MBR, Sergei
Hello Sergei > BTW, you could use memcpy() and thus avoid all the loops and shifts, > see > ata_sff_data_xfer32() in drivers/ata/libata-sff.c. > > [...] > > MBR, Sergei That's a good idea. Thank you. I just tried it and it works good, so I'll get rid of the loops. Chris
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index ecb99fc..a99e634 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -237,6 +237,12 @@ static inline u32 sd_ctrl_read16_and_16_as_32(struct tmio_mmc_host *host, int ad readw(host->ctl + ((addr + 2) << host->bus_shift)) << 16; } +static inline void sd_ctrl_read32_rep(struct tmio_mmc_host *host, int addr, + u32 *buf, int count) +{ + readsl(host->ctl + (addr << host->bus_shift), buf, count); +} + static inline void sd_ctrl_write16(struct tmio_mmc_host *host, int addr, u16 val) { /* If there is a hook and it returns non-zero then there @@ -259,4 +265,10 @@ static inline void sd_ctrl_write32_as_16_and_16(struct tmio_mmc_host *host, int writew(val >> 16, host->ctl + ((addr + 2) << host->bus_shift)); } +static inline void sd_ctrl_write32_rep(struct tmio_mmc_host *host, int addr, + const u32 *buf, int count) +{ + writesl(host->ctl + (addr << host->bus_shift), buf, count); +} + #endif diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 017a4dc..66a25ec 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -439,10 +439,45 @@ static void tmio_mmc_transfer_data(struct tmio_mmc_host *host, { int is_read = host->data->flags & MMC_DATA_READ; u8 *buf8; + u32 data; /* * Transfer the data */ + if (host->pdata->flags & TMIO_MMC_32BIT_DATA_PORT) { + if (is_read) + sd_ctrl_read32_rep(host, CTL_SD_DATA_PORT, (u32 *)buf, + count >> 2); + else + sd_ctrl_write32_rep(host, CTL_SD_DATA_PORT, (u32 *)buf, + count >> 2); + + /* if count was multiple of 4 */ + if (!(count & 0x3)) + return; + + buf8 = (u8 *)(buf + (count >> 2)); + count %= 4; + + if (is_read) { + sd_ctrl_read32_rep(host, CTL_SD_DATA_PORT, &data, 1); + while (count--) { + *buf8 = data & 0xFF; + data = data >> 8; + buf8++; + } + } else { + data = *buf8++; + if (count > 1) + data |= (*buf8++ << 8); + if (count > 2) + data |= (*buf8++ << 16); + sd_ctrl_write32_rep(host, CTL_SD_DATA_PORT, &data, 1); + } + + return; + } + if (is_read) sd_ctrl_read16_rep(host, CTL_SD_DATA_PORT, buf, count >> 1); else diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 3b95dc7..0dbcb7e 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -100,6 +100,11 @@ #define TMIO_MMC_SDIO_STATUS_QUIRK (1 << 8) /* + * Some controllers have a 32-bit wide data port register + */ +#define TMIO_MMC_32BIT_DATA_PORT (1 << 9) + +/* * Some controllers allows to set SDx actual clock */ #define TMIO_MMC_CLK_ACTUAL (1 << 10)
For the r7s72100 SOC, the DATA_PORT register was changed to be 32-bits wide. Therefore a new flag has been created that will allow 32-bit reads/writes to the DATA_PORT register instead of 16-bit (because 16-bits accesses are not supported). Signed-off-by: Chris Brandt <chris.brandt@renesas.com> --- v2: * changed 'data * 0xFF' to 'data & 0xFF' * added 'const' for sd_ctrl_write32_rep --- drivers/mmc/host/tmio_mmc.h | 12 ++++++++++++ drivers/mmc/host/tmio_mmc_pio.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/mfd/tmio.h | 5 +++++ 3 files changed, 52 insertions(+)