Skip to content

Commit 89e7353

Browse files
ConchuODbroonie
authored andcommitted
spi: microchip-core-qspi: stop checking viability of op->max_freq in supports_op callback
In commit 1352964 ("spi: microchip-core-qspi: Support per spi-mem operation frequency switches") the logic for checking the viability of op->max_freq in mchp_coreqspi_setup_clock() was copied into mchp_coreqspi_supports_op(). Unfortunately, op->max_freq is not valid when this function is called during probe but is instead zero. Accordingly, baud_rate_val is calculated to be INT_MAX due to division by zero, causing probe of the attached memory device to fail. Seemingly spi-microchip-core-qspi was the only driver that had such a modification made to its supports_op callback when the per_op_freq capability was added, so just remove it to restore prior functionality. CC: [email protected] Reported-by: Valentina Fernandez <[email protected]> Fixes: 1352964 ("spi: microchip-core-qspi: Support per spi-mem operation frequency switches") Signed-off-by: Conor Dooley <[email protected]> Message-ID: <20250825-during-ploy-939bdd068593@spud> Signed-off-by: Mark Brown <[email protected]>
1 parent 1b237f1 commit 89e7353

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

drivers/spi/spi-microchip-core-qspi.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -531,10 +531,6 @@ static int mchp_coreqspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *o
531531

532532
static bool mchp_coreqspi_supports_op(struct spi_mem *mem, const struct spi_mem_op *op)
533533
{
534-
struct mchp_coreqspi *qspi = spi_controller_get_devdata(mem->spi->controller);
535-
unsigned long clk_hz;
536-
u32 baud_rate_val;
537-
538534
if (!spi_mem_default_supports_op(mem, op))
539535
return false;
540536

@@ -557,14 +553,6 @@ static bool mchp_coreqspi_supports_op(struct spi_mem *mem, const struct spi_mem_
557553
return false;
558554
}
559555

560-
clk_hz = clk_get_rate(qspi->clk);
561-
if (!clk_hz)
562-
return false;
563-
564-
baud_rate_val = DIV_ROUND_UP(clk_hz, 2 * op->max_freq);
565-
if (baud_rate_val > MAX_DIVIDER || baud_rate_val < MIN_DIVIDER)
566-
return false;
567-
568556
return true;
569557
}
570558

0 commit comments

Comments
 (0)