Skip to contentSkip to conversation

pci: pcie_dw_rockchip: Fixed the below compilation error

PATCH Superseded Anand Moon 3 participants 10 messages Jun 4, 2021 – Jun 8, 2021

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Anand Moon

author
#0 lore raw

PATCH v3 1/3 pci: pcie_dw_rockchip: Fixed the below compilation error

Use the generic error number instead of specific error number. Changes fix the below error.

drivers/pci/pcie_dw_rockchip.c: In function 'rk_pcie_read':
drivers/pci/pcie_dw_rockchip.c:70:10: error: 'PCIBIOS_UNSUPPORTED'
undeclared (first use in this function)

   70 |   return PCIBIOS_UNSUPPORTED;
      |          ^~~~~~~~~~~~~~~~~~~
drivers/pci/pcie_dw_rockchip.c: In function 'rk_pcie_write':
drivers/pci/pcie_dw_rockchip.c:90:10: error: 'PCIBIOS_UNSUPPORTED'
                        undeclared (first use in this function)
   90 |   return PCIBIOS_UNSUPPORTED;
      |          ^~~~~~~~~~~~~~~~~~~
Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

---
v1: Drop the PCI ERROR MACRO,
v2: added the Neil review tag.
---

---
 drivers/pci/pcie_dw_rockchip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pcie_dw_rockchip.c +2 -2
