From patchwork Tue May 30 07:33:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 768424 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wcQNh5Qgpz9s0m for ; Tue, 30 May 2017 17:34:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751120AbdE3Hdi (ORCPT ); Tue, 30 May 2017 03:33:38 -0400 Received: from goliath.siemens.de ([192.35.17.28]:43374 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750839AbdE3Hdc (ORCPT ); Tue, 30 May 2017 03:33:32 -0400 Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v4U7XRAO016548 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 May 2017 09:33:27 +0200 Received: from md1f2u6c.ww002.siemens.net ([146.254.78.6]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v4U7XQcN020697; Tue, 30 May 2017 09:33:27 +0200 From: Jan Kiszka To: Giuseppe Cavallaro , Alexandre Torgue , David Miller Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v3 3/6] stmmac: pci: Make stmmac_pci_find_phy_addr truly generic Date: Tue, 30 May 2017 09:33:22 +0200 Message-Id: X-Mailer: git-send-email 2.12.3 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index d3d74e526e17..f44ae49eb11c 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,18 @@ 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) { + /* Return error to the caller on DMI enabled boards. */ + if (dmi_get_system_info(DMI_BOARD_NAME)) + return ret; + + /* + * 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. + */ + ret = 1; + } plat->bus_id = PCI_DEVID(pdev->bus->number, pdev->devfn); plat->phy_addr = ret;