From patchwork Fri Nov 24 16:01:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ante Knezic X-Patchwork-Id: 13467830 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=helmholz.de header.i=@helmholz.de header.b="fPDPvg5a" Received: from mail.helmholz.de (mail.helmholz.de [217.6.86.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6578C199A for ; Fri, 24 Nov 2023 08:02:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=helmholz.de ; s=dkim1; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=QU/2BKYHRqdBHTOru/osB5OFNh+RaSLJ8fy3CcYNZXE=; b=fPDPvg5aSSCt9qC0RqC/Yt9H5q O5wc6RVAvlkeV9ZzgSW9onAtjGJ41mHx+PxDxzhjC8b7ZdbEO08eTwtK0UfwGSuBJuQsGgxTAL6Wf FqvlgYbRv4TG84SNUAlPXJBBgt8yqdahjvosyQi1F6MQiMC+38yBaYpF21yD8fpYgpqURK26t/mA9 wvGfpGNMksPVLdYNBY5UfPospUz0WAuJU2bDvE4l41YCLdrPClhMqWiDziRvfklGqfNWWCVY+qgkh pWv6tfZee5ZEVD1C76Hn/UZbDbkdt9keRF4Ekri1wdgUQ2J/HL3n7Ebyn5dSAlPj54vged5zxTUzt lCalnIiQ==; Received: from [192.168.1.4] (port=8299 helo=SH-EX2013.helmholz.local) by mail.helmholz.de with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 (Exim 4.96) (envelope-from ) id 1r6Ycx-0004bZ-0j; Fri, 24 Nov 2023 17:01:59 +0100 Received: from linuxdev.helmholz.local (192.168.6.7) by SH-EX2013.helmholz.local (192.168.1.4) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Fri, 24 Nov 2023 17:01:58 +0100 From: Ante Knezic To: CC: , , , , , , , , , , , , , , Ante Knezic Subject: [PATCH net-next v5 1/2] dt-bindings: net: microchip,ksz: document microchip,rmii-clk-internal Date: Fri, 24 Nov 2023 17:01:47 +0100 Message-ID: <0ea1db6b2f2e93c3531645f98888775a4d3165d4.1700841353.git.ante.knezic@helmholz.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SH-EX2013.helmholz.local (192.168.1.4) To SH-EX2013.helmholz.local (192.168.1.4) X-EXCLAIMER-MD-CONFIG: 2ae5875c-d7e5-4d7e-baa3-654d37918933 X-Patchwork-Delegate: kuba@kernel.org Add documentation for selecting reference rmii clock on KSZ88X3 devices Signed-off-by: Ante Knezic --- .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 38 +++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml index b3029c64d0d5..3cebb9c9b1c8 100644 --- a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml +++ b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml @@ -11,7 +11,6 @@ maintainers: - Woojung Huh allOf: - - $ref: dsa.yaml#/$defs/ethernet-ports - $ref: /schemas/spi/spi-peripheral-props.yaml# properties: @@ -78,6 +77,43 @@ required: - compatible - reg +if: + not: + properties: + compatible: + enum: + - microchip,ksz8863 + - microchip,ksz8873 +then: + $ref: dsa.yaml#/$defs/ethernet-ports +else: + patternProperties: + "^(ethernet-)?ports$": + patternProperties: + "^(ethernet-)?port@[0-2]$": + $ref: dsa-port.yaml# + properties: + microchip,rmii-clk-internal: + $ref: /schemas/types.yaml#/definitions/flag + description: + When ksz88x3 is acting as clock provier (via REFCLKO) it + can select between internal and external RMII reference + clock. Internal reference clock means that the clock for + the RMII of ksz88x3 is provided by the ksz88x3 internally + and the REFCLKI pin is unconnected. For the external + reference clock, the clock needs to be fed back to ksz88x3 + via REFCLKI. + If microchip,rmii-clk-internal is set, ksz88x3 will provide + rmii reference clock internally, otherwise reference clock + should be provided externally. + if: + not: + required: [ ethernet ] + then: + properties: + microchip,rmii-clk-internal: false + unevaluatedProperties: false + unevaluatedProperties: false examples: From patchwork Fri Nov 24 16:01:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ante Knezic X-Patchwork-Id: 13467832 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=helmholz.de header.i=@helmholz.de header.b="TcAwrpSz" Received: from mail.helmholz.de (mail.helmholz.de [217.6.86.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 601BD19B1 for ; Fri, 24 Nov 2023 08:03:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=helmholz.de ; s=dkim1; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=0w6aQuUscuVPAHgE+2Is92gYWkxyPcZB0ubkTwnN32s=; b=TcAwrpSzHO/N4liCJppiA97OP/ EvpaE6Hd356lEc8HixRnGxhw89aoQIrL10GqooXOkfC2VtsPJybz8qcP53FOMMQq62N/jig4bcMgq F1cViEZI9Qxdx7T8dGt6Y3q1SIfeZe4tv9qB6Py1k5dSvhLtTw56L+Z17HzhCl+fWyQaHK2jF3fYW A4cEY5mCpIB6uKwOuh/WQrebpPRB0CERpys4N9sVqIUMrtOXUzr0zlrOV028bYRk8hecrL4Mzu0va mTzpzs8cWipBlw5tUkWg/Mrq8skEW36bpFWK1IFNi/i8LvAJElJdAf9iggXgTVzk4UiLn/LaCVIWz Klk3oG9g==; Received: from [192.168.1.4] (port=8305 helo=SH-EX2013.helmholz.local) by mail.helmholz.de with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 (Exim 4.96) (envelope-from ) id 1r6Ycy-0004bc-17; Fri, 24 Nov 2023 17:02:00 +0100 Received: from linuxdev.helmholz.local (192.168.6.7) by SH-EX2013.helmholz.local (192.168.1.4) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Fri, 24 Nov 2023 17:01:59 +0100 From: Ante Knezic To: CC: , , , , , , , , , , , , , , Ante Knezic Subject: [PATCH net-next v5 2/2] net: dsa: microchip: add property to select internal RMII reference clock Date: Fri, 24 Nov 2023 17:01:48 +0100 Message-ID: <4e62cff653c7845bb848de5af44abe7e5578f624.1700841353.git.ante.knezic@helmholz.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SH-EX2013.helmholz.local (192.168.1.4) To SH-EX2013.helmholz.local (192.168.1.4) X-EXCLAIMER-MD-CONFIG: 2ae5875c-d7e5-4d7e-baa3-654d37918933 X-Patchwork-Delegate: kuba@kernel.org Microchip KSZ8863/KSZ8873 have the ability to select between internal and external RMII reference clock. By default, reference clock needs to be provided via REFCLKI_3 pin. If required, device can be setup to provide RMII clock internally so that REFCLKI_3 pin can be left unconnected. Add a new "microchip,rmii-clk-internal" property which will set RMII clock reference to internal. If property is not set, reference clock needs to be provided externally. While at it, move the ksz8795_cpu_interface_select() to ksz8_config_cpu_port() to get a cleaner call path for cpu port. Signed-off-by: Ante Knezic --- drivers/net/dsa/microchip/ksz8795.c | 56 +++++++++++++++++++++++++++++---- drivers/net/dsa/microchip/ksz8795_reg.h | 3 ++ 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index 4bf4d67557dc..a749a4a970ec 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -1358,6 +1358,9 @@ static void ksz8795_cpu_interface_select(struct ksz_device *dev, int port) { struct ksz_port *p = &dev->ports[port]; + if (!ksz_is_ksz87xx(dev)) + return; + if (!p->interface && dev->compat_interface) { dev_warn(dev->dev, "Using legacy switch \"phy-mode\" property, because it is missing on port %d node. " @@ -1391,18 +1394,55 @@ void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port) /* enable 802.1p priority */ ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_802_1P_ENABLE, true); - if (cpu_port) { - if (!ksz_is_ksz88x3(dev)) - ksz8795_cpu_interface_select(dev, port); - + if (cpu_port) member = dsa_user_ports(ds); - } else { + else member = BIT(dsa_upstream_port(ds, port)); - } ksz8_cfg_port_member(dev, port, member); } +static int ksz88x3_config_rmii_clk(struct ksz_device *dev, int cpu_port) +{ + struct device_node *ports, *port, *cpu_node; + bool rmii_clk_internal; + + if (!ksz_is_ksz88x3(dev)) + return 0; + + cpu_node = NULL; + + ports = of_get_child_by_name(dev->dev->of_node, "ports"); + if (!ports) + ports = of_get_child_by_name(dev->dev->of_node, + "ethernet-ports"); + if (!ports) + return -ENODEV; + + for_each_available_child_of_node(ports, port) { + u32 index; + + if (of_property_read_u32(port, "reg", &index) < 0) + return -ENODEV; + + if (index == cpu_port) { + cpu_node = port; + break; + } + } + + if (!cpu_node) + return -ENODEV; + + rmii_clk_internal = of_property_read_bool(cpu_node, + "microchip,rmii-clk-internal"); + + ksz_cfg(dev, KSZ88X3_REG_FVID_AND_HOST_MODE, + KSZ88X3_PORT3_RMII_CLK_INTERNAL, rmii_clk_internal); + + return 0; +} + void ksz8_config_cpu_port(struct dsa_switch *ds) { struct ksz_device *dev = ds->priv; @@ -1419,6 +1459,10 @@ void ksz8_config_cpu_port(struct dsa_switch *ds) ksz8_port_setup(dev, dev->cpu_port, true); + ksz8795_cpu_interface_select(dev, dev->cpu_port); + if (ksz88x3_config_rmii_clk(dev, dev->cpu_port)) + dev_err(dev->dev, "Failed to set rmii reference clock source mode"); + for (i = 0; i < dev->phy_port_cnt; i++) { ksz_port_stp_state_set(ds, i, BR_STATE_DISABLED); } diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h b/drivers/net/dsa/microchip/ksz8795_reg.h index 3c9dae53e4d8..beca974e0171 100644 --- a/drivers/net/dsa/microchip/ksz8795_reg.h +++ b/drivers/net/dsa/microchip/ksz8795_reg.h @@ -22,6 +22,9 @@ #define KSZ8863_GLOBAL_SOFTWARE_RESET BIT(4) #define KSZ8863_PCS_RESET BIT(0) +#define KSZ88X3_REG_FVID_AND_HOST_MODE 0xC6 +#define KSZ88X3_PORT3_RMII_CLK_INTERNAL BIT(3) + #define REG_SW_CTRL_0 0x02 #define SW_NEW_BACKOFF BIT(7)