5.15-stable patches

added patches:
	blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch
	net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch

diff --git a/queue-5.15/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch b/queue-5.15/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch
new file mode 100644 (file)
index 0000000..014ed73
--- /dev/null
+++ b/queue-5.15/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch
@@ -0,0 +1,45 @@
+From 285febabac4a16655372d23ff43e89ff6f216691 Mon Sep 17 00:00:00 2001
+From: Yu Kuai <yukuai3@huawei.com>
+Date: Sun, 9 Oct 2022 18:10:38 +0800
+Subject: blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init()
+
+From: Yu Kuai <yukuai3@huawei.com>
+
+commit 285febabac4a16655372d23ff43e89ff6f216691 upstream.
+
+commit 8c5035dfbb94 ("blk-wbt: call rq_qos_add() after wb_normal is
+initialized") moves wbt_set_write_cache() before rq_qos_add(), which
+is wrong because wbt_rq_qos() is still NULL.
+
+Fix the problem by removing wbt_set_write_cache() and setting 'rwb->wc'
+directly. Noted that this patch also remove the redundant setting of
+'rab->wc'.
+
+Fixes: 8c5035dfbb94 ("blk-wbt: call rq_qos_add() after wb_normal is initialized")
+Reported-by: kernel test robot <yujie.liu@intel.com>
+Link: https://lore.kernel.org/r/202210081045.77ddf59b-yujie.liu@intel.com
+Signed-off-by: Yu Kuai <yukuai3@huawei.com>
+Reviewed-by: Ming Lei <ming.lei@redhat.com>
+Link: https://lore.kernel.org/r/20221009101038.1692875-1-yukuai1@huaweicloud.com
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ block/blk-wbt.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/block/blk-wbt.c
++++ b/block/blk-wbt.c
+@@ -841,12 +841,11 @@ int wbt_init(struct request_queue *q)
+       rwb->last_comp = rwb->last_issue = jiffies;
+       rwb->win_nsec = RWB_WINDOW_NSEC;
+       rwb->enable_state = WBT_STATE_ON_DEFAULT;
+-      rwb->wc = 1;
++      rwb->wc = test_bit(QUEUE_FLAG_WC, &q->queue_flags);
+       rwb->rq_depth.default_depth = RWB_DEF_DEPTH;
+       rwb->min_lat_nsec = wbt_default_latency_nsec(q);
+ 
+       wbt_queue_depth_changed(&rwb->rqos);
+-      wbt_set_write_cache(q, test_bit(QUEUE_FLAG_WC, &q->queue_flags));
+ 
+       /*
+        * Assign rwb and add the stats callback.

diff --git a/queue-5.15/net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch b/queue-5.15/net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch
new file mode 100644 (file)
index 0000000..ad25d63
--- /dev/null
+++ b/queue-5.15/net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch
@@ -0,0 +1,46 @@
+From 35bbe652c421037822aba29423f5f1f7d0d69f3f Mon Sep 17 00:00:00 2001
+From: Randy Dunlap <rdunlap@infradead.org>
+Date: Tue, 23 Aug 2022 19:42:16 -0700
+Subject: net: ethernet: ti: davinci_mdio: fix build for mdio bitbang uses
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+commit 35bbe652c421037822aba29423f5f1f7d0d69f3f upstream.
+
+davinci_mdio.c uses mdio bitbang APIs, so it should select
+MDIO_BITBANG to prevent build errors.
+
+arm-linux-gnueabi-ld: drivers/net/ethernet/ti/davinci_mdio.o: in function `davinci_mdio_remove':
+drivers/net/ethernet/ti/davinci_mdio.c:649: undefined reference to `free_mdio_bitbang'
+arm-linux-gnueabi-ld: drivers/net/ethernet/ti/davinci_mdio.o: in function `davinci_mdio_probe':
+drivers/net/ethernet/ti/davinci_mdio.c:545: undefined reference to `alloc_mdio_bitbang'
+arm-linux-gnueabi-ld: drivers/net/ethernet/ti/davinci_mdio.o: in function `davinci_mdiobb_read':
+drivers/net/ethernet/ti/davinci_mdio.c:236: undefined reference to `mdiobb_read'
+arm-linux-gnueabi-ld: drivers/net/ethernet/ti/davinci_mdio.o: in function `davinci_mdiobb_write':
+drivers/net/ethernet/ti/davinci_mdio.c:253: undefined reference to `mdiobb_write'
+
+Fixes: d04807b80691 ("net: ethernet: ti: davinci_mdio: Add workaround for errata i2329")
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Cc: Grygorii Strashko <grygorii.strashko@ti.com>
+Cc: Ravi Gunasekaran <r-gunasekaran@ti.com>
+Cc: Eric Dumazet <edumazet@google.com>
+Cc: Paolo Abeni <pabeni@redhat.com>
+Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
+Cc: Sudip Mukherjee (Codethink) <sudipm.mukherjee@gmail.com>
+Link: https://lore.kernel.org/r/20220824024216.4939-1-rdunlap@infradead.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/ti/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/ethernet/ti/Kconfig
++++ b/drivers/net/ethernet/ti/Kconfig
+@@ -33,6 +33,7 @@ config TI_DAVINCI_MDIO
+       tristate "TI DaVinci MDIO Support"
+       depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3 || COMPILE_TEST
+       select PHYLIB
++      select MDIO_BITBANG
+       help
+         This driver supports TI's DaVinci MDIO module.
+ 

diff --git a/queue-5.15/series b/queue-5.15/series
index e10e967a6a6a799a587bf6bc1a0218fc077255a1..33c52f1cef4e73c1618111f1fdd211468144568b 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -619,3 +619,5 @@ io_uring-rw-fix-unexpected-link-breakage.patch
 mm-hugetlb-fix-uaf-in-hugetlb_handle_userfault.patch
 net-ieee802154-return-einval-for-unknown-addr-type.patch
 alsa-usb-audio-fix-last-interface-check-for-registration.patch
+blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch
+net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch