mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-02 12:56:20 +02:00
d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From bc5e93e0cd22e360eda23859b939280205567580 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Wed, 18 May 2022 15:54:42 +0100
|
|
Subject: [PATCH 03/12] net: mtk_eth_soc: add mask and update PCS speed
|
|
definitions
|
|
|
|
The PCS speed setting is a two bit field, but it is defined as two
|
|
separate bits. Add a bitfield mask for the speed definitions, an
|
|
use the FIELD_PREP() macro to define each PCS speed.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -17,6 +17,7 @@
|
|
#include <linux/phylink.h>
|
|
#include <linux/rhashtable.h>
|
|
#include <linux/dim.h>
|
|
+#include <linux/bitfield.h>
|
|
#include "mtk_ppe.h"
|
|
|
|
#define MTK_QDMA_PAGE_SIZE 2048
|
|
@@ -474,9 +475,10 @@
|
|
#define SGMSYS_SGMII_MODE 0x20
|
|
#define SGMII_IF_MODE_BIT0 BIT(0)
|
|
#define SGMII_SPEED_DUPLEX_AN BIT(1)
|
|
-#define SGMII_SPEED_10 0x0
|
|
-#define SGMII_SPEED_100 BIT(2)
|
|
-#define SGMII_SPEED_1000 BIT(3)
|
|
+#define SGMII_SPEED_MASK GENMASK(3, 2)
|
|
+#define SGMII_SPEED_10 FIELD_PREP(SGMII_SPEED_MASK, 0)
|
|
+#define SGMII_SPEED_100 FIELD_PREP(SGMII_SPEED_MASK, 1)
|
|
+#define SGMII_SPEED_1000 FIELD_PREP(SGMII_SPEED_MASK, 2)
|
|
#define SGMII_DUPLEX_FULL BIT(4)
|
|
#define SGMII_IF_MODE_BIT5 BIT(5)
|
|
#define SGMII_REMOTE_FAULT_DIS BIT(8)
|