Skip to contentSkip to conversation

PCI: mvebu: Check if reset gpio is defined

PATCH In review Pali Rohár 1 participant 2 messages Jul 24, 2020 – Aug 10, 2020

Subsystems (3)
lore
Share & tools
lore

Pali Rohár

author maintainer
#0 lore raw

PATCH 1/1 PCI: mvebu: Check if reset gpio is defined

Reset gpio is optional and it does not have to be defined for all boards.

So in mvebu_pcie_powerdown() like in mvebu_pcie_powerup() check that reset gpio is defined prior usage to prevent NULL pointer dereference.

---
 drivers/pci/controller/pci-mvebu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-mvebu.c +2 -1
index 153a64676bc9..58607cbe84c8 100644
@@ -947,7 +947,8 @@ static int mvebu_pcie_powerup(struct mvebu_pcie_port *port)
  */
 static void mvebu_pcie_powerdown(struct mvebu_pcie_port *port)
 {
-	gpiod_set_value_cansleep(port->reset_gpio, 1);
+	if (port->reset_gpio)
+		gpiod_set_value_cansleep(port->reset_gpio, 1);
 
 	clk_disable_unprepare(port->clk);
 }
Signature · 1 line
2.20.1
author maintainer
#1 lore raw
Quoted 15 lines · On Friday 24 July 2020 15:29:30 Pali Rohár wrote:

Reset gpio is optional and it does not have to be defined for all boards.

So in mvebu_pcie_powerdown() like in mvebu_pcie_powerup() check that reset gpio is defined prior usage to prevent NULL pointer dereference.

---
 drivers/pci/controller/pci-mvebu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-mvebu.c +0 -0
index 153a64676bc9..58607cbe84c8 100644

drivers/pci/controller/pci-mvebu.c static int mvebu_pcie_powerup(struct mvebu_pcie_port *port) · line 951

Quoted 6 lines
drivers/pci/controller/pci-mvebu.c +2 -1
@@ -947,7 +947,8 @@ static int mvebu_pcie_powerup(struct mvebu_pcie_port *port)
  */
 static void mvebu_pcie_powerdown(struct mvebu_pcie_port *port)
 {
-	gpiod_set_value_cansleep(port->reset_gpio, 1);
+	if (port->reset_gpio)
+		gpiod_set_value_cansleep(port->reset_gpio, 1);

Please drop this patch. I have realized that gpiod_set_value_cansleep() calls VALIDATE_DESC_VOID() macro which returns from current running function if passed pointer is NULL. So this patch is not needed as gpiod_set_value_cansleep() may be called with NULL pointer.

Quoted 6 lines
drivers/pci/controller/pci-mvebu.c +0 -0
 	clk_disable_unprepare(port->clk);
 }
Signature · 1 line
2.20.1