Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 07:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: dw_eth_qos: Add missing \n in error messages.

Browse source 
Missing line-feeds in error messages lead to output like:

    phy_startup() failed: -110FAILED: -110=>

Output like the following is much easier to read:

    phy_startup() failed: -110
    FAILED: -110
    =>

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2024-04-02 10:39:34 +02:00 • committed by Tom Rini
parent 0ceb1f4cb7
commit f12001b131
1 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
drivers/net/dwc_eth_qos.c
View file

@ -159,7 +159,7 @@ static int eqos_mdio_read(struct mii_dev *bus, int mdio_addr, int mdio_devad,
ret = eqos_mdio_wait_idle(eqos); ret = eqos_mdio_wait_idle(eqos);
if (ret) { if (ret) {
pr_err("MDIO not idle at entry"); pr_err("MDIO not idle at entry\n");
return ret; return ret;
} }
@ -179,7 +179,7 @@ static int eqos_mdio_read(struct mii_dev *bus, int mdio_addr, int mdio_devad,
ret = eqos_mdio_wait_idle(eqos); ret = eqos_mdio_wait_idle(eqos);
if (ret) { if (ret) {
pr_err("MDIO read didn't complete"); pr_err("MDIO read didn't complete\n");
return ret; return ret;
} }
@ -203,7 +203,7 @@ static int eqos_mdio_write(struct mii_dev *bus, int mdio_addr, int mdio_devad,
ret = eqos_mdio_wait_idle(eqos); ret = eqos_mdio_wait_idle(eqos);
if (ret) { if (ret) {
pr_err("MDIO not idle at entry"); pr_err("MDIO not idle at entry\n");
return ret; return ret;
} }
@ -225,7 +225,7 @@ static int eqos_mdio_write(struct mii_dev *bus, int mdio_addr, int mdio_devad,
ret = eqos_mdio_wait_idle(eqos); ret = eqos_mdio_wait_idle(eqos);
if (ret) { if (ret) {
pr_err("MDIO read didn't complete"); pr_err("MDIO read didn't complete\n");
return ret; return ret;
} }
@ -242,37 +242,37 @@ static int eqos_start_clks_tegra186(struct udevice *dev)
ret = clk_enable(&eqos->clk_slave_bus); ret = clk_enable(&eqos->clk_slave_bus);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_slave_bus) failed: %d", ret); pr_err("clk_enable(clk_slave_bus) failed: %d\n", ret);
goto err; goto err;
} }
ret = clk_enable(&eqos->clk_master_bus); ret = clk_enable(&eqos->clk_master_bus);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_master_bus) failed: %d", ret); pr_err("clk_enable(clk_master_bus) failed: %d\n", ret);
goto err_disable_clk_slave_bus; goto err_disable_clk_slave_bus;
} }
ret = clk_enable(&eqos->clk_rx); ret = clk_enable(&eqos->clk_rx);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_rx) failed: %d", ret); pr_err("clk_enable(clk_rx) failed: %d\n", ret);
goto err_disable_clk_master_bus; goto err_disable_clk_master_bus;
} }
ret = clk_enable(&eqos->clk_ptp_ref); ret = clk_enable(&eqos->clk_ptp_ref);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_ptp_ref) failed: %d", ret); pr_err("clk_enable(clk_ptp_ref) failed: %d\n", ret);
goto err_disable_clk_rx; goto err_disable_clk_rx;
} }
ret = clk_set_rate(&eqos->clk_ptp_ref, 125 * 1000 * 1000); ret = clk_set_rate(&eqos->clk_ptp_ref, 125 * 1000 * 1000);
if (ret < 0) { if (ret < 0) {
pr_err("clk_set_rate(clk_ptp_ref) failed: %d", ret); pr_err("clk_set_rate(clk_ptp_ref) failed: %d\n", ret);
goto err_disable_clk_ptp_ref; goto err_disable_clk_ptp_ref;
} }
ret = clk_enable(&eqos->clk_tx); ret = clk_enable(&eqos->clk_tx);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_tx) failed: %d", ret); pr_err("clk_enable(clk_tx) failed: %d\n", ret);
goto err_disable_clk_ptp_ref; goto err_disable_clk_ptp_ref;
} }
#endif #endif
@ -305,26 +305,26 @@ static int eqos_start_clks_stm32(struct udevice *dev)
ret = clk_enable(&eqos->clk_master_bus); ret = clk_enable(&eqos->clk_master_bus);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_master_bus) failed: %d", ret); pr_err("clk_enable(clk_master_bus) failed: %d\n", ret);
goto err; goto err;
} }
ret = clk_enable(&eqos->clk_rx); ret = clk_enable(&eqos->clk_rx);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_rx) failed: %d", ret); pr_err("clk_enable(clk_rx) failed: %d\n", ret);
goto err_disable_clk_master_bus; goto err_disable_clk_master_bus;
} }
ret = clk_enable(&eqos->clk_tx); ret = clk_enable(&eqos->clk_tx);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_tx) failed: %d", ret); pr_err("clk_enable(clk_tx) failed: %d\n", ret);
goto err_disable_clk_rx; goto err_disable_clk_rx;
} }
if (clk_valid(&eqos->clk_ck) && !eqos->clk_ck_enabled) { if (clk_valid(&eqos->clk_ck) && !eqos->clk_ck_enabled) {
ret = clk_enable(&eqos->clk_ck); ret = clk_enable(&eqos->clk_ck);
if (ret < 0) { if (ret < 0) {
pr_err("clk_enable(clk_ck) failed: %d", ret); pr_err("clk_enable(clk_ck) failed: %d\n", ret);
goto err_disable_clk_tx; goto err_disable_clk_tx;
} }
eqos->clk_ck_enabled = true; eqos->clk_ck_enabled = true;
@ -390,7 +390,7 @@ static int eqos_start_resets_tegra186(struct udevice *dev)
ret = dm_gpio_set_value(&eqos->phy_reset_gpio, 1); ret = dm_gpio_set_value(&eqos->phy_reset_gpio, 1);
if (ret < 0) { if (ret < 0) {
pr_err("dm_gpio_set_value(phy_reset, assert) failed: %d", ret); pr_err("dm_gpio_set_value(phy_reset, assert) failed: %d\n", ret);
return ret; return ret;
} }
@ -398,13 +398,13 @@ static int eqos_start_resets_tegra186(struct udevice *dev)
ret = dm_gpio_set_value(&eqos->phy_reset_gpio, 0); ret = dm_gpio_set_value(&eqos->phy_reset_gpio, 0);
if (ret < 0) { if (ret < 0) {
pr_err("dm_gpio_set_value(phy_reset, deassert) failed: %d", ret); pr_err("dm_gpio_set_value(phy_reset, deassert) failed: %d\n", ret);
return ret; return ret;
} }
ret = reset_assert(&eqos->reset_ctl); ret = reset_assert(&eqos->reset_ctl);
if (ret < 0) { if (ret < 0) {
pr_err("reset_assert() failed: %d", ret); pr_err("reset_assert() failed: %d\n", ret);
return ret; return ret;
} }
@ -412,7 +412,7 @@ static int eqos_start_resets_tegra186(struct udevice *dev)
ret = reset_deassert(&eqos->reset_ctl); ret = reset_deassert(&eqos->reset_ctl);
if (ret < 0) { if (ret < 0) {
pr_err("reset_deassert() failed: %d", ret); pr_err("reset_deassert() failed: %d\n", ret);
return ret; return ret;
} }
@ -448,14 +448,14 @@ static int eqos_calibrate_pads_tegra186(struct udevice *dev)
ret = wait_for_bit_le32(&eqos->tegra186_regs->auto_cal_status, ret = wait_for_bit_le32(&eqos->tegra186_regs->auto_cal_status,
EQOS_AUTO_CAL_STATUS_ACTIVE, true, 10, false); EQOS_AUTO_CAL_STATUS_ACTIVE, true, 10, false);
if (ret) { if (ret) {
pr_err("calibrate didn't start"); pr_err("calibrate didn't start\n");
goto failed; goto failed;
} }
ret = wait_for_bit_le32(&eqos->tegra186_regs->auto_cal_status, ret = wait_for_bit_le32(&eqos->tegra186_regs->auto_cal_status,
EQOS_AUTO_CAL_STATUS_ACTIVE, false, 10, false); EQOS_AUTO_CAL_STATUS_ACTIVE, false, 10, false);
if (ret) { if (ret) {
pr_err("calibrate didn't finish"); pr_err("calibrate didn't finish\n");
goto failed; goto failed;
} }
@ -586,13 +586,13 @@ static int eqos_set_tx_clk_speed_tegra186(struct udevice *dev)
rate = 2.5 * 1000 * 1000; rate = 2.5 * 1000 * 1000;
break; break;
default: default:
pr_err("invalid speed %d", eqos->phy->speed); pr_err("invalid speed %d\n", eqos->phy->speed);
return -EINVAL; return -EINVAL;
} }
ret = clk_set_rate(&eqos->clk_tx, rate); ret = clk_set_rate(&eqos->clk_tx, rate);
if (ret < 0) { if (ret < 0) {
pr_err("clk_set_rate(tx_clk, %lu) failed: %d", rate, ret); pr_err("clk_set_rate(tx_clk, %lu) failed: %d\n", rate, ret);
return ret; return ret;
} }
#endif #endif
@ -613,7 +613,7 @@ static int eqos_adjust_link(struct udevice *dev)
else else
ret = eqos_set_half_duplex(dev); ret = eqos_set_half_duplex(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_set_*_duplex() failed: %d", ret); pr_err("eqos_set_*_duplex() failed: %d\n", ret);
return ret; return ret;
} }
@ -631,32 +631,32 @@ static int eqos_adjust_link(struct udevice *dev)
ret = eqos_set_mii_speed_10(dev); ret = eqos_set_mii_speed_10(dev);
break; break;
default: default:
pr_err("invalid speed %d", eqos->phy->speed); pr_err("invalid speed %d\n", eqos->phy->speed);
return -EINVAL; return -EINVAL;
} }
if (ret < 0) { if (ret < 0) {
pr_err("eqos_set_*mii_speed*() failed: %d", ret); pr_err("eqos_set_*mii_speed*() failed: %d\n", ret);
return ret; return ret;
} }
if (en_calibration) { if (en_calibration) {
ret = eqos->config->ops->eqos_calibrate_pads(dev); ret = eqos->config->ops->eqos_calibrate_pads(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_calibrate_pads() failed: %d", pr_err("eqos_calibrate_pads() failed: %d\n",
ret); ret);
return ret; return ret;
} }
} else { } else {
ret = eqos->config->ops->eqos_disable_calibration(dev); ret = eqos->config->ops->eqos_disable_calibration(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_disable_calibration() failed: %d", pr_err("eqos_disable_calibration() failed: %d\n",
ret); ret);
return ret; return ret;
} }
} }
ret = eqos->config->ops->eqos_set_tx_clk_speed(dev); ret = eqos->config->ops->eqos_set_tx_clk_speed(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_set_tx_clk_speed() failed: %d", ret); pr_err("eqos_set_tx_clk_speed() failed: %d\n", ret);
return ret; return ret;
} }
@ -755,7 +755,7 @@ static int eqos_start(struct udevice *dev)
ret = eqos->config->ops->eqos_start_resets(dev); ret = eqos->config->ops->eqos_start_resets(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_start_resets() failed: %d", ret); pr_err("eqos_start_resets() failed: %d\n", ret);
goto err; goto err;
} }
@ -773,13 +773,13 @@ static int eqos_start(struct udevice *dev)
EQOS_DMA_MODE_SWR, false, EQOS_DMA_MODE_SWR, false,
eqos->config->swr_wait, false); eqos->config->swr_wait, false);
if (ret) { if (ret) {
pr_err("EQOS_DMA_MODE_SWR stuck"); pr_err("EQOS_DMA_MODE_SWR stuck\n");
goto err_stop_resets; goto err_stop_resets;
} }
ret = eqos->config->ops->eqos_calibrate_pads(dev); ret = eqos->config->ops->eqos_calibrate_pads(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_calibrate_pads() failed: %d", ret); pr_err("eqos_calibrate_pads() failed: %d\n", ret);
goto err_stop_resets; goto err_stop_resets;
} }
@ -812,7 +812,7 @@ static int eqos_start(struct udevice *dev)
} }
if (!eqos->phy) { if (!eqos->phy) {
pr_err("phy_connect() failed"); pr_err("phy_connect() failed\n");
ret = -ENODEV; ret = -ENODEV;
goto err_stop_resets; goto err_stop_resets;
} }
@ -820,7 +820,7 @@ static int eqos_start(struct udevice *dev)
if (eqos->max_speed) { if (eqos->max_speed) {
ret = phy_set_supported(eqos->phy, eqos->max_speed); ret = phy_set_supported(eqos->phy, eqos->max_speed);
if (ret) { if (ret) {
pr_err("phy_set_supported() failed: %d", ret); pr_err("phy_set_supported() failed: %d\n", ret);
goto err_shutdown_phy; goto err_shutdown_phy;
} }
} }
@ -828,26 +828,26 @@ static int eqos_start(struct udevice *dev)
eqos->phy->node = eqos->phy_of_node; eqos->phy->node = eqos->phy_of_node;
ret = phy_config(eqos->phy); ret = phy_config(eqos->phy);
if (ret < 0) { if (ret < 0) {
pr_err("phy_config() failed: %d", ret); pr_err("phy_config() failed: %d\n", ret);
goto err_shutdown_phy; goto err_shutdown_phy;
} }
} }
ret = phy_startup(eqos->phy); ret = phy_startup(eqos->phy);
if (ret < 0) { if (ret < 0) {
pr_err("phy_startup() failed: %d", ret); pr_err("phy_startup() failed: %d\n", ret);
goto err_shutdown_phy; goto err_shutdown_phy;
} }
if (!eqos->phy->link) { if (!eqos->phy->link) {
pr_err("No link"); pr_err("No link\n");
ret = -EAGAIN; ret = -EAGAIN;
goto err_shutdown_phy; goto err_shutdown_phy;
} }
ret = eqos_adjust_link(dev); ret = eqos_adjust_link(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_adjust_link() failed: %d", ret); pr_err("eqos_adjust_link() failed: %d\n", ret);
goto err_shutdown_phy; goto err_shutdown_phy;
} }
@ -1090,7 +1090,7 @@ err_shutdown_phy:
err_stop_resets: err_stop_resets:
eqos->config->ops->eqos_stop_resets(dev); eqos->config->ops->eqos_stop_resets(dev);
err: err:
pr_err("FAILED: %d", ret); pr_err("FAILED: %d\n", ret);
return ret; return ret;
} }
@ -1361,7 +1361,7 @@ static int eqos_probe_resources_tegra186(struct udevice *dev)
ret = reset_get_by_name(dev, "eqos", &eqos->reset_ctl); ret = reset_get_by_name(dev, "eqos", &eqos->reset_ctl);
if (ret) { if (ret) {
pr_err("reset_get_by_name(rst) failed: %d", ret); pr_err("reset_get_by_name(rst) failed: %d\n", ret);
return ret; return ret;
} }
@ -1369,37 +1369,37 @@ static int eqos_probe_resources_tegra186(struct udevice *dev)
&eqos->phy_reset_gpio, &eqos->phy_reset_gpio,
GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE); GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
if (ret) { if (ret) {
pr_err("gpio_request_by_name(phy reset) failed: %d", ret); pr_err("gpio_request_by_name(phy reset) failed: %d\n", ret);
goto err_free_reset_eqos; goto err_free_reset_eqos;
} }
ret = clk_get_by_name(dev, "slave_bus", &eqos->clk_slave_bus); ret = clk_get_by_name(dev, "slave_bus", &eqos->clk_slave_bus);
if (ret) { if (ret) {
pr_err("clk_get_by_name(slave_bus) failed: %d", ret); pr_err("clk_get_by_name(slave_bus) failed: %d\n", ret);
goto err_free_gpio_phy_reset; goto err_free_gpio_phy_reset;
} }
ret = clk_get_by_name(dev, "master_bus", &eqos->clk_master_bus); ret = clk_get_by_name(dev, "master_bus", &eqos->clk_master_bus);
if (ret) { if (ret) {
pr_err("clk_get_by_name(master_bus) failed: %d", ret); pr_err("clk_get_by_name(master_bus) failed: %d\n", ret);
goto err_free_gpio_phy_reset; goto err_free_gpio_phy_reset;
} }
ret = clk_get_by_name(dev, "rx", &eqos->clk_rx); ret = clk_get_by_name(dev, "rx", &eqos->clk_rx);
if (ret) { if (ret) {
pr_err("clk_get_by_name(rx) failed: %d", ret); pr_err("clk_get_by_name(rx) failed: %d\n", ret);
goto err_free_gpio_phy_reset; goto err_free_gpio_phy_reset;
} }
ret = clk_get_by_name(dev, "ptp_ref", &eqos->clk_ptp_ref); ret = clk_get_by_name(dev, "ptp_ref", &eqos->clk_ptp_ref);
if (ret) { if (ret) {
pr_err("clk_get_by_name(ptp_ref) failed: %d", ret); pr_err("clk_get_by_name(ptp_ref) failed: %d\n", ret);
goto err_free_gpio_phy_reset; goto err_free_gpio_phy_reset;
} }
ret = clk_get_by_name(dev, "tx", &eqos->clk_tx); ret = clk_get_by_name(dev, "tx", &eqos->clk_tx);
if (ret) { if (ret) {
pr_err("clk_get_by_name(tx) failed: %d", ret); pr_err("clk_get_by_name(tx) failed: %d\n", ret);
goto err_free_gpio_phy_reset; goto err_free_gpio_phy_reset;
} }
@ -1436,19 +1436,19 @@ static int eqos_probe_resources_stm32(struct udevice *dev)
ret = clk_get_by_name(dev, "stmmaceth", &eqos->clk_master_bus); ret = clk_get_by_name(dev, "stmmaceth", &eqos->clk_master_bus);
if (ret) { if (ret) {
pr_err("clk_get_by_name(master_bus) failed: %d", ret); pr_err("clk_get_by_name(master_bus) failed: %d\n", ret);
goto err_probe; goto err_probe;
} }
ret = clk_get_by_name(dev, "mac-clk-rx", &eqos->clk_rx); ret = clk_get_by_name(dev, "mac-clk-rx", &eqos->clk_rx);
if (ret) { if (ret) {
pr_err("clk_get_by_name(rx) failed: %d", ret); pr_err("clk_get_by_name(rx) failed: %d\n", ret);
goto err_probe; goto err_probe;
} }
ret = clk_get_by_name(dev, "mac-clk-tx", &eqos->clk_tx); ret = clk_get_by_name(dev, "mac-clk-tx", &eqos->clk_tx);
if (ret) { if (ret) {
pr_err("clk_get_by_name(tx) failed: %d", ret); pr_err("clk_get_by_name(tx) failed: %d\n", ret);
goto err_probe; goto err_probe;
} }
@ -1502,7 +1502,7 @@ static int eqos_probe(struct udevice *dev)
eqos->regs = dev_read_addr(dev); eqos->regs = dev_read_addr(dev);
if (eqos->regs == FDT_ADDR_T_NONE) { if (eqos->regs == FDT_ADDR_T_NONE) {
pr_err("dev_read_addr() failed"); pr_err("dev_read_addr() failed\n");
return -ENODEV; return -ENODEV;
} }
eqos->mac_regs = (void *)(eqos->regs + EQOS_MAC_REGS_BASE); eqos->mac_regs = (void *)(eqos->regs + EQOS_MAC_REGS_BASE);
@ -1514,19 +1514,19 @@ static int eqos_probe(struct udevice *dev)
ret = eqos_probe_resources_core(dev); ret = eqos_probe_resources_core(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_probe_resources_core() failed: %d", ret); pr_err("eqos_probe_resources_core() failed: %d\n", ret);
return ret; return ret;
} }
ret = eqos->config->ops->eqos_probe_resources(dev); ret = eqos->config->ops->eqos_probe_resources(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_probe_resources() failed: %d", ret); pr_err("eqos_probe_resources() failed: %d\n", ret);
goto err_remove_resources_core; goto err_remove_resources_core;
} }
ret = eqos->config->ops->eqos_start_clks(dev); ret = eqos->config->ops->eqos_start_clks(dev);
if (ret < 0) { if (ret < 0) {
pr_err("eqos_start_clks() failed: %d", ret); pr_err("eqos_start_clks() failed: %d\n", ret);
goto err_remove_resources_tegra; goto err_remove_resources_tegra;
} }
@ -1536,7 +1536,7 @@ static int eqos_probe(struct udevice *dev)
if (!eqos->mii) { if (!eqos->mii) {
eqos->mii = mdio_alloc(); eqos->mii = mdio_alloc();
if (!eqos->mii) { if (!eqos->mii) {
pr_err("mdio_alloc() failed"); pr_err("mdio_alloc() failed\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_stop_clks; goto err_stop_clks;
} }
@ -1547,7 +1547,7 @@ static int eqos_probe(struct udevice *dev)
ret = mdio_register(eqos->mii); ret = mdio_register(eqos->mii);
if (ret < 0) { if (ret < 0) {
pr_err("mdio_register() failed: %d", ret); pr_err("mdio_register() failed: %d\n", ret);
goto err_free_mdio; goto err_free_mdio;
} }
} }