kernel: bump 4.19 to 4.19.98
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
 | 
				
			|||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LINUX_VERSION-4.14 = .167
 | 
					LINUX_VERSION-4.14 = .167
 | 
				
			||||||
LINUX_VERSION-4.19 = .97
 | 
					LINUX_VERSION-4.19 = .98
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LINUX_KERNEL_HASH-4.14.167 = 2bb78fc7a902faf4f5dad47fdbc2f4bf3df3cf9b41f408e7260f36656659fe43
 | 
					LINUX_KERNEL_HASH-4.14.167 = 2bb78fc7a902faf4f5dad47fdbc2f4bf3df3cf9b41f408e7260f36656659fe43
 | 
				
			||||||
LINUX_KERNEL_HASH-4.19.97 = 8fb2a328e05e545274e721cf84baaf612b9330febc6f581b9ead81eaf41496da
 | 
					LINUX_KERNEL_HASH-4.19.98 = 91feb13bc22d60d69596ab1d01dfecbec13ef70f00c89a483e0733af94dd2937
 | 
				
			||||||
 | 
					
 | 
				
			||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 | 
					remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 | 
				
			||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
 | 
					sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,7 +16,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--- a/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
 | 
					+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 | 
				
			||||||
@@ -1245,7 +1245,12 @@
 | 
					@@ -1249,7 +1249,12 @@
 | 
				
			||||||
  */
 | 
					  */
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 #define QCA955X_GMAC_REG_ETH_CFG	0x00
 | 
					 #define QCA955X_GMAC_REG_ETH_CFG	0x00
 | 
				
			||||||
@@ -29,7 +29,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 | 
				
			|||||||
 
 | 
					 
 | 
				
			||||||
 #define QCA955X_ETH_CFG_RGMII_EN	BIT(0)
 | 
					 #define QCA955X_ETH_CFG_RGMII_EN	BIT(0)
 | 
				
			||||||
 #define QCA955X_ETH_CFG_MII_GE0		BIT(1)
 | 
					 #define QCA955X_ETH_CFG_MII_GE0		BIT(1)
 | 
				
			||||||
@@ -1267,9 +1272,58 @@
 | 
					@@ -1271,9 +1276,58 @@
 | 
				
			||||||
 #define QCA955X_ETH_CFG_TXE_DELAY_MASK	0x3
 | 
					 #define QCA955X_ETH_CFG_TXE_DELAY_MASK	0x3
 | 
				
			||||||
 #define QCA955X_ETH_CFG_TXE_DELAY_SHIFT	20
 | 
					 #define QCA955X_ETH_CFG_TXE_DELAY_SHIFT	20
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -88,4 +88,3 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 | 
				
			|||||||
 /*
 | 
					 /*
 | 
				
			||||||
  * QCA956X GMAC Interface
 | 
					  * QCA956X GMAC Interface
 | 
				
			||||||
  */
 | 
					  */
 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@ with kernel 5.1 and higher. It can be safely dropped with kernel 5.1.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--- a/drivers/net/phy/at803x.c
 | 
					--- a/drivers/net/phy/at803x.c
 | 
				
			||||||
+++ b/drivers/net/phy/at803x.c
 | 
					+++ b/drivers/net/phy/at803x.c
 | 
				
			||||||
