stmmac: pci: introduce Intel Quark X1000 runtime detection

This patch introduces run-time board detection through DMI and MAC-PHY
configuration function used by quark_default_data() during initialization. It
fills up the phy_addr for Galileo and Galileo Gen2 boards to indicate that the
Ethernet MAC controller is or is not connected to any PHY.

The implementation takes into consideration for future expansion in Quark
series boards that may have different PHY address that is linked to its MAC
controllers.

This piece of work is derived from Bryan O'Donoghue's initial work for Quark
X1000 enabling.

Signed-off-by: Kweh, Hock Leong <hock.leong.kweh@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index a316187967eaf053df248dcae4fd2f5a488f23c9..50f3c50852fb49654c322f94962ff02a8625a33e 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -24,14 +24,50 @@
 *******************************************************************************/
 
 #include <linux/pci.h>
+#include <linux/dmi.h>
+
 #include "stmmac.h"
 
+/*
+ * This struct is used to associate PCI Function of MAC controller on a board,
+ * discovered via DMI, with the address of PHY connected to the MAC. The
+ * negative value of the address means that MAC controller is not connected
+ * with PHY.
+ */
+struct stmmac_pci_dmi_data {
+       const char *name;
+       unsigned int func;
+       int phy_addr;
+};
+
 struct stmmac_pci_info {
        struct pci_dev *pdev;
        int (*setup)(struct plat_stmmacenet_data *plat,
                     struct stmmac_pci_info *info);
+       struct stmmac_pci_dmi_data *dmi;
 };
 
+static int stmmac_pci_find_phy_addr(struct stmmac_pci_info *info)
+{
+       const char *name = dmi_get_system_info(DMI_BOARD_NAME);
+       unsigned int func = PCI_FUNC(info->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;
+
+       for (dmi = info->dmi; dmi->name && *dmi->name; dmi++) {
+               if (!strcmp(dmi->name, name) && dmi->func == func)
+                       return dmi->phy_addr;
+       }
+
+       return -ENODEV;
+}
+
 static void stmmac_default_data(struct plat_stmmacenet_data *plat)
 {
        plat->bus_id = 1;
@@ -58,9 +94,18 @@ static int quark_default_data(struct plat_stmmacenet_data *plat,
                              struct stmmac_pci_info *info)
 {
        struct pci_dev *pdev = info->pdev;
+       int ret;
+
+       /*
+        * Refuse to load the driver and register net device if MAC controller
+        * does not connect to any PHY interface.
+        */
+       ret = stmmac_pci_find_phy_addr(info);
+       if (ret < 0)
+               return ret;
 
        plat->bus_id = PCI_DEVID(pdev->bus->number, pdev->devfn);
-       plat->phy_addr = 1;
+       plat->phy_addr = ret;
        plat->interface = PHY_INTERFACE_MODE_RMII;
        plat->clk_csr = 2;
        plat->has_gmac = 1;
@@ -82,8 +127,23 @@ static int quark_default_data(struct plat_stmmacenet_data *plat,
        return 0;
 }
 
+static struct stmmac_pci_dmi_data quark_pci_dmi_data[] = {
+       {
+               .name = "Galileo",
+               .func = 6,
+               .phy_addr = 1,
+       },
+       {
+               .name = "GalileoGen2",
+               .func = 6,
+               .phy_addr = 1,
+       },
+       {}
+};
+
 static struct stmmac_pci_info quark_pci_info = {
        .setup = quark_default_data,
+       .dmi = quark_pci_dmi_data,
 };
 
 /**