Skip to contentSkip to conversation

spi: clps711x: refactor to use core message parsing

PATCH Superseded Axel Lin 2 participants 5 messages Feb 18, 2014 3 messages not in the archive SPI

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/1 spi: clps711x: refactor to use core message parsing

Convert to use default implementation of transfer_one_message() which provides standard handling of delays and chip select management.

---
v2: Remove spi_clps711x_set_cs() as it is done by spi core

 drivers/spi/spi-clps711x.c | 82 +++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 52 deletions(-)
drivers/spi/spi-clps711x.c +30 -52
index f973e97..e07d1b0 100644
@@ -24,8 +24,6 @@
 #define DRIVER_NAME	"spi-clps711x"
 
 struct spi_clps711x_data {
-	struct completion	done;
-
 	struct clk		*spi_clk;
 	u32			max_speed_hz;
 
@@ -43,15 +41,6 @@ static int spi_clps711x_setup(struct spi_device *spi)
 	return 0;
 }
 
-static void spi_clps711x_setup_mode(struct spi_device *spi)
-{
-	/* Setup edge for transfer */
-	if (spi->mode & SPI_CPHA)
-		clps_writew(clps_readw(SYSCON3) | SYSCON3_ADCCKNSEN, SYSCON3);
-	else
-		clps_writew(clps_readw(SYSCON3) & ~SYSCON3_ADCCKNSEN, SYSCON3);
-}
-
 static void spi_clps711x_setup_xfer(struct spi_device *spi,
 				    struct spi_transfer *xfer)
 {
@@ -73,55 +62,44 @@ static void spi_clps711x_setup_xfer(struct spi_device *spi,
 			    SYSCON1_ADCKSEL(0), SYSCON1);
 }
 
-static int spi_clps711x_transfer_one_message(struct spi_master *master,
-					     struct spi_message *msg)
+static int spi_clps711x_prepare_message(struct spi_master *master,
+					struct spi_message *msg)
 {
-	struct spi_clps711x_data *hw = spi_master_get_devdata(master);
 	struct spi_device *spi = msg->spi;
-	struct spi_transfer *xfer;
-
-	spi_clps711x_setup_mode(spi);
-
-	list_for_each_entry(xfer, &msg->transfers, transfer_list) {
-		u8 data;
-
-		spi_clps711x_setup_xfer(spi, xfer);
 
-		gpio_set_value(spi->cs_gpio, !!(spi->mode & SPI_CS_HIGH));
-
-		reinit_completion(&hw->done);
-
-		hw->len = xfer->len;
-		hw->bpw = xfer->bits_per_word ? : spi->bits_per_word;
-		hw->tx_buf = (u8 *)xfer->tx_buf;
-		hw->rx_buf = (u8 *)xfer->rx_buf;
-
-		/* Initiate transfer */
-		data = hw->tx_buf ? *hw->tx_buf++ : 0;
-		clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
-			    SYNCIO);
-
-		wait_for_completion(&hw->done);
+	/* Setup edge for transfer */
+	if (spi->mode & SPI_CPHA)
+		clps_writew(clps_readw(SYSCON3) | SYSCON3_ADCCKNSEN, SYSCON3);
+	else
+		clps_writew(clps_readw(SYSCON3) & ~SYSCON3_ADCCKNSEN, SYSCON3);
 
-		if (xfer->delay_usecs)
-			udelay(xfer->delay_usecs);
+	return 0;
+}
 
-		if (xfer->cs_change ||
-		    list_is_last(&xfer->transfer_list, &msg->transfers))
-			gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
+static int spi_clps711x_transfer_one(struct spi_master *master,
+				     struct spi_device *spi,
+				     struct spi_transfer *xfer)
+{
+	struct spi_clps711x_data *hw = spi_master_get_devdata(master);
+	u8 data;
 
-		msg->actual_length += xfer->len;
-	}
+	spi_clps711x_setup_xfer(spi, xfer);
 
-	msg->status = 0;
-	spi_finalize_current_message(master);
+	hw->len = xfer->len;
+	hw->bpw = xfer->bits_per_word ? : spi->bits_per_word;
+	hw->tx_buf = (u8 *)xfer->tx_buf;
+	hw->rx_buf = (u8 *)xfer->rx_buf;
 
