[PATCHv2 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 patrick@blueri.se Cc: Neil Armstrong narmstrong@baylibre.com Cc: Kever Yang kever.yang@rock-chips.com Signed-off-by: Anand Moon linux.amoon@gmail.com --- v1: Drop the PCI ERROR MACRO, --- drivers/pci/pcie_dw_rockchip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index bc22af4230..3ac2434b69 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -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);
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 patrick@blueri.se Cc: Neil Armstrong narmstrong@baylibre.com Cc: Kever Yang kever.yang@rock-chips.com Signed-off-by: Anand Moon linux.amoon@gmail.com --- drivers/pci/pcie_dw_rockchip.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index 3ac2434b69..4e448c0a3d 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -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,
On 21/05/2021 18:59, Anand Moon wrote:
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 patrick@blueri.se Cc: Neil Armstrong narmstrong@baylibre.com Cc: Kever Yang kever.yang@rock-chips.com Signed-off-by: Anand Moon linux.amoon@gmail.com
drivers/pci/pcie_dw_rockchip.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index 3ac2434b69..4e448c0a3d 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -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,
Reviewed-by: Neil Armstrong narmstrong@baylibre.com
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 patrick@blueri.se Cc: Neil Armstrong narmstrong@baylibre.com Cc: Kever Yang kever.yang@rock-chips.com Signed-off-by: Anand Moon linux.amoon@gmail.com --- v1: drop the udelay changes. --- drivers/pci/pcie_dw_rockchip.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index 4e448c0a3d..bdc4d51007 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -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
On 21/05/2021 18:59, Anand Moon wrote:
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 patrick@blueri.se Cc: Neil Armstrong narmstrong@baylibre.com Cc: Kever Yang kever.yang@rock-chips.com Signed-off-by: Anand Moon linux.amoon@gmail.com
v1: drop the udelay changes.
drivers/pci/pcie_dw_rockchip.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index 4e448c0a3d..bdc4d51007 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -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
On 21/05/2021 18:59, Anand Moon wrote:
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 patrick@blueri.se Cc: Neil Armstrong narmstrong@baylibre.com Cc: Kever Yang kever.yang@rock-chips.com Signed-off-by: Anand Moon linux.amoon@gmail.com
v1: Drop the PCI ERROR MACRO,
drivers/pci/pcie_dw_rockchip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index bc22af4230..3ac2434b69 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -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);
Reviewed-by: Neil Armstrong narmstrong@baylibre.com
participants (2)
-
Anand Moon -
Neil Armstrong