domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 5.10 to 5.10.146

Browse Source 
All patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit eed0a31b90)
This commit is contained in:
John Audia
2022-09-28 16:05:00 -04:00
committed by Hauke Mehrtens
parent f04515e7bd
commit 2c49ad36fb
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.10
View File

@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .145 LINUX_VERSION-5.10 = .146
LINUX_KERNEL_HASH-5.10.145 = fc5990f3e57479369eaf193bd7760b84f26d2b670c2d88e473101cb679c5ac61 LINUX_KERNEL_HASH-5.10.146 = 7bbd97f3278eadb73c19a1ca8c1a655c60afcee9f487b910063cdd15e9ee6dc1

10
target/linux/generic/hack-5.10/720-net-phy-add-aqr-phys.patch
View File

@@ -20,7 +20,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812 #define MDIO_PHYXS_VEND_IF_STATUS 0xe812
#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3) #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3)
@@ -343,6 +345,49 @@ static int aqr107_read_rate(struct phy_d @@ -352,6 +354,49 @@ static int aqr107_read_rate(struct phy_d
return 0; return 0;
} }
@@ -70,7 +70,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
static int aqr107_read_status(struct phy_device *phydev) static int aqr107_read_status(struct phy_device *phydev)
{ {
int val, ret; int val, ret;
@@ -473,7 +518,7 @@ static void aqr107_chip_info(struct phy_ @@ -482,7 +527,7 @@ static void aqr107_chip_info(struct phy_
build_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID, val); build_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID, val);
prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val); prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val);
@@ -79,7 +79,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
fw_major, fw_minor, build_id, prov_id); fw_major, fw_minor, build_id, prov_id);
} }
@@ -645,6 +690,24 @@ static struct phy_driver aqr_driver[] = @@ -690,6 +735,24 @@ static struct phy_driver aqr_driver[] =
.link_change_notify = aqr107_link_change_notify, .link_change_notify = aqr107_link_change_notify,
}, },
{ {
@@ -104,7 +104,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
PHY_ID_MATCH_MODEL(PHY_ID_AQCS109), PHY_ID_MATCH_MODEL(PHY_ID_AQCS109),
.name = "Aquantia AQCS109", .name = "Aquantia AQCS109",
.probe = aqr107_probe, .probe = aqr107_probe,
@@ -670,6 +733,24 @@ static struct phy_driver aqr_driver[] = @@ -715,6 +778,24 @@ static struct phy_driver aqr_driver[] =
.ack_interrupt = aqr_ack_interrupt, .ack_interrupt = aqr_ack_interrupt,
.read_status = aqr_read_status, .read_status = aqr_read_status,
}, },
@@ -129,7 +129,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
}; };
module_phy_driver(aqr_driver); module_phy_driver(aqr_driver);
@@ -680,8 +761,10 @@ static struct mdio_device_id __maybe_unu @@ -725,8 +806,10 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR105) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR105) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },

12
target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch
View File

@@ -27,9 +27,9 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
#define PHY_ID_AQR813 0x31c31cb2 #define PHY_ID_AQR813 0x31c31cb2
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812 #define MDIO_PHYXS_VEND_IF_STATUS 0xe812
@@ -125,6 +127,29 @@ @@ -134,6 +136,29 @@
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1) #define AQR107_OP_IN_PROG_SLEEP 1000
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0) #define AQR107_OP_IN_PROG_TIMEOUT 100000
+/* registers in MDIO_MMD_VEND1 region */ +/* registers in MDIO_MMD_VEND1 region */
+#define AQUANTIA_VND1_GLOBAL_SC 0x000 +#define AQUANTIA_VND1_GLOBAL_SC 0x000
@@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
struct aqr107_hw_stat { struct aqr107_hw_stat {
const char *name; const char *name;
int reg; int reg;
@@ -256,6 +281,51 @@ static int aqr_config_aneg(struct phy_de @@ -265,6 +290,51 @@ static int aqr_config_aneg(struct phy_de
return genphy_c45_check_and_restart_aneg(phydev, changed); return genphy_c45_check_and_restart_aneg(phydev, changed);
} }
@@ -109,7 +109,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
static int aqr_config_intr(struct phy_device *phydev) static int aqr_config_intr(struct phy_device *phydev)
{ {
bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED; bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED;
@@ -751,6 +821,30 @@ static struct phy_driver aqr_driver[] = @@ -796,6 +866,30 @@ static struct phy_driver aqr_driver[] =
.get_stats = aqr107_get_stats, .get_stats = aqr107_get_stats,
.link_change_notify = aqr107_link_change_notify, .link_change_notify = aqr107_link_change_notify,
}, },
@@ -140,7 +140,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
}; };
module_phy_driver(aqr_driver); module_phy_driver(aqr_driver);
@@ -761,9 +855,11 @@ static struct mdio_device_id __maybe_unu @@ -806,9 +900,11 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR105) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR105) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },

