Unverified Commit 89e7353f authored by Conor Dooley's avatar Conor Dooley Committed by Mark Brown
Browse files

spi: microchip-core-qspi: stop checking viability of op->max_freq in supports_op callback 



In commit 13529647 ("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: stable@vger.kernel.org
Reported-by: default avatarValentina Fernandez <valentina.fernandezalanis@microchip.com>
Fixes: 13529647 ("spi: microchip-core-qspi: Support per spi-mem operation frequency switches")
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
Message-ID: <20250825-during-ploy-939bdd068593@spud>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1b237f19

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

+0 −12
Original line number Diff line number Diff line
@@ -531,10 +531,6 @@ static int mchp_coreqspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *o 


static bool mchp_coreqspi_supports_op(struct spi_mem *mem, const struct spi_mem_op *op)

{

	struct mchp_coreqspi *qspi = spi_controller_get_devdata(mem->spi->controller);

	unsigned long clk_hz;

	u32 baud_rate_val;



	if (!spi_mem_default_supports_op(mem, op))

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

	}



	clk_hz = clk_get_rate(qspi->clk);

	if (!clk_hz)

		return false;



	baud_rate_val = DIV_ROUND_UP(clk_hz, 2 * op->max_freq);

	if (baud_rate_val > MAX_DIVIDER || baud_rate_val < MIN_DIVIDER)

		return false;



	return true;

}