From nobody Sun Jan 25 00:24:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9B0mdyz6Ptx0 for ; Sun, 25 Jan 2026 00:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC993nmBz3cy0 for ; Sun, 25 Jan 2026 00:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eu6jbH5LUfE7eda7e8oQS+PUdmm2vB0M9Li83zYAa+k=; b=VqC/1CMr00gijG3a+mcZ7FLife8SJQOLnizj10ScSzsErOBsPQ1b4jvZ8BRE5f9nyGOmCK aC/4JO+GTBSFGZIHw4l7/1cKtoA7lVyjDRIytycyxcfnLYYemcYkZgQcqHxPtUk5UMTent 3ereItmmW8HBC1YARfxyXHxbLe73Qc2NtiqqebcTJ1i2O99KHWS+4bf6Nwdg4xuj4A3Isi T1SUywBny/iNzDRIr8nrR98n3oz+PCZByaFRLRjsnqzjH3bslprONn5ejfAwvdaPTvePrZ uYv4kIizOqz7oEbUih8IaES0p2Izf+0XsEJGblKI77gY402/NIFn6kmMgEOeag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eu6jbH5LUfE7eda7e8oQS+PUdmm2vB0M9Li83zYAa+k=; b=TWCUpVeFc5lJXkdFGmAkSEP9rduz35Yfg9iIwdreepydDHQm7HN6tXKGiU0MIDfOom8sDl Wv953gGrAihtdhXe12L+tiRC+4EU4PA5m9z1THDeEkFiuKCENmSbQ57m5UNv0rUVjKv5ZE RiHW0Vuz3TciRy0HXCzoLz2Utkh7KaLVnOAof744Bs6j1Ju7l3pTTf46iKcfNWfeHe720q jc88uxpnuY/3IX9/HWv5gASK5P3RYCvKIn+sv8eJChzl4JdCgffCUL0gppcR/UDmqjRi4Q sRaXmyktqsNIEvFOKVZNb/j154TbHBsuTnvWbqMYYDeAhr4jYeYsUlbhTyG8qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300685; a=rsa-sha256; cv=none; b=iimBDA8U37uYIzkMNdXCvC2S1E+ASwl5kUOEhXrHUaJWrtk4PmhRryzTE0CWVW/8fBvq06 V7Rz38yBgk7EYx6yTa3OpXjyVOfqfF9gQP9yBcD2l3wZ3S5MfKx3OXD8AVTuspPX09wfUf nsziQ3CsF856nJCDRq/nIn26CaJOvdl7qw9QmUJGHMeeA9oZVgs+KSnP5PfEoo0EFbEx46 nYbUvH4KJeKyke/iYhV4NS54VFOto2eiQ7OQ4KRiuXnoyXykpXV+B4RZ8lOJcSVjL5yYdK PHc4ZHtT/UYI1JPdghQuilCXDwS3v2JWeFB+FToPdIWDBgkpq9vWhsSkrXom+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9938Qjz1Pv8 for ; Sun, 25 Jan 2026 00:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df7e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7c59e09a0df4 - stable/15 - x86/local_apic.c: convert lvts[] and elvts[] arrays to designated initializers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7c59e09a0df45581b28d5e99ea41c33aeede7f80 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:40 +0000 Message-Id: <697562c8.3df7e.15c5bcbe@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c59e09a0df45581b28d5e99ea41c33aeede7f80 commit 7c59e09a0df45581b28d5e99ea41c33aeede7f80 Author: Konstantin Belousov AuthorDate: 2025-12-09 01:52:04 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:34 +0000 x86/local_apic.c: convert lvts[] and elvts[] arrays to designated initializers (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 c1c9029531f5..606c551ed921 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -147,22 +147,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[] = {