| Message ID | 61af7f05bb92da3220ed5799dfa5bb84e102f067.1495814872.git.jan.kiszka@siemens.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, May 26, 2017 at 7:07 PM, Jan Kiszka <jan.kiszka@siemens.com> wrote: > Move the special case for the early Galileo firmware into > quark_default_setup. This allows to use stmmac_pci_find_phy_addr for > non-quark cases. > ret = stmmac_pci_find_phy_addr(pdev, info); > - if (ret < 0) > - return ret; > + if (ret < 0) { > + /* > + * Galileo boards with old firmware don't support DMI. We always > + * use 1 here as PHY address, so at least the first found MAC > + * controller would be probed. > + */ > + if (!dmi_get_system_info(DMI_BOARD_NAME)) > + ret = 1; > + else > + return ret; Perhaps /* Return error to the caller on DMI enabled boards */ if (dmi_...) return ret; /* * Comment goes here, I suppose. */ ret = 1; > + }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index 9aca14f8b55e..1a89fa9ee39d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -51,12 +51,8 @@ static int stmmac_pci_find_phy_addr(struct pci_dev *pdev, unsigned int func = PCI_FUNC(pdev->devfn); struct stmmac_pci_dmi_data *dmi; - /* - * Galileo boards with old firmware don't support DMI. We always return - * 1 here, so at least first found MAC controller would be probed. - */ if (!name) - return 1; + return -ENODEV; for (dmi = info->dmi; dmi->name && *dmi->name; dmi++) { if (!strcmp(dmi->name, name) && dmi->func == func) { @@ -136,8 +132,17 @@ static int quark_default_data(struct pci_dev *pdev, * does not connect to any PHY interface. */ ret = stmmac_pci_find_phy_addr(pdev, info); - if (ret < 0) - return ret; + if (ret < 0) { + /* + * Galileo boards with old firmware don't support DMI. We always + * use 1 here as PHY address, so at least the first found MAC + * controller would be probed. + */ + if (!dmi_get_system_info(DMI_BOARD_NAME)) + ret = 1; + else + return ret; + } plat->bus_id = PCI_DEVID(pdev->bus->number, pdev->devfn); plat->phy_addr = ret;
Move the special case for the early Galileo firmware into quark_default_setup. This allows to use stmmac_pci_find_phy_addr for non-quark cases. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)