kernel: add support for kernel 5.4

The following patches were removed because they are integrated in the upstream kernel 5.4:
 * backport-5.4/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch
 * backport-5.4/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch
 * backport-5.4/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch
 * backport-5.4/080-v5.1-0002-bcma-use-dev_-printing-functions.patch
 * backport-5.4/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch
 * backport-5.4/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch
 * backport-5.4/200-v5.2-usb-dwc2-Set-lpm-mode-parameters-depend-on-HW-configuration.patch
 * backport-5.4/210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch
 * backport-5.4/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch
 * backport-5.4/450-v5.0-mtd-spinand-winbond-Add-support-for-W25N01GV.patch
 * backport-5.4/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch
 * backport-5.4/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch
 * backport-5.4/455-v5.1-mtd-spinand-Add-support-for-all-Toshiba-Memory-produ.patch
 * backport-5.4/456-v5.1-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UExxG.patch
 * backport-5.4/460-v5.0-mtd-spi-nor-Add-support-for-mx25u12835f.patch
 * backport-5.4/460-v5.3-mtd-spinand-Define-macros-for-page-read-ops-with-thr.patch
 * backport-5.4/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch
 * backport-5.4/462-v5.3-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UFxxG.patch
 * backport-5.4/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch
 * backport-5.4/700-v5.1-net-phylink-only-call-mac_config-during-resolve-when.patch
 * backport-5.4/701-v5.2-net-phylink-ensure-inband-AN-works-correctly.patch
 * backport-5.4/702-v4.20-net-ethernet-Add-helper-for-MACs-which-support-asym-.patch
 * backport-5.4/703-v4.20-net-ethernet-Add-helper-for-set_pauseparam-for-Asym-.patch
 * backport-5.4/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch
 * backport-5.4/705-v5.1-net-phy-provide-full-set-of-accessor-functions-to-MM.patch
 * backport-5.4/706-v5.1-net-phy-add-register-modifying-helpers-returning-1-o.patch
 * backport-5.4/707-v5.1-net-phy-add-genphy_c45_check_and_restart_aneg.patch
 * backport-5.4/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch
 * backport-5.4/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch
 * backport-5.4/710-v5.3-net-phy-allow-Clause-45-access-via-mii-ioctl.patch
 * backport-5.4/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch
 * backport-5.4/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch
 * backport-5.4/713-v5.2-net-phylink-avoid-reducing-support-mask.patch
 * backport-5.4/714-v5.3-net-sfp-Stop-SFP-polling-and-interrupt-handling-duri.patch
 * backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch
 * backport-5.4/740-v5.5-net-phy-avoid-matching-all-ones-clause-45-PHY-IDs.patch
 * backport-5.4/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch
 * pending-5.4/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
 * pending-5.4/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch
 * pending-5.4/132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch
 * pending-5.4/220-optimize_inlining.patch
 * pending-5.4/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
 * pending-5.4/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch
 * pending-5.4/477-mtd-add-spi-nor-add-mx25u3235f.patch
 * pending-5.4/479-mtd-spi-nor-add-eon-en25qh64.patch

Some bigger changes were done to this feature and we did not port this patch yet:
 * hack-5.4/207-disable-modorder.patch

This depends on BOOTMEM which was removed from the kernel, this needs some bigger changes:
 * hack-5.4/930-crashlog.patch

A different version of the FPU disable patch was merged upstream, OpenWrt needs some adaptations.
 * pending-5.4/304-mips_disable_fpu.patch

- no crashlog support yet as a required file got deleted upstream
- Removed patch below, which is now seen as a recursive dependency [1]
- Removed patch below due to build error [2]
- fix still required to avoid identical function def [3]
- Fixes included from Blocktrron
- Fixes included from Chunkeey
- Fix included from nbd regarding "dst leak in Flow Offload"

[1] target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch
[2] target/linux/generic/hack-5.4/207-disable-modorder.patch
[3] target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: David Bauer <mail@david-bauer.net>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Signed-off-by: Robert Marko <robimarko@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