@@ -295,6 +295,14 @@ static int at803x_config_init(struct phy
 | 
					@@ -279,6 +279,14 @@ static int at803x_config_init(struct phy
 | 
				
			||||||
 	if (ret < 0)
 | 
					 	if (ret < 0)
 | 
				
			||||||
 		return ret;
 | 
					 		return ret;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
--- a/drivers/net/phy/at803x.c
 | 
					--- a/drivers/net/phy/at803x.c
 | 
				
			||||||
+++ b/drivers/net/phy/at803x.c
 | 
					+++ b/drivers/net/phy/at803x.c
 | 
				
			||||||
@@ -484,6 +484,13 @@ static int at803x_aneg_done(struct phy_d
 | 
					@@ -391,6 +391,13 @@ static int at803x_aneg_done(struct phy_d
 | 
				
			||||||
 	if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
 | 
					 	if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
 | 
				
			||||||
 		pr_warn("803x_aneg_done: SGMII link is not ok\n");
 | 
					 		pr_warn("803x_aneg_done: SGMII link is not ok\n");
 | 
				
			||||||
 		aneg_done = 0;
 | 
					 		aneg_done = 0;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -728,7 +728,7 @@
 | 
				
			|||||||
 EXPORT_SYMBOL(xfrm_parse_spi);
 | 
					 EXPORT_SYMBOL(xfrm_parse_spi);
 | 
				
			||||||
--- a/net/ipv4/tcp_input.c
 | 
					--- a/net/ipv4/tcp_input.c
 | 
				
			||||||
+++ b/net/ipv4/tcp_input.c
 | 
					+++ b/net/ipv4/tcp_input.c
 | 
				
			||||||
@@ -3894,14 +3894,16 @@ static bool tcp_parse_aligned_timestamp(
 | 
					@@ -3895,14 +3895,16 @@ static bool tcp_parse_aligned_timestamp(
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
 	const __be32 *ptr = (const __be32 *)(th + 1);
 | 
					 	const __be32 *ptr = (const __be32 *)(th + 1);
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -917,7 +917,7 @@ Fixes https://github.com/raspberrypi/linux/issues/2408
 | 
				
			|||||||
 }
 | 
					 }
 | 
				
			||||||
--- a/drivers/usb/core/hub.c
 | 
					--- a/drivers/usb/core/hub.c
 | 
				
			||||||
+++ b/drivers/usb/core/hub.c
 | 
					+++ b/drivers/usb/core/hub.c
 | 
				
			||||||
@@ -5221,7 +5221,7 @@ static void port_event(struct usb_hub *h
 | 
					@@ -5222,7 +5222,7 @@ static void port_event(struct usb_hub *h
 | 
				
			||||||
 		u16 status = 0, unused;
 | 
					 		u16 status = 0, unused;
 | 
				
			||||||
 		port_dev->over_current_count++;
 | 
					 		port_dev->over_current_count++;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
 | 
				
			|||||||
 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
 | 
					 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
 	u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
 | 
					 	u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
 | 
				
			||||||
@@ -3822,7 +3827,12 @@ static int lan78xx_probe(struct usb_inte
 | 
					@@ -3823,7 +3828,12 @@ static int lan78xx_probe(struct usb_inte
 | 
				
			||||||
 	dev->pipe_intr = usb_rcvintpipe(dev->udev,
 | 
					 	dev->pipe_intr = usb_rcvintpipe(dev->udev,
 | 
				
			||||||
 					dev->ep_intr->desc.bEndpointAddress &
 | 
					 					dev->ep_intr->desc.bEndpointAddress &
 | 
				
			||||||
 					USB_ENDPOINT_NUMBER_MASK);
 | 
					 					USB_ENDPOINT_NUMBER_MASK);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 | 
				
			|||||||
+MODULE_ALIAS("nf-flow-table-hw");
 | 
					+MODULE_ALIAS("nf-flow-table-hw");
 | 
				
			||||||
--- a/net/netfilter/nf_tables_api.c
 | 
					--- a/net/netfilter/nf_tables_api.c
 | 
				
			||||||
+++ b/net/netfilter/nf_tables_api.c
 | 
					+++ b/net/netfilter/nf_tables_api.c
 | 
				
			||||||
@@ -5478,6 +5478,13 @@ static int nf_tables_flowtable_parse_hoo
 | 
					@@ -5490,6 +5490,13 @@ static int nf_tables_flowtable_parse_hoo
 | 
				
			||||||
 	if (err < 0)
 | 
					 	if (err < 0)
 | 
				
			||||||
 		return err;
 | 
					 		return err;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 | 
				
			|||||||
 	ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
 | 
					 	ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
 | 
				
			||||||
 	if (!ops)
 | 
					 	if (!ops)
 | 
				
			||||||
 		return -ENOMEM;
 | 
					 		return -ENOMEM;
 | 
				
			||||||
@@ -5609,10 +5616,19 @@ static int nf_tables_newflowtable(struct
 | 
					@@ -5621,10 +5628,19 @@ static int nf_tables_newflowtable(struct
 | 
				
			||||||
 	}
 | 
					 	}
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 	flowtable->data.type = type;
 | 
					 	flowtable->data.type = type;
 | 
				
			||||||
@@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 | 
				
			|||||||
 	err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
 | 
					 	err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
 | 
				
			||||||
 					     flowtable);
 | 
					 					     flowtable);
 | 
				
			||||||
 	if (err < 0)
 | 
					 	if (err < 0)
 | 
				
			||||||
@@ -5738,7 +5754,8 @@ static int nf_tables_fill_flowtable_info
 | 
					@@ -5750,7 +5766,8 @@ static int nf_tables_fill_flowtable_info
 | 
				
			||||||
 	    nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
 | 
					 	    nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
 | 
				
			||||||
 	    nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
 | 
					 	    nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
 | 
				
			||||||
 	    nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),
 | 
					 	    nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,17 +13,17 @@ Signed-off-by: Roman Yeryomin <roman@advem.lv>
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--- a/drivers/net/phy/at803x.c
 | 
					--- a/drivers/net/phy/at803x.c
 | 
				
			||||||
+++ b/drivers/net/phy/at803x.c
 | 
					+++ b/drivers/net/phy/at803x.c
 | 
				
			||||||
@@ -46,6 +46,7 @@
 | 
					@@ -44,6 +44,7 @@
 | 
				
			||||||
 #define AT803X_FUNC_DATA			0x4003
 | 
					 #define AT803X_FUNC_DATA			0x4003
 | 
				
			||||||
 #define AT803X_REG_CHIP_CONFIG			0x1f
 | 
					 #define AT803X_REG_CHIP_CONFIG			0x1f
 | 
				
			||||||
 #define AT803X_BT_BX_REG_SEL			0x8000
 | 
					 #define AT803X_BT_BX_REG_SEL			0x8000
 | 
				
			||||||
+#define AT803X_SGMII_ANEG_EN			0x1000
 | 
					+#define AT803X_SGMII_ANEG_EN			0x1000
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 #define AT803X_PCS_SMART_EEE_CTRL3			0x805D
 | 
					 #define AT803X_DEBUG_ADDR			0x1D
 | 
				
			||||||
 #define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK	0x3
 | 
					 #define AT803X_DEBUG_DATA			0x1E
 | 
				
			||||||
@@ -268,6 +269,27 @@ static int at803x_config_init(struct phy
 | 
					@@ -252,6 +253,27 @@ static int at803x_probe(struct phy_devic
 | 
				
			||||||
 | 
					 static int at803x_config_init(struct phy_device *phydev)
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
 	struct at803x_platform_data *pdata;
 | 
					 | 
				
			||||||
 	int ret;
 | 
					 	int ret;
 | 
				
			||||||
+	u32 v;
 | 
					+	u32 v;
 | 
				
			||||||
+
 | 
					+
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
--- a/drivers/net/phy/Kconfig
 | 
					--- a/drivers/net/phy/Kconfig
 | 
				
			||||||
+++ b/drivers/net/phy/Kconfig
 | 
					+++ b/drivers/net/phy/Kconfig
 | 
				
			||||||
@@ -519,6 +519,13 @@ config XILINX_GMII2RGMII
 | 
					@@ -524,6 +524,13 @@ config XILINX_GMII2RGMII
 | 
				
			||||||
 	  the Reduced Gigabit Media Independent Interface(RGMII) between
 | 
					 	  the Reduced Gigabit Media Independent Interface(RGMII) between
 | 
				
			||||||
 	  Ethernet physical media devices and the Gigabit Ethernet controller.
 | 
					 	  Ethernet physical media devices and the Gigabit Ethernet controller.
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
--- a/drivers/net/phy/Kconfig
 | 
					--- a/drivers/net/phy/Kconfig
 | 
				
			||||||
+++ b/drivers/net/phy/Kconfig
 | 
					+++ b/drivers/net/phy/Kconfig
 | 
				
			||||||
@@ -526,6 +526,13 @@ config MDIO_IPQ40XX
 | 
					@@ -531,6 +531,13 @@ config MDIO_IPQ40XX
 | 
				
			||||||
 	  This driver supports the MDIO interface found in Qualcomm
 | 
					 	  This driver supports the MDIO interface found in Qualcomm
 | 
				
			||||||
 	  Atheros ipq40xx Soc chip.
 | 
					 	  Atheros ipq40xx Soc chip.
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
 config SFP
 | 
					 config SFP
 | 
				
			||||||
--- a/drivers/net/phy/Makefile
 | 
					--- a/drivers/net/phy/Makefile
 | 
				
			||||||
+++ b/drivers/net/phy/Makefile
 | 
					+++ b/drivers/net/phy/Makefile
 | 
				
			||||||
@@ -100,3 +100,5 @@ obj-$(CONFIG_STE10XP)		+= ste10Xp.o
 | 
					@@ -101,3 +101,5 @@ obj-$(CONFIG_STE10XP)		+= ste10Xp.o
 | 
				
			||||||
 obj-$(CONFIG_TERANETICS_PHY)	+= teranetics.o
 | 
					 obj-$(CONFIG_TERANETICS_PHY)	+= teranetics.o
 | 
				
			||||||
 obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
 | 
					 obj-$(CONFIG_VITESSE_PHY)	+= vitesse.o
 | 
				
			||||||
 obj-$(CONFIG_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o
 | 
					 obj-$(CONFIG_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user