This series performs a variety of cleanups for dpaa/fman, with the aim
of reducing unused flexibility. I've tested this on layerscape, but I
don't have any PPC platforms to test with (nor do I have access to the
dtsec errata).
Sean Anderson (4):
net: fman: Convert to SPDX identifiers
net: fman: Don't pass comm_mode to enable/disable
net: fman: Store en/disable in mac_device instead of mac_priv_s
net: fman: dtsec: Always gracefully stop/start
.../net/ethernet/freescale/dpaa/dpaa_eth.c | 11 +-
drivers/net/ethernet/freescale/fman/fman.c | 31 +---
drivers/net/ethernet/freescale/fman/fman.h | 31 +---
.../net/ethernet/freescale/fman/fman_dtsec.c | 139 +++++-------------
.../net/ethernet/freescale/fman/fman_dtsec.h | 35 +----
.../net/ethernet/freescale/fman/fman_keygen.c | 29 +---
.../net/ethernet/freescale/fman/fman_keygen.h | 29 +---
.../net/ethernet/freescale/fman/fman_mac.h | 10 --
.../net/ethernet/freescale/fman/fman_memac.c | 47 +-----
.../net/ethernet/freescale/fman/fman_memac.h | 35 +----
.../net/ethernet/freescale/fman/fman_muram.c | 31 +---
.../net/ethernet/freescale/fman/fman_muram.h | 32 +---
.../net/ethernet/freescale/fman/fman_port.c | 29 +---
.../net/ethernet/freescale/fman/fman_port.h | 29 +---
drivers/net/ethernet/freescale/fman/fman_sp.c | 29 +---
drivers/net/ethernet/freescale/fman/fman_sp.h | 28 +---
.../net/ethernet/freescale/fman/fman_tgec.c | 45 +-----
.../net/ethernet/freescale/fman/fman_tgec.h | 35 +----
drivers/net/ethernet/freescale/fman/mac.c | 76 ++--------
drivers/net/ethernet/freescale/fman/mac.h | 36 +----
20 files changed, 96 insertions(+), 671 deletions(-)
--
2.35.1.1320.gc452695387.dirty
All macs use the same start/stop functions. The actual mac-specific code
lives in enable/disable. Move these functions to an appropriate struct,
and inline the phy enable/disable calls to the caller of start/stop.
Signed-off-by: Sean Anderson <[email protected]>
---
.../net/ethernet/freescale/dpaa/dpaa_eth.c | 11 +++--
drivers/net/ethernet/freescale/fman/mac.c | 44 +++----------------
drivers/net/ethernet/freescale/fman/mac.h | 4 +-
3 files changed, 15 insertions(+), 44 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 906d392da4e3..fe2572b492b2 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -288,9 +288,11 @@ static int dpaa_stop(struct net_device *net_dev)
*/
msleep(200);
- err = mac_dev->stop(mac_dev);
+ if (mac_dev->phy_dev)
+ phy_stop(mac_dev->phy_dev);
+ err = mac_dev->disable(mac_dev->fman_mac);
if (err < 0)
- netif_err(priv, ifdown, net_dev, "mac_dev->stop() = %d\n",
+ netif_err(priv, ifdown, net_dev, "mac_dev->disable() = %d\n",
err);
for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
@@ -2942,11 +2944,12 @@ static int dpaa_open(struct net_device *net_dev)
goto mac_start_failed;
}
- err = priv->mac_dev->start(mac_dev);
+ err = priv->mac_dev->enable(mac_dev->fman_mac);
if (err < 0) {
- netif_err(priv, ifup, net_dev, "mac_dev->start() = %d\n", err);
+ netif_err(priv, ifup, net_dev, "mac_dev->enable() = %d\n", err);
goto mac_start_failed;
}
+ phy_start(priv->mac_dev->phy_dev);
netif_tx_start_all_queues(net_dev);
diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index a8d521760ffc..6a4eaca83700 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -39,9 +39,6 @@ struct mac_priv_s {
struct fixed_phy_status *fixed_link;
u16 speed;
u16 max_speed;
-
- int (*enable)(struct fman_mac *mac_dev);
- int (*disable)(struct fman_mac *mac_dev);
};
struct mac_address {
@@ -241,29 +238,6 @@ static int memac_initialization(struct mac_device *mac_dev)
return err;
}
-static int start(struct mac_device *mac_dev)
-{
- int err;
- struct phy_device *phy_dev = mac_dev->phy_dev;
- struct mac_priv_s *priv = mac_dev->priv;
-
- err = priv->enable(mac_dev->fman_mac);
- if (!err && phy_dev)
- phy_start(phy_dev);
-
- return err;
-}
-
-static int stop(struct mac_device *mac_dev)
-{
- struct mac_priv_s *priv = mac_dev->priv;
-
- if (mac_dev->phy_dev)
- phy_stop(mac_dev->phy_dev);
-
- return priv->disable(mac_dev->fman_mac);
-}
-
static int set_multi(struct net_device *net_dev, struct mac_device *mac_dev)
{
struct mac_priv_s *priv;
@@ -454,11 +428,9 @@ static void setup_dtsec(struct mac_device *mac_dev)
mac_dev->set_allmulti = dtsec_set_allmulti;
mac_dev->set_tstamp = dtsec_set_tstamp;
mac_dev->set_multi = set_multi;
- mac_dev->start = start;
- mac_dev->stop = stop;
mac_dev->adjust_link = adjust_link_dtsec;
- mac_dev->priv->enable = dtsec_enable;
- mac_dev->priv->disable = dtsec_disable;
+ mac_dev->enable = dtsec_enable;
+ mac_dev->disable = dtsec_disable;
}
static void setup_tgec(struct mac_device *mac_dev)
@@ -474,11 +446,9 @@ static void setup_tgec(struct mac_device *mac_dev)
mac_dev->set_allmulti = tgec_set_allmulti;
mac_dev->set_tstamp = tgec_set_tstamp;
mac_dev->set_multi = set_multi;
- mac_dev->start = start;
- mac_dev->stop = stop;
mac_dev->adjust_link = adjust_link_void;
- mac_dev->priv->enable = tgec_enable;
- mac_dev->priv->disable = tgec_disable;
+ mac_dev->enable = tgec_enable;
+ mac_dev->disable = tgec_disable;
}
static void setup_memac(struct mac_device *mac_dev)
@@ -494,11 +464,9 @@ static void setup_memac(struct mac_device *mac_dev)
mac_dev->set_allmulti = memac_set_allmulti;
mac_dev->set_tstamp = memac_set_tstamp;
mac_dev->set_multi = set_multi;
- mac_dev->start = start;
- mac_dev->stop = stop;
mac_dev->adjust_link = adjust_link_memac;
- mac_dev->priv->enable = memac_enable;
- mac_dev->priv->disable = memac_disable;
+ mac_dev->enable = memac_enable;
+ mac_dev->disable = memac_disable;
}
#define DTSEC_SUPPORTED \
diff --git a/drivers/net/ethernet/freescale/fman/mac.h b/drivers/net/ethernet/freescale/fman/mac.h
index 1ea5fd32f689..4c9fdfab8813 100644
--- a/drivers/net/ethernet/freescale/fman/mac.h
+++ b/drivers/net/ethernet/freescale/fman/mac.h
@@ -36,8 +36,8 @@ struct mac_device {
bool allmulti;
int (*init)(struct mac_device *mac_dev);
- int (*start)(struct mac_device *mac_dev);
- int (*stop)(struct mac_device *mac_dev);
+ int (*enable)(struct fman_mac *mac_dev);
+ int (*disable)(struct fman_mac *mac_dev);
void (*adjust_link)(struct mac_device *mac_dev);
int (*set_promisc)(struct fman_mac *mac_dev, bool enable);
int (*change_addr)(struct fman_mac *mac_dev, enet_addr_t *enet_addr);
--
2.35.1.1320.gc452695387.dirty
On Tue, 31 May 2022 15:58:46 -0400 Sean Anderson wrote:
> This series performs a variety of cleanups for dpaa/fman, with the aim
> of reducing unused flexibility. I've tested this on layerscape, but I
> don't have any PPC platforms to test with (nor do I have access to the
> dtsec errata).
# Form letter - net-next is closed
We have already sent the networking pull request for 5.19
and therefore net-next is closed for new drivers, features,
code refactoring and optimizations. We are currently accepting
bug fixes only.
Please repost when net-next reopens after 5.19-rc1 is cut.
RFC patches sent for review only are obviously welcome at any time.
> -----Original Message-----
> From: Sean Anderson <[email protected]>
> Sent: Tuesday, May 31, 2022 22:59
> To: David S . Miller <[email protected]>; Jakub Kicinski
> <[email protected]>; [email protected]
> Cc: Madalin Bucur <[email protected]>; [email protected];
> Sean Anderson <[email protected]>
> Subject: [PATCH 0/4] net: fman: Various cleanups
>
> This series performs a variety of cleanups for dpaa/fman, with the aim
> of reducing unused flexibility. I've tested this on layerscape, but I
> don't have any PPC platforms to test with (nor do I have access to the
> dtsec errata).
>
>
> Sean Anderson (4):
> net: fman: Convert to SPDX identifiers
> net: fman: Don't pass comm_mode to enable/disable
> net: fman: Store en/disable in mac_device instead of mac_priv_s
> net: fman: dtsec: Always gracefully stop/start
Hi
I ran sanity checks on two PPC platforms (T2080, P5020).
If you resend you can add my tags:
Acked-by: Camelia Groza <[email protected]>
Tested-by: Camelia Groza <[email protected]>
Camelia