From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEC5CC4332F for ; Sat, 11 Dec 2021 02:03:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236232AbhLKCGx (ORCPT ); Fri, 10 Dec 2021 21:06:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345827AbhLKCGW (ORCPT ); Fri, 10 Dec 2021 21:06:22 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 808A5C0698D5; Fri, 10 Dec 2021 18:02:41 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id g14so34444077edb.8; Fri, 10 Dec 2021 18:02:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aUH9zRckSoOkbw2tv4xR9ZLdUtn3mOCNC8Hdz+zJiUU=; b=KpBzf5BU0/3PbCamLNBYfsBuuZ08yHNRKVzzFg6UTgOV1xjjLURUEOX5t4z01Wi4+6 FtjjqsSMzSMc/SFZ+KdTHnn7Z/XpCnUKad/v1KMY68us3L1i/kWaFOdrRNR6gesUt0sl Fbf8UDgRKCuiKicze28CkkjWefXA5pkUhvGlrUBYC8RKsBXhtIkFUXA/befigxkhU+sp TsAx2NhVWTBr320mjLtdGX0KFMsGeDe8iGAsSpbUBQwPNQT5jhuS96UoTYl40u44UyMA xnZgKy50nimAtDVTYtRfVSa2De/7heUmffCD9AUvL84FzzaYJrTHYXqI/CTeOR4BZJZu 89ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aUH9zRckSoOkbw2tv4xR9ZLdUtn3mOCNC8Hdz+zJiUU=; b=T64NjWsojqUOvoyIIVTanryjakMTUttpEuiprrdjhFkn3QBdq82XtfeAmqKB/2k9JF OqN3QavXuAEMDiNFJw5I6nP8VwZJZVQ/6B8eCrxfdNQMaG8cVF1NdIYKiEvZJgTkwPGK nrnb7xaVdWcmdRBlbpGPNUdNCQbzSd3bYqxm0cqgktzidMjVxzmOmDegrbeBVfUxwxBI sGTXDA4OFw0VxDwHx+S8SSh/zLO2arRDo5aohmVGTqCDiXTM/oWK5+Zb6oH4lLWoBeqt D+rISRpHfvNNbu6SBLX6oF3O5oQxOLXJA+mdKZnjWzP/rCjPSMBwpavKkUxmDkBhx1Oh i36Q== X-Gm-Message-State: AOAM531vUQpJkbF5VFW3ozM96pzVIE236uMwm6cF3qALKkzl6KNDJ8SD 788WhQBq/R9tC43N8XYvaY8= X-Google-Smtp-Source: ABdhPJxxnyEFQxZJSEnYpODdB9mZ958ri3POEpq+tSYARfxI6QMUGDG4GqSi97vr9izN0bHUECzBPg== X-Received: by 2002:a17:906:fca3:: with SMTP id qw3mr28722390ejb.285.1639188159951; Fri, 10 Dec 2021 18:02:39 -0800 (PST) Received: from localhost.localdomain (93-42-71-246.ip85.fastwebnet.it. [93.42.71.246]) by smtp.googlemail.com with ESMTPSA id p13sm2265956eds.38.2021.12.10.18.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 18:02:39 -0800 (PST) From: Ansuel Smith To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Cc: Ansuel Smith Subject: [net-next RFC PATCH v3 13/14] net: dsa: qca8k: add support for phy read/write with mdio Ethernet Date: Sat, 11 Dec 2021 03:01:52 +0100 Message-Id: <20211211020155.10114-21-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211211020155.10114-1-ansuelsmth@gmail.com> References: <20211211020155.10114-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Use mdio Ethernet also for phy read/write if availabale. Use a different seq number to make sure we receive the correct packet. On any error, we fallback to the legacy mdio read/write. Signed-off-by: Ansuel Smith --- drivers/net/dsa/qca8k.c | 150 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 624df3b0fd9f..375a1d34e46f 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -831,6 +831,125 @@ qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable) regmap_clear_bits(priv->regmap, QCA8K_REG_PORT_STATUS(port), mask); } +static int +qca8k_mdio_eth_busy_wait(struct qca8k_mdio_hdr_data *phy_hdr_data, + struct sk_buff *read_skb, u32 *val) +{ + struct sk_buff *skb = skb_copy(read_skb, GFP_KERNEL); + bool ack; + int ret; + + reinit_completion(&phy_hdr_data->rw_done); + phy_hdr_data->seq = 400; + phy_hdr_data->ack = false; + + dev_queue_xmit(skb); + + ret = wait_for_completion_timeout(&phy_hdr_data->rw_done, + QCA8K_ETHERNET_TIMEOUT); + + ack = phy_hdr_data->ack; + + if (ret <= 0) + return -ETIMEDOUT; + + if (!ack) + return -EINVAL; + + *val = phy_hdr_data->data[0]; + + return 0; +} + +static int +qca8k_mdio_eth_command(struct qca8k_priv *priv, bool read, int phy, + int regnum, u16 data) +{ + struct net_device *dev = dsa_to_port(priv->ds, 0)->master; + struct sk_buff *write_skb, *clear_skb, *read_skb; + struct qca8k_mdio_hdr_data *phy_hdr_data; + u32 write_val, clear_val = 0, val; + int seq_num = 400; + int ret, ret1; + bool ack; + + if (regnum >= QCA8K_MDIO_MASTER_MAX_REG) + return -EINVAL; + + phy_hdr_data = &priv->mdio_hdr_data; + + write_val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN | + QCA8K_MDIO_MASTER_PHY_ADDR(phy) | + QCA8K_MDIO_MASTER_REG_ADDR(regnum); + + if (read) { + write_val |= QCA8K_MDIO_MASTER_READ; + } else { + write_val |= QCA8K_MDIO_MASTER_WRITE; + write_val |= QCA8K_MDIO_MASTER_DATA(data); + } + + /* Prealloc all the needed skb before the lock */ + write_skb = qca8k_alloc_mdio_header(MDIO_WRITE, QCA8K_MDIO_MASTER_CTRL, + &write_val, seq_num); + write_skb->dev = dev; + clear_skb = qca8k_alloc_mdio_header(MDIO_WRITE, QCA8K_MDIO_MASTER_CTRL, + &clear_val, seq_num); + clear_skb->dev = dev; + read_skb = qca8k_alloc_mdio_header(MDIO_READ, QCA8K_MDIO_MASTER_CTRL, + &clear_val, seq_num); + read_skb->dev = dev; + + /* Actually start the request: + * 1. Send mdio master packet + * 2. Busy Wait for mdio master command + * 3. Get the data if we are reading + * 4. Reset the mdio master (even with error) + */ + mutex_lock(&phy_hdr_data->mutex); + + reinit_completion(&phy_hdr_data->rw_done); + phy_hdr_data->ack = false; + phy_hdr_data->seq = seq_num; + + dev_queue_xmit(write_skb); + + ret = wait_for_completion_timeout(&phy_hdr_data->rw_done, + QCA8K_ETHERNET_TIMEOUT); + + ack = phy_hdr_data->ack; + + if (ret <= 0) { + ret = -ETIMEDOUT; + goto exit; + } + + if (!ack) { + ret = -EINVAL; + goto exit; + } + + ret = read_poll_timeout(qca8k_mdio_eth_busy_wait, ret1, + !(val & QCA8K_MDIO_MASTER_BUSY), 0, + QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC, false, + phy_hdr_data, read_skb, &val); + + if (ret < 0 && ret1 < 0) + ret = ret1; + + if (read) + ret = phy_hdr_data->data[0] & QCA8K_MDIO_MASTER_DATA_MASK; + +exit: + dev_queue_xmit(clear_skb); + + mutex_unlock(&phy_hdr_data->mutex); + + kfree_skb(read_skb); + + return ret; +} + static u32 qca8k_port_to_phy(int port) { @@ -953,6 +1072,14 @@ qca8k_internal_mdio_write(struct mii_bus *slave_bus, int phy, int regnum, u16 da { struct qca8k_priv *priv = slave_bus->priv; struct mii_bus *bus = priv->bus; + int ret; + + /* Use mdio Ethernet when available, fallback to legacy one on error */ + if (priv->master_oper) { + ret = qca8k_mdio_eth_command(priv, false, phy, regnum, data); + if (!ret) + return 0; + } return qca8k_mdio_write(bus, phy, regnum, data); } @@ -962,6 +1089,14 @@ qca8k_internal_mdio_read(struct mii_bus *slave_bus, int phy, int regnum) { struct qca8k_priv *priv = slave_bus->priv; struct mii_bus *bus = priv->bus; + int ret; + + /* Use mdio Ethernet when available, fallback to legacy one on error */ + if (priv->master_oper) { + ret = qca8k_mdio_eth_command(priv, true, phy, regnum, 0); + if (ret >= 0) + return ret; + } return qca8k_mdio_read(bus, phy, regnum); } @@ -970,6 +1105,7 @@ static int qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data) { struct qca8k_priv *priv = ds->priv; + int ret; /* Check if the legacy mapping should be used and the * port is not correctly mapped to the right PHY in the @@ -978,6 +1114,13 @@ qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data) if (priv->legacy_phy_port_mapping) port = qca8k_port_to_phy(port) % PHY_MAX_ADDR; + /* Use mdio Ethernet when available, fallback to legacy one on error */ + if (priv->master_oper) { + ret = qca8k_mdio_eth_command(priv, true, port, regnum, 0); + if (!ret) + return ret; + } + return qca8k_mdio_write(priv->bus, port, regnum, data); } @@ -994,6 +1137,13 @@ qca8k_phy_read(struct dsa_switch *ds, int port, int regnum) if (priv->legacy_phy_port_mapping) port = qca8k_port_to_phy(port) % PHY_MAX_ADDR; + /* Use mdio Ethernet when available, fallback to legacy one on error */ + if (priv->master_oper) { + ret = qca8k_mdio_eth_command(priv, true, port, regnum, 0); + if (ret >= 0) + return ret; + } + ret = qca8k_mdio_read(priv->bus, port, regnum); if (ret < 0) -- 2.32.0