The branch stable/14 has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=a83f433a9d0ef5774e398cf3518834f47323ab2a

commit a83f433a9d0ef5774e398cf3518834f47323ab2a
Author:     Konstantin Belousov <[email protected]>
AuthorDate: 2025-10-24 18:17:56 +0000
Commit:     Konstantin Belousov <[email protected]>
CommitDate: 2025-10-31 14:42:18 +0000

    x86 LAPIC: force edge-triggered mode for !bootverbose as well
    
    (cherry picked from commit cf59dabe161f956ac7d36fbb91b7edeab9d0f6c3)
---
 sys/x86/x86/local_apic.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
index 6a913883cc5c..bf05855439bc 100644
--- a/sys/x86/x86/local_apic.c
+++ b/sys/x86/x86/local_apic.c
@@ -371,9 +371,12 @@ lvt_mode_impl(struct lapic *la, struct lvt *lvt, u_int 
pin, uint32_t value)
        case APIC_LVT_DM_SMI:
        case APIC_LVT_DM_INIT:
        case APIC_LVT_DM_EXTINT:
-               if (!lvt->lvt_edgetrigger && bootverbose) {
-                       printf("lapic%u: Forcing LINT%u to edge trigger\n",
-                           la->la_id, pin);
+               if (!lvt->lvt_edgetrigger) {
+                       if (bootverbose) {
+                               printf(
+                                   "lapic%u: Forcing LINT%u to edge trigger\n",
+                                   la->la_id, pin);
+                       }
                        value &= ~APIC_LVT_TM;
                }
                /* Use a vector of 0. */

Reply via email to