From 81d73ae747881387efd060db5c42c98de694024d Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Thu, 6 Sep 2018 14:17:17 +0200 Subject: [PATCH] kernel: bump 4.9 to 4.9.125 Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- ...03-at803x-add-sgmii-aneg-override-pdata.patch | 16 ++++++---------- .../940-qca955x-add-more-registers.patch | 6 ++---- .../patches-4.9/830-huawei_e970_support.patch | 4 ++-- .../090-net-generalize-napi_complete_done.patch | 2 +- .../patches-4.9/817-usb-support-layerscape.patch | 2 +- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 425c7ab594..3e31f6ca7c 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,11 +2,11 @@ LINUX_RELEASE?=1 -LINUX_VERSION-4.9 = .124 LINUX_VERSION-4.14 = .67 +LINUX_VERSION-4.9 = .125 -LINUX_KERNEL_HASH-4.9.124 = 5ca6b0d48c8dd1265005169f1b97149a4e893668c0d8aa566a73c7663c8e4311 LINUX_KERNEL_HASH-4.14.67 = 3f4b056dc27233a78f7a4a35ed6fdcfd0a9680ec40b611a898bb6c8b905070ba +LINUX_KERNEL_HASH-4.9.125 = a764deef61bebfac1d07b2ed6890f93a12a9ab6d3fc3c53e3d850ed4681111cb remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch b/target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch index 9c922d155d..fc640af17d 100644 --- a/target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch +++ b/target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch @@ -1,8 +1,6 @@ -Index: linux-4.9.111/drivers/net/phy/at803x.c -=================================================================== ---- linux-4.9.111.orig/drivers/net/phy/at803x.c -+++ linux-4.9.111/drivers/net/phy/at803x.c -@@ -461,12 +461,15 @@ static void at803x_link_change_notify(st +--- a/drivers/net/phy/at803x.c ++++ b/drivers/net/phy/at803x.c +@@ -460,12 +460,15 @@ static void at803x_link_change_notify(st static int at803x_aneg_done(struct phy_device *phydev) { @@ -18,7 +16,7 @@ Index: linux-4.9.111/drivers/net/phy/at803x.c /* * in SGMII mode, if copper side autoneg is successful, * also check SGMII side autoneg result -@@ -481,7 +484,8 @@ static int at803x_aneg_done(struct phy_d +@@ -480,7 +483,8 @@ static int at803x_aneg_done(struct phy_d /* check if the SGMII link is OK. */ if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) { pr_warn("803x_aneg_done: SGMII link is not ok\n"); @@ -28,10 +26,8 @@ Index: linux-4.9.111/drivers/net/phy/at803x.c } /* switch back to copper page */ phy_write(phydev, AT803X_REG_CHIP_CONFIG, ccr | AT803X_BT_BX_REG_SEL); -Index: linux-4.9.111/include/linux/platform_data/phy-at803x.h -=================================================================== ---- linux-4.9.111.orig/include/linux/platform_data/phy-at803x.h -+++ linux-4.9.111/include/linux/platform_data/phy-at803x.h +--- a/include/linux/platform_data/phy-at803x.h ++++ b/include/linux/platform_data/phy-at803x.h @@ -7,6 +7,7 @@ struct at803x_platform_data { int enable_rgmii_rx_delay:1; int fixup_rgmii_tx_delay:1; diff --git a/target/linux/ar71xx/patches-4.9/940-qca955x-add-more-registers.patch b/target/linux/ar71xx/patches-4.9/940-qca955x-add-more-registers.patch index 97400e3ec8..ff72308465 100644 --- a/target/linux/ar71xx/patches-4.9/940-qca955x-add-more-registers.patch +++ b/target/linux/ar71xx/patches-4.9/940-qca955x-add-more-registers.patch @@ -1,7 +1,5 @@ -Index: linux-4.9.111/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -=================================================================== ---- linux-4.9.111.orig/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -+++ linux-4.9.111/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h ++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h @@ -134,7 +134,7 @@ #define QCA955X_PCI_CTRL_SIZE 0x100 diff --git a/target/linux/brcm47xx/patches-4.9/830-huawei_e970_support.patch b/target/linux/brcm47xx/patches-4.9/830-huawei_e970_support.patch index 5d40fe6541..b6150ed8fd 100644 --- a/target/linux/brcm47xx/patches-4.9/830-huawei_e970_support.patch +++ b/target/linux/brcm47xx/patches-4.9/830-huawei_e970_support.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -231,6 +232,33 @@ static struct fixed_phy_status bcm47xx_f +@@ -225,6 +226,33 @@ static struct fixed_phy_status bcm47xx_f .duplex = DUPLEX_FULL, }; @@ -42,7 +42,7 @@ static int __init bcm47xx_register_bus_complete(void) { switch (bcm47xx_bus_type) { -@@ -250,6 +278,7 @@ static int __init bcm47xx_register_bus_c +@@ -244,6 +272,7 @@ static int __init bcm47xx_register_bus_c bcm47xx_workarounds(); fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status, -1); diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index 127707827e..3268b3407a 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -302,7 +302,7 @@ Signed-off-by: David S. Miller if (alx->flags & ALX_FLAG_USING_MSIX) { --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -1885,7 +1885,7 @@ static int atl1c_clean(struct napi_struc +@@ -1886,7 +1886,7 @@ static int atl1c_clean(struct napi_struc if (work_done < budget) { quit_polling: diff --git a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch index 7afef36e4b..3c278099d3 100644 --- a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch @@ -1658,7 +1658,7 @@ Signed-off-by: Yangbo Lu return IRQ_HANDLED; } } -@@ -923,12 +932,32 @@ int usb_otg_start(struct platform_device +@@ -925,12 +934,32 @@ int usb_otg_start(struct platform_device temp &= ~(PORTSC_PHY_TYPE_SEL | PORTSC_PTW); switch (pdata->phy_mode) { case FSL_USB2_PHY_ULPI: -- 2.30.2