1 files changed, 29 insertions, 47 deletions

diff --git a/target/linux/generic/pending-5.4/752-net-phy-add-Broadcom-BCM84881-PHY-driver.patch b/target/linux/generic/pending-5.4/752-net-phy-add-Broadcom-BCM84881-PHY-driver.patch
index a69cf397aa..8929f1f19e 100644
--- a/target/linux/generic/pending-5.4/752-net-phy-add-Broadcom-BCM84881-PHY-driver.patch
+++ b/target/linux/generic/pending-5.4/752-net-phy-add-Broadcom-BCM84881-PHY-driver.patch
@@ -1,27 +1,30 @@
-From 0f669e10ede7f06bb998373de6a9d169f47fcc66 Mon Sep 17 00:00:00 2001
+From 75f4d8d10e016f7428c268424483a927ee7a78bb Mon Sep 17 00:00:00 2001
 From: Russell King <rmk+kernel@armlinux.org.uk>
-Date: Tue, 5 Nov 2019 11:54:30 +0000
-Subject: [PATCH 655/660] net: phy: add Broadcom BCM84881 PHY driver
+Date: Wed, 11 Dec 2019 10:56:56 +0000
+Subject: [PATCH] net: phy: add Broadcom BCM84881 PHY driver
 
 Add a rudimentary Clause 45 driver for the BCM84881 PHY, found on
 Methode DM7052 SFPs.
 
+Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
- drivers/net/phy/Kconfig    |   5 +
+ drivers/net/phy/Kconfig    |   6 +
  drivers/net/phy/Makefile   |   1 +
- drivers/net/phy/bcm84881.c | 290 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 296 insertions(+)
+ drivers/net/phy/bcm84881.c | 269 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 276 insertions(+)
  create mode 100644 drivers/net/phy/bcm84881.c
 
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -280,6 +280,11 @@ config BROADCOM_PHY
+@@ -329,6 +329,12 @@ config BROADCOM_PHY
  	  Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464,
  	  BCM5481, BCM54810 and BCM5482 PHYs.
  
 +config BCM84881_PHY
 +	tristate "Broadcom BCM84881 PHY"
++	depends on PHYLIB
 +	---help---
 +	  Support the Broadcom BCM84881 PHY.
 +
@@ -30,7 +33,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  	---help---
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -54,6 +54,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
+@@ -62,6 +62,7 @@ obj-$(CONFIG_BCM87XX_PHY)	+= bcm87xx.o
  obj-$(CONFIG_BCM_CYGNUS_PHY)	+= bcm-cygnus.o
  obj-$(CONFIG_BCM_NET_PHYLIB)	+= bcm-phy-lib.o
  obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
@@ -40,7 +43,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  obj-$(CONFIG_DAVICOM_PHY)	+= davicom.o
 --- /dev/null
 +++ b/drivers/net/phy/bcm84881.c
-@@ -0,0 +1,290 @@
+@@ -0,0 +1,269 @@
 +// SPDX-License-Identifier: GPL-2.0
 +// Broadcom BCM84881 NBASE-T PHY driver, as found on a SFP+ module.
 +// Copyright (C) 2019 Russell King, Deep Blue Solutions Ltd.
@@ -116,34 +119,21 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 +	return 0;
 +}
 +
-+static int genphy_c45_an_config_aneg(struct phy_device *phydev)
++static int bcm84881_get_features(struct phy_device *phydev)
 +{
-+	bool changed = false;
-+	u32 advertising;
 +	int ret;
 +
-+	phydev->advertising &= phydev->supported;
-+	advertising = phydev->advertising;
-+
-+	ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE,
-+				     ADVERTISE_ALL | ADVERTISE_100BASE4 |
-+				     ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM,
-+				     ethtool_adv_to_mii_adv_t(advertising));
-+	if (ret < 0)
++	ret = genphy_c45_pma_read_abilities(phydev);
++	if (ret)
 +		return ret;
-+	if (ret > 0)
-+		changed = true;
 +
-+	ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
-+				     MDIO_AN_10GBT_CTRL_ADV10G,
-+				     advertising & ADVERTISED_10000baseT_Full ?
-+					MDIO_AN_10GBT_CTRL_ADV10G : 0);
-+	if (ret < 0)
-+		return ret;
-+	if (ret > 0)
-+		changed = true;
++	/* Although the PHY sets bit 1.11.8, it does not support 10M modes */
++	linkmode_clear_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT,
++			   phydev->supported);
++	linkmode_clear_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT,
++			   phydev->supported);
 +
-+	return genphy_c45_check_and_restart_aneg(phydev, changed);
++	return 0;
 +}
 +
 +static int bcm84881_config_aneg(struct phy_device *phydev)
@@ -172,7 +162,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 +	if (ret > 0)
 +		changed = true;
 +
-+	adv = ethtool_adv_to_mii_ctrl1000_t(phydev->advertising);
++	adv = linkmode_adv_to_mii_ctrl1000_t(phydev->advertising);
 +	ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN,
 +				     MDIO_AN_C22 + MII_CTRL1000,
 +				     ADVERTISE_1000FULL | ADVERTISE_1000HALF,
@@ -203,7 +193,6 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 +
 +static int bcm84881_read_status(struct phy_device *phydev)
 +{
-+	bool autoneg_complete;
 +	unsigned int mode;
 +	int bmsr, val;
 +
@@ -224,24 +213,24 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 +	if (bmsr < 0)
 +		return val;
 +
-+	autoneg_complete = !!(val & MDIO_AN_STAT1_COMPLETE) &&
-+			   !!(bmsr & BMSR_ANEGCOMPLETE);
++	phydev->autoneg_complete = !!(val & MDIO_AN_STAT1_COMPLETE) &&
++				   !!(bmsr & BMSR_ANEGCOMPLETE);
 +	phydev->link = !!(val & MDIO_STAT1_LSTATUS) &&
 +		       !!(bmsr & BMSR_LSTATUS);
-+	if (phydev->autoneg == AUTONEG_ENABLE && !autoneg_complete)
++	if (phydev->autoneg == AUTONEG_ENABLE && !phydev->autoneg_complete)
 +		phydev->link = false;
 +
 +	if (!phydev->link)
 +		return 0;
 +
-+	phydev->lp_advertising = 0;
++	linkmode_zero(phydev->lp_advertising);
 +	phydev->speed = SPEED_UNKNOWN;
 +	phydev->duplex = DUPLEX_UNKNOWN;
 +	phydev->pause = 0;
 +	phydev->asym_pause = 0;
 +	phydev->mdix = 0;
 +
-+	if (autoneg_complete) {
++	if (phydev->autoneg_complete) {
 +		val = genphy_c45_read_lpa(phydev);
 +		if (val < 0)
 +			return val;
@@ -251,7 +240,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 +		if (val < 0)
 +			return val;
 +
-+		phydev->lp_advertising |= mii_stat1000_to_ethtool_lpa_t(val);
++		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
 +
 +		if (phydev->autoneg == AUTONEG_ENABLE)
 +			phy_resolve_aneg_linkmode(phydev);
@@ -304,16 +293,9 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 +		.phy_id		= 0xae025150,
 +		.phy_id_mask	= 0xfffffff0,
 +		.name		= "Broadcom BCM84881",
-+		.features	= SUPPORTED_100baseT_Full |
-+				  SUPPORTED_100baseT_Half |
-+				  SUPPORTED_1000baseT_Full |
-+				  SUPPORTED_Autoneg |
-+				  SUPPORTED_TP |
-+				  SUPPORTED_FIBRE |
-+				  SUPPORTED_10000baseT_Full |
-+				  SUPPORTED_Backplane,
 +		.config_init	= bcm84881_config_init,
 +		.probe		= bcm84881_probe,
++		.get_features	= bcm84881_get_features,
 +		.config_aneg	= bcm84881_config_aneg,
 +		.aneg_done	= bcm84881_aneg_done,
 +		.read_status	= bcm84881_read_status,