From: Greg Kroah-Hartman Date: Tue, 18 Oct 2022 16:10:02 +0000 (+0200) Subject: drop queue-6.0/ib-mlx5-call-io_stop_wc-after-writing-to-wc-mmio.patch X-Git-Tag: v6.0.3~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2c0d2ba7e52746dc6baad2c3602c2cb40e1fb8c;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.0/ib-mlx5-call-io_stop_wc-after-writing-to-wc-mmio.patch --- diff --git a/queue-6.0/ib-mlx5-call-io_stop_wc-after-writing-to-wc-mmio.patch b/queue-6.0/ib-mlx5-call-io_stop_wc-after-writing-to-wc-mmio.patch deleted file mode 100644 index 510176e53ba..00000000000 --- a/queue-6.0/ib-mlx5-call-io_stop_wc-after-writing-to-wc-mmio.patch +++ /dev/null @@ -1,40 +0,0 @@ -From da1aef13acaf3b266a51ff20baf2699f7caf334b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 29 Jul 2022 13:33:38 -0300 -Subject: IB/mlx5: Call io_stop_wc() after writing to WC MMIO - -From: Jason Gunthorpe - -[ Upstream commit 19d6214ad6dfffda1a5bdc2b34ea75ba45a1a60a ] - -This new function is defined only on ARM and serves to guarantee a barrier -in the WC operation. The barrier means that another run of this loop will -not combine with the stores this loop created. - -On x86 this is happening implicitly because of the spin_unlock(). - -Link: https://lore.kernel.org/r/0-v1-c5dade92f363+11-mlx5_io_stop_wc_jgg@nvidia.com -Suggested-by: Pavel Shamis -Signed-off-by: Jason Gunthorpe -Signed-off-by: Leon Romanovsky -Stable-dep-of: 13ad1125b941 ("RDMA/mlx5: Don't compare mkey tags in DEVX indirect mkey") -Signed-off-by: Sasha Levin ---- - drivers/infiniband/hw/mlx5/mem.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/infiniband/hw/mlx5/mem.c b/drivers/infiniband/hw/mlx5/mem.c -index 6191aa833ac2..6b29e9ca323e 100644 ---- a/drivers/infiniband/hw/mlx5/mem.c -+++ b/drivers/infiniband/hw/mlx5/mem.c -@@ -152,6 +152,7 @@ static int post_send_nop(struct mlx5_ib_dev *dev, struct ib_qp *ibqp, u64 wr_id, - for (i = 0; i < 8; i++) - mlx5_write64(&mmio_wqe[i * 2], - bf->bfreg->map + bf->offset + i * 8); -+ io_stop_wc(); - - bf->offset ^= bf->buf_size; - --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index 3a4b6d31846..bf4a8085491 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -467,7 +467,6 @@ iio-inkern-only-release-the-device-node-when-done-wi.patch iio-inkern-fix-return-value-in-devm_of_iio_channel_g.patch iio-abi-fix-wrong-format-of-differential-capacitance.patch iio-magnetometer-yas530-change-data-type-of-hard_off.patch -ib-mlx5-call-io_stop_wc-after-writing-to-wc-mmio.patch rdma-mlx5-don-t-compare-mkey-tags-in-devx-indirect-m.patch usb-common-usb-conn-gpio-simplify-some-error-message.patch usb-common-debug-check-non-standard-control-requests.patch