Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 23 Jul 2026 10:01:15 +0000
From:      Olivier Certner <olce@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Konstantin Belousov <kib@FreeBSD.org>
Subject:   git: 847c60455a9e - stable/14 - x86/local_apic.c: convert lvts[] and elvts[] arrays to designated initializers
Message-ID:  <6a61e66b.3d43d.7c51b415@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch stable/14 has been updated by olce:

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

commit 847c60455a9ee7577cd986eb455cc4a855ff8ff0
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2025-12-09 01:52:04 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
CommitDate: 2026-07-23 09:59:15 +0000

    x86/local_apic.c: convert lvts[] and elvts[] arrays to designated initializers
    
    Reviewed by:    markj
    Tested by:      pho
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D54543
    
    (cherry picked from commit 4938ee8064868f120413405f1b3aa40344a6fabd)
---
 sys/x86/x86/local_apic.c | 105 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 92 insertions(+), 13 deletions(-)

diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
index 83783effad36..d9b5a559479a 100644
--- a/sys/x86/x86/local_apic.c
+++ b/sys/x86/x86/local_apic.c
@@ -152,22 +152,101 @@ struct lapic {
 } static *lapics;
 
 /* Global defaults for local APIC LVT entries. */
-static struct lvt lvts[APIC_LVT_MAX + 1] = {
-	{ 1, 1, 1, 1, APIC_LVT_DM_EXTINT, 0 },	/* LINT0: masked ExtINT */
-	{ 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 },	/* LINT1: NMI */
-	{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT },	/* Timer */
-	{ 1, 1, 0, 1, APIC_LVT_DM_FIXED, APIC_ERROR_INT },	/* Error */
-	{ 1, 1, 1, 1, APIC_LVT_DM_NMI, 0 },	/* PMC */
-	{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_THERMAL_INT },	/* Thermal */
-	{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_CMC_INT },	/* CMCI */
+static struct lvt lvts[] = {
+	/* LINT0: masked ExtINT */
+	[APIC_LVT_LINT0] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 1,
+		.lvt_active = 1,
+		.lvt_mode = APIC_LVT_DM_EXTINT,
+		.lvt_vector = 0,
+	},
+	/* LINT1: NMI */
+	[APIC_LVT_LINT1] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 0,
+		.lvt_active = 1,
+		.lvt_mode = APIC_LVT_DM_NMI,
+		.lvt_vector = 0,
+	},
+	[APIC_LVT_TIMER] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 1,
+		.lvt_active = 1,
+		.lvt_mode = APIC_LVT_DM_FIXED,
+		.lvt_vector = APIC_TIMER_INT,
+	},
+	[APIC_LVT_ERROR] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 0,
+		.lvt_active = 1,
+		.lvt_mode = APIC_LVT_DM_FIXED,
+		.lvt_vector = APIC_ERROR_INT,
+	},
+	[APIC_LVT_PMC] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 1,
+		.lvt_active = 1,
+		.lvt_mode = APIC_LVT_DM_NMI,
+		.lvt_vector = 0,
+	},
+	[APIC_LVT_THERMAL] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 1,
+		.lvt_active = 1,
+		.lvt_mode = APIC_LVT_DM_FIXED,
+		.lvt_vector = APIC_THERMAL_INT,
+	},
+	[APIC_LVT_CMCI] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 1,
+		.lvt_active = 1,
+		.lvt_mode = APIC_LVT_DM_FIXED,
+		.lvt_vector = APIC_CMC_INT,
+	},
 };
 
 /* Global defaults for AMD local APIC ELVT entries. */
-static struct lvt elvts[APIC_ELVT_MAX + 1] = {
-	{ 1, 1, 1, 0, APIC_LVT_DM_FIXED, 0 },
-	{ 1, 1, 1, 0, APIC_LVT_DM_FIXED, APIC_CMC_INT },
-	{ 1, 1, 1, 0, APIC_LVT_DM_FIXED, 0 },
-	{ 1, 1, 1, 0, APIC_LVT_DM_FIXED, 0 },
+static struct lvt elvts[] = {
+	[APIC_ELVT_IBS] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 1,
+		.lvt_active = 0,
+		.lvt_mode = APIC_LVT_DM_FIXED,
+		.lvt_vector = 0,
+	},
+	[APIC_ELVT_MCA] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 1,
+		.lvt_active = 0,
+		.lvt_mode = APIC_LVT_DM_FIXED,
+		.lvt_vector = APIC_CMC_INT,
+	},
+	[APIC_ELVT_DEI] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 1,
+		.lvt_active = 0,
+		.lvt_mode = APIC_LVT_DM_FIXED,
+		.lvt_vector = 0,
+	},
+	[APIC_ELVT_SBI] = {
+		.lvt_edgetrigger = 1,
+		.lvt_activehi = 1,
+		.lvt_masked = 1,
+		.lvt_active = 0,
+		.lvt_mode = APIC_LVT_DM_FIXED,
+		.lvt_vector = 0,
+	},
 };
 
 static inthand_t *ioint_handlers[] = {
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a61e66b.3d43d.7c51b415>