Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.146
Browse files Browse the repository at this point in the history 
All patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
  • Loading branch information
@graysky2 @hauke
graysky2 authored and hauke committed Oct 2, 2022
1 parent 8fe67fa commit eed0a31
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
View file
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .145
LINUX_KERNEL_HASH-5.10.145 = fc5990f3e57479369eaf193bd7760b84f26d2b670c2d88e473101cb679c5ac61
LINUX_VERSION-5.10 = .146
LINUX_KERNEL_HASH-5.10.146 = 7bbd97f3278eadb73c19a1ca8c1a655c60afcee9f487b910063cdd15e9ee6dc1
10 changes: 5 additions & 5 deletions target/linux/generic/hack-5.10/720-net-phy-add-aqr-phys.patch
View file
Expand Up @@ -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_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;
}

Expand Down Expand Up @@ -70,7 +70,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
static int aqr107_read_status(struct phy_device *phydev)
{
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);
prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val);

Expand All @@ -79,7 +79,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
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,
},
{
Expand All @@ -104,7 +104,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
PHY_ID_MATCH_MODEL(PHY_ID_AQCS109),
.name = "Aquantia AQCS109",
.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,
.read_status = aqr_read_status,
},
Expand All @@ -129,7 +129,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
};

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_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
Expand Down
12 changes: 6 additions & 6 deletions target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch
View file
Expand Up @@ -27,9 +27,9 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
#define PHY_ID_AQR813 0x31c31cb2

#define MDIO_PHYXS_VEND_IF_STATUS 0xe812
@@ -125,6 +127,29 @@
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1)
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0)
@@ -134,6 +136,29 @@
#define AQR107_OP_IN_PROG_SLEEP 1000
#define AQR107_OP_IN_PROG_TIMEOUT 100000

+/* registers in MDIO_MMD_VEND1 region */
+#define AQUANTIA_VND1_GLOBAL_SC 0x000
Expand Down Expand Up @@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
struct aqr107_hw_stat {
const char *name;
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);
}

Expand Down Expand Up @@ -109,7 +109,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
static int aqr_config_intr(struct phy_device *phydev)
{
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,
.link_change_notify = aqr107_link_change_notify,
},
Expand Down Expand Up @@ -140,7 +140,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
};

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_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch
View file
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>

--- a/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,
aquantia_syscfg[if_type].start_rate);

Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch
View file
Expand Up @@ -18,7 +18,7 @@ Add a new entry for AQR113 PHY_ID
#define PHY_ID_AQR113C 0x31c31c12
#define PHY_ID_AQCS109 0x03a1b5c2
#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,
},
{
Expand All @@ -33,7 +33,7 @@ Add a new entry for AQR113 PHY_ID
PHY_ID_MATCH_MODEL(PHY_ID_AQR412),
.name = "Aquantia AQR412",
.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_AQR107) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
View file
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#define PHY_ID_AQR113 0x31c31c40
#define PHY_ID_AQR113C 0x31c31c12
#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,
},
{
Expand Down Expand Up @@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
PHY_ID_MATCH_MODEL(PHY_ID_AQR113),
.name = "Aquantia AQR113",
.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_AQR107) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
View file
Expand Up @@ -33,8 +33,8 @@ Submitted-by: Daniel Golle <daniel@makrotopia.org>

#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
@@ -1140,6 +1142,11 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
@@ -1143,6 +1145,11 @@ static const struct usb_device_id option
.driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },
+ /* Meiglink products using Qualcomm vendor ID */
Expand Down
2 changes: 1 addition & 1 deletion target/linux/realtek/patches-5.10/709-lag-offloading.patch
View file
Expand Up @@ -22,7 +22,7 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de>

--- a/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;
}

Expand Down
2 changes: 1 addition & 1 deletion target/linux/uml/patches-5.10/001-um-Fix-build-w-o-CONFIG_PM_SLEEP.patch
View file
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
---
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -387,12 +387,12 @@
@@ -387,12 +387,12 @@ void text_poke_sync(void)
{
}

Expand Down

1 comment on commit eed0a31

@peterwillcn
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rtl8812au-ct Compilation Error

make[5]: *** [scripts/Makefile.build:437: /home/openwrt/master/openwrt/build_dir/target-x86_64_musl/linux-x86_64/rtl8812au-ct-2021-11-07-39df5596/rtl8812au.o] Error 1
make[4]: *** [Makefile:1833: /home/openwrt/master/openwrt/build_dir/target-x86_64_musl/linux-x86_64/rtl8812au-ct-2021-11-07-39df5596] Error 2
make[3]: *** [Makefile:57: /home/openwrt/master/openwrt/build_dir/target-x86_64_musl/linux-x86_64/rtl8812au-ct-2021-11-07-39df5596/.built] Error 2
make[2]: *** [package/Makefile:116: package/kernel/rtl8812au-ct/compile] Error 1

Please sign in to comment.