| Message ID | 1554900696-28858-1-git-send-email-f.suligoi@asem.it (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] spi: pxa2xx: fix SCR (divisor) calculation | expand |
On 4/10/19 3:51 PM, Flavio Suligoi wrote: > Calculate the divisor for the SCR (Serial Clock Rate), avoiding > that the SSP transmission rate can be greater than the device rate. > > When the division between the SSP clock and the device rate generates > a reminder, we have to increment by one the divisor. > In this way the resulting SSP clock will never be greater than the > device SPI max frequency. > > For example, with: > > - ssp_clk = 50 MHz > - dev freq = 15 MHz > > without this patch the SSP clock will be greater than 15 MHz: > > - 25 MHz for PXA25x_SSP and CE4100_SSP > - 16,56 MHz for the others > > Instead, with this patch, we have in both case an SSP clock of 12.5MHz, > so the max rate of the SPI device clock is respected. > > Signed-off-by: Flavio Suligoi <f.suligoi@asem.it> > --- > drivers/spi/spi-pxa2xx.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c > index f7068cc..c9560a1 100644 > --- a/drivers/spi/spi-pxa2xx.c > +++ b/drivers/spi/spi-pxa2xx.c > @@ -884,10 +884,15 @@ static unsigned int ssp_get_clk_div(struct driver_data *drv_data, int rate) > > rate = min_t(int, ssp_clk, rate); > > + /* > + * Calculate the divisor for the SCR (Serial Clock Rate), avoiding > + * that the SSP transmission rate can be greater than the device rate > + */ > if (ssp->type == PXA25x_SSP || ssp->type == CE4100_SSP) > - return (ssp_clk / (2 * rate) - 1) & 0xff; > + return (ssp_clk / (2 * rate) - 1 + > + (ssp_clk % (2 * rate) ? 1 : 0)) & 0xff; > else > - return (ssp_clk / rate - 1) & 0xfff; > + return (ssp_clk / rate - 1 + (ssp_clk % rate ? 1 : 0)) & 0xfff; > } > I think DIV_ROUND_UP() - 1 would also fix this? I realized we have also another issue here with the low rates. Calculated divider will underflow due masking with 0xff or 0xfff when the rate is low enough. Would you want to fix that by setting the ctlr->min_speed_hz so that spi core can validate the rate? I'm asking since it goes well together with your fix. Maybe one patch setting the min_speed_hz and getting masking off from here and then another fixing the rate calculation.
Hi Jarkko, > > diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c > > index f7068cc..c9560a1 100644 > > --- a/drivers/spi/spi-pxa2xx.c > > +++ b/drivers/spi/spi-pxa2xx.c > > @@ -884,10 +884,15 @@ static unsigned int ssp_get_clk_div(struct > driver_data *drv_data, int rate) > > > > rate = min_t(int, ssp_clk, rate); > > > > + /* > > + * Calculate the divisor for the SCR (Serial Clock Rate), avoiding > > + * that the SSP transmission rate can be greater than the device > rate > > + */ > > if (ssp->type == PXA25x_SSP || ssp->type == CE4100_SSP) > > - return (ssp_clk / (2 * rate) - 1) & 0xff; > > + return (ssp_clk / (2 * rate) - 1 + > > + (ssp_clk % (2 * rate) ? 1 : 0)) & 0xff; > > else > > - return (ssp_clk / rate - 1) & 0xfff; > > + return (ssp_clk / rate - 1 + (ssp_clk % rate ? 1 : 0)) & > 0xfff; > > } > > > I think DIV_ROUND_UP() - 1 would also fix this? > > I realized we have also another issue here with the low rates. > Calculated divider will underflow due masking with 0xff or 0xfff when > the rate is low enough. > > Would you want to fix that by setting the ctlr->min_speed_hz so that spi > core can validate the rate? I'm asking since it goes well together with > your fix. Maybe one patch setting the min_speed_hz and getting masking > off from here and then another fixing the rate calculation. Ok for the two separate patches, I prepare them as soon as I can. Thanks, Flavio
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index f7068cc..c9560a1 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -884,10 +884,15 @@ static unsigned int ssp_get_clk_div(struct driver_data *drv_data, int rate) rate = min_t(int, ssp_clk, rate); + /* + * Calculate the divisor for the SCR (Serial Clock Rate), avoiding + * that the SSP transmission rate can be greater than the device rate + */ if (ssp->type == PXA25x_SSP || ssp->type == CE4100_SSP) - return (ssp_clk / (2 * rate) - 1) & 0xff; + return (ssp_clk / (2 * rate) - 1 + + (ssp_clk % (2 * rate) ? 1 : 0)) & 0xff; else - return (ssp_clk / rate - 1) & 0xfff; + return (ssp_clk / rate - 1 + (ssp_clk % rate ? 1 : 0)) & 0xfff; } static unsigned int pxa2xx_ssp_get_clk_div(struct driver_data *drv_data,
Calculate the divisor for the SCR (Serial Clock Rate), avoiding that the SSP transmission rate can be greater than the device rate. When the division between the SSP clock and the device rate generates a reminder, we have to increment by one the divisor. In this way the resulting SSP clock will never be greater than the device SPI max frequency. For example, with: - ssp_clk = 50 MHz - dev freq = 15 MHz without this patch the SSP clock will be greater than 15 MHz: - 25 MHz for PXA25x_SSP and CE4100_SSP - 16,56 MHz for the others Instead, with this patch, we have in both case an SSP clock of 12.5MHz, so the max rate of the SPI device clock is respected. Signed-off-by: Flavio Suligoi <f.suligoi@asem.it> --- drivers/spi/spi-pxa2xx.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)