Skip to contentSkip to conversation

pci: pcie_dw_rockchip: Fixed the below compilation error

PATCH Superseded Anand Moon 2 participants 6 messages May 21, 2021 – May 31, 2021

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Anand Moon

author
#0 lore raw

PATCH v2 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,

---
 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 v2 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]>
---
 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
author
#3 lore raw

PATCH v2 3/3 pci: pcie_dw_rockchip: Use mleep macro to fix below error

In reply to Anand Moon

Define msleep macro to fix below error.

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]>

---
v1: drop the udelay changes.

---
 drivers/pci/pcie_dw_rockchip.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/pcie_dw_rockchip.c +1 -0
index 4e448c0a3d..bdc4d51007 100644
@@ -60,6 +60,7 @@ struct rk_pcie {
 #define PCIE_CLIENT_DBG_TRANSITION_DATA	0xffff0000
 #define PCIE_CLIENT_DBF_EN		0xffff0003
 
+#define msleep(a) udelay((a) * 1000)
 /* Parameters for the waiting for #perst signal */
 #define PERST_WAIT_MS			1000
 
Signature · 1 line
2.31.1
Reviewed-by on v2 1/3
#5 lore raw
In reply to Anand Moon
Quoted 39 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;
      |          ^~~~~~~~~~~~~~~~~~~
Cc Patrick Wildt <[email protected]>
Cc Neil Armstrong <[email protected]>
Cc Kever Yang <[email protected]>

---
v1: Drop the PCI ERROR MACRO,

---
 drivers/pci/pcie_dw_rockchip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pcie_dw_rockchip.c +1 -1
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) {

drivers/pci/pcie_dw_rockchip.c static int rk_pcie_read(void __iomem *addr, int size, u32 *val) · line 93

Quoted 8 lines
drivers/pci/pcie_dw_rockchip.c +1 -1
@@ -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);
Reviewed-by on v2 2/3
#2 lore raw

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

In reply to Anand Moon
Quoted 21 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]>
---
 drivers/pci/pcie_dw_rockchip.c | 2 --
 1 file changed, 2 deletions(-)
drivers/pci/pcie_dw_rockchip.c +0 -0
index 3ac2434b69..4e448c0a3d 100644

drivers/pci/pcie_dw_rockchip.c static inline void rk_pcie_writel_apb(struct rk_pcie *rk_pcie, u32 reg, · line 163

Quoted 8 lines
drivers/pci/pcie_dw_rockchip.c +0 -2
@@ -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,
#4 lore raw

Re: [PATCHv2 3/3] pci: pcie_dw_rockchip: Use mleep macro to fix below error

In reply to Anand Moon
Quoted 21 lines · Anand Moon

Define msleep macro to fix below error.

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]>

---
v1: drop the udelay changes.

---
 drivers/pci/pcie_dw_rockchip.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/pcie_dw_rockchip.c +0 -0
index 4e448c0a3d..bdc4d51007 100644

drivers/pci/pcie_dw_rockchip.c struct rk_pcie { · line 66

Quoted 7 lines
drivers/pci/pcie_dw_rockchip.c +1 -0
@@ -60,6 +60,7 @@ struct rk_pcie {
 #define PCIE_CLIENT_DBG_TRANSITION_DATA	0xffff0000
 #define PCIE_CLIENT_DBF_EN		0xffff0003
 
+#define msleep(a) udelay((a) * 1000)
 /* Parameters for the waiting for #perst signal */
 #define PERST_WAIT_MS			1000
 

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

Neil