Daniel Golle
f0f6fa2e28
Swap pending with accepted patches, rebase remaining pending patches on top of new upstream. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
From 3c1d77006daca1df20d612850535bc6050e266ee Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Thu, 26 Mar 2026 01:50:00 +0000
|
|
Subject: [PATCH 03/19] net: dsa: mxl862xx: move API macros to mxl862xx-host.h
|
|
|
|
Move the MXL862XX_API_WRITE, MXL862XX_API_READ and
|
|
MXL862XX_API_READ_QUIET convenience macros from mxl862xx.c to
|
|
mxl862xx-host.h next to the mxl862xx_api_wrap() prototype they wrap.
|
|
This makes them available to other compilation units that include
|
|
mxl862xx-host.h, which is needed once the SerDes PCS code in
|
|
mxl862xx-phylink.c also calls firmware commands.
|
|
|
|
No functional change.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/net/dsa/mxl862xx/mxl862xx-host.h | 8 ++++++++
|
|
drivers/net/dsa/mxl862xx/mxl862xx.c | 7 -------
|
|
2 files changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mxl862xx/mxl862xx-host.h
|
|
+++ b/drivers/net/dsa/mxl862xx/mxl862xx-host.h
|
|
@@ -9,6 +9,14 @@ void mxl862xx_host_init(struct mxl862xx_
|
|
void mxl862xx_host_shutdown(struct mxl862xx_priv *priv);
|
|
int mxl862xx_api_wrap(struct mxl862xx_priv *priv, u16 cmd, void *data, u16 size,
|
|
bool read, bool quiet);
|
|
+
|
|
+#define MXL862XX_API_WRITE(dev, cmd, data) \
|
|
+ mxl862xx_api_wrap(dev, cmd, &(data), sizeof((data)), false, false)
|
|
+#define MXL862XX_API_READ(dev, cmd, data) \
|
|
+ mxl862xx_api_wrap(dev, cmd, &(data), sizeof((data)), true, false)
|
|
+#define MXL862XX_API_READ_QUIET(dev, cmd, data) \
|
|
+ mxl862xx_api_wrap(dev, cmd, &(data), sizeof((data)), true, true)
|
|
+
|
|
int mxl862xx_reset(struct mxl862xx_priv *priv);
|
|
|
|
#endif /* __MXL862XX_HOST_H */
|
|
--- a/drivers/net/dsa/mxl862xx/mxl862xx.c
|
|
+++ b/drivers/net/dsa/mxl862xx/mxl862xx.c
|
|
@@ -24,13 +24,6 @@
|
|
#include "mxl862xx-host.h"
|
|
#include "mxl862xx-phylink.h"
|
|
|
|
-#define MXL862XX_API_WRITE(dev, cmd, data) \
|
|
- mxl862xx_api_wrap(dev, cmd, &(data), sizeof((data)), false, false)
|
|
-#define MXL862XX_API_READ(dev, cmd, data) \
|
|
- mxl862xx_api_wrap(dev, cmd, &(data), sizeof((data)), true, false)
|
|
-#define MXL862XX_API_READ_QUIET(dev, cmd, data) \
|
|
- mxl862xx_api_wrap(dev, cmd, &(data), sizeof((data)), true, true)
|
|
-
|
|
/* Polling interval for RMON counter accumulation. At 2.5 Gbps with
|
|
* minimum-size (64-byte) frames, a 32-bit packet counter wraps in ~880s.
|
|
* 2s gives a comfortable margin.
|