ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-03-10 22:44:04 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

lantiq: ifxmips_pcie: use dev_err_probe

Browse Source 
Use dev_err_probe() to get rid of the following warning which is
seen when the PCIe PHY has not been probed yet:
pcie-xrx200 1d900000.pcie: failed to get the PCIe PHY

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
This commit is contained in:
Martin Schiller 2024-04-10 13:48:50 +02:00
parent 783c3aace2
commit 284f12bfa6
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/linux/lantiq/patches-5.15/0151-lantiq-ifxmips_pcie-use-of.patch
View File

@ -151,7 +151,7 @@ Signed-off-by: Eddi De Pieri <eddi@depieri.net>
} }
if (i >= IFX_PCIE_PHY_LOOP_CNT) { if (i >= IFX_PCIE_PHY_LOOP_CNT) {
printk(KERN_ERR "%s link up failed!!!!!\n", __func__); printk(KERN_ERR "%s link up failed!!!!!\n", __func__);
@@ -1045,17 +1088,74 @@ pcie_rc_initialize(int pcie_port) @@ -1045,17 +1088,73 @@ pcie_rc_initialize(int pcie_port)
return 0; return 0;
} }
@ -193,10 +193,9 @@ Signed-off-by: Eddi De Pieri <eddi@depieri.net>
- -
+ +
+ ltq_pcie_phy = devm_phy_get(&pdev->dev, "pcie"); + ltq_pcie_phy = devm_phy_get(&pdev->dev, "pcie");
+ if (IS_ERR(ltq_pcie_phy)) { + if (IS_ERR(ltq_pcie_phy))
+ dev_err(&pdev->dev, "failed to get the PCIe PHY\n"); + return dev_err_probe(&pdev->dev, PTR_ERR(ltq_pcie_phy),
+ return PTR_ERR(ltq_pcie_phy); + "failed to get the PCIe PHY\n");
+ }
+ +
+ ltq_pcie_reset = devm_reset_control_get_shared(&pdev->dev, NULL); + ltq_pcie_reset = devm_reset_control_get_shared(&pdev->dev, NULL);
+ if (IS_ERR(ltq_pcie_reset)) { + if (IS_ERR(ltq_pcie_reset)) {
@ -228,7 +227,7 @@ Signed-off-by: Eddi De Pieri <eddi@depieri.net>
for (pcie_port = startup_port; pcie_port < IFX_PCIE_CORE_NR; pcie_port++){ for (pcie_port = startup_port; pcie_port < IFX_PCIE_CORE_NR; pcie_port++){
if (pcie_rc_initialize(pcie_port) == 0) { if (pcie_rc_initialize(pcie_port) == 0) {
IFX_PCIE_PRINT(PCIE_MSG_INIT, "%s: ifx_pcie_cfg_base 0x%p\n", IFX_PCIE_PRINT(PCIE_MSG_INIT, "%s: ifx_pcie_cfg_base 0x%p\n",
@@ -1067,6 +1167,7 @@ static int __init ifx_pcie_bios_init(voi @@ -1067,6 +1166,7 @@ static int __init ifx_pcie_bios_init(voi
return -ENOMEM; return -ENOMEM;
} }
ifx_pcie_controller[pcie_port].pcic.io_map_base = (unsigned long)io_map_base; ifx_pcie_controller[pcie_port].pcic.io_map_base = (unsigned long)io_map_base;
@ -236,7 +235,7 @@ Signed-off-by: Eddi De Pieri <eddi@depieri.net>
register_pci_controller(&ifx_pcie_controller[pcie_port].pcic); register_pci_controller(&ifx_pcie_controller[pcie_port].pcic);
/* XXX, clear error status */ /* XXX, clear error status */
@@ -1083,6 +1184,30 @@ static int __init ifx_pcie_bios_init(voi @@ -1083,6 +1183,30 @@ static int __init ifx_pcie_bios_init(voi
return 0; return 0;
} }

13
target/linux/lantiq/patches-6.1/0151-lantiq-ifxmips_pcie-use-of.patch
View File

@ -151,7 +151,7 @@ Signed-off-by: Eddi De Pieri <eddi@depieri.net>
} }
if (i >= IFX_PCIE_PHY_LOOP_CNT) { if (i >= IFX_PCIE_PHY_LOOP_CNT) {
printk(KERN_ERR "%s link up failed!!!!!\n", __func__); printk(KERN_ERR "%s link up failed!!!!!\n", __func__);
@@ -1045,17 +1088,74 @@ pcie_rc_initialize(int pcie_port) @@ -1045,17 +1088,73 @@ pcie_rc_initialize(int pcie_port)
return 0; return 0;
} }
@ -193,10 +193,9 @@ Signed-off-by: Eddi De Pieri <eddi@depieri.net>
- -
+ +
+ ltq_pcie_phy = devm_phy_get(&pdev->dev, "pcie"); + ltq_pcie_phy = devm_phy_get(&pdev->dev, "pcie");
+ if (IS_ERR(ltq_pcie_phy)) { + if (IS_ERR(ltq_pcie_phy))
+ dev_err(&pdev->dev, "failed to get the PCIe PHY\n"); + return dev_err_probe(&pdev->dev, PTR_ERR(ltq_pcie_phy),
+ return PTR_ERR(ltq_pcie_phy); + "failed to get the PCIe PHY\n");
+ }
+ +
+ ltq_pcie_reset = devm_reset_control_get_shared(&pdev->dev, NULL); + ltq_pcie_reset = devm_reset_control_get_shared(&pdev->dev, NULL);
+ if (IS_ERR(ltq_pcie_reset)) { + if (IS_ERR(ltq_pcie_reset)) {
@ -228,7 +227,7 @@ Signed-off-by: Eddi De Pieri <eddi@depieri.net>
for (pcie_port = startup_port; pcie_port < IFX_PCIE_CORE_NR; pcie_port++){ for (pcie_port = startup_port; pcie_port < IFX_PCIE_CORE_NR; pcie_port++){
if (pcie_rc_initialize(pcie_port) == 0) { if (pcie_rc_initialize(pcie_port) == 0) {
IFX_PCIE_PRINT(PCIE_MSG_INIT, "%s: ifx_pcie_cfg_base 0x%p\n", IFX_PCIE_PRINT(PCIE_MSG_INIT, "%s: ifx_pcie_cfg_base 0x%p\n",
@@ -1067,6 +1167,7 @@ static int __init ifx_pcie_bios_init(voi @@ -1067,6 +1166,7 @@ static int __init ifx_pcie_bios_init(voi
return -ENOMEM; return -ENOMEM;
} }
ifx_pcie_controller[pcie_port].pcic.io_map_base = (unsigned long)io_map_base; ifx_pcie_controller[pcie_port].pcic.io_map_base = (unsigned long)io_map_base;
@ -236,7 +235,7 @@ Signed-off-by: Eddi De Pieri <eddi@depieri.net>
register_pci_controller(&ifx_pcie_controller[pcie_port].pcic); register_pci_controller(&ifx_pcie_controller[pcie_port].pcic);
/* XXX, clear error status */ /* XXX, clear error status */
@@ -1083,6 +1184,30 @@ static int __init ifx_pcie_bios_init(voi @@ -1083,6 +1183,30 @@ static int __init ifx_pcie_bios_init(voi
return 0; return 0;
} }