From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 24 Aug 2022 06:56:13 +0000 (+0200)
Subject: drop queue-5.19/swiotlb-panic-if-nslabs-is-too-small.patch
X-Git-Tag: v4.9.326~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52273a10e75b7807d33a094ab2a12e532a33cefa;p=thirdparty%2Fkernel%2Fstable-queue.git

drop queue-5.19/swiotlb-panic-if-nslabs-is-too-small.patch
---

diff --git a/queue-5.19/series b/queue-5.19/series
index 3e03f9eb108..d6b9ef0dc4e 100644
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -315,7 +315,6 @@ ext4-avoid-remove-directory-when-directory-is-corrup.patch
 ext4-block-range-must-be-validated-before-use-in-ext.patch
 ext4-avoid-resizing-to-a-partial-cluster-size.patch
 lib-list_debug.c-detect-uninitialized-lists.patch
-swiotlb-panic-if-nslabs-is-too-small.patch
 tty-serial-fix-refcount-leak-bug-in-ucc_uart.c.patch
 kvm-ppc-book3s-hv-fix-rm_exit-entry-in-debugfs-timin.patch
 vfio-clear-the-caps-buf-to-null-after-free.patch
diff --git a/queue-5.19/swiotlb-panic-if-nslabs-is-too-small.patch b/queue-5.19/swiotlb-panic-if-nslabs-is-too-small.patch
deleted file mode 100644
index aeac9abde47..00000000000
--- a/queue-5.19/swiotlb-panic-if-nslabs-is-too-small.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 01161d81b226bd77445ec23ea604114ae29daa4c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 11 Jun 2022 01:25:14 -0700
-Subject: swiotlb: panic if nslabs is too small
-
-From: Dongli Zhang <dongli.zhang@oracle.com>
-
-[ Upstream commit 0bf28fc40d89b1a3e00d1b79473bad4e9ca20ad1 ]
-
-Panic on purpose if nslabs is too small, in order to sync with the remap
-retry logic.
-
-In addition, print the number of bytes for tlb alloc failure.
-
-Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/dma/swiotlb.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
-index 5830dce6081b..f5304e2f6a35 100644
---- a/kernel/dma/swiotlb.c
-+++ b/kernel/dma/swiotlb.c
-@@ -242,6 +242,9 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,
- 	if (swiotlb_force_disable)
- 		return;
- 
-+	if (nslabs < IO_TLB_MIN_SLABS)
-+		panic("%s: nslabs = %lu too small\n", __func__, nslabs);
-+
- 	/*
- 	 * By default allocate the bounce buffer memory from low memory, but
- 	 * allow to pick a location everywhere for hypervisors with guest
-@@ -254,7 +257,8 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,
- 	else
- 		tlb = memblock_alloc_low(bytes, PAGE_SIZE);
- 	if (!tlb) {
--		pr_warn("%s: failed to allocate tlb structure\n", __func__);
-+		pr_warn("%s: Failed to allocate %zu bytes tlb structure\n",
-+			__func__, bytes);
- 		return;
- 	}
- 
--- 
-2.35.1
-