Skip to contentSkip to conversation

dm: spi: Return 0 if driver does not implement ops->cs_info

PATCH Superseded Bin Meng 2 participants 9 messages Aug 29, 2019 – Sep 7, 2019 SPI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/2 dm: spi: Return 0 if driver does not implement ops->cs_info

If an SPI controller driver does not implement ops->cs_info, that probably means any chip select number could be valid, hence let's return 0 for spi_cs_info().

---

 drivers/spi/spi-uclass.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/spi/spi-uclass.c +3 -4
index 88cb2a1..24de0b5 100644
@@ -237,11 +237,10 @@ int spi_cs_info(struct udevice *bus, uint cs, struct spi_cs_info *info)
 		return ops->cs_info(bus, cs, info);
 
 	/*
-	 * We could assume there is at least one valid chip select, but best
-	 * to be sure and return an error in this case. The driver didn't
-	 * care enough to tell us.
+	 * We could assume there is at least one valid chip select.
+	 * The driver didn't care enough to tell us.
 	 */
-	return -ENODEV;
+	return 0;
 }
 
 int spi_find_bus_and_cs(int busnum, int cs, struct udevice **busp,
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/2 dm: spi: Return 0 if driver does not implement ops->cs_info

Quoted 11 lines · Bin Meng

If an SPI controller driver does not implement ops->cs_info, that probably means any chip select number could be valid, hence let's return 0 for spi_cs_info().

---

 drivers/spi/spi-uclass.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Ping?

author
#2 lore raw

PATCH 2/2 dm: spi: Check cs number before accessing slaves

In reply to Bin Meng

In spi_get_bus_and_cs() only bus number is checked before accessing slaves. We should check cs number as well.

---

 drivers/spi/spi-uclass.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/spi/spi-uclass.c +6 -0
index 24de0b5..f633eb5 100644
@@ -271,6 +271,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 {
 	struct udevice *bus, *dev;
 	struct dm_spi_slave_platdata *plat;
+	struct spi_cs_info info;
 	bool created = false;
 	int ret;
 
@@ -283,6 +284,11 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 		printf("Invalid bus %d (err=%d)\n", busnum, ret);
 		return ret;
 	}
+	ret = spi_cs_info(bus, cs, &info);
+	if (ret) {
+		printf("Invalid cs %d (err=%d)\n", cs, ret);
+		return ret;
+	}
 	ret = spi_find_chip_select(bus, cs, &dev);
 
 	/*
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH 2/2 dm: spi: Check cs number before accessing slaves

Quoted 10 lines · Bin Meng

In spi_get_bus_and_cs() only bus number is checked before accessing slaves. We should check cs number as well.

---

 drivers/spi/spi-uclass.c | 6 ++++++
 1 file changed, 6 insertions(+)

Ping?

#4 lore raw

PATCH 2/2 dm: spi: Check cs number before accessing slaves

In reply to Bin Meng
Quoted 23 lines · Bin Meng

In spi_get_bus_and_cs() only bus number is checked before accessing slaves. We should check cs number as well.

---

 drivers/spi/spi-uclass.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/spi/spi-uclass.c +1 -0
index 24de0b5..f633eb5 100644
@@ -271,6 +271,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 {
        struct udevice *bus, *dev;
        struct dm_spi_slave_platdata *plat;
+       struct spi_cs_info info;
        bool created = false;
        int ret;
 

drivers/spi/spi-uclass.c int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, · line 292

Quoted 9 lines
drivers/spi/spi-uclass.c +5 -0
@@ -283,6 +284,11 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
                printf("Invalid bus %d (err=%d)\n", busnum, ret);
                return ret;
        }
+       ret = spi_cs_info(bus, cs, &info);
+       if (ret) {
+               printf("Invalid cs %d (err=%d)\n", cs, ret);
+               return ret;
+       }
        ret = spi_find_chip_select(bus, cs, &dev);

I think it would rather check the cs_info in spi_find_chip_select function itself, make more sense.

author
#5 lore raw

PATCH 2/2 dm: spi: Check cs number before accessing slaves

Hi Jagan,

Quoted 24 lines · Jagan Teki
Quoted 22 lines · Bin Meng

In spi_get_bus_and_cs() only bus number is checked before accessing slaves. We should check cs number as well.

---

 drivers/spi/spi-uclass.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/spi/spi-uclass.c +1 -0
index 24de0b5..f633eb5 100644
@@ -271,6 +271,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 {
        struct udevice *bus, *dev;
        struct dm_spi_slave_platdata *plat;
+       struct spi_cs_info info;
        bool created = false;
        int ret;
 
Quoted 13 lines

drivers/spi/spi-uclass.c int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, · line 292

Quoted 10 lines
drivers/spi/spi-uclass.c +5 -0
@@ -283,6 +284,11 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
                printf("Invalid bus %d (err=%d)\n", busnum, ret);
                return ret;
        }
+       ret = spi_cs_info(bus, cs, &info);
+       if (ret) {
+               printf("Invalid cs %d (err=%d)\n", cs, ret);
+               return ret;
+       }
        ret = spi_find_chip_select(bus, cs, &dev);

I think it would rather check the cs_info in spi_find_chip_select function itself, make more sense.

This routine spi_get_bus_and_cs() has both busnum and cs as parameters, but only busnum is checked so far. It looks to me more appropriate to check the cs in spi_get_bus_and_cs() directly, instead of going into spi_find_chip_select().

Regards,
Bin

#6 lore raw

PATCH 2/2 dm: spi: Check cs number before accessing slaves

Quoted 42 lines · Bin Meng

Hi Jagan,

Quoted 24 lines · Jagan Teki
Quoted 22 lines · Bin Meng

In spi_get_bus_and_cs() only bus number is checked before accessing slaves. We should check cs number as well.

---

 drivers/spi/spi-uclass.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/spi/spi-uclass.c +1 -0
index 24de0b5..f633eb5 100644
@@ -271,6 +271,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 {
        struct udevice *bus, *dev;
        struct dm_spi_slave_platdata *plat;
+       struct spi_cs_info info;
        bool created = false;
        int ret;
 
Quoted 13 lines

drivers/spi/spi-uclass.c int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, · line 292

Quoted 10 lines
drivers/spi/spi-uclass.c +5 -0
@@ -283,6 +284,11 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
                printf("Invalid bus %d (err=%d)\n", busnum, ret);
                return ret;
        }
+       ret = spi_cs_info(bus, cs, &info);
+       if (ret) {
+               printf("Invalid cs %d (err=%d)\n", cs, ret);
+               return ret;
+       }
        ret = spi_find_chip_select(bus, cs, &dev);

I think it would rather check the cs_info in spi_find_chip_select function itself, make more sense.

Quoted 4 lines

This routine spi_get_bus_and_cs() has both busnum and cs as parameters, but only busnum is checked so far. It looks to me more appropriate to check the cs in spi_get_bus_and_cs() directly, instead of going into spi_find_chip_select().

True, but the spi_find_chip_select is also used in other calls (like spi_find_bus_and_cs). Checking cs_info on the core function might help to calling it on multiple places. what do you think?

author
#7 lore raw

PATCH 2/2 dm: spi: Check cs number before accessing slaves

Hi Jagan,

Quoted 44 lines · Jagan Teki
Quoted 42 lines · Bin Meng

Hi Jagan,

Quoted 37 lines · Jagan Teki
Quoted 23 lines · Bin Meng

In spi_get_bus_and_cs() only bus number is checked before accessing slaves. We should check cs number as well.

---

 drivers/spi/spi-uclass.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/spi/spi-uclass.c +1 -0
index 24de0b5..f633eb5 100644
@@ -271,6 +271,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 {
        struct udevice *bus, *dev;
        struct dm_spi_slave_platdata *plat;
+       struct spi_cs_info info;
        bool created = false;
        int ret;
 

drivers/spi/spi-uclass.c int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, · line 292

Quoted 9 lines
drivers/spi/spi-uclass.c +5 -0
@@ -283,6 +284,11 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
                printf("Invalid bus %d (err=%d)\n", busnum, ret);
                return ret;
        }
+       ret = spi_cs_info(bus, cs, &info);
+       if (ret) {
+               printf("Invalid cs %d (err=%d)\n", cs, ret);
+               return ret;
+       }
        ret = spi_find_chip_select(bus, cs, &dev);

I think it would rather check the cs_info in spi_find_chip_select function itself, make more sense.

Quoted 8 lines
Quoted 4 lines

This routine spi_get_bus_and_cs() has both busnum and cs as parameters, but only busnum is checked so far. It looks to me more appropriate to check the cs in spi_get_bus_and_cs() directly, instead of going into spi_find_chip_select().

True, but the spi_find_chip_select is also used in other calls (like spi_find_bus_and_cs). Checking cs_info on the core function might help to calling it on multiple places. what do you think?

Ok, makes sense. I will do it in v2.

Regards,
Bin