Drop efi-earlycon-replace-open-coded-strnchrnul.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/efi-earlycon-replace-open-coded-strnchrnul.patch b/queue-5.10/efi-earlycon-replace-open-coded-strnchrnul.patch
deleted file mode 100644 (file)
index 33a8c61..0000000
--- a/queue-5.10/efi-earlycon-replace-open-coded-strnchrnul.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6e92a7ec121c7e23afadefc601975ace938df6db Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Dec 2022 00:12:16 +0200
-Subject: efi/earlycon: Replace open coded strnchrnul()
-
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-[ Upstream commit b7a1cd243839cc1459fbc83a7a62e3b57f29f497 ]
-
-strnchrnul() can be called in the early stages. Replace
-open coded variant in the EFI early console driver.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Stable-dep-of: 0e68b5517d37 ("arm64: efi: Make efi_rt_lock a raw_spinlock")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/firmware/efi/earlycon.c | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/firmware/efi/earlycon.c b/drivers/firmware/efi/earlycon.c
-index a52236e11e5f7..fc233b6f27cb2 100644
---- a/drivers/firmware/efi/earlycon.c
-+++ b/drivers/firmware/efi/earlycon.c
-@@ -10,6 +10,7 @@
- #include <linux/kernel.h>
- #include <linux/serial_core.h>
- #include <linux/screen_info.h>
-+#include <linux/string.h>
- 
- #include <asm/early_ioremap.h>
- 
-@@ -143,16 +144,10 @@ efi_earlycon_write(struct console *con, const char *str, unsigned int num)
-       len = si->lfb_linelength;
- 
-       while (num) {
--              unsigned int linemax;
--              unsigned int h, count = 0;
-+              unsigned int linemax = (si->lfb_width - efi_x) / font->width;
-+              unsigned int h, count;
- 
--              for (s = str; *s && *s != '\n'; s++) {
--                      if (count == num)
--                              break;
--                      count++;
--              }
--
--              linemax = (si->lfb_width - efi_x) / font->width;
-+              count = strnchrnul(str, num, '\n') - str;
-               if (count > linemax)
-                       count = linemax;
- 
--- 
-2.39.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 57f952e68ed310034e6cc534977ae61b82c77072..be04cbf632d22e856b94c5b142c450cfb83917dc 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -28,7 +28,6 @@ riscv-ftrace-remove-wasted-nops-for-riscv_isa_c.patch
 riscv-ftrace-reduce-the-detour-code-size-to-half.patch
 iommu-vt-d-fix-lockdep-splat-in-intel_pasid_get_entr.patch
 iommu-vt-d-fix-pasid-directory-pointer-coherency.patch
-efi-earlycon-replace-open-coded-strnchrnul.patch
 arm64-efi-make-efi_rt_lock-a-raw_spinlock.patch
 risc-v-avoid-dereferening-null-regs-in-die.patch
 riscv-avoid-enabling-interrupts-in-die.patch

diff --git a/queue-5.15/efi-earlycon-replace-open-coded-strnchrnul.patch b/queue-5.15/efi-earlycon-replace-open-coded-strnchrnul.patch
deleted file mode 100644 (file)
index 3c53131..0000000
--- a/queue-5.15/efi-earlycon-replace-open-coded-strnchrnul.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7f2efce312d57b155b17963471668d67a9ad4415 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Dec 2022 00:12:16 +0200
-Subject: efi/earlycon: Replace open coded strnchrnul()
-
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-[ Upstream commit b7a1cd243839cc1459fbc83a7a62e3b57f29f497 ]
-
-strnchrnul() can be called in the early stages. Replace
-open coded variant in the EFI early console driver.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Stable-dep-of: 0e68b5517d37 ("arm64: efi: Make efi_rt_lock a raw_spinlock")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/firmware/efi/earlycon.c | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/firmware/efi/earlycon.c b/drivers/firmware/efi/earlycon.c
-index a52236e11e5f7..fc233b6f27cb2 100644
---- a/drivers/firmware/efi/earlycon.c
-+++ b/drivers/firmware/efi/earlycon.c
-@@ -10,6 +10,7 @@
- #include <linux/kernel.h>
- #include <linux/serial_core.h>
- #include <linux/screen_info.h>
-+#include <linux/string.h>
- 
- #include <asm/early_ioremap.h>
- 
-@@ -143,16 +144,10 @@ efi_earlycon_write(struct console *con, const char *str, unsigned int num)
-       len = si->lfb_linelength;
- 
-       while (num) {
--              unsigned int linemax;
--              unsigned int h, count = 0;
-+              unsigned int linemax = (si->lfb_width - efi_x) / font->width;
-+              unsigned int h, count;
- 
--              for (s = str; *s && *s != '\n'; s++) {
--                      if (count == num)
--                              break;
--                      count++;
--              }
--
--              linemax = (si->lfb_width - efi_x) / font->width;
-+              count = strnchrnul(str, num, '\n') - str;
-               if (count > linemax)
-                       count = linemax;
- 
--- 
-2.39.2
-

diff --git a/queue-5.15/series b/queue-5.15/series
index deae2af52a1beae45877e4e06331d195b168c72a..ca89a84a26073d4e7a72b666f6e3ff57c875e558 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -31,7 +31,6 @@ irqdomain-refactor-__irq_domain_alloc_irqs.patch
 iommu-vt-d-fix-pasid-directory-pointer-coherency.patch
 block-brd-add-error-handling-support-for-add_disk.patch
 brd-mark-as-nowait-compatible.patch
-efi-earlycon-replace-open-coded-strnchrnul.patch
 arm64-efi-make-efi_rt_lock-a-raw_spinlock.patch
 risc-v-avoid-dereferening-null-regs-in-die.patch
 riscv-avoid-enabling-interrupts-in-die.patch