From patchwork Sat Mar 21 20:24:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Waldekranz X-Patchwork-Id: 1259539 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=waldekranz.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=waldekranz-com.20150623.gappssmtp.com header.i=@waldekranz-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=VPEIPYKy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48lBwB6nqYz9sPJ for ; Sun, 22 Mar 2020 07:25:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727314AbgCUUZJ (ORCPT ); Sat, 21 Mar 2020 16:25:09 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:42028 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726539AbgCUUZJ (ORCPT ); Sat, 21 Mar 2020 16:25:09 -0400 Received: by mail-lf1-f66.google.com with SMTP id t21so7179296lfe.9 for ; Sat, 21 Mar 2020 13:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=waldekranz-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:organization; bh=RrRlxSA5JH5KL9KpSVlg+eWTNkhtjgbo6CYW0I8MPLM=; b=VPEIPYKyIrc18kA0NUiuROjW7ab5PDRYQNVUvTthWv6+m6kvLOtsIypOj3nnNDu3EU 5KuDWm5eif/OJED7qv+SjGDUqCKcHZXorQ2XpUMySgMPnYPbeY4nWXmD/k+bhuBEQ66O RnkHGXjd1Sgi3PQ5eo9UpO9NHuG+p5myez6wlDwDfvYb++uudYtFQUeDaU24g9v9NM6m yWK4hxJqGMndVKoFN62Yayv6gutOgXjq2vLyinWIoAcNQYD9jIlm7sH495Tz8fB8yA18 GvXoUewzenCqNRfzpB/4SOqU6o8f7Rr/aqHPjqseSuR2/8abRgxzEMy1+9sm8OVk7eN8 4iug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization; bh=RrRlxSA5JH5KL9KpSVlg+eWTNkhtjgbo6CYW0I8MPLM=; b=NBbCaqQKCvAxuYIjJELDQDgGa3lX3EkneQPiXLu8Zz+yUWCHE5WU1EwwKemJlrizMU P+VueLpzUsPsBBndnX2x+o/Ci9RZ0KpEUtN3w4JpNWpGB24tM+7VMJB0QckaZ0P70Xq8 07sgcFTUbZGqRg8qjCBbxs7Yrd11dpdDUD/2THLa++XbSu6kjs6eg0CdAy9P9/5t9Skc AVYMUoBHMkyoA3j0oX9QpNDGUuLOocyK6p+j0Ek35h31Md21dzrM5oQXTzupRqnz9eJT fj+xAnZsdVdIH/GhVX6/KzZsx428yZtWE6jZjXvDqsiszLeEiG36UGWuMP1S4qpDvSQU mJtg== X-Gm-Message-State: ANhLgQ1wbclO+pcTiGzwiBD4vhFbJJCR0ilrXSA1rzNVmOMNeocnYwcr DhFTsXziLVF11Sos9Qv2OW09DQ== X-Google-Smtp-Source: ADFU+vuSw1c/gt1iuSiXjvfqYV9ZyyFKHJfdbmQCzdE4OkD/qC7mUs6o3Fcxhe46zVbN+wJoPFZiQA== X-Received: by 2002:ac2:5de1:: with SMTP id z1mr8631238lfq.95.1584822304413; Sat, 21 Mar 2020 13:25:04 -0700 (PDT) Received: from veiron.westermo.com (static-193-12-47-89.cust.tele2.se. [193.12.47.89]) by smtp.gmail.com with ESMTPSA id p25sm5847334ljg.85.2020.03.21.13.25.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 13:25:03 -0700 (PDT) From: Tobias Waldekranz To: davem@davemloft.net Cc: netdev@vger.kernel.org, andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux-usb@vger.kernel.org Subject: [PATCH v3 1/2] dt-bindings: net: add marvell usb to mdio bindings Date: Sat, 21 Mar 2020 21:24:42 +0100 Message-Id: <20200321202443.15352-1-tobias@waldekranz.com> X-Mailer: git-send-email 2.17.1 Organization: Westermo Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Describe how the USB to MDIO controller can optionally use device tree bindings to reference attached devices such as switches. Signed-off-by: Tobias Waldekranz Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- .../bindings/net/marvell,mvusb.yaml | 65 +++++++++++++++++++ MAINTAINERS | 6 ++ 2 files changed, 71 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/marvell,mvusb.yaml diff --git a/Documentation/devicetree/bindings/net/marvell,mvusb.yaml b/Documentation/devicetree/bindings/net/marvell,mvusb.yaml new file mode 100644 index 000000000000..9458f6659be1 --- /dev/null +++ b/Documentation/devicetree/bindings/net/marvell,mvusb.yaml @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/marvell,mvusb.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell USB to MDIO Controller + +maintainers: + - Tobias Waldekranz + +description: |+ + This controller is mounted on development boards for Marvell's Link Street + family of Ethernet switches. It allows you to configure the switch's registers + using the standard MDIO interface. + + Since the device is connected over USB, there is no strict requirement of + having a device tree representation of the device. But in order to use it with + the mv88e6xxx driver, you need a device tree node in which to place the switch + definition. + +allOf: + - $ref: "mdio.yaml#" + +properties: + compatible: + const: usb1286,1fa4 + reg: + maxItems: 1 + description: The USB port number on the host controller + +required: + - compatible + - reg + - "#address-cells" + - "#size-cells" + +examples: + - | + /* USB host controller */ + &usb1 { + mvusb: mdio@1 { + compatible = "usb1286,1fa4"; + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + /* MV88E6390X devboard */ + &mvusb { + switch@0 { + compatible = "marvell,mv88e6190"; + status = "ok"; + reg = <0x0>; + + ports { + /* Port definitions */ + }; + + mdio { + /* PHY definitions */ + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 97dce264bc7c..ff35669f8712 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10101,6 +10101,12 @@ M: Nicolas Pitre S: Odd Fixes F: drivers/mmc/host/mvsdio.* +MARVELL USB MDIO CONTROLLER DRIVER +M: Tobias Waldekranz +L: netdev@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/net/marvell,mvusb.yaml + MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER M: Hu Ziji L: linux-mmc@vger.kernel.org From patchwork Sat Mar 21 20:24:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Waldekranz X-Patchwork-Id: 1259540 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=waldekranz.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=waldekranz-com.20150623.gappssmtp.com header.i=@waldekranz-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=dV5BDG2X; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48lBwD3P2Cz9sPR for ; Sun, 22 Mar 2020 07:25:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727634AbgCUUZN (ORCPT ); Sat, 21 Mar 2020 16:25:13 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:40569 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727323AbgCUUZM (ORCPT ); Sat, 21 Mar 2020 16:25:12 -0400 Received: by mail-lj1-f195.google.com with SMTP id 19so10244633ljj.7 for ; Sat, 21 Mar 2020 13:25:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=waldekranz-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :organization; bh=K9Wf5GzKVON6qAY3kHv4zzrPtb8dkbTHpnzTuv5kmHo=; b=dV5BDG2XlYBZdaOYzTt/voLqIg3KPShiW7JENYv5CDVEQjIj88a9xeM8WyjINXhzYk mgNAbdBT1NROIF2X0u/Ojg7czeZfQVkZRunUU1lrxz/9vXXSVVMuT9TyV478PjFAF4JN Dm3aLAmNEwzua+ZoeJ4C5X9qJVyeKTfuh7gn561D0niam6AmZVcwIeZZk0zAPVA1aYmV zp4e3Nkdw43vNZ1j2V0fXbQUcgEPwjU34wY53ZGBVBAFB6VBooex/donIt2ngMz01j3b VYNvZEm/lDa9eHAESUdpsWTjKhIpfNQfm4MXTTi6vzqlceoDEd0k6ySoka6san4fVO6m DLnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:organization; bh=K9Wf5GzKVON6qAY3kHv4zzrPtb8dkbTHpnzTuv5kmHo=; b=WQ5lbWxqR7bL5VPd8UwWDENdzyIxR5Ep2b7C9UiFyPUCen3O1LA33CLO7by5f9h3Uo lMip++AHrgwslPIidS+sRau0sSxXuuaoCk4kd+hIWv68DlMwDFjdre9/Rx0uXOaFmZX/ FcCpyOQHWetEiyzHI2O56pmhbqGGa/ZPZRuqnukLz619LUeKJV54XOKRqrbw6bdTzTbM RIteFwI18QW8u98Il6VQMQeUTFNsN2+B6pQJ4y/nhgp0ga/WQKlWyS9zuXIg6dB04c8u cMzc8cx1BLXDy7VEmeMGf67ntB8HX9Uv8XhODNX3yrR+ooJnHSRZ9LIyXj7gy1xiHmSV 7QDA== X-Gm-Message-State: ANhLgQ1I/kgOQrHi0WVhIPokIDV6aACKrdAao6NRiNpncoU9AdB62NyC yTpMcQcgxNCOG/96V+PVsWC34A== X-Google-Smtp-Source: ADFU+vtWTmYZr3YVV35/n9T7zsKuODATBYSkWrnDB8YUoxVfgVsMW6wdXRiHH6BgrRu2bzBUYqLqKA== X-Received: by 2002:a2e:3010:: with SMTP id w16mr3752817ljw.41.1584822308968; Sat, 21 Mar 2020 13:25:08 -0700 (PDT) Received: from veiron.westermo.com (static-193-12-47-89.cust.tele2.se. [193.12.47.89]) by smtp.gmail.com with ESMTPSA id p25sm5847334ljg.85.2020.03.21.13.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 13:25:08 -0700 (PDT) From: Tobias Waldekranz To: davem@davemloft.net Cc: netdev@vger.kernel.org, andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux-usb@vger.kernel.org Subject: [PATCH v3 2/2] net: phy: add marvell usb to mdio controller Date: Sat, 21 Mar 2020 21:24:43 +0100 Message-Id: <20200321202443.15352-2-tobias@waldekranz.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200321202443.15352-1-tobias@waldekranz.com> References: <20200321202443.15352-1-tobias@waldekranz.com> Organization: Westermo Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org An MDIO controller present on development boards for Marvell switches from the Link Street (88E6xxx) family. Using this module, you can use the following setup as a development platform for switchdev and DSA related work. .-------. .-----------------. | USB----USB | | SoC | | 88E6390X-DB ETH1-10 | ETH----ETH0 | '-------' '-----------------' Signed-off-by: Tobias Waldekranz Reviewed-by: Greg Kroah-Hartman Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- Hi linux-usb, This is my first ever USB driver, therefore I would really appreciate it if someone could have a look at it from a USB perspective before it is (hopefully) pulled into net-next. Thanks v2->v3: - Rename driver smi2usb -> mvusb. - Clean up unused USB references. v1->v2: - Reverse christmas tree ordering of local variables. --- MAINTAINERS | 1 + drivers/net/phy/Kconfig | 7 ++ drivers/net/phy/Makefile | 1 + drivers/net/phy/mdio-mvusb.c | 120 +++++++++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+) create mode 100644 drivers/net/phy/mdio-mvusb.c diff --git a/MAINTAINERS b/MAINTAINERS index ff35669f8712..f36023d4ee44 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10105,6 +10105,7 @@ MARVELL USB MDIO CONTROLLER DRIVER M: Tobias Waldekranz L: netdev@vger.kernel.org S: Maintained +F: drivers/net/phy/mdio-mvusb.c F: Documentation/devicetree/bindings/net/marvell,mvusb.yaml MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index cc7f1df855da..be9ae8620cd1 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -179,6 +179,13 @@ config MDIO_MSCC_MIIM This driver supports the MIIM (MDIO) interface found in the network switches of the Microsemi SoCs +config MDIO_MVUSB + tristate "Marvell USB to MDIO Adapter" + depends on OF_MDIO && USB + help + A USB to MDIO converter present on development boards for + Marvell's Link Street family of Ethernet switches. + config MDIO_OCTEON tristate "Octeon and some ThunderX SOCs MDIO buses" depends on (64BIT && OF_MDIO) || COMPILE_TEST diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 70774ab474e6..2f5c7093a65b 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -40,6 +40,7 @@ obj-$(CONFIG_MDIO_I2C) += mdio-i2c.o obj-$(CONFIG_MDIO_IPQ8064) += mdio-ipq8064.o obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o obj-$(CONFIG_MDIO_MSCC_MIIM) += mdio-mscc-miim.o +obj-$(CONFIG_MDIO_MVUSB) += mdio-mvusb.o obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o obj-$(CONFIG_MDIO_THUNDER) += mdio-thunder.o diff --git a/drivers/net/phy/mdio-mvusb.c b/drivers/net/phy/mdio-mvusb.c new file mode 100644 index 000000000000..d5eabddfdf51 --- /dev/null +++ b/drivers/net/phy/mdio-mvusb.c @@ -0,0 +1,120 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include + +#define USB_MARVELL_VID 0x1286 + +static const struct usb_device_id mvusb_mdio_table[] = { + { USB_DEVICE(USB_MARVELL_VID, 0x1fa4) }, + + {} +}; +MODULE_DEVICE_TABLE(usb, mvusb_mdio_table); + +enum { + MVUSB_CMD_PREAMBLE0, + MVUSB_CMD_PREAMBLE1, + MVUSB_CMD_ADDR, + MVUSB_CMD_VAL, +}; + +struct mvusb_mdio { + struct usb_device *udev; + struct mii_bus *mdio; + + __le16 buf[4]; +}; + +static int mvusb_mdio_read(struct mii_bus *mdio, int dev, int reg) +{ + struct mvusb_mdio *mvusb = mdio->priv; + int err, alen; + + if (dev & MII_ADDR_C45) + return -EOPNOTSUPP; + + mvusb->buf[MVUSB_CMD_ADDR] = cpu_to_le16(0xa400 | (dev << 5) | reg); + + err = usb_bulk_msg(mvusb->udev, usb_sndbulkpipe(mvusb->udev, 2), + mvusb->buf, 6, &alen, 100); + if (err) + return err; + + err = usb_bulk_msg(mvusb->udev, usb_rcvbulkpipe(mvusb->udev, 6), + &mvusb->buf[MVUSB_CMD_VAL], 2, &alen, 100); + if (err) + return err; + + return le16_to_cpu(mvusb->buf[MVUSB_CMD_VAL]); +} + +static int mvusb_mdio_write(struct mii_bus *mdio, int dev, int reg, u16 val) +{ + struct mvusb_mdio *mvusb = mdio->priv; + int alen; + + if (dev & MII_ADDR_C45) + return -EOPNOTSUPP; + + mvusb->buf[MVUSB_CMD_ADDR] = cpu_to_le16(0x8000 | (dev << 5) | reg); + mvusb->buf[MVUSB_CMD_VAL] = cpu_to_le16(val); + + return usb_bulk_msg(mvusb->udev, usb_sndbulkpipe(mvusb->udev, 2), + mvusb->buf, 8, &alen, 100); +} + +static int mvusb_mdio_probe(struct usb_interface *interface, + const struct usb_device_id *id) +{ + struct device *dev = &interface->dev; + struct mvusb_mdio *mvusb; + struct mii_bus *mdio; + + mdio = devm_mdiobus_alloc_size(dev, sizeof(*mvusb)); + if (!mdio) + return -ENOMEM; + + mvusb = mdio->priv; + mvusb->mdio = mdio; + mvusb->udev = usb_get_dev(interface_to_usbdev(interface)); + + /* Reversed from USB PCAPs, no idea what these mean. */ + mvusb->buf[MVUSB_CMD_PREAMBLE0] = cpu_to_le16(0xe800); + mvusb->buf[MVUSB_CMD_PREAMBLE1] = cpu_to_le16(0x0001); + + snprintf(mdio->id, MII_BUS_ID_SIZE, "mvusb-%s", dev_name(dev)); + mdio->name = mdio->id; + mdio->parent = dev; + mdio->read = mvusb_mdio_read; + mdio->write = mvusb_mdio_write; + + usb_set_intfdata(interface, mvusb); + return of_mdiobus_register(mdio, dev->of_node); +} + +static void mvusb_mdio_disconnect(struct usb_interface *interface) +{ + struct mvusb_mdio *mvusb = usb_get_intfdata(interface); + struct usb_device *udev = mvusb->udev; + + mdiobus_unregister(mvusb->mdio); + usb_set_intfdata(interface, NULL); + usb_put_dev(udev); +} + +static struct usb_driver mvusb_mdio_driver = { + .name = "mvusb_mdio", + .id_table = mvusb_mdio_table, + .probe = mvusb_mdio_probe, + .disconnect = mvusb_mdio_disconnect, +}; + +module_usb_driver(mvusb_mdio_driver); + +MODULE_AUTHOR("Tobias Waldekranz "); +MODULE_DESCRIPTION("Marvell USB MDIO Adapter"); +MODULE_LICENSE("GPL");