* [PATCH] spi: aspeed: Fix division by zero
@ 2022-06-11 10:39 Cédric Le Goater
2022-06-13 8:39 ` Pratyush Yadav
0 siblings, 1 reply; 4+ messages in thread
From: Cédric Le Goater @ 2022-06-11 10:39 UTC (permalink / raw)
To: linux-aspeed
When using the normal read operation for data transfers, the dummy bus
width is zero. In that case, they are no dummy bytes to transfer and
setting the dummy field in the controller register becomes useless.
Issue was found on a custom "Bifrost" board with a AST2500 SoC and
using a MX25L51245GMI-08G SPI Flash.
Cc: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>
Reported-by: Ian Woloschin <ian.woloschin@akamai.com>
Fixes: 54613fc6659b ("spi: aspeed: Add support for direct mapping")
Signed-off-by: C?dric Le Goater <clg@kaod.org>
---
drivers/spi/spi-aspeed-smc.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c
index 496f3e1e9079..3e891bf22470 100644
--- a/drivers/spi/spi-aspeed-smc.c
+++ b/drivers/spi/spi-aspeed-smc.c
@@ -558,6 +558,14 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
u32 ctl_val;
int ret = 0;
+ dev_dbg(aspi->dev,
+ "CE%d %s dirmap [ 0x%.8llx - 0x%.8llx ] OP %#x mode:%d.%d.%d.%d naddr:%#x ndummies:%#x\n",
+ chip->cs, op->data.dir == SPI_MEM_DATA_IN ? "read" : "write",
+ desc->info.offset, desc->info.offset + desc->info.length,
+ op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth,
+ op->dummy.buswidth, op->data.buswidth,
+ op->addr.nbytes, op->dummy.nbytes);
+
chip->clk_freq = desc->mem->spi->max_speed_hz;
/* Only for reads */
@@ -574,9 +582,11 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
ctl_val = readl(chip->ctl) & ~CTRL_IO_CMD_MASK;
ctl_val |= aspeed_spi_get_io_mode(op) |
op->cmd.opcode << CTRL_COMMAND_SHIFT |
- CTRL_IO_DUMMY_SET(op->dummy.nbytes / op->dummy.buswidth) |
CTRL_IO_MODE_READ;
+ if (op->dummy.nbytes)
+ ctl_val |= CTRL_IO_DUMMY_SET(op->dummy.nbytes / op->dummy.buswidth);
+
/* Tune 4BYTE address mode */
if (op->addr.nbytes) {
u32 addr_mode = readl(aspi->regs + CE_CTRL_REG);
--
2.35.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] spi: aspeed: Fix division by zero
2022-06-11 10:39 [PATCH] spi: aspeed: Fix division by zero Cédric Le Goater
@ 2022-06-13 8:39 ` Pratyush Yadav
2022-06-13 8:57 ` Cédric Le Goater
0 siblings, 1 reply; 4+ messages in thread
From: Pratyush Yadav @ 2022-06-13 8:39 UTC (permalink / raw)
To: linux-aspeed
On 11/06/22 12:39PM, C?dric Le Goater wrote:
> When using the normal read operation for data transfers, the dummy bus
> width is zero. In that case, they are no dummy bytes to transfer and
> setting the dummy field in the controller register becomes useless.
>
> Issue was found on a custom "Bifrost" board with a AST2500 SoC and
> using a MX25L51245GMI-08G SPI Flash.
>
> Cc: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>
> Reported-by: Ian Woloschin <ian.woloschin@akamai.com>
> Fixes: 54613fc6659b ("spi: aspeed: Add support for direct mapping")
> Signed-off-by: C?dric Le Goater <clg@kaod.org>
> ---
> drivers/spi/spi-aspeed-smc.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c
> index 496f3e1e9079..3e891bf22470 100644
> --- a/drivers/spi/spi-aspeed-smc.c
> +++ b/drivers/spi/spi-aspeed-smc.c
> @@ -558,6 +558,14 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
> u32 ctl_val;
> int ret = 0;
>
> + dev_dbg(aspi->dev,
> + "CE%d %s dirmap [ 0x%.8llx - 0x%.8llx ] OP %#x mode:%d.%d.%d.%d naddr:%#x ndummies:%#x\n",
> + chip->cs, op->data.dir == SPI_MEM_DATA_IN ? "read" : "write",
> + desc->info.offset, desc->info.offset + desc->info.length,
> + op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth,
> + op->dummy.buswidth, op->data.buswidth,
> + op->addr.nbytes, op->dummy.nbytes);
> +
Unrelated change. Please send as a separate patch.
> chip->clk_freq = desc->mem->spi->max_speed_hz;
>
> /* Only for reads */
> @@ -574,9 +582,11 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
> ctl_val = readl(chip->ctl) & ~CTRL_IO_CMD_MASK;
> ctl_val |= aspeed_spi_get_io_mode(op) |
> op->cmd.opcode << CTRL_COMMAND_SHIFT |
> - CTRL_IO_DUMMY_SET(op->dummy.nbytes / op->dummy.buswidth) |
> CTRL_IO_MODE_READ;
>
> + if (op->dummy.nbytes)
> + ctl_val |= CTRL_IO_DUMMY_SET(op->dummy.nbytes / op->dummy.buswidth);
> +
LGTM. With the above fixed,
Reviewed-by: Pratyush Yadav <p.yadav@ti.com>
> /* Tune 4BYTE address mode */
> if (op->addr.nbytes) {
> u32 addr_mode = readl(aspi->regs + CE_CTRL_REG);
> --
> 2.35.3
>
--
Regards,
Pratyush Yadav
Texas Instruments Inc.
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] spi: aspeed: Fix division by zero
2022-06-13 8:39 ` Pratyush Yadav
@ 2022-06-13 8:57 ` Cédric Le Goater
2022-06-13 16:18 ` Woloschin, Ian
0 siblings, 1 reply; 4+ messages in thread
From: Cédric Le Goater @ 2022-06-13 8:57 UTC (permalink / raw)
To: linux-aspeed
On 6/13/22 10:39, Pratyush Yadav wrote:
> On 11/06/22 12:39PM, C?dric Le Goater wrote:
>> When using the normal read operation for data transfers, the dummy bus
>> width is zero. In that case, they are no dummy bytes to transfer and
>> setting the dummy field in the controller register becomes useless.
>>
>> Issue was found on a custom "Bifrost" board with a AST2500 SoC and
>> using a MX25L51245GMI-08G SPI Flash.
>>
>> Cc: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>
>> Reported-by: Ian Woloschin <ian.woloschin@akamai.com>
>> Fixes: 54613fc6659b ("spi: aspeed: Add support for direct mapping")
>> Signed-off-by: C?dric Le Goater <clg@kaod.org>
>> ---
>> drivers/spi/spi-aspeed-smc.c | 12 +++++++++++-
>> 1 file changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c
>> index 496f3e1e9079..3e891bf22470 100644
>> --- a/drivers/spi/spi-aspeed-smc.c
>> +++ b/drivers/spi/spi-aspeed-smc.c
>> @@ -558,6 +558,14 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
>> u32 ctl_val;
>> int ret = 0;
>>
>> + dev_dbg(aspi->dev,
>> + "CE%d %s dirmap [ 0x%.8llx - 0x%.8llx ] OP %#x mode:%d.%d.%d.%d naddr:%#x ndummies:%#x\n",
>> + chip->cs, op->data.dir == SPI_MEM_DATA_IN ? "read" : "write",
>> + desc->info.offset, desc->info.offset + desc->info.length,
>> + op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth,
>> + op->dummy.buswidth, op->data.buswidth,
>> + op->addr.nbytes, op->dummy.nbytes);
>> +
>
> Unrelated change. Please send as a separate patch.
OK.
>> chip->clk_freq = desc->mem->spi->max_speed_hz;
>>
>> /* Only for reads */
>> @@ -574,9 +582,11 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
>> ctl_val = readl(chip->ctl) & ~CTRL_IO_CMD_MASK;
>> ctl_val |= aspeed_spi_get_io_mode(op) |
>> op->cmd.opcode << CTRL_COMMAND_SHIFT |
>> - CTRL_IO_DUMMY_SET(op->dummy.nbytes / op->dummy.buswidth) |
>> CTRL_IO_MODE_READ;
>>
>> + if (op->dummy.nbytes)
>> + ctl_val |= CTRL_IO_DUMMY_SET(op->dummy.nbytes / op->dummy.buswidth);
>> +
>
> LGTM. With the above fixed,
>
> Reviewed-by: Pratyush Yadav <p.yadav@ti.com>
Thanks,
C.
>
>> /* Tune 4BYTE address mode */
>> if (op->addr.nbytes) {
>> u32 addr_mode = readl(aspi->regs + CE_CTRL_REG);
>> --
>> 2.35.3
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] spi: aspeed: Fix division by zero
2022-06-13 8:57 ` Cédric Le Goater
@ 2022-06-13 16:18 ` Woloschin, Ian
0 siblings, 0 replies; 4+ messages in thread
From: Woloschin, Ian @ 2022-06-13 16:18 UTC (permalink / raw)
To: linux-aspeed
> On Jun 13, 2022, at 4:57 AM, C?dric Le Goater <clg@kaod.org> wrote:
>
> On 6/13/22 10:39, Pratyush Yadav wrote:
>> On 11/06/22 12:39PM, C?dric Le Goater wrote:
>>> When using the normal read operation for data transfers, the dummy bus
>>> width is zero. In that case, they are no dummy bytes to transfer and
>>> setting the dummy field in the controller register becomes useless.
>>>
>>> Issue was found on a custom "Bifrost" board with a AST2500 SoC and
>>> using a MX25L51245GMI-08G SPI Flash.
>>>
>>> Cc: Chin-Ting Kuo <chin-ting_kuo@aspeedtech.com>
>>> Reported-by: Ian Woloschin <ian.woloschin@akamai.com>
>>> Fixes: 54613fc6659b ("spi: aspeed: Add support for direct mapping")
>>> Signed-off-by: C?dric Le Goater <clg@kaod.org>
>>> ---
>>> drivers/spi/spi-aspeed-smc.c | 12 +++++++++++-
>>> 1 file changed, 11 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c
>>> index 496f3e1e9079..3e891bf22470 100644
>>> --- a/drivers/spi/spi-aspeed-smc.c
>>> +++ b/drivers/spi/spi-aspeed-smc.c
>>> @@ -558,6 +558,14 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
>>> u32 ctl_val;
>>> int ret = 0;
>>> + dev_dbg(aspi->dev,
>>> + "CE%d %s dirmap [ 0x%.8llx - 0x%.8llx ] OP %#x mode:%d.%d.%d.%d naddr:%#x ndummies:%#x\n",
>>> + chip->cs, op->data.dir == SPI_MEM_DATA_IN ? "read" : "write",
>>> + desc->info.offset, desc->info.offset + desc->info.length,
>>> + op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth,
>>> + op->dummy.buswidth, op->data.buswidth,
>>> + op->addr.nbytes, op->dummy.nbytes);
>>> +
>> Unrelated change. Please send as a separate patch.
>
> OK.
>
>>> chip->clk_freq = desc->mem->spi->max_speed_hz;
>>> /* Only for reads */
>>> @@ -574,9 +582,11 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
>>> ctl_val = readl(chip->ctl) & ~CTRL_IO_CMD_MASK;
>>> ctl_val |= aspeed_spi_get_io_mode(op) |
>>> op->cmd.opcode << CTRL_COMMAND_SHIFT |
>>> - CTRL_IO_DUMMY_SET(op->dummy.nbytes / op->dummy.buswidth) |
>>> CTRL_IO_MODE_READ;
>>> + if (op->dummy.nbytes)
>>> + ctl_val |= CTRL_IO_DUMMY_SET(op->dummy.nbytes / op->dummy.buswidth);
>>> +
>> LGTM. With the above fixed,
>>
>> Reviewed-by: Pratyush Yadav <p.yadav@ti.com>
>
> Thanks,
>
> C.
I tested just the relevant change and it fixed my problem, allowing my board to boot.
Tested-by: Ian Woloschin <iwolosch at akamai.com <mailto:iwolosch@akamai.com>>
Thanks!
>
>>> /* Tune 4BYTE address mode */
>>> if (op->addr.nbytes) {
>>> u32 addr_mode = readl(aspi->regs + CE_CTRL_REG);
>>> --
>>> 2.35.3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20220613/7983ba21/attachment-0001.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2998 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linux-aspeed/attachments/20220613/7983ba21/attachment-0001.p7s>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-13 16:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-11 10:39 [PATCH] spi: aspeed: Fix division by zero Cédric Le Goater
2022-06-13 8:39 ` Pratyush Yadav
2022-06-13 8:57 ` Cédric Le Goater
2022-06-13 16:18 ` Woloschin, Ian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox