aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-02-17 05:58:14 -0500
committerÁlvaro Fernández Rojas <noltari@gmail.com>2021-02-19 07:15:59 +0100
commit76d1168d0d4b9d76e2ad78c0fc6b255561deb284 (patch)
tree60fd91fe322d516bfd5147bf33019c03c8ad32e8 /target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
parentcbe4beb442e10f9ad8fc71202e87c15a0859c44c (diff)
downloadupstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.tar.gz
upstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.tar.bz2
upstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.zip
kernel: bump 5.4 to 5.4.99
Ran update_kernel.sh in a fresh clone without any existing toolchains. No manual changes needed. Build system: x86_64 Build-tested: bcm27xx/bcm2711 Signed-off-by: John Audia <graysky@archlinux.us> (cherry-picked from commit 5d3a6fd970)
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch b/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
index 82fde98823..6c3c525d5f 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0234-enetc-WA-for-MDIO-register-access-issue.patch
@@ -254,7 +254,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
rx_frm_cnt++;
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
-@@ -325,8 +325,15 @@ struct enetc_hw {
+@@ -327,8 +327,15 @@ struct enetc_hw {
};
/* general register accessors */
@@ -272,7 +272,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
#ifdef ioread64
#define enetc_rd_reg64(reg) ioread64((reg))
#else
-@@ -345,12 +352,102 @@ static inline u64 enetc_rd_reg64(void __
+@@ -347,12 +354,102 @@ static inline u64 enetc_rd_reg64(void __
}
#endif
@@ -397,7 +397,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
#define enetc_mdio_rd(mdio_priv, off) \
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
-@@ -987,6 +987,9 @@ static void enetc_pf_remove(struct pci_d
+@@ -1046,6 +1046,9 @@ static void enetc_pf_remove(struct pci_d
enetc_pci_remove(pdev);
}