Skip to content

kernel(-64k): add patch to revert new UART change #12883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2025
Merged

kernel(-64k): add patch to revert new UART change #12883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7bd51
kernel(-64k): add patch to revert new UART change
christopherco Mar 11, 2025
50ab50a
chore: bump all kernel-related specs
christopherco Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion SPECS-SIGNED/fwctl-signed/fwctl-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
Summary: %{_name} Driver
Name: %{_name}
Version: 24.10
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://nvidia.com
Group: System Environment/Base
Expand Down Expand Up @@ -112,6 +112,9 @@ fi # 1 : closed


%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 24.10-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 24.10-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/iser-signed/iser-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Summary: %{_name} Driver
Name: %{_name}
Version: 24.10
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://www.mellanox.com
Group: System Environment/Base
Expand Down Expand Up @@ -103,6 +103,9 @@ fi # 1 : closed
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 24.10-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 24.10-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/isert-signed/isert-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Summary: %{_name} Driver
Name: %{_name}
Version: 24.10
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://www.mellanox.com
Group: System Environment/Base
Expand Down Expand Up @@ -102,6 +102,9 @@ fi # 1 : closed
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 24.10-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 24.10-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-64k-signed-%{buildarch}
Version: 6.6.78.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 6.6.78.1-3
- Bump release to match kernel

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 6.6.78.1-2
- Bump release to match kernel

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-signed/kernel-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 6.6.78.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 6.6.78.1-3
- Bump release to match kernel

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 6.6.78.1-2
- Bump release to match kernel

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Summary: Signed Unified Kernel Image for %{buildarch} systems
Name: kernel-uki-signed-%{buildarch}
Version: 6.6.78.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -68,6 +68,9 @@ popd
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 6.6.78.1-3
- Bump release to match kernel

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 6.6.78.1-2
- Bump release to match kernel

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Summary: KNEM: High-Performance Intra-Node MPI Communication
Name: %{_name}-modules
Version: 1.1.4.90mlnx3
Release: 10%{?dist}
Release: 11%{?dist}
Provides: knem-mlnx = %{version}-%{release}
Obsoletes: knem-mlnx < %{version}-%{release}
License: BSD and GPLv2
Expand Down Expand Up @@ -103,6 +103,9 @@ fi
/lib/modules/

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 1.1.4.90mlnx3-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 1.1.4.90mlnx3-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Name: mft_kernel
Summary: %{name} Kernel Module for the %{KVERSION} kernel
Version: 4.30.0
Release: 10%{?dist}
Release: 11%{?dist}
License: Dual BSD/GPLv2
Group: System Environment/Kernel

Expand Down Expand Up @@ -74,6 +74,9 @@ popd
/lib/modules/%{KVERSION}/updates/

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 4.30.0-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 4.30.0-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Summary: %{_name} Driver
Name: %{_name}
Version: 24.10
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://www.mellanox.com
Group: System Environment/Base
Expand Down Expand Up @@ -111,6 +111,9 @@ fi
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 24.10-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 24.10-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
Summary: Infiniband HCA Driver
Name: %{_name}-modules
Version: 24.10
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://www.mellanox.com/
Group: System Environment/Base
Expand Down Expand Up @@ -185,6 +185,9 @@ fi
%license %{_datadir}/licenses/%{name}/copyright

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 24.10-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 24.10-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/srp-signed/srp-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Summary: srp driver
Name: srp
Version: 24.10
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://www.mellanox.com
Group: System Environment/Base
Expand Down Expand Up @@ -99,6 +99,9 @@ popd
%license %{_datadir}/licenses/%{name}/copyright

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 24.10-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 24.10-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
Summary: Cross-partition memory
Name: xpmem-modules
Version: 2.7.4
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2 and LGPLv2.1
Group: System Environment/Libraries
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -76,6 +76,9 @@ popd


%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 2.7.4-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 2.7.4-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS/fwctl/fwctl.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
Summary: %{_name} Driver
Name: fwctl
Version: 24.10
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://nvidia.com
Group: System Environment/Base
Expand Down Expand Up @@ -250,6 +250,9 @@ fi # 1 : closed
%endif

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 24.10-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 24.10-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS/iser/iser.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
Summary: %{_name} Driver
Name: iser
Version: 24.10
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://www.mellanox.com
Group: System Environment/Base
Expand Down Expand Up @@ -247,6 +247,9 @@ fi # 1 : closed
%endif

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 24.10-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 24.10-10
- Bump release to rebuild for new kernel release