-	return 0;
+	/* Initiate transfer */
+	data = hw->tx_buf ? *hw->tx_buf++ : 0;
+	clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN, SYNCIO);
+	return 1;
 }
 
 static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
 {
-	struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id;
+	struct spi_master *master = dev_id;
+	struct spi_clps711x_data *hw = spi_master_get_devdata(master);
 	u8 data;
 
 	/* Handle RX */
@@ -135,7 +113,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
 		clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
 			    SYNCIO);
 	} else
-		complete(&hw->done);
+		complete(&master->xfer_completion);
 
 	return IRQ_HANDLED;
 }
@@ -173,7 +151,8 @@ static int spi_clps711x_probe(struct platform_device *pdev)
 	master->bits_per_word_mask =  SPI_BPW_RANGE_MASK(1, 8);
 	master->num_chipselect = pdata->num_chipselect;
 	master->setup = spi_clps711x_setup;
-	master->transfer_one_message = spi_clps711x_transfer_one_message;
+	master->prepare_message = spi_clps711x_prepare_message;
+	master->transfer_one = spi_clps711x_transfer_one;
 
 	hw = spi_master_get_devdata(master);
 
@@ -199,7 +178,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
 	}
 	hw->max_speed_hz = clk_get_rate(hw->spi_clk);
 
-	init_completion(&hw->done);
 	platform_set_drvdata(pdev, master);
 
 	/* Disable extended mode due hardware problems */
@@ -209,7 +187,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
 	clps_readl(SYNCIO);
 
 	ret = devm_request_irq(&pdev->dev, IRQ_SSEOTI, spi_clps711x_isr, 0,
-			       dev_name(&pdev->dev), hw);
+			       dev_name(&pdev->dev), master);
 	if (ret) {
 		dev_err(&pdev->dev, "Can't request IRQ\n");
 		goto err_out;
Signature · 8 lines
1.8.1.2



--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw

0JLRgtC+0YDQvdC40LosIDE4INGE0LXQstGA0LDQu9GPIDIwMTQsIDk6MzEgKzA4OjAwINC+0YIg QXhlbCBMaW4gPGF4ZWwubGluQGluZ2ljcy5jb20+Ogo+IENvbnZlcnQgdG8gdXNlIGRlZmF1bHQg aW1wbGVtZW50YXRpb24gb2YgdHJhbnNmZXJfb25lX21lc3NhZ2UoKSB3aGljaCBwcm92aWRlcwo+ IHN0YW5kYXJkIGhhbmRsaW5nIG9mIGRlbGF5cyBhbmQgY2hpcCBzZWxlY3QgbWFuYWdlbWVudC4K PiAKPiBTaWduZWQtb2ZmLWJ5OiBBeGVsIExpbiA8YXhlbC5saW5AaW5naWNzLmNvbT4KPiAtLS0K Li4uCj4gIHN0YXRpYyBpcnFyZXR1cm5fdCBzcGlfY2xwczcxMXhfaXNyKGludCBpcnEsIHZvaWQg KmRldl9pZCkKPiAgewo+IC0Jc3RydWN0IHNwaV9jbHBzNzExeF9kYXRhICpodyA9IChzdHJ1Y3Qg c3BpX2NscHM3MTF4X2RhdGEgKilkZXZfaWQ7Cj4gKwlzdHJ1Y3Qgc3BpX21hc3RlciAqbWFzdGVy ID0gZGV2X2lkOwo+ICsJc3RydWN0IHNwaV9jbHBzNzExeF9kYXRhICpodyA9IHNwaV9tYXN0ZXJf Z2V0X2RldmRhdGEobWFzdGVyKTsKPiAgCXU4IGRhdGE7Cj4gIAo+ICAJLyogSGFuZGxlIFJYICov Cj4gQEAgLTEzNSw3ICsxMTMsNyBAQCBzdGF0aWMgaXJxcmV0dXJuX3Qgc3BpX2NscHM3MTF4X2lz cihpbnQgaXJxLCB2b2lkICpkZXZfaWQpCj4gIAkJY2xwc193cml0ZWwoZGF0YSB8IFNZTkNJT19G Uk1MRU4oaHctPmJwdykgfCBTWU5DSU9fVFhGUk1FTiwKPiAgCQkJICAgIFNZTkNJTyk7Cj4gIAl9 IGVsc2UKPiAtCQljb21wbGV0ZSgmaHctPmRvbmUpOwo+ICsJCWNvbXBsZXRlKCZtYXN0ZXItPnhm ZXJfY29tcGxldGlvbik7CgpzcGlfZmluYWxpemVfY3VycmVudF90cmFuc2ZlcihtYXN0ZXIpOwoK LS0tCg==
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#3 lore raw

2014-02-18 16:27 GMT+08:00 Alexander Shiyan <shc_work-JGs/[email protected]>:

Quoted 14 lines

Вторник, 18 февраля 2014, 9:31 +08:00 от Axel Lin <[email protected]>:

Quoted 5 lines

Convert to use default implementation of transfer_one_message() which provides standard handling of delays and chip select management.

---

...

Quoted 7 lines

static irqreturn_t spi_clps711x_isr(int irq, void *dev_id) {

drivers/spi/spi-clps711x.c +2 -1
-     struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id;
+     struct spi_master *master = dev_id;
+     struct spi_clps711x_data *hw = spi_master_get_devdata(master);
      u8 data;
Quoted 9 lines

drivers/spi/spi-clps711x.c static irqreturn_t spi_clps711x_isr(int irq, void *dev_id) · line 116

Quoted 7 lines
      /* Handle RX */
drivers/spi/spi-clps711x.c +1 -1
@@ -135,7 +113,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
              clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
                          SYNCIO);
      } else
