On 9/22/2016, Ulf Hansson wrote:
> To: Chris Brandt <Chris.Brandt@xxxxxxxxxxx>
> Cc: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>; Sergei Shtylyov
> <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>; Geert Uytterhoeven <geert@linux-
> m68k.org>; Simon Horman <horms+renesas@xxxxxxxxxxxx>; linux-mmc <linux-
> mmc@xxxxxxxxxxxxxxx>; Linux-Renesas <linux-renesas-soc@xxxxxxxxxxxxxxx>;
> Lee Jones <lee@xxxxxxxxxx>
> Subject: Re: [PATCH v3 2/3] mmc: tmio-mmc: add support for 32bit data port
>
> + Lee
>
> On 12 September 2016 at 16:15, Chris Brandt <chris.brandt@xxxxxxxxxxx>
> wrote:
> > For the r7s72100 SOC, the DATA_PORT register was changed to 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@xxxxxxxxxxx>
> > ---
> > v3:
> > * changed loops to memcpy
> > 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 | 30 ++++++++++++++++++++++++++++++
> > include/linux/mfd/tmio.h | 5 +++++
>
> This header file needs to be split up. The mmc specific bits, should be
> moved to a local header file under driver/mmc/host/*.
>
> Sure, we don't need to do that as part of $subject patch, but then I need
> an ack from Lee Jones, the mfd maintainer. I have added him on cc.
Is this still waiting on an ACK from Lee Jones because it touches the tmio.h file under include/linux/mfd/ ?
> > 3 files changed, 47 insertions(+)
> >
> > 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..59fac7d 100644
> > --- a/drivers/mmc/host/tmio_mmc_pio.c
> > +++ b/drivers/mmc/host/tmio_mmc_pio.c
> > @@ -443,6 +443,36 @@ static void tmio_mmc_transfer_data(struct
> tmio_mmc_host *host,
> > /*
> > * Transfer the data
> > */
> > + if (host->pdata->flags & TMIO_MMC_32BIT_DATA_PORT) {
> > + u8 data[4] = { };
> > +
> > + 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,
> > + (u32 *)data, 1);
> > + memcpy(buf8, data, count);
> > + } else {
> > + memcpy(data, buf8, count);
> > + sd_ctrl_write32_rep(host, CTL_SD_DATA_PORT,
> > + (u32 *)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)
> > --
> > 2.9.2
> >
> >
>
> Kind regards
> Uffe
��.n��������+%������w��{.n�����{��i��)�� jg��� �����ݢj����G���� ���j:+v���w�m������w�������h�����٥
