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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE300C43381 for ; Wed, 20 Mar 2019 18:27:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACBFE218A6 for ; Wed, 20 Mar 2019 18:27:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Od/9HgUJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727465AbfCTS1R (ORCPT ); Wed, 20 Mar 2019 14:27:17 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:50633 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726438AbfCTS1R (ORCPT ); Wed, 20 Mar 2019 14:27:17 -0400 Received: by mail-wm1-f66.google.com with SMTP id z11so251434wmi.0; Wed, 20 Mar 2019 11:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:openpgp:autocrypt:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=KkUCu5e4Y5ZmZyelQEqP08VfqMq2gfKXirKcQtIsVQw=; b=Od/9HgUJ8P3K9VEUi/EWEg8lTtqEeQXGdYvEIS5NrFsObOGUOegl78Ojrf7RMkpYXx dr58ukh/E2lxIBfPewAQ1Uj53fDF11j2ren3y/YSMYCkoXeJVKnyTcA8QJ5PhIwgfCJB M+7lM5LSjXwEIETd+VjOf4TiEdYrMYXdvDD30kksgbyHHy8RFsA/xEqikgOqYRwuokfb az/ZnVczQScu9mo/gKLe4sIHdwCoA9KlaZBLRmK0TojZe2Hs+E2vywyZjVzKGJZxth/T HHglxzf7BBy+vPY80CdCe8LaNJanoDgHy2fqv/T6EEngzaj7zu0DzyOVRaCvi/JVnYgL 5Enw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=KkUCu5e4Y5ZmZyelQEqP08VfqMq2gfKXirKcQtIsVQw=; b=QBW0bjjz9NG9Z5h8uAMW5Be1W439yrVi8O6dD9NCWvcw2968xARf71RrOmNcBlM6Zw XplqKa+Ct1zNu+mJD2vDG44PoO3m14fHFYjUdI/otsFcrsL0g8ayvoc1WvxNiooDk6m+ mvl0ju3BtlLkBDzoYp/aT69q256CGTd6el63u6l8GD8iU9v/90EsiuqRblSAAp97BT/8 Tlf6k+6CnMKLBTnsGWhxZl+kaPmdt9xR59do735zAx++/fLjmoQlOj3EQA3leArhlx+C kkbpDYJKZhjwhf1E1qhIoVpwjA9TXtzczEPkCkgrp2ChrebFXh8MXdZHOKWIqlrTMISV zRMA== X-Gm-Message-State: APjAAAUo5Fj0WdoFyM4UDrHPpz74+pCjobWl7yQXDx/aH5jj8iBMieDY gR4JYcqShX06GLBcqPjAax4= X-Google-Smtp-Source: APXvYqxt7deXqtmGpaOPol3NermzEkeqOPdrSQ35SlZ0t4JtOq8HdubLeBh+Muo0M5XVahk8pjgpHg== X-Received: by 2002:a1c:67c2:: with SMTP id b185mr9369131wmc.68.1553106433798; Wed, 20 Mar 2019 11:27:13 -0700 (PDT) Received: from [10.67.50.0] ([192.19.223.250]) by smtp.googlemail.com with ESMTPSA id q24sm3642107wmq.5.2019.03.20.11.27.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 11:27:12 -0700 (PDT) Subject: Re: [PATCH v3 3/3] net: dsa: qca8k: extend slave-bus implementations To: Christian Lamparter , netdev@vger.kernel.org, devicetree@vger.kernel.org Cc: Vivien Didelot , Andrew Lunn , Rob Herring , Mark Rutland References: <20190319195419.12746-1-chunkeey@gmail.com> <20190319195419.12746-3-chunkeey@gmail.com> From: Florian Fainelli Openpgp: preference=signencrypt Autocrypt: addr=f.fainelli@gmail.com; prefer-encrypt=mutual; keydata= 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 M5kY0ACeNhCZJvZ5g4C2Lc9fcTHu8jxmEkI= Message-ID: <5cd4b993-d1fa-80a2-a03b-a494a63ae56c@gmail.com> Date: Wed, 20 Mar 2019 11:27:09 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190319195419.12746-3-chunkeey@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 3/19/19 12:54 PM, Christian Lamparter wrote: > This patch implements accessors for the QCA8337 MDIO access > through the MDIO_MASTER register, which makes it possible to > access the PHYs on slave-bus through the switch. In cases > where the switch ports are already mapped via external > "phy-phandles", the internal mdio-bus is disabled in order to > prevent a duplicated discovery and enumeration of the same > PHYs. Don't use mixed external and internal mdio-bus > configurations, as this is not supported by the hardware. > > Signed-off-by: Christian Lamparter > --- > Changes from v2: > - Make it compatible with existing configurations > - make it clear that's sadly a either external or > internal mdio bus access. > > Changes from v1: > - drop DT port <-> phy mapping > - added register definitions for the MDIO control register > - implemented new slave-mdio bus accessors > - DT-binding: fix switch's PSEUDO_PHY address. It's 0x10 not 0. > > Old patch (+ discussion) for reference: > LGTM, just a few comments/nits below. > > Tested on a Compex WPQ864 (IPQ8064 + QCA8337N) > internal bus: > qca8k 37000000.mdio-mii:10 lan1 (uninitialized): PHY [!mdio@37000000!switch@10:01] driver [Generic PHY] > qca8k 37000000.mdio-mii:10 lan2 (uninitialized): PHY [!mdio@37000000!switch@10:02] driver [Generic PHY] > qca8k 37000000.mdio-mii:10 lan3 (uninitialized): PHY [!mdio@37000000!switch@10:03] driver [Generic PHY] > qca8k 37000000.mdio-mii:10 lan4 (uninitialized): PHY [!mdio@37000000!switch@10:04] driver [Generic PHY] > qca8k 37000000.mdio-mii:10 wan (uninitialized): PHY [!mdio@37000000!switch@10:05] driver [Generic PHY] > > external bus: > qca8k 37000000.mdio-mii:10 lan1 (uninitialized): PHY [37000000.mdio-mii:00] driver [Generic PHY] > qca8k 37000000.mdio-mii:10 lan2 (uninitialized): PHY [37000000.mdio-mii:01] driver [Generic PHY] > qca8k 37000000.mdio-mii:10 lan3 (uninitialized): PHY [37000000.mdio-mii:02] driver [Generic PHY] > qca8k 37000000.mdio-mii:10 lan4 (uninitialized): PHY [37000000.mdio-mii:03] driver [Generic PHY] > qca8k 37000000.mdio-mii:10 wan (uninitialized): PHY [37000000.mdio-mii:04] driver [Generic PHY] > --- [snip] > +static int > +qca8k_mdio_write(struct qca8k_priv *priv, int port, int regnum, u16 data) > +{ > + u32 val; > + int phy; > + > + phy = qca8k_port_to_phy(port); > + if (phy < 0 || (regnum < 0 || regnum >= QCA8K_MDIO_MASTER_MAX_REG)) > + return -EINVAL; Is not the first condition always true? We should fix the signature of phy_{read,write} in dsa.h to match what mdiobus_{read,write} takes, which is an u32 regnum. > + > + val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN | > + QCA8K_MDIO_MASTER_WRITE | QCA8K_MDIO_MASTER_PHY_ADDR(phy) | > + QCA8K_MDIO_MASTER_REG_ADDR(regnum) | > + QCA8K_MDIO_MASTER_DATA(data); > + > + qca8k_write(priv, QCA8K_MDIO_MASTER_CTRL, val); > + > + return qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL, > + QCA8K_MDIO_MASTER_BUSY); > +} > + > +static int > +qca8k_mdio_read(struct qca8k_priv *priv, int port, int regnum) > +{ > + u32 val; > + int phy; > + > + phy = qca8k_port_to_phy(port); > + if (phy < 0 || (regnum < 0 || regnum >= QCA8K_MDIO_MASTER_MAX_REG)) > + return -EINVAL; Likewise. [snip] > +static int > +qca8k_phy_read(struct dsa_switch *ds, int port, int regnum) > +{ > + struct qca8k_priv *priv = ds->priv; > + int ret = -EIO; > + > + if (ds->slave_mii_bus->phy_mask & BIT(port)) > + ret = qca8k_mdio_read(priv, port, regnum); I suppose in theory you could also look at the external_mdio_mask and do something like this: if (ds->slave_mii_bus->phy_mask & BIT(port)) ret = qca8k_mdio_read(priv, port, regnum); else ret = mdiobus_read_nested(priv->bus, port, regnum); Not strictly necessary for now. > + > + return ret; > +} > + > +static int > +qca8k_setup_mdio_bus(struct qca8k_priv *priv) > +{ > + struct device_node *ports, *port; > + struct mii_bus *bus; > + u32 internal_mdio_mask = 0; > + u32 external_mdio_mask = 0; > + u32 reg; > + int err; > + > + ports = of_get_child_by_name(priv->dev->of_node, "ports"); > + if (!ports) > + return -EINVAL; > + > + for_each_available_child_of_node(ports, port) { > + err = of_property_read_u32(port, "reg", ®); > + if (err) > + return err; > + > + if (dsa_is_user_port(priv->ds, reg)) { You could reduce indentation a bit with: if (!dsa_is_user_port(priv->ds, reg)) continue; > + if (of_property_read_bool(port, "phy-handle")) > + external_mdio_mask |= BIT(reg); > + else > + internal_mdio_mask |= BIT(reg); > + } > + } > + > + if (!external_mdio_mask && !internal_mdio_mask) { > + dev_err(priv->dev, "no PHYs are defined.\n"); > + return -EINVAL; > + } > + > + /* The QCA8K_MDIO_MASTER_EN Bit, which grants access to PHYs through > + * the MDIO_MASTER register also _disconnects_ the external MDC > + * passthrough to the internal PHYs. It's not possible to use both > + * configurations at the same time! > + */ Right, but presumably you can do this on a per-port basis and support both types of configuration? bcm_sf2 is pretty much the same thing. > + if (external_mdio_mask && internal_mdio_mask) { > + dev_err(priv->dev, "either internal or external mdio bus configuration is supported.\n"); > + return -EINVAL; > + } Don't both conditions amount to: if (external_mdio_mask == internal_mdio_mask) error()? > + > + if (external_mdio_mask) { > + /* Make sure to disable the internal mdio bus in cases > + * a dt-overlay and driver reload changed the configuration > + */ > + > + qca8k_reg_clear(priv, QCA8K_MDIO_MASTER_CTRL, > + QCA8K_MDIO_MASTER_EN); > + return 0; > + } > + > + bus = devm_mdiobus_alloc_size(priv->dev, sizeof(priv)); > + if (!bus) > + return -ENOMEM; > + bus->priv = (void *)priv; Cast is not necessary. -- Florian