Expand Down
5 changes: 4 additions & 1 deletion SPECS/isert/isert.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
Summary: %{_name} Driver
Name: isert
Version: 24.10
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://www.mellanox.com
Group: System Environment/Base
Expand Down Expand Up @@ -247,6 +247,9 @@ fi # 1 : closed
%endif

%changelog
* Mon Mar 10 2025 Chris Co <[email protected]> - 24.10-11
- Bump release to rebuild for new kernel release

* Wed Mar 05 2025 Rachel Menge <[email protected]> - 24.10-10
- Bump release to rebuild for new kernel release

Expand Down
92 changes: 92 additions & 0 deletions SPECS/kernel-64k/Revert-serial-8250-Adjust-the-timeout-for-FIFO-mode.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
From cc88cf0846636a553eb132604da8dcc318593118 Mon Sep 17 00:00:00 2001
From: Chris Co <[email protected]>
Date: Sun, 9 Mar 2025 23:37:53 -0700
Subject: [PATCH] Revert "serial: 8250: Adjust the timeout for FIFO mode"

This reverts commit fe616b82bc46982f60c2f95fe0f3023d7de6598b.
---
drivers/tty/serial/8250/8250_port.c | 32 ++++++-----------------------
1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 2b1b2928ef7b..a17803da83f8 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -2074,8 +2074,7 @@ static void serial8250_break_ctl(struct uart_port *port, int break_state)
serial8250_rpm_put(up);
}

-/* Returns true if @bits were set, false on timeout */
-static bool wait_for_lsr(struct uart_8250_port *up, int bits)
+static void wait_for_lsr(struct uart_8250_port *up, int bits)
{
unsigned int status, tmout = 10000;

@@ -2090,11 +2089,11 @@ static bool wait_for_lsr(struct uart_8250_port *up, int bits)
udelay(1);
touch_nmi_watchdog();
}
-
- return (tmout != 0);
}

-/* Wait for transmitter and holding register to empty with timeout */
+/*
+ * Wait for transmitter & holding register to empty
+ */
static void wait_for_xmitr(struct uart_8250_port *up, int bits)
{
unsigned int tmout;
@@ -3351,16 +3350,6 @@ static void serial8250_console_restore(struct uart_8250_port *up)
serial8250_out_MCR(up, up->mcr | UART_MCR_DTR | UART_MCR_RTS);
}

-static void fifo_wait_for_lsr(struct uart_8250_port *up, unsigned int count)
-{
- unsigned int i;
-
- for (i = 0; i < count; i++) {
- if (wait_for_lsr(up, UART_LSR_THRE))
- return;
- }
-}
-
/*
* Print a string to the serial port using the device FIFO
*
@@ -3370,15 +3359,13 @@ static void fifo_wait_for_lsr(struct uart_8250_port *up, unsigned int count)
static void serial8250_console_fifo_write(struct uart_8250_port *up,
const char *s, unsigned int count)
{
+ int i;
const char *end = s + count;
unsigned int fifosize = up->tx_loadsz;
- unsigned int tx_count = 0;
bool cr_sent = false;
- unsigned int i;

while (s != end) {
- /* Allow timeout for each byte of a possibly full FIFO */
- fifo_wait_for_lsr(up, fifosize);
+ wait_for_lsr(up, UART_LSR_THRE);

for (i = 0; i < fifosize && s != end; ++i) {
if (*s == '\n' && !cr_sent) {
@@ -3389,14 +3376,7 @@ static void serial8250_console_fifo_write(struct uart_8250_port *up,
cr_sent = false;
}
}
- tx_count = i;
}
-
- /*
- * Allow timeout for each byte written since the caller will only wait
- * for UART_LSR_BOTH_EMPTY using the timeout of a single character
- */
- fifo_wait_for_lsr(up, tx_count);
}

/*
--
2.45.2

Loading
Loading