ad2077165b
Backpot upstream patch for Flow Offload support for AN7581 and refresh all affected patch. To correctly work a dedicated firmware is needed to use the dedicated Network Coprocessor (NPU). This also introduce good cleanup and moves the driver in a dedicated Airoha directory. While currently not totally usable (due to lack of firmware blob) this is needed to backport support for external PHY/SFP support. Refresh all affected patch. Tested-by: Aleksander Jan Bajkowski <olek2@wp.pl> # tested on Quantum W1700k Tested-by: Andrew LaMarche <andrewjlamarche@gmail.com> Link: https://github.com/openwrt/openwrt/pull/18166 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
101 lines
3.7 KiB
Diff
101 lines
3.7 KiB
Diff
From e0758a8694fbaffdc72940774db295585e951119 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 28 Feb 2025 11:54:11 +0100
|
|
Subject: [PATCH 03/15] net: airoha: Move reg/write utility routines in
|
|
airoha_eth.h
|
|
|
|
This is a preliminary patch to introduce flowtable hw offloading
|
|
support for airoha_eth driver.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 28 +++---------------------
|
|
drivers/net/ethernet/airoha/airoha_eth.h | 26 ++++++++++++++++++++++
|
|
2 files changed, 29 insertions(+), 25 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -673,17 +673,17 @@ struct airoha_qdma_fwd_desc {
|
|
__le32 rsv1;
|
|
};
|
|
|
|
-static u32 airoha_rr(void __iomem *base, u32 offset)
|
|
+u32 airoha_rr(void __iomem *base, u32 offset)
|
|
{
|
|
return readl(base + offset);
|
|
}
|
|
|
|
-static void airoha_wr(void __iomem *base, u32 offset, u32 val)
|
|
+void airoha_wr(void __iomem *base, u32 offset, u32 val)
|
|
{
|
|
writel(val, base + offset);
|
|
}
|
|
|
|
-static u32 airoha_rmw(void __iomem *base, u32 offset, u32 mask, u32 val)
|
|
+u32 airoha_rmw(void __iomem *base, u32 offset, u32 mask, u32 val)
|
|
{
|
|
val |= (airoha_rr(base, offset) & ~mask);
|
|
airoha_wr(base, offset, val);
|
|
@@ -691,28 +691,6 @@ static u32 airoha_rmw(void __iomem *base
|
|
return val;
|
|
}
|
|
|
|
-#define airoha_fe_rr(eth, offset) \
|
|
- airoha_rr((eth)->fe_regs, (offset))
|
|
-#define airoha_fe_wr(eth, offset, val) \
|
|
- airoha_wr((eth)->fe_regs, (offset), (val))
|
|
-#define airoha_fe_rmw(eth, offset, mask, val) \
|
|
- airoha_rmw((eth)->fe_regs, (offset), (mask), (val))
|
|
-#define airoha_fe_set(eth, offset, val) \
|
|
- airoha_rmw((eth)->fe_regs, (offset), 0, (val))
|
|
-#define airoha_fe_clear(eth, offset, val) \
|
|
- airoha_rmw((eth)->fe_regs, (offset), (val), 0)
|
|
-
|
|
-#define airoha_qdma_rr(qdma, offset) \
|
|
- airoha_rr((qdma)->regs, (offset))
|
|
-#define airoha_qdma_wr(qdma, offset, val) \
|
|
- airoha_wr((qdma)->regs, (offset), (val))
|
|
-#define airoha_qdma_rmw(qdma, offset, mask, val) \
|
|
- airoha_rmw((qdma)->regs, (offset), (mask), (val))
|
|
-#define airoha_qdma_set(qdma, offset, val) \
|
|
- airoha_rmw((qdma)->regs, (offset), 0, (val))
|
|
-#define airoha_qdma_clear(qdma, offset, val) \
|
|
- airoha_rmw((qdma)->regs, (offset), (val), 0)
|
|
-
|
|
static void airoha_qdma_set_irqmask(struct airoha_qdma *qdma, int index,
|
|
u32 clear, u32 set)
|
|
{
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.h
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
|
|
@@ -248,4 +248,30 @@ struct airoha_eth {
|
|
struct airoha_gdm_port *ports[AIROHA_MAX_NUM_GDM_PORTS];
|
|
};
|
|
|
|
+u32 airoha_rr(void __iomem *base, u32 offset);
|
|
+void airoha_wr(void __iomem *base, u32 offset, u32 val);
|
|
+u32 airoha_rmw(void __iomem *base, u32 offset, u32 mask, u32 val);
|
|
+
|
|
+#define airoha_fe_rr(eth, offset) \
|
|
+ airoha_rr((eth)->fe_regs, (offset))
|
|
+#define airoha_fe_wr(eth, offset, val) \
|
|
+ airoha_wr((eth)->fe_regs, (offset), (val))
|
|
+#define airoha_fe_rmw(eth, offset, mask, val) \
|
|
+ airoha_rmw((eth)->fe_regs, (offset), (mask), (val))
|
|
+#define airoha_fe_set(eth, offset, val) \
|
|
+ airoha_rmw((eth)->fe_regs, (offset), 0, (val))
|
|
+#define airoha_fe_clear(eth, offset, val) \
|
|
+ airoha_rmw((eth)->fe_regs, (offset), (val), 0)
|
|
+
|
|
+#define airoha_qdma_rr(qdma, offset) \
|
|
+ airoha_rr((qdma)->regs, (offset))
|
|
+#define airoha_qdma_wr(qdma, offset, val) \
|
|
+ airoha_wr((qdma)->regs, (offset), (val))
|
|
+#define airoha_qdma_rmw(qdma, offset, mask, val) \
|
|
+ airoha_rmw((qdma)->regs, (offset), (mask), (val))
|
|
+#define airoha_qdma_set(qdma, offset, val) \
|
|
+ airoha_rmw((qdma)->regs, (offset), 0, (val))
|
|
+#define airoha_qdma_clear(qdma, offset, val) \
|
|
+ airoha_rmw((qdma)->regs, (offset), (val), 0)
|
|
+
|
|
#endif /* AIROHA_ETH_H */
|