diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-12-05 16:43:36 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-12-12 20:08:17 +0100 |
| commit | 14940aee4566cff33fff9e068fb9559a1925cf44 (patch) | |
| tree | 3b95865893c878cb915970faffe6a411299d4cee /target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch | |
| parent | 06547e0a58daf768ff9776339cd31231dcd5c0ea (diff) | |
| download | upstream-14940aee4566cff33fff9e068fb9559a1925cf44.tar.gz upstream-14940aee4566cff33fff9e068fb9559a1925cf44.tar.bz2 upstream-14940aee4566cff33fff9e068fb9559a1925cf44.zip | |
kernel: bump 5.4 to 5.4.163
Removed upstreamed:
target/linux/mvebu/patches-5.4/001-PCI-aardvark-Wait-for-endpoint-to-be-ready-before-tr.patch
target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch
target/linux/mvebu/patches-5.4/017-PCI-aardvark-Improve-link-training.patch
target/linux/mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch
target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch
The following patch does not apply to upstream any more and needs some
more work to make it work fully again. I am not sure if we are still
able to set the UART to a none standard baud rate.
target/linux/ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch
These patches needed manually changes:
target/linux/generic/pending-5.4/110-ehci_hcd_ignore_oc.patch
target/linux/ipq806x/patches-5.4/0065-arm-override-compiler-flags.patch
target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch
target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
All others updated automatically.
Compile-tested on: malta/le, armvirt/64, lantiq/xrx200
Runtime-tested on: malta/le, armvirt/64, lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch b/target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch index 655f60b6d9..7b979d556b 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0245-net-mscc-ocelot-refactor-ethtool-callbacks.patch @@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c -@@ -1191,10 +1191,9 @@ static const struct net_device_ops ocelo +@@ -1185,10 +1185,9 @@ static const struct net_device_ops ocelo .ndo_do_ioctl = ocelot_ioctl, }; @@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int i; if (sset != ETH_SS_STATS) -@@ -1205,6 +1204,16 @@ static void ocelot_get_strings(struct ne +@@ -1199,6 +1198,16 @@ static void ocelot_get_strings(struct ne ETH_GSTRING_LEN); } @@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static void ocelot_update_stats(struct ocelot *ocelot) { int i, j; -@@ -1245,12 +1254,8 @@ static void ocelot_check_stats_work(stru +@@ -1239,12 +1248,8 @@ static void ocelot_check_stats_work(stru OCELOT_STATS_CHECK_DELAY); } @@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int i; /* check and update now */ -@@ -1261,25 +1266,37 @@ static void ocelot_get_ethtool_stats(str +@@ -1255,25 +1260,37 @@ static void ocelot_get_ethtool_stats(str *data++ = ocelot->stats[port * ocelot->num_stats + i]; } @@ -100,7 +100,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> info->phc_index = ocelot->ptp_clock ? ptp_clock_index(ocelot->ptp_clock) : -1; info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE | -@@ -1295,13 +1312,26 @@ static int ocelot_get_ts_info(struct net +@@ -1292,13 +1309,26 @@ static int ocelot_get_ts_info(struct net return 0; } |