2
target/linux/generic/hack-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch
View File

@@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
--- a/drivers/net/phy/aquantia_main.c --- a/drivers/net/phy/aquantia_main.c
+++ b/drivers/net/phy/aquantia_main.c +++ b/drivers/net/phy/aquantia_main.c
@@ -314,10 +314,16 @@ static int aqr_config_aneg_set_prot(stru @@ -323,10 +323,16 @@ static int aqr_config_aneg_set_prot(stru
phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE, phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE,
aquantia_syscfg[if_type].start_rate); aquantia_syscfg[if_type].start_rate);

4
target/linux/generic/hack-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch
View File

@@ -18,7 +18,7 @@ Add a new entry for AQR113 PHY_ID
#define PHY_ID_AQR113C 0x31c31c12 #define PHY_ID_AQR113C 0x31c31c12
#define PHY_ID_AQCS109 0x03a1b5c2 #define PHY_ID_AQCS109 0x03a1b5c2
#define PHY_ID_AQR405 0x03a1b4b0 #define PHY_ID_AQR405 0x03a1b4b0
@@ -840,6 +841,14 @@ static struct phy_driver aqr_driver[] = @@ -885,6 +886,14 @@ static struct phy_driver aqr_driver[] =
.get_stats = aqr107_get_stats, .get_stats = aqr107_get_stats,
}, },
{ {
@@ -33,7 +33,7 @@ Add a new entry for AQR113 PHY_ID
PHY_ID_MATCH_MODEL(PHY_ID_AQR412), PHY_ID_MATCH_MODEL(PHY_ID_AQR412),
.name = "Aquantia AQR412", .name = "Aquantia AQR412",
.probe = aqr107_probe, .probe = aqr107_probe,
@@ -862,6 +871,7 @@ static struct mdio_device_id __maybe_unu @@ -907,6 +916,7 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },

4
target/linux/generic/hack-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
View File

@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#define PHY_ID_AQR113 0x31c31c40 #define PHY_ID_AQR113 0x31c31c40
#define PHY_ID_AQR113C 0x31c31c12 #define PHY_ID_AQR113C 0x31c31c12
#define PHY_ID_AQCS109 0x03a1b5c2 #define PHY_ID_AQCS109 0x03a1b5c2
@@ -841,6 +843,30 @@ static struct phy_driver aqr_driver[] = @@ -886,6 +888,30 @@ static struct phy_driver aqr_driver[] =
.get_stats = aqr107_get_stats, .get_stats = aqr107_get_stats,
}, },
{ {
@@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
PHY_ID_MATCH_MODEL(PHY_ID_AQR113), PHY_ID_MATCH_MODEL(PHY_ID_AQR113),
.name = "Aquantia AQR113", .name = "Aquantia AQR113",
.config_aneg = aqr_config_aneg, .config_aneg = aqr_config_aneg,
@@ -871,6 +897,8 @@ static struct mdio_device_id __maybe_unu @@ -916,6 +942,8 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },

4
target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
View File

@@ -19,8 +19,8 @@
#define QUECTEL_VENDOR_ID 0x2c7c #define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */ /* These Quectel products use Quectel's vendor ID */
@@ -1140,6 +1142,11 @@ static const struct usb_device_id option @@ -1143,6 +1145,11 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, .driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) }, .driver_info = RSVD(4) },
+ /* Meiglink products using Qualcomm vendor ID */ + /* Meiglink products using Qualcomm vendor ID */

2
target/linux/realtek/patches-5.10/709-lag-offloading.patch
View File

@@ -1,6 +1,6 @@
--- a/drivers/net/bonding/bond_main.c --- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c
@@ -2046,6 +2046,8 @@ int bond_enslave(struct net_device *bond @@ -2045,6 +2045,8 @@ int bond_enslave(struct net_device *bond
goto err_unregister; goto err_unregister;
} }