Skip to contentSkip to conversation

spi: pxa2xx: Convert reset_sccr1() to use pxa2xx_spi_update()

PATCH In review Andy Shevchenko 2 participants 4 messages Jul 19, 2021

Subsystems (3)
lore
Share & tools
lore

Andy Shevchenko

author reviewer
#0 lore raw

PATCH 1/3 spi: pxa2xx: Convert reset_sccr1() to use pxa2xx_spi_update()

Convert reset_sccr1() to use pxa2xx_spi_update().
It will help for further improvements.

---
 drivers/spi/spi-pxa2xx.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/spi/spi-pxa2xx.c +7 -9
index 974e30744b83..7c4c8179a329 100644
@@ -594,24 +594,22 @@ static int u32_reader(struct driver_data *drv_data)
 
 static void reset_sccr1(struct driver_data *drv_data)
 {
-	struct chip_data *chip =
-		spi_get_ctldata(drv_data->controller->cur_msg->spi);
-	u32 sccr1_reg;
+	struct chip_data *chip = spi_get_ctldata(drv_data->controller->cur_msg->spi);
+	u32 mask = drv_data->int_cr1;
 
-	sccr1_reg = pxa2xx_spi_read(drv_data, SSCR1) & ~drv_data->int_cr1;
 	switch (drv_data->ssp_type) {
 	case QUARK_X1000_SSP:
-		sccr1_reg &= ~QUARK_X1000_SSCR1_RFT;
+		mask |= QUARK_X1000_SSCR1_RFT;
 		break;
 	case CE4100_SSP:
-		sccr1_reg &= ~CE4100_SSCR1_RFT;
+		mask |= CE4100_SSCR1_RFT;
 		break;
 	default:
-		sccr1_reg &= ~SSCR1_RFT;
+		mask |= SSCR1_RFT;
 		break;
 	}
-	sccr1_reg |= chip->threshold;
-	pxa2xx_spi_write(drv_data, SSCR1, sccr1_reg);
+
+	pxa2xx_spi_update(drv_data, SSCR1, mask, chip->threshold);
 }
 
 static void int_stop_and_reset(struct driver_data *drv_data)
Signature · 1 line
2.30.2
author reviewer
#1 lore raw

PATCH 2/3 spi: pxa2xx: Reset DMA bits in CR1 in reset_sccr1()

In order to allow reset_sccr1() to be reused in DMA paths, reset DMA bits in CR1 in this function.

---
 drivers/spi/spi-pxa2xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-pxa2xx.c +1 -1
index 7c4c8179a329..833eb52ed305 100644
@@ -595,7 +595,7 @@ static int u32_reader(struct driver_data *drv_data)
 static void reset_sccr1(struct driver_data *drv_data)
 {
 	struct chip_data *chip = spi_get_ctldata(drv_data->controller->cur_msg->spi);
-	u32 mask = drv_data->int_cr1;
+	u32 mask = drv_data->int_cr1 | drv_data->dma_cr1;
 
 	switch (drv_data->ssp_type) {
 	case QUARK_X1000_SSP:
Signature · 1 line
2.30.2
author reviewer
#2 lore raw

PATCH 3/3 spi: pxa2xx: Reuse int_stop_and_reset() in couple of places

In reply to Andy Shevchenko

Reuse int_stop_and_reset() in couple of places.

While at it, change the order of the int_stop_and_reset() and pxa2xx_spi_off() to be in align with the similar flow in int_error_stop().

---
 drivers/spi/spi-pxa2xx.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/spi/spi-pxa2xx.c +3 -9
index 833eb52ed305..19a2d1ea7d42 100644
@@ -722,11 +722,8 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
 
 static void handle_bad_msg(struct driver_data *drv_data)
 {
+	int_stop_and_reset(drv_data);
 	pxa2xx_spi_off(drv_data);
-	clear_SSCR1_bits(drv_data, drv_data->int_cr1);
-	if (!pxa25x_ssp_comp(drv_data))
-		pxa2xx_spi_write(drv_data, SSTO, 0);
-	write_SSSR_CS(drv_data, drv_data->clear_sr);
 
 	dev_err(drv_data->ssp->dev, "bad message state in interrupt handler\n");
 }
@@ -1154,13 +1151,10 @@ static void pxa2xx_spi_handle_err(struct spi_controller *controller,
 {
 	struct driver_data *drv_data = spi_controller_get_devdata(controller);
 
+	int_stop_and_reset(drv_data);
+
 	/* Disable the SSP */
 	pxa2xx_spi_off(drv_data);
-	/* Clear and disable interrupts and service requests */
-	write_SSSR_CS(drv_data, drv_data->clear_sr);
-	clear_SSCR1_bits(drv_data, drv_data->int_cr1 | drv_data->dma_cr1);
-	if (!pxa25x_ssp_comp(drv_data))
-		pxa2xx_spi_write(drv_data, SSTO, 0);
 
 	/*
 	 * Stop the DMA if running. Note DMA callback handler may have unset
Signature · 1 line
2.30.2
maintainer
#3 lore raw
In reply to Andy Shevchenko
Quoted 2 lines · Andy Shevchenko

Convert reset_sccr1() to use pxa2xx_spi_update().
It will help for further improvements.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/3] spi: pxa2xx: Convert reset_sccr1() to use pxa2xx_spi_update()

      commit: e0a6512d29126901dd16dfede314616b57ec8210
[2/3] spi: pxa2xx: Reset DMA bits in CR1 in reset_sccr1()
      commit: cdcb26ce747a5ec665a98fd6c303248a12418140
[3/3] spi: pxa2xx: Reuse int_stop_and_reset() in couple of places
      commit: 3bbdc083262dc082e5c8e7b0646faf8f4ef894dd

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark