Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1356102 > unrolled thread

[PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code.

Started byDavid Daney <ddaney.cavm@gmail.com>
First post2016-03-11 19:00 +0100
Last post2016-03-14 21:20 +0100
Articles 10 — 4 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code. David Daney <ddaney.cavm@gmail.com> - 2016-03-11 19:00 +0100
    [PATCH v2 1/3] net: thunderx: Cleanup PHY probing code. David Daney <ddaney.cavm@gmail.com> - 2016-03-11 19:00 +0100
    [PATCH v2 3/3] phy: mdio-thunder:  Add driver for Cavium Thunder SoC MDIO buses. David Daney <ddaney.cavm@gmail.com> - 2016-03-11 19:00 +0100
      Re: [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder  SoC MDIO buses. David Daney <ddaney@caviumnetworks.com> - 2016-03-17 00:00 +0100
        Re: [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder  SoC MDIO buses. Andreas Färber <afaerber@suse.de> - 2016-03-17 00:30 +0100
      Re: [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder  SoC MDIO buses. Andreas Färber <afaerber@suse.de> - 2016-03-17 00:00 +0100
    Re: [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code. David Daney <ddaney@caviumnetworks.com> - 2016-03-12 01:10 +0100
    Re: [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO  code. David Miller <davem@davemloft.net> - 2016-03-14 20:30 +0100
      Re: [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO  code. David Miller <davem@davemloft.net> - 2016-03-14 21:20 +0100
      Re: [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code. David Daney <ddaney@caviumnetworks.com> - 2016-03-14 21:20 +0100

#1356102 — [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code.

FromDavid Daney <ddaney.cavm@gmail.com>
Date2016-03-11 19:00 +0100
Subject[PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code.
Message-ID<rbzvY-1lH-7@gated-at.bofh.it>
From: David Daney <david.daney@cavium.com>

Changes from v1:

 - In 1/3 Add back check for non-OF objects in bgx_init_of_phy().  It
   is probably not necessary, but better safe than sorry...

The firmware on many Cavium Thunder systems configures the MDIO bus
hardware to be probed as a PCI device.  In order to use the MDIO bus
drivers in this configuration, we must add PCI probing to the driver.

There are two parts to this set of three patches:

 1) Cleanup the PHY probing code in thunder_bgx.c to handle the case
    where there is no PHY attached to a port, as well as being more
    robust in the face of driver loading order by use of
    -EPROBE_DEFER.

 2) Split mdio-octeon.c into two drivers, one with platform probing,
 and the other with PCI probing.  Common code is shared between the
 two.

Tested on several different Thunder and OCTEON systems, also compile
tested on x86_64.

David Daney (3):
  net: thunderx: Cleanup PHY probing code.
  phy: mdio-octeon: Refactor into two files/modules
  phy: mdio-thunder:  Add driver for Cavium Thunder SoC MDIO buses.

 .../devicetree/bindings/net/cavium-mdio.txt        |  61 ++++-
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c  |  29 ++-
 drivers/net/phy/Kconfig                            |  22 +-
 drivers/net/phy/Makefile                           |   2 +
 drivers/net/phy/mdio-cavium.c                      | 149 +++++++++++
 drivers/net/phy/mdio-cavium.h                      | 119 +++++++++
 drivers/net/phy/mdio-octeon.c                      | 280 ++-------------------
 drivers/net/phy/mdio-thunder.c                     | 154 ++++++++++++
 8 files changed, 535 insertions(+), 281 deletions(-)
 create mode 100644 drivers/net/phy/mdio-cavium.c
 create mode 100644 drivers/net/phy/mdio-cavium.h
 create mode 100644 drivers/net/phy/mdio-thunder.c

-- 
1.7.11.7

[toc] | [next] | [standalone]


#1356103 — [PATCH v2 1/3] net: thunderx: Cleanup PHY probing code.

FromDavid Daney <ddaney.cavm@gmail.com>
Date2016-03-11 19:00 +0100
Subject[PATCH v2 1/3] net: thunderx: Cleanup PHY probing code.
Message-ID<rbzvY-1lH-17@gated-at.bofh.it>
In reply to#1356102
From: David Daney <david.daney@cavium.com>

Remove the call to force the octeon-mdio driver to be loaded.  Allow
the standard driver loading mechanisms to load the PHY drivers, and
use -EPROBE_DEFER to cause the BGX driver to be probed only after the
PHY drivers are available.

Reorder the setting of MAC addresses and PHY probing to allow BGX
LMACs with no attached PHY to still be assigned a MAC address.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 29 ++++++++++++++---------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index f8abdff..feed231 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -978,27 +978,37 @@ static int bgx_init_of_phy(struct bgx *bgx)
 	const char *mac;
 
 	device_for_each_child_node(&bgx->pdev->dev, fwn) {
+		struct phy_device *pd;
 		struct device_node *phy_np;
 		struct device_node *node = to_of_node(fwn);
 
-		/* If it is not an OF node we cannot handle it yet, so
-		 * exit the loop.
+		/* Should always be an OF node.  But if it is not, we
+		 * cannot handle it, so exit the loop.
 		 */
 		if (!node)
 			break;
 
-		phy_np = of_parse_phandle(node, "phy-handle", 0);
-		if (!phy_np)
-			continue;
-
-		bgx->lmac[lmac].phydev = of_phy_find_device(phy_np);
-
 		mac = of_get_mac_address(node);
 		if (mac)
 			ether_addr_copy(bgx->lmac[lmac].mac, mac);
 
 		SET_NETDEV_DEV(&bgx->lmac[lmac].netdev, &bgx->pdev->dev);
 		bgx->lmac[lmac].lmacid = lmac;
+
+		phy_np = of_parse_phandle(node, "phy-handle", 0);
+		/* If there is no phy or defective firmware presents
+		 * this cortina phy, for which there is no driver
+		 * support, ignore it.
+		 */
+		if (phy_np &&
+		    !of_device_is_compatible(phy_np, "cortina,cs4223-slice")) {
+			/* Wait until the phy drivers are available */
+			pd = of_phy_find_device(phy_np);
+			if (!pd)
+				return -EPROBE_DEFER;
+			bgx->lmac[lmac].phydev = pd;
+		}
+
 		lmac++;
 		if (lmac == MAX_LMAC_PER_BGX) {
 			of_node_put(node);
@@ -1032,9 +1042,6 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct bgx *bgx = NULL;
 	u8 lmac;
 
-	/* Load octeon mdio driver */
-	octeon_mdiobus_force_mod_depencency();
-
 	bgx = devm_kzalloc(dev, sizeof(*bgx), GFP_KERNEL);
 	if (!bgx)
 		return -ENOMEM;
-- 
1.7.11.7

[toc] | [prev] | [next] | [standalone]


#1356104 — [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder SoC MDIO buses.

FromDavid Daney <ddaney.cavm@gmail.com>
Date2016-03-11 19:00 +0100
Subject[PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder SoC MDIO buses.
Message-ID<rbzvY-1lH-19@gated-at.bofh.it>
In reply to#1356102
From: David Daney <david.daney@cavium.com>

The Cavium Thunder SoCs have multiple MIDO buses that are part of a
single PCI device.  To model this in the device tree we call the PCI
parent device a "cavium,thunder-8890-mdio-nexus", it has several
children, one for each MDIO bus.

The MDIO bus hardware is identical to that found in the OCTEON SoCs,
so we use that code for things that are not part of the PCI driver
probe/remove

Signed-off-by: David Daney <david.daney@cavium.com>
---
 .../devicetree/bindings/net/cavium-mdio.txt        |  61 +++++++-
 drivers/net/phy/Kconfig                            |  11 ++
 drivers/net/phy/Makefile                           |   1 +
 drivers/net/phy/mdio-thunder.c                     | 154 +++++++++++++++++++++
 4 files changed, 225 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/phy/mdio-thunder.c

diff --git a/Documentation/devicetree/bindings/net/cavium-mdio.txt b/Documentation/devicetree/bindings/net/cavium-mdio.txt
index 04cb749..020df08 100644
--- a/Documentation/devicetree/bindings/net/cavium-mdio.txt
+++ b/Documentation/devicetree/bindings/net/cavium-mdio.txt
@@ -1,9 +1,12 @@
 * System Management Interface (SMI) / MDIO
 
 Properties:
-- compatible: "cavium,octeon-3860-mdio"
+- compatible: One of:
 
-  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
+   "cavium,octeon-3860-mdio": Compatibility with all cn3XXX, cn5XXX
+                       and cn6XXX SOCs.
+
+   "cavium,thunder-8890-mdio": Compatibility with all cn8XXX SOCs.
 
 - reg: The base address of the MDIO bus controller register bank.
 
@@ -25,3 +28,57 @@ Example:
 			reg = <0>;
 		};
 	};
+
+
+* System Management Interface (SMI) / MDIO Nexus
+
+  Several mdio buses may be gathered as children of a single PCI
+  device, this PCI device is the nexus of the buses.
+
+Properties:
+
+- compatible: "cavium,thunder-8890-mdio-nexus";
+
+- reg: The PCI device and function numbers of the nexus device.
+
+- #address-cells: Must be <2>.
+
+- #size-cells: Must be <2>.
+
+- ranges: As needed for mapping of the MDIO bus device registers.
+
+- assigned-addresses: As needed for mapping of the MDIO bus device registers.
+
+Example:
+
+        mdio-nexus@1,3 {
+                compatible = "cavium,thunder-8890-mdio-nexus";
+                #address-cells = <2>;
+                #size-cells = <2>;
+                reg = <0x0b00 0 0 0 0>; /* DEVFN = 0x0b (1:3) */
+                assigned-addresses = <0x03000000 0x87e0 0x05000000 0x0 0x800000>;
+                ranges = <0x87e0 0x05000000 0x03000000 0x87e0 0x05000000 0x0 0x800000>;
+
+                mdio0@87e0,05003800 {
+                        compatible = "cavium,thunder-8890-mdio";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x87e0 0x05003800 0x0 0x30>;
+
+                        ethernet-phy@0 {
+                                ...
+                                reg = <0>;
+                        };
+                };
+                mdio0@87e0,05003880 {
+                        compatible = "cavium,thunder-8890-mdio";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x87e0 0x05003880 0x0 0x30>;
+
+                        ethernet-phy@0 {
+                                ...
+                                reg = <0>;
+                        };
+                };
+        };
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 40faec9..075a4cc 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -196,6 +196,17 @@ config MDIO_OCTEON
 	  buses. It is required by the Octeon and ThunderX ethernet device
 	  drivers on some systems.
 
+config MDIO_THUNDER
+	tristate "Support for MDIO buses on on ThunderX SOCs"
+	depends on 64BIT
+	depends on PCI
+	select MDIO_CAVIUM
+	help
+	  This driver supports the MDIO interfaces found on Cavium
+	  ThunderX SoCs when the MDIO bus device appears on as a PCI
+	  device.
+
+
 config MDIO_SUN4I
 	tristate "Allwinner sun4i MDIO interface support"
 	depends on ARCH_SUNXI
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 041b3d9..fcdbb92 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_DP83867_PHY)	+= dp83867.o
 obj-$(CONFIG_STE10XP)		+= ste10Xp.o
 obj-$(CONFIG_MICREL_PHY)	+= micrel.o
 obj-$(CONFIG_MDIO_OCTEON)	+= mdio-octeon.o
+obj-$(CONFIG_MDIO_THUNDER)	+= mdio-thunder.o
 obj-$(CONFIG_MDIO_CAVIUM)	+= mdio-cavium.o
 obj-$(CONFIG_MICREL_KS8995MA)	+= spi_ks8995.o
 obj-$(CONFIG_AT803X_PHY)	+= at803x.o
diff --git a/drivers/net/phy/mdio-thunder.c b/drivers/net/phy/mdio-thunder.c
new file mode 100644
index 0000000..5646169
--- /dev/null
+++ b/drivers/net/phy/mdio-thunder.c
@@ -0,0 +1,154 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2009-2016 Cavium, Inc.
+ */
+
+#include <linux/of_address.h>
+#include <linux/of_mdio.h>
+#include <linux/module.h>
+#include <linux/gfp.h>
+#include <linux/phy.h>
+#include <linux/io.h>
+#include <linux/acpi.h>
+#include <linux/pci.h>
+
+#include "mdio-cavium.h"
+
+struct thunder_mdiobus_nexus {
+	void __iomem *bar0;
+	struct cavium_mdiobus *buses[4];
+};
+
+static int thunder_mdiobus_pci_probe(struct pci_dev *pdev,
+				     const struct pci_device_id *ent)
+{
+	struct device_node *node;
+	struct fwnode_handle *fwn;
+	struct thunder_mdiobus_nexus *nexus;
+	int err;
+	int i;
+
+	nexus = devm_kzalloc(&pdev->dev, sizeof(*nexus), GFP_KERNEL);
+	if (!nexus)
+		return -ENOMEM;
+
+	pci_set_drvdata(pdev, nexus);
+
+	err = pcim_enable_device(pdev);
+	if (err) {
+		dev_err(&pdev->dev, "Failed to enable PCI device\n");
+		pci_set_drvdata(pdev, NULL);
+		return err;
+	}
+
+	err = pci_request_regions(pdev, KBUILD_MODNAME);
+	if (err) {
+		dev_err(&pdev->dev, "pci_request_regions failed\n");
+		goto err_disable_device;
+	}
+
+	nexus->bar0 = pcim_iomap(pdev, 0, pci_resource_len(pdev, 0));
+	if (!nexus->bar0) {
+		err = -ENOMEM;
+		goto err_release_regions;
+	}
+
+	i = 0;
+	device_for_each_child_node(&pdev->dev, fwn) {
+		struct resource r;
+		struct mii_bus *mii_bus;
+		struct cavium_mdiobus *bus;
+		union cvmx_smix_en smi_en;
+
+		/* If it is not an OF node we cannot handle it yet, so
+		 * exit the loop.
+		 */
+		node = to_of_node(fwn);
+		if (!node)
+			break;
+
+		err = of_address_to_resource(node, 0, &r);
+		if (err) {
+			dev_err(&pdev->dev,
+				"Couldn't translate address for \"%s\"\n",
+				node->name);
+			break;
+		}
+
+		mii_bus = devm_mdiobus_alloc_size(&pdev->dev, sizeof(*bus));
+		if (!mii_bus)
+			break;
+		bus = mii_bus->priv;
+		bus->mii_bus = mii_bus;
+
+		nexus->buses[i] = bus;
+		i++;
+
+		bus->register_base = (u64)nexus->bar0 +
+			r.start - pci_resource_start(pdev, 0);
+
+		smi_en.u64 = 0;
+		smi_en.s.en = 1;
+		oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN);
+		bus->mii_bus->name = KBUILD_MODNAME;
+		snprintf(bus->mii_bus->id, MII_BUS_ID_SIZE, "%llx", r.start);
+		bus->mii_bus->parent = &pdev->dev;
+		bus->mii_bus->read = cavium_mdiobus_read;
+		bus->mii_bus->write = cavium_mdiobus_write;
+
+		err = of_mdiobus_register(bus->mii_bus, node);
+		if (err)
+			dev_err(&pdev->dev, "of_mdiobus_register failed\n");
+
+		dev_info(&pdev->dev, "Added bus at %llx\n", r.start);
+		if (i >= ARRAY_SIZE(nexus->buses))
+			break;
+	}
+	return 0;
+
+err_release_regions:
+	pci_release_regions(pdev);
+
+err_disable_device:
+	pci_set_drvdata(pdev, NULL);
+	return err;
+}
+
+static void thunder_mdiobus_pci_remove(struct pci_dev *pdev)
+{
+	int i;
+	struct thunder_mdiobus_nexus *nexus = pci_get_drvdata(pdev);
+
+	for (i = 0; i < ARRAY_SIZE(nexus->buses); i++) {
+		struct cavium_mdiobus *bus = nexus->buses[i];
+
+		if (!bus)
+			continue;
+
+		mdiobus_unregister(bus->mii_bus);
+		mdiobus_free(bus->mii_bus);
+		oct_mdio_writeq(0, bus->register_base + SMI_EN);
+	}
+	pci_set_drvdata(pdev, NULL);
+}
+
+static const struct pci_device_id thunder_mdiobus_id_table[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, 0xa02b) },
+	{ 0, } /* End of table. */
+};
+MODULE_DEVICE_TABLE(pci, thunder_mdiobus_id_table);
+
+static struct pci_driver thunder_mdiobus_driver = {
+	.name = KBUILD_MODNAME,
+	.id_table = thunder_mdiobus_id_table,
+	.probe = thunder_mdiobus_pci_probe,
+	.remove = thunder_mdiobus_pci_remove,
+};
+
+module_pci_driver(thunder_mdiobus_driver);
+
+MODULE_DESCRIPTION("Cavium ThunderX MDIO bus driver");
+MODULE_LICENSE("GPL");
-- 
1.7.11.7

[toc] | [prev] | [next] | [standalone]


#1359435 — Re: [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder SoC MDIO buses.

FromDavid Daney <ddaney@caviumnetworks.com>
Date2016-03-17 00:00 +0100
SubjectRe: [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder SoC MDIO buses.
Message-ID<rdsA1-78W-1@gated-at.bofh.it>
In reply to#1356104
On 03/16/2016 03:50 PM, Andreas Färber wrote:
> Hi,
>
> Am 11.03.2016 um 18:53 schrieb David Daney:
>> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
>> index 40faec9..075a4cc 100644
>> --- a/drivers/net/phy/Kconfig
>> +++ b/drivers/net/phy/Kconfig
>> @@ -196,6 +196,17 @@ config MDIO_OCTEON
>>   	  buses. It is required by the Octeon and ThunderX ethernet device
>>   	  drivers on some systems.
>>
>> +config MDIO_THUNDER
>> +	tristate "Support for MDIO buses on on ThunderX SOCs"
>
> Double "on", spotted in next-20160316.
>
>> +	depends on 64BIT
>> +	depends on PCI
>> +	select MDIO_CAVIUM
>> +	help
>> +	  This driver supports the MDIO interfaces found on Cavium
>> +	  ThunderX SoCs when the MDIO bus device appears on as a PCI
>> +	  device.
>
> While at it, this sentence sounds weird. Did you mean s/as/is/? Or is
> there another verb missing in there?

Should be "... appears as a PCI device."

davem already merged the patch, so this would have to be fixed as a 
follow-on patch.

Since you found this, do you want to send the patch?

Thanks,
David Daney

>
> Regards,
> Andreas
>
>> +
>> +
>>   config MDIO_SUN4I
>>   	tristate "Allwinner sun4i MDIO interface support"
>>   	depends on ARCH_SUNXI
> [snip]
>

[toc] | [prev] | [next] | [standalone]


#1359454 — Re: [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder SoC MDIO buses.

FromAndreas Färber <afaerber@suse.de>
Date2016-03-17 00:30 +0100
SubjectRe: [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder SoC MDIO buses.
Message-ID<rdt34-7Be-31@gated-at.bofh.it>
In reply to#1359435
Am 16.03.2016 um 23:54 schrieb David Daney:
> On 03/16/2016 03:50 PM, Andreas Färber wrote:
>> Am 11.03.2016 um 18:53 schrieb David Daney:
>>> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
>>> index 40faec9..075a4cc 100644
>>> --- a/drivers/net/phy/Kconfig
>>> +++ b/drivers/net/phy/Kconfig
>>> @@ -196,6 +196,17 @@ config MDIO_OCTEON
>>>         buses. It is required by the Octeon and ThunderX ethernet device
>>>         drivers on some systems.
>>>
>>> +config MDIO_THUNDER
>>> +    tristate "Support for MDIO buses on on ThunderX SOCs"
>>
>> Double "on", spotted in next-20160316.
>>
>>> +    depends on 64BIT
>>> +    depends on PCI
>>> +    select MDIO_CAVIUM
>>> +    help
>>> +      This driver supports the MDIO interfaces found on Cavium
>>> +      ThunderX SoCs when the MDIO bus device appears on as a PCI
>>> +      device.
>>
>> While at it, this sentence sounds weird. Did you mean s/as/is/? Or is
>> there another verb missing in there?
> 
> Should be "... appears as a PCI device."
> 
> davem already merged the patch, so this would have to be fixed as a
> follow-on patch.
> 
> Since you found this, do you want to send the patch?

Done.

Cheers,
Andreas

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)

[toc] | [prev] | [next] | [standalone]


#1359438 — Re: [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder SoC MDIO buses.

FromAndreas Färber <afaerber@suse.de>
Date2016-03-17 00:00 +0100
SubjectRe: [PATCH v2 3/3] phy: mdio-thunder: Add driver for Cavium Thunder SoC MDIO buses.
Message-ID<rdsA1-78W-3@gated-at.bofh.it>
In reply to#1356104
Hi,

Am 11.03.2016 um 18:53 schrieb David Daney:
> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
> index 40faec9..075a4cc 100644
> --- a/drivers/net/phy/Kconfig
> +++ b/drivers/net/phy/Kconfig
> @@ -196,6 +196,17 @@ config MDIO_OCTEON
>  	  buses. It is required by the Octeon and ThunderX ethernet device
>  	  drivers on some systems.
>  
> +config MDIO_THUNDER
> +	tristate "Support for MDIO buses on on ThunderX SOCs"

Double "on", spotted in next-20160316.

> +	depends on 64BIT
> +	depends on PCI
> +	select MDIO_CAVIUM
> +	help
> +	  This driver supports the MDIO interfaces found on Cavium
> +	  ThunderX SoCs when the MDIO bus device appears on as a PCI
> +	  device.

While at it, this sentence sounds weird. Did you mean s/as/is/? Or is
there another verb missing in there?

Regards,
Andreas

> +
> +
>  config MDIO_SUN4I
>  	tristate "Allwinner sun4i MDIO interface support"
>  	depends on ARCH_SUNXI
[snip]

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)

[toc] | [prev] | [next] | [standalone]


#1356295

FromDavid Daney <ddaney@caviumnetworks.com>
Date2016-03-12 01:10 +0100
Message-ID<rbFi1-5Ou-7@gated-at.bofh.it>
In reply to#1356102
I am going to send a new version of this set.

David Daney


On 03/11/2016 09:53 AM, David Daney wrote:
> From: David Daney <david.daney@cavium.com>
>
> Changes from v1:
>
>   - In 1/3 Add back check for non-OF objects in bgx_init_of_phy().  It
>     is probably not necessary, but better safe than sorry...
>
> The firmware on many Cavium Thunder systems configures the MDIO bus
> hardware to be probed as a PCI device.  In order to use the MDIO bus
> drivers in this configuration, we must add PCI probing to the driver.
>
> There are two parts to this set of three patches:
>
>   1) Cleanup the PHY probing code in thunder_bgx.c to handle the case
>      where there is no PHY attached to a port, as well as being more
>      robust in the face of driver loading order by use of
>      -EPROBE_DEFER.
>
>   2) Split mdio-octeon.c into two drivers, one with platform probing,
>   and the other with PCI probing.  Common code is shared between the
>   two.
>
> Tested on several different Thunder and OCTEON systems, also compile
> tested on x86_64.
>
> David Daney (3):
>    net: thunderx: Cleanup PHY probing code.
>    phy: mdio-octeon: Refactor into two files/modules
>    phy: mdio-thunder:  Add driver for Cavium Thunder SoC MDIO buses.
>
>   .../devicetree/bindings/net/cavium-mdio.txt        |  61 ++++-
>   drivers/net/ethernet/cavium/thunder/thunder_bgx.c  |  29 ++-
>   drivers/net/phy/Kconfig                            |  22 +-
>   drivers/net/phy/Makefile                           |   2 +
>   drivers/net/phy/mdio-cavium.c                      | 149 +++++++++++
>   drivers/net/phy/mdio-cavium.h                      | 119 +++++++++
>   drivers/net/phy/mdio-octeon.c                      | 280 ++-------------------
>   drivers/net/phy/mdio-thunder.c                     | 154 ++++++++++++
>   8 files changed, 535 insertions(+), 281 deletions(-)
>   create mode 100644 drivers/net/phy/mdio-cavium.c
>   create mode 100644 drivers/net/phy/mdio-cavium.h
>   create mode 100644 drivers/net/phy/mdio-thunder.c
>

[toc] | [prev] | [next] | [standalone]


#1357572 — Re: [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code.

FromDavid Miller <davem@davemloft.net>
Date2016-03-14 20:30 +0100
SubjectRe: [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code.
Message-ID<rcGlI-86m-19@gated-at.bofh.it>
In reply to#1356102
From: David Daney <ddaney.cavm@gmail.com>
Date: Fri, 11 Mar 2016 09:53:08 -0800

> Changes from v1:
> 
>  - In 1/3 Add back check for non-OF objects in bgx_init_of_phy().  It
>    is probably not necessary, but better safe than sorry...
> 
> The firmware on many Cavium Thunder systems configures the MDIO bus
> hardware to be probed as a PCI device.  In order to use the MDIO bus
> drivers in this configuration, we must add PCI probing to the driver.
> 
> There are two parts to this set of three patches:
> 
>  1) Cleanup the PHY probing code in thunder_bgx.c to handle the case
>     where there is no PHY attached to a port, as well as being more
>     robust in the face of driver loading order by use of
>     -EPROBE_DEFER.
> 
>  2) Split mdio-octeon.c into two drivers, one with platform probing,
>  and the other with PCI probing.  Common code is shared between the
>  two.
> 
> Tested on several different Thunder and OCTEON systems, also compile
> tested on x86_64.

Series applied, thanks David.

[toc] | [prev] | [next] | [standalone]


#1357600 — Re: [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code.

FromDavid Miller <davem@davemloft.net>
Date2016-03-14 21:20 +0100
SubjectRe: [PATCH v2 0/3] net/phy: Improvements to Cavium Thunder MDIO code.
Message-ID<rcH86-dk-21@gated-at.bofh.it>
In reply to#1357572
From: David Daney <ddaney@caviumnetworks.com>
Date: Mon, 14 Mar 2016 13:12:53 -0700

> At this point, I think the best path forward is for me to rebase
> against net-next and send you a small fixup set to what was merged.
> 
> What do you think?

That is in fact the one and only option.

[toc] | [prev] | [next] | [standalone]


#1357602

FromDavid Daney <ddaney@caviumnetworks.com>
Date2016-03-14 21:20 +0100
Message-ID<rcH86-dk-23@gated-at.bofh.it>
In reply to#1357572
On 03/14/2016 12:27 PM, David Miller wrote:
> From: David Daney <ddaney.cavm@gmail.com>
> Date: Fri, 11 Mar 2016 09:53:08 -0800
>
>> Changes from v1:
>>
>>   - In 1/3 Add back check for non-OF objects in bgx_init_of_phy().  It
>>     is probably not necessary, but better safe than sorry...
>>
>> The firmware on many Cavium Thunder systems configures the MDIO bus
>> hardware to be probed as a PCI device.  In order to use the MDIO bus
>> drivers in this configuration, we must add PCI probing to the driver.
>>
>> There are two parts to this set of three patches:
>>
>>   1) Cleanup the PHY probing code in thunder_bgx.c to handle the case
>>      where there is no PHY attached to a port, as well as being more
>>      robust in the face of driver loading order by use of
>>      -EPROBE_DEFER.
>>
>>   2) Split mdio-octeon.c into two drivers, one with platform probing,
>>   and the other with PCI probing.  Common code is shared between the
>>   two.
>>
>> Tested on several different Thunder and OCTEON systems, also compile
>> tested on x86_64.
>
> Series applied, thanks David.


Thanks, but ... I was going to send another revision.

See: https://lkml.org/lkml/2016/3/11/721

There were a couple of items I wanted to fix.

   1) Missing MODULE_LICENSE() in new common code source file results in 
taint warnings.

   2) Fix device reference counts for -EPROBE_DEFER case.


At this point, I think the best path forward is for me to rebase against 
net-next and send you a small fixup set to what was merged.

What do you think?

David Daney

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web