[PATCH 0/5 next] net: vertexcom: mse102x: Minor clean-ups

[PATCH 0/5 next] net: vertexcom: mse102x: Minor clean-ups

[Stefan Wahren]

From: Stefan Wahren <stefan.wahren@chargebyte.com>

This series provides some minor clean-ups for the Vertexcom MSE102x
driver.

Stefan Wahren (5):
  net: vertexcom: mse102x: Use DEFINE_SIMPLE_DEV_PM_OPS
  net: vertexcom: mse102x: Silence TX timeout
  net: vertexcom: mse102x: Fix random MAC address log
  net: vertexcom: mse102x: Drop log message on remove
  net: vertexcom: mse102x: Use ETH_ZLEN

 drivers/net/ethernet/vertexcom/mse102x.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

--
2.34.1

[PATCH 1/5 next] net: vertexcom: mse102x: Use DEFINE_SIMPLE_DEV_PM_OPS

[Stefan Wahren]

This macro has the advantage over SET_SYSTEM_SLEEP_PM_OPS that we don't
have to care about when the functions are actually used.

Also make use of pm_sleep_ptr() to discard all PM_SLEEP related
stuff if CONFIG_PM_SLEEP isn't enabled.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 drivers/net/ethernet/vertexcom/mse102x.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c
index edd8b59680e5..0711641fc3c9 100644
--- a/drivers/net/ethernet/vertexcom/mse102x.c
+++ b/drivers/net/ethernet/vertexcom/mse102x.c
@@ -622,8 +622,6 @@ static const struct ethtool_ops mse102x_ethtool_ops = {

 /* driver bus management functions */

-#ifdef CONFIG_PM_SLEEP
-
 static int mse102x_suspend(struct device *dev)
 {
 	struct mse102x_net *mse = dev_get_drvdata(dev);
@@ -649,9 +647,8 @@ static int mse102x_resume(struct device *dev)

 	return 0;
 }
-#endif

-static SIMPLE_DEV_PM_OPS(mse102x_pm_ops, mse102x_suspend, mse102x_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(mse102x_pm_ops, mse102x_suspend, mse102x_resume);

 static int mse102x_probe_spi(struct spi_device *spi)
 {
@@ -761,7 +758,7 @@ static struct spi_driver mse102x_driver = {
 	.driver = {
 		.name = DRV_NAME,
 		.of_match_table = mse102x_match_table,
-		.pm = &mse102x_pm_ops,
+		.pm = pm_sleep_ptr(&mse102x_pm_ops),
 	},
 	.probe = mse102x_probe_spi,
 	.remove = mse102x_remove_spi,
--
2.34.1

Re: [PATCH 1/5 next] net: vertexcom: mse102x: Use DEFINE_SIMPLE_DEV_PM_OPS

[Simon Horman]

On Tue, Aug 27, 2024 at 09:09:56PM +0200, Stefan Wahren wrote:
> This macro has the advantage over SET_SYSTEM_SLEEP_PM_OPS that we don't
> have to care about when the functions are actually used.
> 
> Also make use of pm_sleep_ptr() to discard all PM_SLEEP related
> stuff if CONFIG_PM_SLEEP isn't enabled.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>

Reviewed-by: Simon Horman <horms@kernel.org>

One note, no need to respin because of this.
This series should be targeted at net-next.

	Subject: [PATCH m/n net-next] ...

[PATCH 2/5 next] net: vertexcom: mse102x: Silence TX timeout

[Stefan Wahren]

As long as the MSE102x is not operational, every packet transmission
will run into a TX timeout and flood the kernel log. So log only the
first TX timeout and a user is at least informed about this issue.
The amount of timeouts are still available via netstat.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 drivers/net/ethernet/vertexcom/mse102x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c
index 0711641fc3c9..336435fe8241 100644
--- a/drivers/net/ethernet/vertexcom/mse102x.c
+++ b/drivers/net/ethernet/vertexcom/mse102x.c
@@ -451,7 +451,7 @@ static void mse102x_tx_work(struct work_struct *work)

 	if (ret == -ETIMEDOUT) {
 		if (netif_msg_timer(mse))
-			netdev_err(mse->ndev, "tx work timeout\n");
+			netdev_err_once(mse->ndev, "tx work timeout\n");

 		mse->stats.tx_timeout++;
 	}
--
2.34.1

Re: [PATCH 2/5 next] net: vertexcom: mse102x: Silence TX timeout

[Simon Horman]

On Tue, Aug 27, 2024 at 09:09:57PM +0200, Stefan Wahren wrote:
> As long as the MSE102x is not operational, every packet transmission
> will run into a TX timeout and flood the kernel log. So log only the
> first TX timeout and a user is at least informed about this issue.
> The amount of timeouts are still available via netstat.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>

Reviewed-by: Simon Horman <horms@kernel.org>

[PATCH 3/5 next] net: vertexcom: mse102x: Fix random MAC address log

[Stefan Wahren]

At the time of MAC address assignment the netdev is not registered yet,
so netdev log functions won't work as expected. While we are at this
downgrade the log level to a warning, because a random MAC address is
not a real error.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 drivers/net/ethernet/vertexcom/mse102x.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c
index 336435fe8241..4ce027f8e376 100644
--- a/drivers/net/ethernet/vertexcom/mse102x.c
+++ b/drivers/net/ethernet/vertexcom/mse102x.c
@@ -485,8 +485,8 @@ static void mse102x_init_mac(struct mse102x_net *mse, struct device_node *np)

 	if (ret) {
 		eth_hw_addr_random(ndev);
-		netdev_err(ndev, "Using random MAC address: %pM\n",
-			   ndev->dev_addr);
+		dev_warn(ndev->dev.parent, "Using random MAC address: %pM\n",
+			 ndev->dev_addr);
 	}
 }

--
2.34.1

Re: [PATCH 3/5 next] net: vertexcom: mse102x: Fix random MAC address log

[Simon Horman]

On Tue, Aug 27, 2024 at 09:09:58PM +0200, Stefan Wahren wrote:
> At the time of MAC address assignment the netdev is not registered yet,
> so netdev log functions won't work as expected. While we are at this
> downgrade the log level to a warning, because a random MAC address is
> not a real error.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>

Reviewed-by: Simon Horman <horms@kernel.org>

[PATCH 4/5 next] net: vertexcom: mse102x: Drop log message on remove

[Stefan Wahren]

This message is a leftover from initial development. It's
unnecessary now and can be dropped.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 drivers/net/ethernet/vertexcom/mse102x.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c
index 4ce027f8e376..8a72d8699b84 100644
--- a/drivers/net/ethernet/vertexcom/mse102x.c
+++ b/drivers/net/ethernet/vertexcom/mse102x.c
@@ -733,9 +733,6 @@ static void mse102x_remove_spi(struct spi_device *spi)
 	struct mse102x_net *mse = dev_get_drvdata(&spi->dev);
 	struct mse102x_net_spi *mses = to_mse102x_spi(mse);

-	if (netif_msg_drv(mse))
-		dev_info(&spi->dev, "remove\n");
-
 	mse102x_remove_device_debugfs(mses);
 	unregister_netdev(mse->ndev);
 }
--
2.34.1

Re: [PATCH 4/5 next] net: vertexcom: mse102x: Drop log message on remove

[Simon Horman]

On Tue, Aug 27, 2024 at 09:09:59PM +0200, Stefan Wahren wrote:
> This message is a leftover from initial development. It's
> unnecessary now and can be dropped.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>

Reviewed-by: Simon Horman <horms@kernel.org>

[PATCH 5/5 next] net: vertexcom: mse102x: Use ETH_ZLEN

[Stefan Wahren]

There is already a define for minimum Ethernet frame length without FCS.
So used this instead of the magic number.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 drivers/net/ethernet/vertexcom/mse102x.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c
index 8a72d8699b84..a04d4073def9 100644
--- a/drivers/net/ethernet/vertexcom/mse102x.c
+++ b/drivers/net/ethernet/vertexcom/mse102x.c
@@ -377,8 +377,8 @@ static int mse102x_tx_pkt_spi(struct mse102x_net *mse, struct sk_buff *txb,
 	int ret;
 	bool first = true;

-	if (txb->len < 60)
-		pad = 60 - txb->len;
+	if (txb->len < ETH_ZLEN)
+		pad = ETH_ZLEN - txb->len;

 	while (1) {
 		mse102x_tx_cmd_spi(mse, CMD_RTS | (txb->len + pad));
--
2.34.1

Re: [PATCH 5/5 next] net: vertexcom: mse102x: Use ETH_ZLEN

[Simon Horman]

On Tue, Aug 27, 2024 at 09:10:00PM +0200, Stefan Wahren wrote:
> There is already a define for minimum Ethernet frame length without FCS.
> So used this instead of the magic number.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>

Reviewed-by: Simon Horman <horms@kernel.org>

Re: [PATCH 0/5 next] net: vertexcom: mse102x: Minor clean-ups

[Jakub Kicinski]

On Tue, 27 Aug 2024 21:09:55 +0200 Stefan Wahren wrote:
> This series provides some minor clean-ups for the Vertexcom MSE102x
> driver.

Applied, thanks!