This is the start of the stable review cycle for the 4.9.307 release.
There are 19 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed, 16 Mar 2022 14:59:04 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.307-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.9.307-rc2
Qu Wenruo <wqu(a)suse.com>
btrfs: unlock newly allocated extent buffer after error
Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk>
ARM: fix Thumb2 regression with Spectre BHB
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Don't expect inter-netns unique iflink indices
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Request iflink once in batadv-on-batadv check
Dan Carpenter <dan.carpenter(a)oracle.com>
staging: gdm724x: fix use after free in gdm_lte_rx()
Randy Dunlap <rdunlap(a)infradead.org>
ARM: Spectre-BHB: provide empty stub for non-config
Mike Kravetz <mike.kravetz(a)oracle.com>
selftests/memfd: clean up mapping in mfd_fail_write
Sven Schnelle <svens(a)linux.ibm.com>
tracing: Ensure trace buffer is at least 4096 bytes large
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
Revert "xen-netback: Check for hotplug-status existence before watching"
suresh kumar <suresh2514(a)gmail.com>
net-sysfs: add check for netdevice being present to speed_show
Eric Dumazet <edumazet(a)google.com>
sctp: fix kernel-infoleak for SCTP sockets
Mark Featherston <mark(a)embeddedTS.com>
gpio: ts4900: Do not set DAT and OE together
Pavel Skripkin <paskripkin(a)gmail.com>
NFC: port100: fix use-after-free in port100_send_complete
Mohammad Kabat <mohammadkab(a)nvidia.com>
net/mlx5: Fix size field in bufferx_reg struct
Duoming Zhou <duoming(a)zju.edu.cn>
ax25: Fix NULL pointer dereference in ax25_kill_by_device
Jiasheng Jiang <jiasheng(a)iscas.ac.cn>
net: ethernet: lpc_eth: Handle error for clk_enable
Miaoqian Lin <linmq006(a)gmail.com>
ethernet: Fix error handling in xemaclite_of_probe
Tom Rix <trix(a)redhat.com>
qed: return status of qed_iov_get_link
Jia-Ju Bai <baijiaju1990(a)gmail.com>
net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare()
-------------
Diffstat:
Makefile | 4 ++--
arch/arm/include/asm/spectre.h | 6 ++++++
arch/arm/kernel/entry-armv.S | 4 ++--
drivers/gpio/gpio-ts4900.c | 24 +++++++++++++++++++-----
drivers/net/ethernet/nxp/lpc_eth.c | 5 ++++-
drivers/net/ethernet/qlogic/qed/qed_sriov.c | 18 +++++++++++-------
drivers/net/ethernet/qlogic/qed/qed_vf.c | 7 +++++++
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +++-
drivers/net/xen-netback/xenbus.c | 12 ++++--------
drivers/nfc/port100.c | 2 ++
drivers/staging/gdm724x/gdm_lte.c | 5 +++--
fs/btrfs/extent-tree.c | 1 +
include/linux/mlx5/mlx5_ifc.h | 4 ++--
kernel/trace/trace.c | 10 ++++++----
net/ax25/af_ax25.c | 7 +++++++
net/batman-adv/hard-interface.c | 13 ++++++++-----
net/core/net-sysfs.c | 2 +-
net/sctp/sctp_diag.c | 9 +++------
tools/testing/selftests/memfd/memfd_test.c | 1 +
19 files changed, 92 insertions(+), 46 deletions(-)
This is the start of the stable review cycle for the 4.14.272 release.
There are 22 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed, 16 Mar 2022 14:58:59 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.272-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.14.272-rc2
Qu Wenruo <wqu(a)suse.com>
btrfs: unlock newly allocated extent buffer after error
Josh Triplett <josh(a)joshtriplett.org>
ext4: add check to prevent attempting to resize an fs with sparse_super2
Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk>
ARM: fix Thumb2 regression with Spectre BHB
Michael S. Tsirkin <mst(a)redhat.com>
virtio: acknowledge all features before access
Michael S. Tsirkin <mst(a)redhat.com>
virtio: unexport virtio_finalize_features
Dan Carpenter <dan.carpenter(a)oracle.com>
staging: gdm724x: fix use after free in gdm_lte_rx()
Randy Dunlap <rdunlap(a)infradead.org>
ARM: Spectre-BHB: provide empty stub for non-config
Mike Kravetz <mike.kravetz(a)oracle.com>
selftests/memfd: clean up mapping in mfd_fail_write
Sven Schnelle <svens(a)linux.ibm.com>
tracing: Ensure trace buffer is at least 4096 bytes large
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
Revert "xen-netback: Check for hotplug-status existence before watching"
Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com>
Revert "xen-netback: remove 'hotplug-status' once it has served its purpose"
suresh kumar <suresh2514(a)gmail.com>
net-sysfs: add check for netdevice being present to speed_show
Eric Dumazet <edumazet(a)google.com>
sctp: fix kernel-infoleak for SCTP sockets
Mark Featherston <mark(a)embeddedTS.com>
gpio: ts4900: Do not set DAT and OE together
Pavel Skripkin <paskripkin(a)gmail.com>
NFC: port100: fix use-after-free in port100_send_complete
Mohammad Kabat <mohammadkab(a)nvidia.com>
net/mlx5: Fix size field in bufferx_reg struct
Duoming Zhou <duoming(a)zju.edu.cn>
ax25: Fix NULL pointer dereference in ax25_kill_by_device
Jiasheng Jiang <jiasheng(a)iscas.ac.cn>
net: ethernet: lpc_eth: Handle error for clk_enable
Jiasheng Jiang <jiasheng(a)iscas.ac.cn>
net: ethernet: ti: cpts: Handle error for clk_enable
Miaoqian Lin <linmq006(a)gmail.com>
ethernet: Fix error handling in xemaclite_of_probe
Tom Rix <trix(a)redhat.com>
qed: return status of qed_iov_get_link
Jia-Ju Bai <baijiaju1990(a)gmail.com>
net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare()
-------------
Diffstat:
Makefile | 4 +--
arch/arm/include/asm/spectre.h | 6 ++++
arch/arm/kernel/entry-armv.S | 4 +--
drivers/gpio/gpio-ts4900.c | 24 ++++++++++++----
drivers/net/ethernet/nxp/lpc_eth.c | 5 +++-
drivers/net/ethernet/qlogic/qed/qed_sriov.c | 18 +++++++-----
drivers/net/ethernet/qlogic/qed/qed_vf.c | 7 +++++
drivers/net/ethernet/ti/cpts.c | 4 ++-
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 ++-
drivers/net/xen-netback/xenbus.c | 13 ++++-----
drivers/nfc/port100.c | 2 ++
drivers/staging/gdm724x/gdm_lte.c | 5 ++--
drivers/virtio/virtio.c | 40 ++++++++++++++-------------
fs/btrfs/extent-tree.c | 1 +
fs/ext4/resize.c | 5 ++++
include/linux/mlx5/mlx5_ifc.h | 4 +--
include/linux/virtio.h | 1 -
include/linux/virtio_config.h | 3 +-
kernel/trace/trace.c | 10 ++++---
net/ax25/af_ax25.c | 7 +++++
net/core/net-sysfs.c | 2 +-
net/sctp/sctp_diag.c | 9 ++----
tools/testing/selftests/memfd/memfd_test.c | 1 +
23 files changed, 116 insertions(+), 63 deletions(-)
Lime2 HW first public revisions G/G1/G2 used RTL8211E PHYs. Later public
revision K and newest are using KSZ9031 PHYs. Up to commit bbc4d71d6354
("net: phy: realtek: fix rtl8211e rx/tx delay config") it was possible
to use same DTS for A20-olinuxino-lime2 with either KSZ9031 or RTL8211E
PHYs, thus on all HW revisions.
Having commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx delay
config") applied, Bastien found out, that his board using RTL8211E PHY
doesn't work anymore and tried to fix it by providing proper `phy-mode`
in commit 55dd7e059098 ("ARM: dts: sun7i: A20-olinuxino-lime2: Fix
ethernet phy-mode") with following reasoning:
Commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx delay
config") sets the RX/TX delay according to the phy-mode property in the
device tree. For the A20-olinuxino-lime2 board this is "rgmii", which is
the wrong setting.
Indeed, the settings were likely wrong, but only for boards with G/G1/G2
revisions using RTL8211E PHY. Those settings were still correct on
boards with HW revisions K and later with KSZ9031 PHY, so this fix was
incorrect.
So fix it properly by introducing separate DTS for boards with G/G1/G2
revisions using proper PHY mode for RTL8211E PHY.
Cc: stable(a)vger.kernel.org
Cc: Bastien Roucariès <rouca(a)debian.org>
References: https://github.com/OLIMEX/OLINUXINO/blob/master/HARDWARE/A20-OLinuXino-LIME…
Signed-off-by: Petr Štetiar <ynezz(a)true.cz>
---
arch/arm/boot/dts/Makefile | 2 ++
.../boot/dts/sun7i-a20-olinuxino-lime2-emmc-revG.dts | 11 +++++++++++
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-revG.dts | 11 +++++++++++
3 files changed, 24 insertions(+)
create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc-revG.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-revG.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e41eca79c950..241a1a229f0f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1244,7 +1244,9 @@ dtb-$(CONFIG_MACH_SUN7I) += \
sun7i-a20-olinuxino-lime.dtb \
sun7i-a20-olinuxino-lime-emmc.dtb \
sun7i-a20-olinuxino-lime2.dtb \
+ sun7i-a20-olinuxino-lime2-revG.dtb \
sun7i-a20-olinuxino-lime2-emmc.dtb \
+ sun7i-a20-olinuxino-lime2-emmc-revG.dtb \
sun7i-a20-olinuxino-micro.dtb \
sun7i-a20-olinuxino-micro-emmc.dtb \
sun7i-a20-orangepi.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc-revG.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc-revG.dts
new file mode 100644
index 000000000000..1e29f973614d
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc-revG.dts
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+#include "sun7i-a20-olinuxino-lime2-emmc.dts"
+
+/ {
+ model = "Olimex A20-OLinuXino-LIME2-eMMC (Rev G/G1/G2)";
+ compatible = "olimex,a20-olinuxino-lime2-emmc-revG", "allwinner,sun7i-a20";
+};
+
+&gmac {
+ phy-mode = "rgmii-id";
+};
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-revG.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-revG.dts
new file mode 100644
index 000000000000..7122dc99810a
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-revG.dts
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+#include "sun7i-a20-olinuxino-lime2.dts"
+
+/ {
+ model = "Olimex A20-OLinuXino-LIME2 (Rev G/G1/G2)";
+ compatible = "olimex,a20-olinuxino-lime2-revG", "allwinner,sun7i-a20";
+};
+
+&gmac {
+ phy-mode = "rgmii-id";
+};
This reverts commit 55dd7e059098ce4bd0a55c251cb78e74604abb57 as it
breaks network on my A20-olinuxino-lime2 hardware revision "K" which has
Micrel KSZ9031RNXCC-TR Gigabit PHY. Bastien has probably some previous
hardware revisions which were based on RTL8211E-VB-CG1 PHY and thus this
fix was working on his board.
Cc: stable(a)vger.kernel.org
Cc: Bastien Roucariès <rouca(a)debian.org>
References: https://github.com/openwrt/openwrt/issues/9153
References: https://github.com/OLIMEX/OLINUXINO/blob/master/HARDWARE/A20-OLinuXino-LIME…
Signed-off-by: Petr Štetiar <ynezz(a)true.cz>
---
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index ecb91fb899ff..8077f1716fbc 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -112,7 +112,7 @@ &gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_rgmii_pins>;
phy-handle = <&phy1>;
- phy-mode = "rgmii-id";
+ phy-mode = "rgmii";
status = "okay";
};