phytium: refresh 5.10 support patch

This commit is contained in:
coolsnowwolf 2025-09-27 15:11:26 +08:00
parent c0a2ac247c
commit 9e04de00af

View File

@ -322,14 +322,13 @@
}
--- a/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@ -69,7 +69,7 @@
#define ARM64_SPECTRE_BHB 59
#define ARM64_WORKAROUND_2457168 60
@@ -71,6 +71,7 @@
#define ARM64_WORKAROUND_1742098 61
-
-#define ARM64_NCAPS 62
+#define ARM64_HAS_ECV 62
+#define ARM64_NCAPS 63
#define ARM64_WORKAROUND_SPECULATIVE_SSBS 62
-#define ARM64_NCAPS 63
+#define ARM64_HAS_ECV 63
+#define ARM64_NCAPS 64
#endif /* __ASM_CPUCAPS_H */
--- a/arch/arm64/include/asm/esr.h
@ -2348,9 +2347,9 @@
struct clk *tsu_clk;
struct net_device *dev;
+ struct ncsi_dev *ndev;
/* Protects hw_stats and ethtool_stats */
spinlock_t stats_lock;
union {
struct macb_stats macb;
struct gem_stats gem;
@@ -1201,7 +1299,13 @@ struct macb {
struct mii_bus *mii_bus;
struct phylink *phylink;