From patchwork Wed Mar 30 09:07:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1610991 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=flr5MAVD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KT0w66Jrqz9sCq for ; Wed, 30 Mar 2022 20:08:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 56B5B84040; Wed, 30 Mar 2022 11:08:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.b="flr5MAVD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2D68F84092; Wed, 30 Mar 2022 11:08:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E8A1084040 for ; Wed, 30 Mar 2022 11:08:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wm1-x329.google.com with SMTP id k124-20020a1ca182000000b0038c9cf6e2a6so3047567wme.0 for ; Wed, 30 Mar 2022 02:08:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20210112.gappssmtp.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1XQW8IRH2UFS0HHl1lOUI5tQUpR2DMLsyB5/Axfq9HA=; b=flr5MAVDM4jf2TtdQzQn1Qxr8qAILISpiczRqXzQuOKre9nFvQ7gkFf4Iacb7s2qrs kNgiVxqave84oLl/MDbaDE/bFibdRXsXs8uOpxz9HLPEFluluYjU2eJ9sFeiC7GK065n 4xQvYX4qo1Hv9XRP6K2jBiIUiuBNodB7Od+UNmwwFebnyLDM4dxApRiF2N8sjHluThL7 YbYYNCsxTbGHN9MayCcqwvo2RP16nsXRpYUB9MyC959PxxDrdTzMcVT8JggEAWR6U/X9 M4ILCd4Wfkya3k58V8D3GYRTN9x2MM4D26MRN4dZubzckJB5ha9loQSKxrs98ThXwtEM +hDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1XQW8IRH2UFS0HHl1lOUI5tQUpR2DMLsyB5/Axfq9HA=; b=ZWxSfctcD0XsdSR8M+qK0jrOJUwnrPXgdCfm08/D6uAKRVZdW0YWYDMV/vrOSn/B7R fdKAq5mHNxd1jhTRGW3yHpaaTRVH8RGXHEtvzS7O1tF2Bm0tVuJjvonG/b90/xDDMxCr wAqxcwuFpspVqvVZ635UEN6sQ9BqDtzftooIf/tQRR78mzMU7FMJKRBo9b6iKCHate+H vRLqCY83biDJ7Khl4kS2VQuM0A6i/UOReI6VMqagafZ6y121OTzxgzt2Nk4oksBP0fms KR/94zg/iz0rhfWxR4vwDBDzwsAi0hmr+6w5+JLX/fSETWxcNruMw4MwZiG24MaIWWwV 8fTw== X-Gm-Message-State: AOAM532YDpD0x6DMGYW+eyZmTtn7D+99qObHSYXaZrmn6DLC3/Cgzfwx YZoG+WoMBo1frXqryI5IwEyMntaD2Vkpew== X-Google-Smtp-Source: ABdhPJx+OCO3Ovm28CJaeeD/5ecDBzJfBFjPlPVYeaGSGz4yK2wd9zy1scE0Ph8qDn5OlYEom3Mx3g== X-Received: by 2002:a05:600c:3d14:b0:38c:9d85:781d with SMTP id bh20-20020a05600c3d1400b0038c9d85781dmr3384994wmb.191.1648631282376; Wed, 30 Mar 2022 02:08:02 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::f9e]) by smtp.gmail.com with ESMTPSA id w17-20020a5d4051000000b00205a8bb9c18sm12780830wrp.67.2022.03.30.02.08.01 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Mar 2022 02:08:01 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Joe Hershberger , Ramon Fried Subject: [PATCH 1/6] net: zynq_gem: Use shared MDIO bus support for zynqmp Date: Wed, 30 Mar 2022 11:07:53 +0200 Message-Id: <337b1a38ba36cde1951739af62fb3d2736d97f53.1648631275.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean CONFIG_ETH_PHY enables support to utilize generic ethernet phy framework. Though if ethernet PHY node is in other ethernet node, it will use shared MDIO to access the PHY of other ethernet. Signed-off-by: Michal Simek Signed-off-by: T Karthik Reddy --- drivers/net/zynq_gem.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 3118d1472669..168aabbdd006 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -33,6 +33,7 @@ #include #include #include +#include /* Bit/mask specification */ #define ZYNQ_GEM_PHYMNTNC_OP_MASK 0x40020000 /* operation mask bits */ @@ -321,6 +322,9 @@ static int zynq_phy_init(struct udevice *dev) /* Enable only MDIO bus */ writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, ®s_mdio->nwctrl); + if (IS_ENABLED(CONFIG_DM_ETH_PHY)) + priv->phyaddr = eth_phy_get_addr(dev); + priv->phydev = phy_connect(priv->bus, priv->phyaddr, dev, priv->interface); if (!priv->phydev) @@ -771,14 +775,22 @@ static int zynq_gem_probe(struct udevice *dev) } } - priv->bus = mdio_alloc(); - priv->bus->read = zynq_gem_miiphy_read; - priv->bus->write = zynq_gem_miiphy_write; - priv->bus->priv = priv; + if (IS_ENABLED(CONFIG_DM_ETH_PHY)) + priv->bus = eth_phy_get_mdio_bus(dev); - ret = mdio_register_seq(priv->bus, dev_seq(dev)); - if (ret) - goto err2; + if (!priv->bus) { + priv->bus = mdio_alloc(); + priv->bus->read = zynq_gem_miiphy_read; + priv->bus->write = zynq_gem_miiphy_write; + priv->bus->priv = priv; + + ret = mdio_register_seq(priv->bus, dev_seq(dev)); + if (ret) + goto err2; + } + + if (IS_ENABLED(CONFIG_DM_ETH_PHY)) + eth_phy_set_mdio_bus(dev, priv->bus); ret = zynq_phy_init(dev); if (ret) @@ -841,8 +853,10 @@ static int zynq_gem_of_to_plat(struct udevice *dev) ofnode parent; debug("phy-handle does exist %s\n", dev->name); - priv->phyaddr = ofnode_read_u32_default(phandle_args.node, - "reg", -1); + if (!(IS_ENABLED(CONFIG_DM_ETH_PHY))) + priv->phyaddr = ofnode_read_u32_default + (phandle_args.node, "reg", -1); + priv->phy_of_node = phandle_args.node; priv->max_speed = ofnode_read_u32_default(phandle_args.node, "max-speed", From patchwork Wed Mar 30 09:07:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1610996 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=3CBw5y8d; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KT0xN6xtTz9sCq for ; Wed, 30 Mar 2022 20:09:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 25222840AF; Wed, 30 Mar 2022 11:08:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.b="3CBw5y8d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D7AE783AF6; Wed, 30 Mar 2022 11:08:15 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9261884054 for ; Wed, 30 Mar 2022 11:08:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wm1-x332.google.com with SMTP id r7so11802967wmq.2 for ; Wed, 30 Mar 2022 02:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20210112.gappssmtp.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Azp5uQkFCxY2ztSW+634G67nj7eGgM4306W0eQpBqrc=; b=3CBw5y8dDzKCfCNPP9U1WQmIkJcFnV8UdnJDwEQXR1ZOoSFA5GlZZmrVb05JEBmmjv vxypgm8sK8meUuMVBFmNiJ3RK3TUTSW/nXe8Okh+wb8ZiqNe8HG7vZs6G2HTTO+NY5l4 DwZyMX4sHzPRsKCEkDUKx8kzbNDsMF6Mcs7nDa4uPpgMNiW48orGqGREwymHNoT4dTcP BZruvLy5n6OLfgRAiW50q6ZmNRI+EIxQSzPjZI712HGOGlzhbTb8SIdw82rHDxx5TBGw ZfHR9R6Mkot4boLKWm6JTo13DE1643DgzP0gj28swBSMVQ8dFHL1RsmKv8qmXRpDL7z6 cKvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Azp5uQkFCxY2ztSW+634G67nj7eGgM4306W0eQpBqrc=; b=hvUGZIjO2gCKEB+2X83rOQ7V/osMSN3L6XoM4pD6NwIwdvv4Wic2P1tGOHw0XCxasN 50rnYEsbBCVIgGWlajhOofZuLootiHu0gigA5NExZOVZrw7JuQxAW431BGA+OClGXWZu fy2bKZZRu1BXeTbxiLmp3V+gfb1dlohaH0FCTDD6t6qcPsPnN5YT98gKY3rK7DPixoPr s8LNmh1b6HkbThRcIQA0DtdGh7Z31dkCIFD64CRgAOCcZ3lbZzfuzZ66ucauhEiF+sAB ioXmxCDYpNmJbb6FKKBZSXq8tSBxhIZckw2TCXOzobbk7o8tlMucj0IwL8bUtrIttduc /sSA== X-Gm-Message-State: AOAM532U+4x7NqlWzKmx1eY7an4OLHOvW31VS08pIb1Z4rkx+TjT4E5Z IQhjWhDjRCL94fE9xHj7d5KhQnovvp/2RA== X-Google-Smtp-Source: ABdhPJxgk4j9kQnZc5dui2fmY3qdq14eQb8VTGlL0JdX/S/4Xh18WOHcbmZ8mOvkKa/ALimTRBaP3Q== X-Received: by 2002:a05:600c:1c8d:b0:38c:db69:5759 with SMTP id k13-20020a05600c1c8d00b0038cdb695759mr3543889wms.204.1648631283970; Wed, 30 Mar 2022 02:08:03 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::f9e]) by smtp.gmail.com with ESMTPSA id d14-20020a056000186e00b0020405198faasm19503087wri.52.2022.03.30.02.08.03 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Mar 2022 02:08:03 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: T Karthik Reddy , Joe Hershberger , Ramon Fried Subject: [PATCH 2/6] net: phy: Avoid phy gpio reset sequence if DM_ETH_PHY is enabled Date: Wed, 30 Mar 2022 11:07:54 +0200 Message-Id: <4d0fd3f9f886c1d943776025e5efb5438b0eb389.1648631275.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: T Karthik Reddy If DM_ETH_PHY config is enabled PHY gpio reset is taken care by the eth-phy-uclass driver, so use the PHY gpio reset functionality from ethernet_id file when this config is disabled to reset the PHY. Use debug() print instead of dev_err() to avoid warning incase if phy-id compatible string is not present. Signed-off-by: T Karthik Reddy Signed-off-by: Michal Simek --- drivers/net/phy/ethernet_id.c | 45 ++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/drivers/net/phy/ethernet_id.c b/drivers/net/phy/ethernet_id.c index 44abc5bfb301..1a78a751ede3 100644 --- a/drivers/net/phy/ethernet_id.c +++ b/drivers/net/phy/ethernet_id.c @@ -33,31 +33,38 @@ struct phy_device *phy_connect_phy_id(struct mii_dev *bus, struct udevice *dev, ret = ofnode_read_eth_phy_id(node, &vendor, &device); if (ret) { - dev_err(dev, "Failed to read eth PHY id, err: %d\n", ret); + debug("Failed to read eth PHY id, err: %d\n", ret); return NULL; } - ret = gpio_request_by_name_nodev(node, "reset-gpios", 0, &gpio, - GPIOD_ACTIVE_LOW); - if (!ret) { - assert = ofnode_read_u32_default(node, "reset-assert-us", 0); - deassert = ofnode_read_u32_default(node, - "reset-deassert-us", 0); - ret = dm_gpio_set_value(&gpio, 1); - if (ret) { - dev_err(dev, "Failed assert gpio, err: %d\n", ret); - return NULL; - } + if (!IS_ENABLED(CONFIG_DM_ETH_PHY)) { + ret = gpio_request_by_name_nodev(node, "reset-gpios", 0, &gpio, + GPIOD_ACTIVE_LOW); + if (!ret) { + assert = ofnode_read_u32_default(node, + "reset-assert-us", 0); + deassert = ofnode_read_u32_default(node, + "reset-deassert-us", + 0); + ret = dm_gpio_set_value(&gpio, 1); + if (ret) { + dev_err(dev, + "Failed assert gpio, err: %d\n", ret); + return NULL; + } - udelay(assert); + udelay(assert); - ret = dm_gpio_set_value(&gpio, 0); - if (ret) { - dev_err(dev, "Failed deassert gpio, err: %d\n", ret); - return NULL; - } + ret = dm_gpio_set_value(&gpio, 0); + if (ret) { + dev_err(dev, + "Failed deassert gpio, err: %d\n", + ret); + return NULL; + } - udelay(deassert); + udelay(deassert); + } } id = vendor << 16 | device; From patchwork Wed Mar 30 09:07:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1610993 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=vXIUthEt; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KT0wQ6sYFz9sCq for ; Wed, 30 Mar 2022 20:08:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 825E78405A; Wed, 30 Mar 2022 11:08:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.b="vXIUthEt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2B7BD8409D; Wed, 30 Mar 2022 11:08:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1907D8405A for ; Wed, 30 Mar 2022 11:08:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wm1-x334.google.com with SMTP id c190-20020a1c35c7000000b0038e37907b5bso442784wma.0 for ; Wed, 30 Mar 2022 02:08:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20210112.gappssmtp.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kyZO+WjGn8g4lILnZHq5XSa8qjDLJ4rd+9rrzDq5sNQ=; b=vXIUthEtk7OcQJaN3iF2X9uxYhgVADjjgJAcES0qeseGVdnPGQHkO8Y8cL1noV/o7r o16mn+q4C44OTdENOUnzdfF1IiVP+d8HpKhOphyg7r1y5JESwPOceEPBelrPkxrvnB+1 p5R3xiR8SDJJblxQAMw6uUo7rUorhDk9HaSkoCJqcDI8EShyHNVc7QOF8M0WYUYfM0FA UWq5t3+F1HNtMiC6cis/JFIKGQy2K5btxu00mO8qHYVyT8PhE6IU4E0wk9z8AY+PTbS1 s78DCVrF6VZTGwgONA3wAC9utaIOp3hdq/mAHkepRRH0N4Pl5TfuVZltaN/vNmyqazx1 C7xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kyZO+WjGn8g4lILnZHq5XSa8qjDLJ4rd+9rrzDq5sNQ=; b=IX7+6qP4mpipt0wh5allXztqGJRVXNhrXJozAf+8tdz1c3GoU3cfVzHq4lybdiaA/O TYa17z/szqYCw96IUgkTBBG3Hl6ne9nlAjllBYC3ef3aJmyHied49b+I0h+wFAqvNT4s dJt6BzqDq+NiGgbjL/+OV0lVx5T3gDjBukC2hRYhesMvEaAUW0AqOSvfMtDjrXTykvMR mOoRuSetoI4hEQksmAe36zYYKxcJMKQFmgefErH/6aJtfE2QCExMhvFpthtpLfJod2bE AmAPtFwvYP5DZc6aUdcFKxwaH3uO05TlLaY59WxO3o1W/EberGj+GR0fjSXxpn/osXPX XHLw== X-Gm-Message-State: AOAM531G7RlZY1rhaX1iZKw/KNj9of2/W+Zs4bqmPdGV1X45F6hqtHY2 QhKgY8zXm4OmZrDduDfF/B3qpUeCfF7p9w== X-Google-Smtp-Source: ABdhPJxWXySq/tR5+zwfEBaWxm0hiKwgbak/OHBIduAz5XKs6CBmw0i+L73KP9P4txFeROhlmMDo8g== X-Received: by 2002:a05:600c:4f0c:b0:38c:bdf5:2232 with SMTP id l12-20020a05600c4f0c00b0038cbdf52232mr3517119wmq.90.1648631285500; Wed, 30 Mar 2022 02:08:05 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::f9e]) by smtp.gmail.com with ESMTPSA id i2-20020a05600c354200b0038cb422e3fesm4322743wmq.32.2022.03.30.02.08.05 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Mar 2022 02:08:05 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: T Karthik Reddy , Joe Hershberger , Ramon Fried Subject: [PATCH 3/6] net: zynq_gem: Move ethernet info print statement Date: Wed, 30 Mar 2022 11:07:55 +0200 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: T Karthik Reddy As we are not reading the PHY address in case of CONFIG_ETH_PHY in plat function, phy address always prints as -1. So move the ethernet info print statement to probe function, to display proper phy address. Signed-off-by: T Karthik Reddy Signed-off-by: Michal Simek --- drivers/net/zynq_gem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 168aabbdd006..07de1bf0a40e 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -802,6 +802,10 @@ static int zynq_gem_probe(struct udevice *dev) return ret; } + printf("\nZYNQ GEM: %lx, mdio bus %lx, phyaddr %d, interface %s\n", + (ulong)priv->iobase, (ulong)priv->mdiobase, priv->phydev->addr, + phy_string_for_interface(priv->interface)); + return ret; err3: @@ -884,10 +888,6 @@ static int zynq_gem_of_to_plat(struct udevice *dev) priv->int_pcs = dev_read_bool(dev, "is-internal-pcspma"); - printf("\nZYNQ GEM: %lx, mdio bus %lx, phyaddr %d, interface %s\n", - (ulong)priv->iobase, (ulong)priv->mdiobase, priv->phyaddr, - phy_string_for_interface(priv->interface)); - priv->clk_en_info = dev_get_driver_data(dev); return 0; From patchwork Wed Mar 30 09:07:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1610994 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=hSA2lIUN; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KT0ws07vHz9sCq for ; Wed, 30 Mar 2022 20:08:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E44C7840A2; Wed, 30 Mar 2022 11:08:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.b="hSA2lIUN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8F29984098; Wed, 30 Mar 2022 11:08:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B6C9484040 for ; Wed, 30 Mar 2022 11:08:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wm1-x334.google.com with SMTP id bg31-20020a05600c3c9f00b00381590dbb33so3017355wmb.3 for ; Wed, 30 Mar 2022 02:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20210112.gappssmtp.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cUQebanU12O40Gyznzh5HJ3YVlED2iyWAmQW94HCfqM=; b=hSA2lIUNEMK12kmjywknRY+wkUuU1oO/oUzj/48RjHN2vP7XpAPM1fy+sfwMehdK3o UD7iW+ATRftPFGfhK7E0BrgmRTH0ocdPJwNiKJhEoehK3vxXhAfSaxfmSvYbw1uWwez5 sO8IqH1//YzKgQ2FwAHDHywDrV6VBr59Ae/eo04VqklJHHSPA0kyfri6Q8As3/ftAVVj NKsdUfT4HkkvepS4osW7EQaQbSDZOwnUliOn1fkqTunZr0wzJy84LpwMooUAlTmmTXwM E3Qd4cj36x0UN1VBHahgUxPejtVniUqNOsr5ujH9gsMKSqpnn1jOWcMBEspMuSrWl633 3GTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cUQebanU12O40Gyznzh5HJ3YVlED2iyWAmQW94HCfqM=; b=wAO7X0aQ0GXqCXATuXre069nis9mG7OlVGYtC6RMC0gjsK8TEv747sj84m31KuZP4u bI81Rh791ke2pq8AB0NX6Xw4FilcTA1DRFxbigl/EzMaz9WuIc+sgPpiyjUY6c8tUVsh /AWdKf6zYUb8NEyET0PltG5e4JJni24HgP5c8dUNj1qn1FrI3Yqsv0wArU7bkBDF9Y06 3CMjzvodnD1w6lsZ6xajO0gP6UnGHehACVImEObfTkqEeqRKdKEdU/bBe5Hq2OV69pZI RTa+VyA/J9ejxmRFaNxKIUegvbnXNBvkz5X36UPKbS5RVlMfo/WLfcOltQUtylZenqcS MDaw== X-Gm-Message-State: AOAM532zIuUWR+CKOKiUujSybzmFL2S26Z3Wl4r1aRq2/+HOznpJrb30 UKP3evkH9J8f7EAbL0SE87hk+fCMhTpXkg== X-Google-Smtp-Source: ABdhPJywdQQrmWcpLEeYDR10kTPOf3fcZmAVBG0d+bzNieEaidL+6PZb/QNPNGWpNYHmxZIP3x7wXg== X-Received: by 2002:a05:600c:21a:b0:38b:d06e:e0f7 with SMTP id 26-20020a05600c021a00b0038bd06ee0f7mr3325918wmi.105.1648631287038; Wed, 30 Mar 2022 02:08:07 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::f9e]) by smtp.gmail.com with ESMTPSA id s6-20020adfc546000000b00203f3de84d7sm17355180wrf.23.2022.03.30.02.08.06 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Mar 2022 02:08:06 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: T Karthik Reddy Subject: [PATCH 4/6] gpio: slg7xl45106: Update gpio desc flags from DT Date: Wed, 30 Mar 2022 11:07:56 +0200 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: T Karthik Reddy In current slg7xl45106 gpio driver xlate() function we are not updating gpio flags from DT. Read the given flag from DT and update the gpio desc flags variable with required gpio direction state. Signed-off-by: T Karthik Reddy Signed-off-by: Michal Simek --- drivers/gpio/gpio_slg7xl45106.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpio/gpio_slg7xl45106.c b/drivers/gpio/gpio_slg7xl45106.c index 2cbf7488ad62..4ad06c18b4bd 100644 --- a/drivers/gpio/gpio_slg7xl45106.c +++ b/drivers/gpio/gpio_slg7xl45106.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #define SLG7XL45106_REG 0xdb @@ -26,6 +27,7 @@ static int slg7xl45106_i2c_gpo_xlate(struct udevice *dev, struct ofnode_phandle_args *args) { desc->offset = (unsigned int)args->args[0]; + desc->flags = (args->args[1] & GPIO_ACTIVE_LOW ? GPIOD_ACTIVE_LOW : 0); return 0; } From patchwork Wed Mar 30 09:07:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1610998 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=EndfDi0D; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KT0xy6fJ3z9sCq for ; Wed, 30 Mar 2022 20:09:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0E31A840C1; Wed, 30 Mar 2022 11:09:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.b="EndfDi0D"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A25A58405A; Wed, 30 Mar 2022 11:08:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3952E8408A for ; Wed, 30 Mar 2022 11:08:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wr1-x432.google.com with SMTP id b19so28252286wrh.11 for ; Wed, 30 Mar 2022 02:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20210112.gappssmtp.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OFfbYoEQfm5F/XJXyURN7yaQR1NacBghp4VqOniaXEw=; b=EndfDi0DnWX9iqCajeA9GzhFKVMHhfM/Y5ooBDrJl2JYCGgpwgb4EMRF1soHrQ11TF K3xxdDm2SI9c9LScRP1SyCfI9yfY0yfL7tZvppY9v82cFMeOoycla602mu9iFlE8pGsu I2/plGu2nsE/TEcc7Qt1UIU0l1tW5qd/ue1J2nTBab8fW/g1shdxCJrW0Ul8CXMVQAMo QqEL0ihPGIQ99UofmaIGuf4M4dMm+gjgQSlPN3UL7wpVa9ZEpndZ3G0Z6ENU8GKiq6hf M8dJM9lg9qvOCWY0HEInwRzEy5BxEn3pmxDd1hGMi520Eul9yGcm3Vhxt2nVC7VC1/G0 GoVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OFfbYoEQfm5F/XJXyURN7yaQR1NacBghp4VqOniaXEw=; b=qdBG/qUQPHj9IgJU+gFkMqlSJsV8dcdffW+2xDtpZbGx6EJm47KevWS74alesKiOF7 zJ1h4MPUHOqvcn9gS0inCgiHhipHBjyBx3JePvPnNWeVmqKDOXLAWtOJVYt8IA9CtiBG mqCR/JM84I1x/I6dOy5lEtf0XPyW2K233D/TRFQ8KVHhWHfOww0q+IgosTAxMD/jV8Xw isYkoBpa7iiTMlex5Ch9+mHf3XmRpntSiXVbQBIZYY9jQY1wjVZfSWR6xohBaqWGRkwe Y6fqZYA4fMa0+l+4Fy3DGmmkFeNwoRX7YEKgXCeZrlVwFzTCCo0Dv6UfwH5pZTfBDseQ ZKhw== X-Gm-Message-State: AOAM530mbV6JCU/umLpKSUWtg6BHuQQufvqJ3JMeCV7RUtn+ZP7i4pzK Xkr8/JQK3EVvowciJqAhwKBCYsJUmmuAdg== X-Google-Smtp-Source: ABdhPJxEZ+S5SPgamPC1mlIrrcsHr2TfprZpb/Hxd6CYfChZHxBHY+zWPxB0Y9WJvVDFxg972Wtb7g== X-Received: by 2002:adf:db4b:0:b0:203:e76f:fc45 with SMTP id f11-20020adfdb4b000000b00203e76ffc45mr34307222wrj.549.1648631288619; Wed, 30 Mar 2022 02:08:08 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::f9e]) by smtp.gmail.com with ESMTPSA id x3-20020a5d6b43000000b001e317fb86ecsm16647830wrw.57.2022.03.30.02.08.08 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Mar 2022 02:08:08 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: T Karthik Reddy , Adrian Fiergolski , Ashok Reddy Soma , Jaehoon Chung Subject: [PATCH 5/6] firmware: firmware-zynqmp: Add zynqmp_pm_set_gem_config api Date: Wed, 30 Mar 2022 11:07:57 +0200 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: T Karthik Reddy Add zynqmp_pm_set_gem_config() api to configure GEM secure registers. Signed-off-by: T Karthik Reddy Signed-off-by: Michal Simek --- drivers/firmware/firmware-zynqmp.c | 13 +++++++++++++ include/zynqmp_firmware.h | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c index 78da5abc5d3e..0f0d2b07c005 100644 --- a/drivers/firmware/firmware-zynqmp.c +++ b/drivers/firmware/firmware-zynqmp.c @@ -140,6 +140,19 @@ unsigned int zynqmp_firmware_version(void) return pm_api_version; }; +int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type config, u32 value) +{ + int ret; + + ret = xilinx_pm_request(PM_IOCTL, node, IOCTL_SET_GEM_CONFIG, + config, value, NULL); + if (ret) + printf("%s: node %d: set_gem_config %d failed\n", + __func__, node, config); + + return ret; +} + int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type config, u32 value) { int ret; diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h index f577008736d9..76ec2141ff6a 100644 --- a/include/zynqmp_firmware.h +++ b/include/zynqmp_firmware.h @@ -408,6 +408,11 @@ enum pm_sd_config_type { SD_CONFIG_FIXED = 4, /* To set fixed config registers */ }; +enum pm_gem_config_type { + GEM_CONFIG_SGMII_MODE = 1, /* To set GEM_SGMII_MODE in GEM_CLK_CTRL */ + GEM_CONFIG_FIXED = 2, /* To set fixed config registers */ +}; + #define PM_SIP_SVC 0xc2000000 #define ZYNQMP_PM_VERSION_MAJOR 1 @@ -439,6 +444,8 @@ void zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size); int xilinx_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 *ret_payload); int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type config, u32 value); +int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type config, + u32 value); int zynqmp_pm_is_function_supported(const u32 api_id, const u32 id); /* Type of Config Object */ From patchwork Wed Mar 30 09:07:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1610995 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=PEWH4IPk; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KT0x60ZlDz9sCq for ; Wed, 30 Mar 2022 20:09:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5C463840AA; Wed, 30 Mar 2022 11:08:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.b="PEWH4IPk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E9C658405A; Wed, 30 Mar 2022 11:08:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A4A0384098 for ; Wed, 30 Mar 2022 11:08:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-wr1-x42e.google.com with SMTP id m30so28308882wrb.1 for ; Wed, 30 Mar 2022 02:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20210112.gappssmtp.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1FEQZcyVLjquAeFVAX/RulMWdsShMflhxdvSz6OtiYM=; b=PEWH4IPkxpfJ+at1YJsmbhFfQHjOzarIXuZhw7r9PCG1mQqtnUoy6JHVqbNKPy6os6 XZa1vONa6Qh6rxNE/+jduC0niEobd1zu8E8MSTBGHZ7//W5l4xkNxfZWBfLPsoMTp5z/ zflxhxr3+YjiwKs5asfUk0E3fJRNdShA2t9kPjDGx222Hwu9w0qQ3/ST6689WG8iM2nB 9WvhXHSYqa/R+dbp0fiXyOH6JFgxox1B8OOWKVokw3u91MnycCpSLoOQKiooExptQcUc Y6IUFH/OZhC9XbrVxccK+2d5dIAWzqTU9c2LdvNwe8eqCcqF545Zh1I8mRO9Yz4g6ix6 VR6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1FEQZcyVLjquAeFVAX/RulMWdsShMflhxdvSz6OtiYM=; b=yqnP9f4zs0IvY50ctqKLLQYTrM2WrBemI1u9PrU/FKhzgcAvRzNK+B+u6jry4ZMGbj rHkGWcLlb2/4Aamm39knlXuUcKKg5+ht+EG6X3j9FceDeRLfsgwLxXMgizznG3vRT7fA hu7bkCAqLlA+vmz1++xzlMC9RalXDUNqG1EwHAIJ2j1sXhxdtRF7PEwbjBUcYDa+qZT0 fhO84KhkE3NcGTpwz3y6f3bBOlU4OEmiShp/pw4CCMk+zBi0X5KY6qZu9Xe49iGCldAr Nv3W7fGuxaEo+DCS4fcC0x8Im9CJ9YMG1awWxXS5RSeQQEX3Ms6Xcv7SBFedO+2DmlPy fTSg== X-Gm-Message-State: AOAM531UtI3AGX6Q41Y2syQU9ZRFlzgoSN9IB7xxmHhdjxNW6NszLEOW KwuOAERyogL9DCkk+/pQa/bRkIBBdWyABw== X-Google-Smtp-Source: ABdhPJyLwSBNwcrT5F1PFrhkCIdGSflRVLjRBABc9hRvJAPJq6thUnwmnMWcfud3isLMuyo6guGQZQ== X-Received: by 2002:adf:f9c9:0:b0:205:7ba0:121b with SMTP id w9-20020adff9c9000000b002057ba0121bmr35002616wrr.599.1648631290091; Wed, 30 Mar 2022 02:08:10 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::f9e]) by smtp.gmail.com with ESMTPSA id g7-20020a5d64e7000000b00204a13925dcsm17774521wri.11.2022.03.30.02.08.09 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Mar 2022 02:08:09 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: T Karthik Reddy , Joe Hershberger , Ramon Fried Subject: [PATCH 6/6] net: zynq_gem: Add SGMII dynamic config support Date: Wed, 30 Mar 2022 11:07:58 +0200 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: T Karthik Reddy Add support for SGMII dynamic configuration which will takes care of configuring SGMII in the GEM secure (GEM_CLK_CTRL) configuration register. Signed-off-by: T Karthik Reddy Signed-off-by: Michal Simek --- drivers/net/zynq_gem.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 07de1bf0a40e..4c83ccc1dfbc 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -34,6 +34,7 @@ #include #include #include +#include /* Bit/mask specification */ #define ZYNQ_GEM_PHYMNTNC_OP_MASK 0x40020000 /* operation mask bits */ @@ -714,6 +715,40 @@ static int zynq_gem_reset_init(struct udevice *dev) return 0; } +static int gem_zynqmp_set_dynamic_config(struct udevice *dev) +{ + u32 pm_info[2]; + int ret; + + if (IS_ENABLED(CONFIG_ARCH_ZYNQMP)) { + if (!zynqmp_pm_is_function_supported(PM_IOCTL, + IOCTL_SET_GEM_CONFIG)) { + ret = ofnode_read_u32_array(dev_ofnode(dev), + "power-domains", + pm_info, + ARRAY_SIZE(pm_info)); + if (ret) { + dev_err(dev, + "Failed to read power-domains info\n"); + return ret; + } + + ret = zynqmp_pm_set_gem_config(pm_info[1], + GEM_CONFIG_FIXED, 0); + if (ret) + return ret; + + ret = zynqmp_pm_set_gem_config(pm_info[1], + GEM_CONFIG_SGMII_MODE, + 1); + if (ret) + return ret; + } + } + + return 0; +} + static int zynq_gem_probe(struct udevice *dev) { void *bd_space; @@ -797,6 +832,17 @@ static int zynq_gem_probe(struct udevice *dev) goto err3; if (priv->interface == PHY_INTERFACE_MODE_SGMII && phy.dev) { + if (IS_ENABLED(CONFIG_DM_ETH_PHY)) { + if (device_is_compatible(dev, "cdns,zynqmp-gem")) { + ret = gem_zynqmp_set_dynamic_config(dev); + if (ret) { + dev_err + (dev, + "Failed to set gem dynamic config\n"); + return ret; + } + } + } ret = generic_phy_power_on(&phy); if (ret) return ret;