-             complete(&hw->done);
+             complete(&master->xfer_completion);

spi_finalize_current_transfer(master);

It's done by spi core. see spi_transfer_one_message() in spi.c

Regards,
Axel
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): CAFRkauCQkyDFixt-t1Oe9L8eJBdhCeAFMeEBn7KimfcFRcP_ag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#5 lore raw

0JLRgtC+0YDQvdC40LosIDE4INGE0LXQstGA0LDQu9GPIDIwMTQsIDE2OjUyICswODowMCDQvtGC IEF4ZWwgTGluIDxheGVsLmxpbkBpbmdpY3MuY29tPjoKPiAyMDE0LTAyLTE4IDE2OjI3IEdNVCsw ODowMCBBbGV4YW5kZXIgU2hpeWFuIDxzaGNfd29ya0BtYWlsLnJ1PjoKPiA+INCS0YLQvtGA0L3Q uNC6LCAxOCDRhNC10LLRgNCw0LvRjyAyMDE0LCA5OjMxICswODowMCDQvtGCIEF4ZWwgTGluIDxh eGVsLmxpbkBpbmdpY3MuY29tPjoKPiA+PiBDb252ZXJ0IHRvIHVzZSBkZWZhdWx0IGltcGxlbWVu dGF0aW9uIG9mIHRyYW5zZmVyX29uZV9tZXNzYWdlKCkgd2hpY2ggcHJvdmlkZXMKPiA+PiBzdGFu ZGFyZCBoYW5kbGluZyBvZiBkZWxheXMgYW5kIGNoaXAgc2VsZWN0IG1hbmFnZW1lbnQuCj4gPj4K PiA+PiBTaWduZWQtb2ZmLWJ5OiBBeGVsIExpbiA8YXhlbC5saW5AaW5naWNzLmNvbT4KPiA+PiAt LS0KPiA+IC4uLgo+ID4+ICBzdGF0aWMgaXJxcmV0dXJuX3Qgc3BpX2NscHM3MTF4X2lzcihpbnQg aXJxLCB2b2lkICpkZXZfaWQpCj4gPj4gIHsKPiA+PiAtICAgICBzdHJ1Y3Qgc3BpX2NscHM3MTF4 X2RhdGEgKmh3ID0gKHN0cnVjdCBzcGlfY2xwczcxMXhfZGF0YSAqKWRldl9pZDsKPiA+PiArICAg ICBzdHJ1Y3Qgc3BpX21hc3RlciAqbWFzdGVyID0gZGV2X2lkOwo+ID4+ICsgICAgIHN0cnVjdCBz cGlfY2xwczcxMXhfZGF0YSAqaHcgPSBzcGlfbWFzdGVyX2dldF9kZXZkYXRhKG1hc3Rlcik7Cj4g Pj4gICAgICAgdTggZGF0YTsKPiA+Pgo+ID4+ICAgICAgIC8qIEhhbmRsZSBSWCAqLwo+ID4+IEBA IC0xMzUsNyArMTEzLDcgQEAgc3RhdGljIGlycXJldHVybl90IHNwaV9jbHBzNzExeF9pc3IoaW50 IGlycSwgdm9pZCAqZGV2X2lkKQo+ID4+ICAgICAgICAgICAgICAgY2xwc193cml0ZWwoZGF0YSB8 IFNZTkNJT19GUk1MRU4oaHctPmJwdykgfCBTWU5DSU9fVFhGUk1FTiwKPiA+PiAgICAgICAgICAg ICAgICAgICAgICAgICAgIFNZTkNJTyk7Cj4gPj4gICAgICAgfSBlbHNlCj4gPj4gLSAgICAgICAg ICAgICBjb21wbGV0ZSgmaHctPmRvbmUpOwo+ID4+ICsgICAgICAgICAgICAgY29tcGxldGUoJm1h c3Rlci0+eGZlcl9jb21wbGV0aW9uKTsKPiA+Cj4gPiBzcGlfZmluYWxpemVfY3VycmVudF90cmFu c2ZlcihtYXN0ZXIpOwo+IAo+IEl0J3MgZG9uZSBieSBzcGkgY29yZS4gc2VlIHNwaV90cmFuc2Zl cl9vbmVfbWVzc2FnZSgpIGluIHNwaS5jCgpzcGlfZmluYWxpemVfY3VycmVudF90cmFuc2Zlcigp ICE9IHNwaV9maW5hbGl6ZV9jdXJyZW50X21lc3NhZ2UoKQoKSSBqdXN0IHN1Z2dlc3QgdG8gcmVw bGFjZSBjb21wbGV0ZSgmbWFzdGVyLT54ZmVyX2NvbXBsZXRpb24pIHRvCnNwaV9maW5hbGl6ZV9j dXJyZW50X3RyYW5zZmVyKG1hc3RlcikuCgotLS0K
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#7 lore raw