index bc22af4230..3ac2434b69 100644
@@ -67,7 +67,7 @@ static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
 {
 	if ((uintptr_t)addr & (size - 1)) {
 		*val = 0;
-		return PCIBIOS_UNSUPPORTED;
+		return -EOPNOTSUPP;
 	}
 
 	if (size == 4) {
@@ -87,7 +87,7 @@ static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
 static int rk_pcie_write(void __iomem *addr, int size, u32 val)
 {
 	if ((uintptr_t)addr & (size - 1))
-		return PCIBIOS_UNSUPPORTED;
+		return -EOPNOTSUPP;
 
 	if (size == 4)
 		writel(val, addr);
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH v3 2/3 pci: pcie_dw_rockchip: Drop the unused variable warning

Drop the unused variable warning below.

drivers/pci/pcie_dw_rockchip.c:161:6: warning: unused variable 'val' [-Wunused-variable]

  161 |  u32 val;
       |      ^~~
Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

---
V1
V2: Added Neil review tags.

---
 drivers/pci/pcie_dw_rockchip.c | 2 --
 1 file changed, 2 deletions(-)
drivers/pci/pcie_dw_rockchip.c +0 -2
index 3ac2434b69..4e448c0a3d 100644
@@ -158,8 +158,6 @@ static inline void rk_pcie_writel_apb(struct rk_pcie *rk_pcie, u32 reg,
  */
 static void rk_pcie_configure(struct rk_pcie *pci, u32 cap_speed)
 {
-	u32 val;
-
 	dw_pcie_dbi_write_enable(&pci->dw, true);
 
 	clrsetbits_le32(pci->dw.dbi_base + PCIE_LINK_CAPABILITY,
Signature · 1 line
2.31.1
Reviewed-by on v3 2/3
#2 lore raw

Re: [PATCHv3 2/3] pci: pcie_dw_rockchip: Drop the unused variable warning

Am Fri, Jun 04, 2021 at 04:56:06AM +0000 schrieb Anand Moon:

Quoted 34 lines

Drop the unused variable warning below.

drivers/pci/pcie_dw_rockchip.c:161:6: warning: unused variable 'val' [-Wunused-variable]

  161 |  u32 val;
       |      ^~~
Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

---
V1
V2: Added Neil review tags.

---
 drivers/pci/pcie_dw_rockchip.c | 2 --
 1 file changed, 2 deletions(-)
drivers/pci/pcie_dw_rockchip.c +0 -2
index 3ac2434b69..4e448c0a3d 100644
@@ -158,8 +158,6 @@ static inline void rk_pcie_writel_apb(struct rk_pcie *rk_pcie, u32 reg,
  */
 static void rk_pcie_configure(struct rk_pcie *pci, u32 cap_speed)
 {
-	u32 val;
-
 	dw_pcie_dbi_write_enable(&pci->dw, true);
 
 	clrsetbits_le32(pci->dw.dbi_base + PCIE_LINK_CAPABILITY,
Signature · 1 line
2.31.1
Reviewed-by on v3 2/3
#3 lore raw

Re: [PATCHv3 2/3] pci: pcie_dw_rockchip: Drop the unused variable warning

In reply to Anand Moon
Quoted 11 lines · Anand Moon

Drop the unused variable warning below.

drivers/pci/pcie_dw_rockchip.c:161:6: warning: unused variable 'val' [-Wunused-variable]

   161 |  u32 val;
        |      ^~~
Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

Thanks,
- Kever

Quoted 20 lines

---
V1
V2: Added Neil review tags.

---
  drivers/pci/pcie_dw_rockchip.c | 2 --
  1 file changed, 2 deletions(-)
drivers/pci/pcie_dw_rockchip.c +0 -2
index 3ac2434b69..4e448c0a3d 100644
@@ -158,8 +158,6 @@ static inline void rk_pcie_writel_apb(struct rk_pcie *rk_pcie, u32 reg,
   */
  static void rk_pcie_configure(struct rk_pcie *pci, u32 cap_speed)
  {
-	u32 val;
-
  	dw_pcie_dbi_write_enable(&pci->dw, true);
 
  	clrsetbits_le32(pci->dw.dbi_base + PCIE_LINK_CAPABILITY,
author
#4 lore raw

PATCH v3 3/3 pci: pcie_dw_rockchip: Replace msleep occurences by udelay

In reply to Anand Moon

Replace msleep occurences by udelay.

drivers/pci/pcie_dw_rockchip.c:254:3: warning: implicit
declaration of function 'msleep' [-Wimplicit-function-declaration]

Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

---
V2: drop the msleep macro.

---
 drivers/pci/pcie_dw_rockchip.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/pci/pcie_dw_rockchip.c +5 -4
index 4e448c0a3d..039266a357 100644
@@ -62,6 +62,7 @@ struct rk_pcie {
 
 /* Parameters for the waiting for #perst signal */
 #define PERST_WAIT_MS			1000
+#define MACRO_US			1000
 
 static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
 {
@@ -249,7 +250,7 @@ static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed)
 		 * some wired devices need much more, such as 600ms.
 		 * Add a enough delay to cover all cases.
 		 */
-		msleep(PERST_WAIT_MS);
+		udelay(PERST_WAIT_MS);
 		dm_gpio_set_value(&priv->rst_gpio, 1);
 	}
 
@@ -271,12 +272,12 @@ static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed)
 		dev_info(priv->dw.dev, "PCIe Linking... LTSSM is 0x%x\n",
 			 rk_pcie_readl_apb(priv, PCIE_CLIENT_LTSSM_STATUS));
 		rk_pcie_debug_dump(priv);
-		msleep(1000);
+		udelay(PERST_WAIT_MS * MACRO_US);
 	}
 
 	dev_err(priv->dw.dev, "PCIe-%d Link Fail\n", dev_seq(priv->dw.dev));
 	/* Link maybe in Gen switch recovery but we need to wait more 1s */
-	msleep(1000);
+	udelay(PERST_WAIT_MS * MACRO_US);
 	return -EIO;
 }
 
@@ -296,7 +297,7 @@ static int rockchip_pcie_init_port(struct udevice *dev)
 		}
 	}
 
-	msleep(1000);
+	udelay(PERST_WAIT_MS * MACRO_US);
 
 	ret = generic_phy_init(&priv->phy);
 	if (ret) {
Signature · 1 line
2.31.1
#5 lore raw

Re: [PATCHv3 3/3] pci: pcie_dw_rockchip: Replace msleep occurences by udelay

Am Fri, Jun 04, 2021 at 04:56:07AM +0000 schrieb Anand Moon:

Quoted 28 lines

Replace msleep occurences by udelay.

drivers/pci/pcie_dw_rockchip.c:254:3: warning: implicit
declaration of function 'msleep' [-Wimplicit-function-declaration]

Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

---
V2: drop the msleep macro.

---
 drivers/pci/pcie_dw_rockchip.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/pci/pcie_dw_rockchip.c +1 -0
index 4e448c0a3d..039266a357 100644
@@ -62,6 +62,7 @@ struct rk_pcie {
 
 /* Parameters for the waiting for #perst signal */
 #define PERST_WAIT_MS			1000
+#define MACRO_US			1000
 
 static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
 {

drivers/pci/pcie_dw_rockchip.c static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed) · line 253

Quoted 5 lines
drivers/pci/pcie_dw_rockchip.c +1 -1
@@ -249,7 +250,7 @@ static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed)
 		 * some wired devices need much more, such as 600ms.
 		 * Add a enough delay to cover all cases.
 		 */
-		msleep(PERST_WAIT_MS);
+		udelay(PERST_WAIT_MS);

You're missing the * MACRO_US here. I'm not sure though that really needs a macro for MS to US, or did someone request that?

Quoted 30 lines
drivers/pci/pcie_dw_rockchip.c +3 -3
 		dm_gpio_set_value(&priv->rst_gpio, 1);
 	}
 
@@ -271,12 +272,12 @@ static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed)
 		dev_info(priv->dw.dev, "PCIe Linking... LTSSM is 0x%x\n",
 			 rk_pcie_readl_apb(priv, PCIE_CLIENT_LTSSM_STATUS));
 		rk_pcie_debug_dump(priv);
-		msleep(1000);
+		udelay(PERST_WAIT_MS * MACRO_US);
 	}
 
 	dev_err(priv->dw.dev, "PCIe-%d Link Fail\n", dev_seq(priv->dw.dev));
 	/* Link maybe in Gen switch recovery but we need to wait more 1s */
-	msleep(1000);
+	udelay(PERST_WAIT_MS * MACRO_US);
 	return -EIO;
 }
 
@@ -296,7 +297,7 @@ static int rockchip_pcie_init_port(struct udevice *dev)
 		}
 	}
 
-	msleep(1000);
+	udelay(PERST_WAIT_MS * MACRO_US);
 
 	ret = generic_phy_init(&priv->phy);
 	if (ret) {
Signature · 1 line
2.31.1
author
#6 lore raw

Re: [PATCHv3 3/3] pci: pcie_dw_rockchip: Replace msleep occurences by udelay

Hi Patrick.

Quoted 27 lines · Patrick Wildt

Am Fri, Jun 04, 2021 at 04:56:07AM +0000 schrieb Anand Moon:

Quoted 25 lines

Replace msleep occurences by udelay.

drivers/pci/pcie_dw_rockchip.c:254:3: warning: implicit
declaration of function 'msleep' [-Wimplicit-function-declaration]

Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

---
V2: drop the msleep macro.

---
 drivers/pci/pcie_dw_rockchip.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/pci/pcie_dw_rockchip.c +1 -0
index 4e448c0a3d..039266a357 100644
@@ -62,6 +62,7 @@ struct rk_pcie {
 
 /* Parameters for the waiting for #perst signal */
 #define PERST_WAIT_MS                        1000
+#define MACRO_US                     1000
 
Quoted 10 lines

drivers/pci/pcie_dw_rockchip.c static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed) · line 253

Quoted 8 lines
drivers/pci/pcie_dw_rockchip.c +1 -1
 static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
 {
@@ -249,7 +250,7 @@ static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed)
               * some wired devices need much more, such as 600ms.
               * Add a enough delay to cover all cases.
               */
-             msleep(PERST_WAIT_MS);
+             udelay(PERST_WAIT_MS);

You're missing the * MACRO_US here. I'm not sure though that really

Thanks, I forgot to update, it got skipped.

Quoted 1 line

needs a macro for MS to US, or did someone request that?

Neil suggested something in my review commend.

Please replace msleep occurences by udelay with either:
- udelay(MACRO_MS * 1000)
- udelay(MACRO_US) and replace MACRO_MS with MACRO_US with values *1000

Opps I miss read the request.

Thanks
-Anand

Reviewed-by on v3 3/3
#7 lore raw

Re: [PATCHv3 3/3] pci: pcie_dw_rockchip: Replace msleep occurences by udelay

In reply to Anand Moon
Quoted 9 lines · Anand Moon

Replace msleep occurences by udelay.

drivers/pci/pcie_dw_rockchip.c:254:3: warning: implicit
declaration of function 'msleep' [-Wimplicit-function-declaration]

Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

Thanks,
- Kever

Quoted 51 lines

---
V2: drop the msleep macro.

---
  drivers/pci/pcie_dw_rockchip.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
drivers/pci/pcie_dw_rockchip.c +5 -4
index 4e448c0a3d..039266a357 100644
@@ -62,6 +62,7 @@ struct rk_pcie {
 
  /* Parameters for the waiting for #perst signal */
  #define PERST_WAIT_MS			1000
+#define MACRO_US			1000
 
  static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
  {
@@ -249,7 +250,7 @@ static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed)
  		 * some wired devices need much more, such as 600ms.
  		 * Add a enough delay to cover all cases.
  		 */
-		msleep(PERST_WAIT_MS);
+		udelay(PERST_WAIT_MS);
  		dm_gpio_set_value(&priv->rst_gpio, 1);
  	}
 
@@ -271,12 +272,12 @@ static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed)
  		dev_info(priv->dw.dev, "PCIe Linking... LTSSM is 0x%x\n",
  			 rk_pcie_readl_apb(priv, PCIE_CLIENT_LTSSM_STATUS));
  		rk_pcie_debug_dump(priv);
-		msleep(1000);
+		udelay(PERST_WAIT_MS * MACRO_US);
  	}
 
  	dev_err(priv->dw.dev, "PCIe-%d Link Fail\n", dev_seq(priv->dw.dev));
  	/* Link maybe in Gen switch recovery but we need to wait more 1s */
-	msleep(1000);
+	udelay(PERST_WAIT_MS * MACRO_US);
  	return -EIO;
  }
 
