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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1E7A5C04FFE for ; Wed, 8 May 2024 05:44:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:Subject: From:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=76z6yO59r6l8uIkmn2eF7qZ+YaSIhKujD6ZmFi/FZ3s=; b=WnSzs6QwbAikI/ 2SwTA5go8wq7NELph9H5xCT/MCZiJd6XAf/xdwxbGLOWExvTflz017s/7exjeVTkA6vVcIdNIsL8P 88AEIVJvCL/0/rGHg53WNIZY0qHWGc6xQFCp567YPdJgkHiRVDpT5a55go1TxnwROETZuImW8i7T1 19QHDj1GAEGkAfvAUhMICHBPdyfmr0oKPZlA17bfW+xz82HXKxXsaWZjcss0NLXbJVUVcLfM/2Z9k b7M9kt/rwja32FMJhDl3+X1quECeAWIQjXgJsU+ZlCADrIkbT1UPvVJl/TLxQwdg8/ypZzcaZcnv4 bVpubWdhgMTcHTQcWpyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4a5p-0000000E8Dl-2IwP; Wed, 08 May 2024 05:43:53 +0000 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4a5j-0000000E8Ac-3hLl for linux-arm-kernel@lists.infradead.org; Wed, 08 May 2024 05:43:51 +0000 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a59a17fcc6bso905108366b.1 for ; Tue, 07 May 2024 22:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715147023; x=1715751823; darn=lists.infradead.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:subject:from:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=fiWPwYiB92tF4WQY1BN+lNYYVhCz5it+Y7g3x7gUTT0=; b=iA1ztWjI5IsX7K7AE7BcZ+AlIdR0svhUiER3j3LK3GbCVpkKrb4mQPE4guF9XOHsYC FlGBRTfNc9MzTMIzsw67RZx/pKu0EWRvfMY6U2wswF+UELph8kCsJCmsWFrw/W2y/0v3 jzrAuBzk3DEINqPbJZyG7VD6zkkzIDdD6KNxSHRoHG/sC3iYz0YaAINRg7IQWgOMdUgH 8qzhDTkKu85wAlB+L7qAXzT8e/uML6nWgnbNgbpaNJV/1hj2xFlB55ybhiAJFhld4tL6 UbBZsmEzHmRMxvH8O1VolIYxS5kwcFpMB4nMCVa/DBiVrF1ExXa8yajnbCNb29HFyiKG 4Nug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715147023; x=1715751823; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:subject:from:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fiWPwYiB92tF4WQY1BN+lNYYVhCz5it+Y7g3x7gUTT0=; b=Nns4T+BGKzHkHwaOhyBYY0LVnm8MgihCtIkMjU7lhHTi3o7Lj1oDjAjOmfmEgPXveb r2LMrMuDWUxmGbmgFlCI+xPdOLpF14Jo0R3r6t+nVw24aLS9nwxPuznRcOHoCR6OQU73 IeYGW6A4C8bO0E3ZEvnQAhzgm7UgjdfjeH0P61MU6bYKrZlw+sJIYvMBqfQfItw9F3k/ E6Q1pDbdqLEZaXiDquPTyQR+G2wPKY7xWYYufHaJrEsEij/ko9qmQ+Fk96P/ADiAfgT8 8HDBtLqBNS2bqBh5qh8YFFjjVd03ZMsjA5uXFHfbH64/pFldJ2QeNFKfo8cs3r4IPGX1 PiTQ== X-Forwarded-Encrypted: i=1; AJvYcCVqf0h3yT/Yh9xXNHFk03QC6h1owK88/so+/+SUQvWA50xYQOeOBhALqozf6gMzqJ2ozxaCVpg8fFH90kfZ15JBnW7qQ1TfSf4P0FBVoYT8OSiBMKs= X-Gm-Message-State: AOJu0YzTF9gx98kMvwvTAx38IrEYjnrl2JQPLakoSS8pR9gekxQHMHYb IDDl6dD/l9UBiA9Dd/Zc/tEoCqgX5u3/jywR7ghfsWpn4uguyrDi X-Google-Smtp-Source: AGHT+IF7cIGyFtpEAXYC1YmQO4hzObfVUwPA74DS0TjxiqRtmI/DEc970iSlvGionU5zELgJQe6lFA== X-Received: by 2002:a50:bb41:0:b0:572:719f:b44f with SMTP id 4fb4d7f45d1cf-5731d9ce2a9mr1060568a12.9.1715147023013; Tue, 07 May 2024 22:43:43 -0700 (PDT) Received: from ?IPV6:2a01:c23:c5ec:1600:f15f:edb4:9cd5:3c38? (dynamic-2a01-0c23-c5ec-1600-f15f-edb4-9cd5-3c38.c23.pool.telefonica.de. [2a01:c23:c5ec:1600:f15f:edb4:9cd5:3c38]) by smtp.googlemail.com with ESMTPSA id p9-20020a056402500900b005727b2ae25csm7176205eda.14.2024.05.07.22.43.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 May 2024 22:43:42 -0700 (PDT) Message-ID: Date: Wed, 8 May 2024 07:43:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Heiner Kallweit Subject: Re: [PATCH net-next 1/2] net: phy: phy_link_topology: Pass netdevice to phy_link_topo helpers To: Maxime Chevallier , davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Russell King , linux-arm-kernel@lists.infradead.org, Christophe Leroy , Herve Codina , Florian Fainelli , Vladimir Oltean , =?UTF-8?Q?K=C3=B6ry_Maincent?= , Jesse Brandeburg , =?UTF-8?Q?Marek_Beh=C3=BAn?= , Piergiorgio Beruto , Oleksij Rempel , =?UTF-8?Q?Nicol=C3=B2_Veronese?= , Simon Horman , mwojtas@chromium.org, Nathan Chancellor , Antoine Tenart References: <20240507102822.2023826-1-maxime.chevallier@bootlin.com> <20240507102822.2023826-2-maxime.chevallier@bootlin.com> Content-Language: en-US Autocrypt: addr=hkallweit1@gmail.com; keydata= xsFNBF/0ZFUBEAC0eZyktSE7ZNO1SFXL6cQ4i4g6Ah3mOUIXSB4pCY5kQ6OLKHh0FlOD5/5/ sY7IoIouzOjyFdFPnz4Bl3927ClT567hUJJ+SNaFEiJ9vadI6vZm2gcY4ExdIevYHWe1msJF MVE4yNwdS+UsPeCF/6CQQTzHc+n7DomE7fjJD5J1hOJjqz2XWe71fTvYXzxCFLwXXbBiqDC9 dNqOe5odPsa4TsWZ09T33g5n2nzTJs4Zw8fCy8rLqix/raVsqr8fw5qM66MVtdmEljFaJ9N8 /W56qGCp+H8Igk/F7CjlbWXiOlKHA25mPTmbVp7VlFsvsmMokr/imQr+0nXtmvYVaKEUwY2g 86IU6RAOuA8E0J5bD/BeyZdMyVEtX1kT404UJZekFytJZrDZetwxM/cAH+1fMx4z751WJmxQ J7mIXSPuDfeJhRDt9sGM6aRVfXbZt+wBogxyXepmnlv9K4A13z9DVLdKLrYUiu9/5QEl6fgI kPaXlAZmJsQfoKbmPqCHVRYj1lpQtDM/2/BO6gHASflWUHzwmBVZbS/XRs64uJO8CB3+V3fa cIivllReueGCMsHh6/8wgPAyopXOWOxbLsZ291fmZqIR0L5Y6b2HvdFN1Xhc+YrQ8TKK+Z4R mJRDh0wNQ8Gm89g92/YkHji4jIWlp2fwzCcx5+lZCQ1XdqAiHQARAQABzSZIZWluZXIgS2Fs bHdlaXQgPGhrYWxsd2VpdDFAZ21haWwuY29tPsLBjgQTAQgAOBYhBGxfqY/yOyXjyjJehXLe ig9U8DoMBQJf9GRVAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEHLeig9U8DoMSycQ AJbfg8HZEK0ljV4M8nvdaiNixWAufrcZ+SD8zhbxl8GispK4F3Yo+20Y3UoZ7FcIidJWUUJL axAOkpI/70YNhlqAPMsuudlAieeYZKjIv1WV5ucNZ3VJ7dC+dlVqQdAr1iD869FZXvy91KhJ wYulyCf+s4T9YgmLC6jLMBZghKIf1uhSd0NzjyCqYWbk2ZxByZHgunEShOhHPHswu3Am0ftt ePaYIHgZs+Vzwfjs8I7EuW/5/f5G9w1vibXxtGY/GXwgGGHRDjFM7RSprGOv4F5eMGh+NFUJ TU9N96PQYMwXVxnQfRXl8O6ffSVmFx4H9rovxWPKobLmqQL0WKLLVvA/aOHCcMKgfyKRcLah 57vGC50Ga8oT2K1g0AhKGkyJo7lGXkMu5yEs0m9O+btqAB261/E3DRxfI1P/tvDZpLJKtq35 dXsj6sjvhgX7VxXhY1wE54uqLLHY3UZQlmH3QF5t80MS7/KhxB1pO1Cpcmkt9hgyzH8+5org +9wWxGUtJWNP7CppY+qvv3SZtKJMKsxqk5coBGwNkMms56z4qfJm2PUtJQGjA65XWdzQACib 2iaDQoBqGZfXRdPT0tC1H5kUJuOX4ll1hI/HBMEFCcO8++Bl2wcrUsAxLzGvhINVJX2DAQaF aNetToazkCnzubKfBOyiTqFJ0b63c5dqziAgzsFNBF/0ZFUBEADF8UEZmKDl1w/UxvjeyAeX kghYkY3bkK6gcIYXdLRfJw12GbvMioSguvVzASVHG8h7NbNjk1yur6AONfbUpXKSNZ0skV8V fG+ppbaY+zQofsSMoj5gP0amwbwvPzVqZCYJai81VobefTX2MZM2Mg/ThBVtGyzV3NeCpnBa 8AX3s9rrX2XUoCibYotbbxx9afZYUFyflOc7kEpc9uJXIdaxS2Z6MnYLHsyVjiU6tzKCiVOU KJevqvzPXJmy0xaOVf7mhFSNQyJTrZpLa+tvB1DQRS08CqYtIMxRrVtC0t0LFeQGly6bOngr ircurWJiJKbSXVstLHgWYiq3/GmCSx/82ObeLO3PftklpRj8d+kFbrvrqBgjWtMH4WtK5uN5 1WJ71hWJfNchKRlaJ3GWy8KolCAoGsQMovn/ZEXxrGs1ndafu47yXOpuDAozoHTBGvuSXSZo ythk/0EAuz5IkwkhYBT1MGIAvNSn9ivE5aRnBazugy0rTRkVggHvt3/7flFHlGVGpBHxFUwb /a4UjJBPtIwa4tWR8B1Ma36S8Jk456k2n1id7M0LQ+eqstmp6Y+UB+pt9NX6t0Slw1NCdYTW gJezWTVKF7pmTdXszXGxlc9kTrVUz04PqPjnYbv5UWuDd2eyzGjrrFOsJEi8OK2d2j4FfF++ AzOMdW09JVqejQARAQABwsF2BBgBCAAgFiEEbF+pj/I7JePKMl6Fct6KD1TwOgwFAl/0ZFUC GwwACgkQct6KD1TwOgxUfg//eAoYc0Vm4NrxymfcY30UjHVD0LgSvU8kUmXxil3qhFPS7KA+ y7tgcKLHOkZkXMX5MLFcS9+SmrAjSBBV8omKoHNo+kfFx/dUAtz0lot8wNGmWb+NcHeKM1eb nwUMOEa1uDdfZeKef/U/2uHBceY7Gc6zPZPWgXghEyQMTH2UhLgeam8yglyO+A6RXCh+s6ak Wje7Vo1wGK4eYxp6pwMPJXLMsI0ii/2k3YPEJPv+yJf90MbYyQSbkTwZhrsokjQEaIfjrIk3 rQRjTve/J62WIO28IbY/mENuGgWehRlTAbhC4BLTZ5uYS0YMQCR7v9UGMWdNWXFyrOB6PjSu Trn9MsPoUc8qI72mVpxEXQDLlrd2ijEWm7Nrf52YMD7hL6rXXuis7R6zY8WnnBhW0uCfhajx q+KuARXC0sDLztcjaS3ayXonpoCPZep2Bd5xqE4Ln8/COCslP7E92W1uf1EcdXXIrx1acg21 H/0Z53okMykVs3a8tECPHIxnre2UxKdTbCEkjkR4V6JyplTS47oWMw3zyI7zkaadfzVFBxk2 lo/Tny+FX1Azea3Ce7oOnRUEZtWSsUidtIjmL8YUQFZYm+JUIgfRmSpMFq8JP4VH43GXpB/S OCrl+/xujzvoUBFV/cHKjEQYBxo+MaiQa1U54ykM2W4DnHb1UiEf5xDkFd4= In-Reply-To: <20240507102822.2023826-2-maxime.chevallier@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240507_224347_967368_2A853A28 X-CRM114-Status: GOOD ( 25.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 07.05.2024 12:28, Maxime Chevallier wrote: > The phy link topology's main goal is to better track which PHYs are > connected to a given netdevice. Make so that the helpers take the > netdevice as a parameter directly. > The commit message should explain what the issue is that you're fixing, and how this patch fixes it. > Signed-off-by: Maxime Chevallier > Fixes: 6916e461e793 ("net: phy: Introduce ethernet link topology representation") > Closes: https://lore.kernel.org/netdev/2e11b89d-100f-49e7-9c9a-834cc0b82f97@gmail.com/ > Closes: https://lore.kernel.org/netdev/20240409201553.GA4124869@dev-arch.thelio-3990X/ > --- > drivers/net/phy/phy_device.c | 25 ++++++++----------------- > drivers/net/phy/phy_link_topology.c | 13 ++++++++++--- > include/linux/phy_link_topology.h | 21 +++++++++++++-------- > net/ethtool/netlink.c | 2 +- > 4 files changed, 32 insertions(+), 29 deletions(-) > > diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c > index 616bd7ba46cb..111434201545 100644 > --- a/drivers/net/phy/phy_device.c > +++ b/drivers/net/phy/phy_device.c > @@ -277,14 +277,6 @@ static void phy_mdio_device_remove(struct mdio_device *mdiodev) > > static struct phy_driver genphy_driver; > > -static struct phy_link_topology *phy_get_link_topology(struct phy_device *phydev) > -{ > - if (phydev->attached_dev) > - return phydev->attached_dev->link_topo; > - > - return NULL; > -} > - > static LIST_HEAD(phy_fixup_list); > static DEFINE_MUTEX(phy_fixup_lock); > > @@ -1389,10 +1381,10 @@ static DEVICE_ATTR_RO(phy_standalone); > int phy_sfp_connect_phy(void *upstream, struct phy_device *phy) > { > struct phy_device *phydev = upstream; > - struct phy_link_topology *topo = phy_get_link_topology(phydev); > + struct net_device *dev = phydev->attached_dev; > > - if (topo) > - return phy_link_topo_add_phy(topo, phy, PHY_UPSTREAM_PHY, phydev); > + if (dev) > + return phy_link_topo_add_phy(dev, phy, PHY_UPSTREAM_PHY, phydev); > > return 0; > } > @@ -1411,10 +1403,10 @@ EXPORT_SYMBOL(phy_sfp_connect_phy); > void phy_sfp_disconnect_phy(void *upstream, struct phy_device *phy) > { > struct phy_device *phydev = upstream; > - struct phy_link_topology *topo = phy_get_link_topology(phydev); > + struct net_device *dev = phydev->attached_dev; > > - if (topo) > - phy_link_topo_del_phy(topo, phy); > + if (dev) > + phy_link_topo_del_phy(dev, phy); > } > EXPORT_SYMBOL(phy_sfp_disconnect_phy); > > @@ -1561,8 +1553,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, > if (phydev->sfp_bus_attached) > dev->sfp_bus = phydev->sfp_bus; > > - err = phy_link_topo_add_phy(dev->link_topo, phydev, > - PHY_UPSTREAM_MAC, dev); > + err = phy_link_topo_add_phy(dev, phydev, PHY_UPSTREAM_MAC, dev); > if (err) > goto error; > } > @@ -1992,7 +1983,7 @@ void phy_detach(struct phy_device *phydev) > if (dev) { > phydev->attached_dev->phydev = NULL; > phydev->attached_dev = NULL; > - phy_link_topo_del_phy(dev->link_topo, phydev); > + phy_link_topo_del_phy(dev, phydev); > } > phydev->phylink = NULL; > > diff --git a/drivers/net/phy/phy_link_topology.c b/drivers/net/phy/phy_link_topology.c > index 985941c5c558..0e36bd7c15dc 100644 > --- a/drivers/net/phy/phy_link_topology.c > +++ b/drivers/net/phy/phy_link_topology.c > @@ -35,10 +35,11 @@ void phy_link_topo_destroy(struct phy_link_topology *topo) > kfree(topo); > } > > -int phy_link_topo_add_phy(struct phy_link_topology *topo, > +int phy_link_topo_add_phy(struct net_device *dev, > struct phy_device *phy, > enum phy_upstream upt, void *upstream) > { > + struct phy_link_topology *topo = dev->link_topo; > struct phy_device_node *pdn; > int ret; > > @@ -90,10 +91,16 @@ int phy_link_topo_add_phy(struct phy_link_topology *topo, > } > EXPORT_SYMBOL_GPL(phy_link_topo_add_phy); > > -void phy_link_topo_del_phy(struct phy_link_topology *topo, > +void phy_link_topo_del_phy(struct net_device *dev, > struct phy_device *phy) > { > - struct phy_device_node *pdn = xa_erase(&topo->phys, phy->phyindex); > + struct phy_link_topology *topo = dev->link_topo; > + struct phy_device_node *pdn; > + > + if (!topo) > + return; > + > + pdn = xa_erase(&topo->phys, phy->phyindex); > > /* We delete the PHY from the topology, however we don't re-set the > * phy->phyindex field. If the PHY isn't gone, we can re-assign it the > diff --git a/include/linux/phy_link_topology.h b/include/linux/phy_link_topology.h > index 6b79feb607e7..166a01710aa2 100644 > --- a/include/linux/phy_link_topology.h > +++ b/include/linux/phy_link_topology.h > @@ -12,11 +12,11 @@ > #define __PHY_LINK_TOPOLOGY_H > > #include > +#include > #include > > struct xarray; > struct phy_device; > -struct net_device; > struct sfp_bus; > > struct phy_device_node { > @@ -37,11 +37,16 @@ struct phy_link_topology { > u32 next_phy_index; > }; > > -static inline struct phy_device * > -phy_link_topo_get_phy(struct phy_link_topology *topo, u32 phyindex) > +static inline struct phy_device > +*phy_link_topo_get_phy(struct net_device *dev, u32 phyindex) > { > - struct phy_device_node *pdn = xa_load(&topo->phys, phyindex); > + struct phy_link_topology *topo = dev->link_topo; > + struct phy_device_node *pdn; > > + if (!topo) > + return NULL; > + > + pdn = xa_load(&topo->phys, phyindex); > if (pdn) > return pdn->phy; > > @@ -49,21 +54,21 @@ phy_link_topo_get_phy(struct phy_link_topology *topo, u32 phyindex) > } > > #if IS_REACHABLE(CONFIG_PHYLIB) > -int phy_link_topo_add_phy(struct phy_link_topology *topo, > +int phy_link_topo_add_phy(struct net_device *dev, > struct phy_device *phy, > enum phy_upstream upt, void *upstream); > > -void phy_link_topo_del_phy(struct phy_link_topology *lt, struct phy_device *phy); > +void phy_link_topo_del_phy(struct net_device *dev, struct phy_device *phy); > > #else > -static inline int phy_link_topo_add_phy(struct phy_link_topology *topo, > +static inline int phy_link_topo_add_phy(struct net_device *dev, > struct phy_device *phy, > enum phy_upstream upt, void *upstream) > { > return 0; > } > > -static inline void phy_link_topo_del_phy(struct phy_link_topology *topo, > +static inline void phy_link_topo_del_phy(struct net_device *dev, > struct phy_device *phy) > { > } > diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c > index 563e94e0cbd8..f5b4adf324bc 100644 > --- a/net/ethtool/netlink.c > +++ b/net/ethtool/netlink.c > @@ -170,7 +170,7 @@ int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info, > struct nlattr *phy_id; > > phy_id = tb[ETHTOOL_A_HEADER_PHY_INDEX]; > - phydev = phy_link_topo_get_phy(dev->link_topo, > + phydev = phy_link_topo_get_phy(dev, > nla_get_u32(phy_id)); > if (!phydev) { > NL_SET_BAD_ATTR(extack, phy_id); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel