| Message ID | 20210520100656.rgkdexdvrddt3upy@runtux.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/1] spi-sun6i: Fix chipselect/clock bug | expand |
On Thu, 20 May 2021 12:06:56 +0200 Ralf Schlatterbeck <rsc@runtux.com> wrote: Hi Ralf, many thanks for taking care of upstreaming this! > The current sun6i SPI implementation initializes the transfer too early, > resulting in SCK going high before the transfer. When using an additional > (gpio) chipselect with sun6i, the chipselect is asserted at a time when > clock is high, making the SPI transfer fail. > > This is due to SUN6I_GBL_CTL_BUS_ENABLE being written into > SUN6I_GBL_CTL_REG at an early stage. Moving that to the transfer > function, hence, right before the transfer starts, mitigates that > problem. > > Signed-off-by: Ralf Schlatterbeck <rsc@runtux.com> > Signed-off-by: Mirko Vogt <mirko-dev|linux@nanl.de> So if I get your last email correctly, your intention was to make this Mirko's patch, which you just send? In this case the authorship should stay with him (git commit --amend --author "..."), and you add your S-o-b (his first, your's next). If you use git format-patch & git send-email, it will take care of formatting this correctly (inserting a "From" line into the body). As for the technical part: I know as much about SPI to have quite some respect for the subtleties of the various modes. But your second oscilloscope shot looks much better, and matches the timing diagram in the manual (SS is the first to go down). So I trust you that's the right move. One formatting thing below: > --- > For oscilloscope screenshots with/without the patch, see my blog post > https://blog.runtux.com/posts/2019/04/18/ > or the discussion in the armbian forum at > https://forum.armbian.com/topic/4330-spi-gpio-chip-select-support/ > (my logo there is a penguin). > > drivers/spi/spi-sun6i.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c > index cc8401980125..2db075c87f51 100644 > --- a/drivers/spi/spi-sun6i.c > +++ b/drivers/spi/spi-sun6i.c > @@ -379,6 +379,10 @@ static int sun6i_spi_transfer_one(struct spi_master *master, > } > > sun6i_spi_write(sspi, SUN6I_CLK_CTL_REG, reg); > + /* Finally enable the bus - doing so before might raise SCK to HIGH */ > + sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, > + sun6i_spi_read(sspi, SUN6I_GBL_CTL_REG) > + | SUN6I_GBL_CTL_BUS_ENABLE); The "|" on the new line looks a bit odd. What about you utilise "reg" here, as the other access do, to make this more readable? reg = sun6i_spi_read(...); reg |= ... sun6i_spi_write(..., reg); Cheers, Andre > > /* Setup the transfer now... */ > if (sspi->tx_buf) > @@ -504,7 +508,7 @@ static int sun6i_spi_runtime_resume(struct device *dev) > } > > sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, > - SUN6I_GBL_CTL_BUS_ENABLE | SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP); > + SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP); > > return 0; >
On Fri, May 21, 2021 at 05:30:11PM +0100, Andre Przywara wrote: > On Thu, 20 May 2021 12:06:56 +0200 > Ralf Schlatterbeck <rsc@runtux.com> wrote: > So if I get your last email correctly, your intention was to make this > Mirko's patch, which you just send? Yes. > In this case the authorship should stay with him (git commit --amend > --author "..."), and you add your S-o-b (his first, your's next). > If you use git format-patch & git send-email, it will take care of > formatting this correctly (inserting a "From" line into the body). I was using format-patch but editing the result. Would a 'Date' line in the body also be OK? The patch is really from 2019... I have it correctly in my git but was unaware that additional header lines in the body are ok. > One formatting thing below: > > sun6i_spi_write(sspi, SUN6I_CLK_CTL_REG, reg); > > + /* Finally enable the bus - doing so before might raise SCK to HIGH */ > > + sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, > > + sun6i_spi_read(sspi, SUN6I_GBL_CTL_REG) > > + | SUN6I_GBL_CTL_BUS_ENABLE); > > The "|" on the new line looks a bit odd. What about you utilise "reg" > here, as the other access do, to make this more readable? > reg = sun6i_spi_read(...); > reg |= ... > sun6i_spi_write(..., reg); I've fixed this and will resubmit. Thanks, Ralf
diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c index cc8401980125..2db075c87f51 100644 --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -379,6 +379,10 @@ static int sun6i_spi_transfer_one(struct spi_master *master, } sun6i_spi_write(sspi, SUN6I_CLK_CTL_REG, reg); + /* Finally enable the bus - doing so before might raise SCK to HIGH */ + sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, + sun6i_spi_read(sspi, SUN6I_GBL_CTL_REG) + | SUN6I_GBL_CTL_BUS_ENABLE); /* Setup the transfer now... */ if (sspi->tx_buf) @@ -504,7 +508,7 @@ static int sun6i_spi_runtime_resume(struct device *dev) } sun6i_spi_write(sspi, SUN6I_GBL_CTL_REG, - SUN6I_GBL_CTL_BUS_ENABLE | SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP); + SUN6I_GBL_CTL_MASTER | SUN6I_GBL_CTL_TP); return 0;