2014-02-18 16:56 GMT+08:00 Alexander Shiyan <shc_work-JGs/[email protected]>:

Quoted 26 lines

Вторник, 18 февраля 2014, 16:52 +08:00 от Axel Lin <[email protected]>:

Quoted 25 lines

2014-02-18 16:27 GMT+08:00 Alexander Shiyan <shc_work-JGs/[email protected]>:

Quoted 23 lines

Вторник, 18 февраля 2014, 9:31 +08:00 от Axel Lin <[email protected]>:

Quoted 5 lines

Convert to use default implementation of transfer_one_message() which provides standard handling of delays and chip select management.

---

...

Quoted 9 lines

static irqreturn_t spi_clps711x_isr(int irq, void *dev_id) {

(quoted diff) +2 -1
-     struct spi_clps711x_data *hw = (struct spi_clps711x_data *)dev_id;
+     struct spi_master *master = dev_id;
+     struct spi_clps711x_data *hw = spi_master_get_devdata(master);
      u8 data;
 
      /* Handle RX */

Review static irqreturn_t spi_clps711x_isr(int irq, void *dev_id) · line 116

Quoted 5 lines
(quoted diff) +1 -1
@@ -135,7 +113,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
              clps_writel(data | SYNCIO_FRMLEN(hw->bpw) | SYNCIO_TXFRMEN,
                          SYNCIO);
      } else
-             complete(&hw->done);
+             complete(&master->xfer_completion);

spi_finalize_current_transfer(master);

Quoted 6 lines
Quoted 1 line

It's done by spi core. see spi_transfer_one_message() in spi.c

spi_finalize_current_transfer() != spi_finalize_current_message()

I just suggest to replace complete(&master->xfer_completion) to spi_finalize_current_transfer(master).

Ok. Got your point now.
Will send v3 soon.

Thanks for the review.
Axel
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html