@@ -296,7 +297,7 @@ static int rockchip_pcie_init_port(struct udevice *dev)
  		}
  	}
 
-	msleep(1000);
+	udelay(PERST_WAIT_MS * MACRO_US);
 
  	ret = generic_phy_init(&priv->phy);
  	if (ret) {
Reviewed-by on v3 1/3
#8 lore raw
In reply to Anand Moon

Am Fri, Jun 04, 2021 at 04:56:05AM +0000 schrieb Anand Moon:

Quoted 52 lines

Use the generic error number instead of specific error number. Changes fix the below error.

drivers/pci/pcie_dw_rockchip.c: In function 'rk_pcie_read':
drivers/pci/pcie_dw_rockchip.c:70:10: error: 'PCIBIOS_UNSUPPORTED'
undeclared (first use in this function)

   70 |   return PCIBIOS_UNSUPPORTED;
      |          ^~~~~~~~~~~~~~~~~~~
drivers/pci/pcie_dw_rockchip.c: In function 'rk_pcie_write':
drivers/pci/pcie_dw_rockchip.c:90:10: error: 'PCIBIOS_UNSUPPORTED'
                        undeclared (first use in this function)
   90 |   return PCIBIOS_UNSUPPORTED;
      |          ^~~~~~~~~~~~~~~~~~~
Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

---
v1: Drop the PCI ERROR MACRO,
v2: added the Neil review tag.
---

---
 drivers/pci/pcie_dw_rockchip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pcie_dw_rockchip.c +2 -2
index bc22af4230..3ac2434b69 100644
@@ -67,7 +67,7 @@ static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
 {
 	if ((uintptr_t)addr & (size - 1)) {
 		*val = 0;
-		return PCIBIOS_UNSUPPORTED;
+		return -EOPNOTSUPP;
 	}
 
 	if (size == 4) {
@@ -87,7 +87,7 @@ static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
 static int rk_pcie_write(void __iomem *addr, int size, u32 val)
 {
 	if ((uintptr_t)addr & (size - 1))
-		return PCIBIOS_UNSUPPORTED;
+		return -EOPNOTSUPP;
 
 	if (size == 4)
 		writel(val, addr);
Signature · 1 line
2.31.1
Reviewed-by on v3 1/3
#9 lore raw
In reply to Anand Moon
Quoted 14 lines · Anand Moon

Use the generic error number instead of specific error number. Changes fix the below error.

drivers/pci/pcie_dw_rockchip.c: In function 'rk_pcie_read':
drivers/pci/pcie_dw_rockchip.c:70:10: error: 'PCIBIOS_UNSUPPORTED'

                         undeclared (first use in this function)
    70 |   return PCIBIOS_UNSUPPORTED;
       |          ^~~~~~~~~~~~~~~~~~~
drivers/pci/pcie_dw_rockchip.c: In function 'rk_pcie_write':
drivers/pci/pcie_dw_rockchip.c:90:10: error: 'PCIBIOS_UNSUPPORTED'
                         undeclared (first use in this function)
    90 |   return PCIBIOS_UNSUPPORTED;
       |          ^~~~~~~~~~~~~~~~~~~
Quoted 5 lines
Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

Thanks,
- Kever

Quoted 30 lines

---
v1: Drop the PCI ERROR MACRO,
v2: added the Neil review tag.
---

---
  drivers/pci/pcie_dw_rockchip.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pcie_dw_rockchip.c +2 -2
index bc22af4230..3ac2434b69 100644
@@ -67,7 +67,7 @@ static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
  {
  	if ((uintptr_t)addr & (size - 1)) {
  		*val = 0;
-		return PCIBIOS_UNSUPPORTED;
+		return -EOPNOTSUPP;
  	}
 
  	if (size == 4) {
@@ -87,7 +87,7 @@ static int rk_pcie_read(void __iomem *addr, int size, u32 *val)
  static int rk_pcie_write(void __iomem *addr, int size, u32 val)
  {
  	if ((uintptr_t)addr & (size - 1))
-		return PCIBIOS_UNSUPPORTED;
+		return -EOPNOTSUPP;
 
  	if (size == 4)
  		writel(val, addr);