From patchwork Fri Sep 8 07:11:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 811362 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dcE3SbdK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xpTDw0dBCz9s83 for ; Fri, 8 Sep 2017 17:18:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754957AbdIHHOL (ORCPT ); Fri, 8 Sep 2017 03:14:11 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35519 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754871AbdIHHOJ (ORCPT ); Fri, 8 Sep 2017 03:14:09 -0400 Received: by mail-wm0-f51.google.com with SMTP id f199so9779610wme.0; Fri, 08 Sep 2017 00:14:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=w8RcbEOMKY/vjLYzKK6iAjKcvFVR8cve2hrcJlAqCbA=; b=dcE3SbdKCzW/XL7krCxC1tTbS1aq+DosWb8Ho2OO5UFbS8Nvq9Kt8xSwS7nrrtv/xK NrZOoshoV1Ioc4jv2NxjIZRIiq3Fs3GOiJCDqETXlKXCWbGIhn/me5otOsxzmfcHTe9C Y7anqc22lVPgvDSSL71qOaSp7ExylkylifEYXV5dFkrJU9g2VA6WBmXpXAQS3FkNrqsD 8gJojBDlPxyWXyu/bMi3Tn0R0LLC8CkqKTjvyF6bhLhtz9WbObIywix78y2ogh2t/tIE 9Yuzttu9rvOF35+tK/VQyixxIMS4GpgMaeOB5yNo5nMOCqW6cpURzffXNCDh6vy6fOlq gKyA== 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; bh=w8RcbEOMKY/vjLYzKK6iAjKcvFVR8cve2hrcJlAqCbA=; b=p1dueECHWDcJXlYOi7yr9vcZsmuo8v5SK9C1dd2f4N5L+JcgaIjKtRPa2PyGOMCp/Q /XwbYhP0Bbaw7z8A5DfMzZpINgF+TSgg7LBTdxfFfQoInmR7AaP5w0qKXAPWmMvA19b1 MFhQ71JnOOwMIpuiie+QQ8cn6A95eZI7GFmbY3CmBZilarp6ka+cGeNEjifdlEtcHSa3 n1h6rzUAAM1667f73mf4+NQazlu/itJpU6kQIyVZn/P6fN0MqsUMK6EKFMGfhEZa8uqw rZhMwmRI/d5yG8RNUDVdltu6EMXsjRIa6PL/yI+arhOfQtedktdrIq/+wMH2v063s9eT xndg== X-Gm-Message-State: AHPjjUgBO3QNVb1Ao/ldvqMrd3xuMy09cra8DcqNhkbHdOmV7FMHxAeK +9i/Uu8yRiBrmqATtweLqWg= X-Google-Smtp-Source: AOwi7QDpUF3KpPm0N5WH0y5vLBDL+hcs7B++N4f/++2/PAQjBVmIbdv8FKT95LdBWdKHf+aU6UIp9A== X-Received: by 10.28.111.196 with SMTP id c65mr853315wmi.18.1504854847595; Fri, 08 Sep 2017 00:14:07 -0700 (PDT) Received: from Red.local (LFbn-MAR-1-580-96.w90-118.abo.wanadoo.fr. [90.118.159.96]) by smtp.googlemail.com with ESMTPSA id l19sm684566wrl.47.2017.09.08.00.14.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Sep 2017 00:14:06 -0700 (PDT) From: Corentin Labbe To: robh+dt@kernel.org, mark.rutland@arm.com, maxime.ripard@free-electrons.com, wens@csie.org, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, peppe.cavallaro@st.com, alexandre.torgue@st.com, andrew@lunn.ch, f.fainelli@gmail.com Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH v5 00/10] net: stmmac: dwmac-sun8i: Handle integrated PHY Date: Fri, 8 Sep 2017 09:11:46 +0200 Message-Id: <20170908071156.5115-1-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hello The current way to find if the PHY is internal is to compare DT phy-mode and emac_variant/internal_phy. But it will negate a possible future SoC where an external PHY use the same phy mode than the integrated one. This patchs series adds a new way to find if the PHY is integrated, via the phy-is-integrated DT property. Since it exists both integrated and external ethernet-phy@1, they are merged in the final DTB and so share all properties. For avoiding this, and better represent the reality, we use a MDIO mux. The first try was to create a new MDIO mux "mdio-mux-syscon". mdio-mux-syscon working the same way than mdio-mux-mmioreg with the exception that the register is used via syscon/regmap. But this solution does not work for two reason: - changing the MDIO selection need the reset of MAC which cannot be done by the mdio-mux-syscon driver - There were driver loading order problem: - mdio-mux-syscon needing that stmmac register the parent MDIO - stmmac needing that child MDIO was registered just after registering parent MDIO So we cannot use any external MDIO-mux. The final solution was to represent a mdio-mux and let the MAC handle all things. Note that phy-is-integrated is still needed (even if we use a MDIO mux) since some properties apply only on integrated PHY and we need to know the final MDIO bus in mdio_mux_syscon_switch_fn(). Since DT bits was reverted in 4.13, this patch series include the revert of the revert. So - the first four patchs bring back DT/stmmac stuff that was in 4.13 (and reverted) - fifth patch document how DT MDIO mux is implemented - patch 6 and 7 modify DT - patch 8, 9, 10 Modify stmmac according to the new bindings I have let patch splited for easy review. (for seeing what's new) But the final serie could have some patch squashed if someone want. Like squashing patch and 2 and 5 (documentation) Since DT worked well in 4.13, could it be targeted for 4.14 ? If necessary I could split this serie in two: - bring back A64/A83T (patchs 1, 2, 4, 7, 9) - add MXIO-mux and H3 (patchs 3, 4, 5, 6, 8, 10) Regards Changes since v4: - Update documentation for new bindings - Added 4 patchs for bring back reverted stuff of 4.13 - dwmac-sun8i now handle mdio-mux - MDIO use now compatible = "snps,dwmac-mdio"; Changes since v3: - Added a patch for handling fixed-link - Updated documentation Changes since v2: - Add a MDIO mux for creating distinction between integrated and external MDIO. - phy-is-integrated is not set in dtsi. Changes since v1: - Dropped phy-is-integrated documentation patch since another same patch was already merged - Moved phy-is-integrated from SoC dtsi to final board DT. Corentin Labbe (10): arm64: dts: allwinner: Restore EMAC changes dt-bindings: net: Restore sun8i dwmac binding arm: dts: sunxi: Restore EMAC changes net: stmmac: sun8i: Restore the compatibles dt-bindings: net: dwmac-sun8i: update documentation about integrated PHY ARM: dts: sunxi: h3/h5: represent the mdio switch used by sun8i-h3-emac arm64: dts: allwinner: add snps,dwmac-mdio compatible to emac/mdio net: stmmac: dwmac-sun8i: choose internal PHY via phy-is-integrated net: stmmac: snps,dwmac-mdio MDIOs are automatically registered net: stmmac: dwmac-sun8i: Handle integrated/external MDIOs .../devicetree/bindings/net/dwmac-sun8i.txt | 197 +++++++++++++++++++++ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 9 + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 19 ++ arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 22 +++ arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 16 ++ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 46 +++++ .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 16 ++ .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 15 ++ .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 17 ++ .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 16 ++ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 21 +++ .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 17 ++ .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 17 ++ .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 17 ++ drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 140 ++++++++++++--- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 - 22 files changed, 601 insertions(+), 25 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/dwmac-sun8i.txt