armsr: rename from armvirt

[openwrt/openwrt.git] / target / linux / armvirt / patches-6.1 / 701-v6.2-0002-net-dpaa2-replace-dpaa2_mac_is_type_fixed-with-dpaa2.patch

diff --git a/target/linux/armvirt/patches-6.1/701-v6.2-0002-net-dpaa2-replace-dpaa2_mac_is_type_fixed-with-dpaa2.patch b/target/linux/armvirt/patches-6.1/701-v6.2-0002-net-dpaa2-replace-dpaa2_mac_is_type_fixed-with-dpaa2.patch
deleted file mode 100644 (file)
index 501eaf4..0000000
--- a/target/linux/armvirt/patches-6.1/701-v6.2-0002-net-dpaa2-replace-dpaa2_mac_is_type_fixed-with-dpaa2.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 022a11062261dc4703da846d3bf4d194ef6bebf5 Mon Sep 17 00:00:00 2001
-From: Vladimir Oltean <vladimir.oltean@nxp.com>
-Date: Tue, 29 Nov 2022 16:12:11 +0200
-Subject: [PATCH 04/14] net: dpaa2: replace dpaa2_mac_is_type_fixed() with
- dpaa2_mac_is_type_phy()
-
-dpaa2_mac_is_type_fixed() is a header with no implementation and no
-callers, which is referenced from the documentation though. It can be
-deleted.
-
-On the other hand, it would be useful to reuse the code between
-dpaa2_eth_is_type_phy() and dpaa2_switch_port_is_type_phy(). That common
-code should be called dpaa2_mac_is_type_phy(), so let's create that.
-
-The removal and the addition are merged into the same patch because,
-in fact, is_type_phy() is the logical opposite of is_type_fixed().
-
-Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
-Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com>
-Tested-by: Ioana Ciornei <ioana.ciornei@nxp.com>
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
----
- .../ethernet/freescale/dpaa2/mac-phy-support.rst       |  9 ++++++---
- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h       |  7 +------
- drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h       | 10 ++++++++--
- drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h    |  7 +------
- 4 files changed, 16 insertions(+), 17 deletions(-)
-
---- a/Documentation/networking/device_drivers/ethernet/freescale/dpaa2/mac-phy-support.rst
-+++ b/Documentation/networking/device_drivers/ethernet/freescale/dpaa2/mac-phy-support.rst
-@@ -181,10 +181,13 @@ when necessary using the below listed AP
-  - int dpaa2_mac_connect(struct dpaa2_mac *mac);
-  - void dpaa2_mac_disconnect(struct dpaa2_mac *mac);
- 
--A phylink integration is necessary only when the partner DPMAC is not of TYPE_FIXED.
--One can check for this condition using the below API::
-+A phylink integration is necessary only when the partner DPMAC is not of
-+``TYPE_FIXED``. This means it is either of ``TYPE_PHY``, or of
-+``TYPE_BACKPLANE`` (the difference being the two that in the ``TYPE_BACKPLANE``
-+mode, the MC firmware does not access the PCS registers). One can check for
-+this condition using the following helper::
- 
-- - bool dpaa2_mac_is_type_fixed(struct fsl_mc_device *dpmac_dev,struct fsl_mc_io *mc_io);
-+ - static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac);
- 
- Before connection to a MAC, the caller must allocate and populate the
- dpaa2_mac structure with the associated net_device, a pointer to the MC portal
---- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
-+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
-@@ -733,12 +733,7 @@ static inline unsigned int dpaa2_eth_rx_
- 
- static inline bool dpaa2_eth_is_type_phy(struct dpaa2_eth_priv *priv)
- {
--      if (priv->mac &&
--          (priv->mac->attr.link_type == DPMAC_LINK_TYPE_PHY ||
--           priv->mac->attr.link_type == DPMAC_LINK_TYPE_BACKPLANE))
--              return true;
--
--      return false;
-+      return dpaa2_mac_is_type_phy(priv->mac);
- }
- 
- static inline bool dpaa2_eth_has_mac(struct dpaa2_eth_priv *priv)
---- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
-+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h
-@@ -30,8 +30,14 @@ struct dpaa2_mac {
-       struct phy *serdes_phy;
- };
- 
--bool dpaa2_mac_is_type_fixed(struct fsl_mc_device *dpmac_dev,
--                           struct fsl_mc_io *mc_io);
-+static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)
-+{
-+      if (!mac)
-+              return false;
-+
-+      return mac->attr.link_type == DPMAC_LINK_TYPE_PHY ||
-+             mac->attr.link_type == DPMAC_LINK_TYPE_BACKPLANE;
-+}
- 
- int dpaa2_mac_open(struct dpaa2_mac *mac);
- 
---- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h
-+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h
-@@ -230,12 +230,7 @@ static inline bool dpaa2_switch_supports
- static inline bool
- dpaa2_switch_port_is_type_phy(struct ethsw_port_priv *port_priv)
- {
--      if (port_priv->mac &&
--          (port_priv->mac->attr.link_type == DPMAC_LINK_TYPE_PHY ||
--           port_priv->mac->attr.link_type == DPMAC_LINK_TYPE_BACKPLANE))
--              return true;
--
--      return false;
-+      return dpaa2_mac_is_type_phy(port_priv->mac);
- }
- 
- static inline bool dpaa2_switch_port_has_mac(struct ethsw_port_priv *port_priv)