From nobody Thu Jul 23 10:01:15 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 4h5RTl6md0z6lVxV for ; Thu, 23 Jul 2026 10:01:15 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h5RTl4YWGz3WkL for ; Thu, 23 Jul 2026 10:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZefW6DVkRxc0x7/l7DObEY5kQ7KdochiuPH9I7p3/6M=; b=YsMkDdaDyGQS7WhyTuKuKxdzb1HozymVkAXn64H4Ho6X8/6EfAO/YVfymRIen1Hr+f5e1U /qAuYoQR4nOMznsFRyM2SKN0eJFpZ/3BwE9xN1NIZgfGs/eQ7uizaiR4y/Kv/l8AZ0Kqf1 3pq+XdmyVkwUEpYTqfXDFzBuTNYaUbsJ2pxL+phgS5tE7v9GX93A+lXduyAzck7nHAy/Y+ jKTJPjggSWT5K0Qkx3ntayxiIYHHVJbWylHLZBFUij9n8H/xZPXA42V00a7ZNdtk/tqttI beIRfSNxi35G70T5vN5doBOJ8w+m5jWjjSn1O/+z+JQ9CEvqjVbkbiqDJbHpgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800875; a=rsa-sha256; cv=none; b=skOzjvhn5iLxEG3OpDlt0tl3at6kerA/h0pVnCMJkw29AZCZj4M3t5d5SXMUbtOKhUFhuF pegqddR6AYdSsVJyccGDE/jKtWcx7UeY/ly+ImHJqQwRwz31TlG5qns6vr6Wz5C6jYpdM/ ZlAeQQIDscr42hAWPfIYbWCSzvf8QFyKTBdSguaQeL0yfWEsnLX9aOnxO102YtfL9dpamb mgyFMluwym46Hwnzqy/rW+Nzn2/hZ/98Wz9QPs35smyDPMvZFztCzZgcvenWejSUjL+eqZ i5/59aW0SsiCT5bA8IJQlHC4yiI7BZ6Fdc7L7s+cTt1zsjQQk9oOzmA9crLOnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZefW6DVkRxc0x7/l7DObEY5kQ7KdochiuPH9I7p3/6M=; b=x3KLOynKZJVsDlvzs4nyGwVCafI62dOZPn6FAMwLfxr4PHwEJ0BHga10XFo5o1b4VNDkHq 0xG5ZJFX3I4Tiot1ni7kHqj/uAegJopKzQQgSKshg4DcZhN8tkvocIc6UnEHUHO9OeuUAZ LgHWEWA+XO0NeCm4sRp9zYQkIkBrcpfwQnR5aJXYma5OainP/IWDqs40lSSn/2OY/dy89G 8Cg4YSNHLlwwDu4iZDpsGOQZsvalsRSm6vSri3EpKcVmEASXtEkEgB9MNjqv+hH4fYcAyM RHjxF738YBlllgAV0YbQbrRbZjZvLoz3LSmGBzjUANToAfQ0gpeD0WCsE+m0iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RTl3JGbz10t5 for ; Thu, 23 Jul 2026 10:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d43d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:01:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Olivier Certner Subject: git: 847c60455a9e - stable/14 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 847c60455a9ee7577cd986eb455cc4a855ff8ff0 Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:01:15 +0000 Message-Id: <6a61e66b.3d43d.7c51b415@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=847c60455a9ee7577cd986eb455cc4a855ff8ff0 commit 847c60455a9ee7577cd986eb455cc4a855ff8ff0 Author: Konstantin Belousov AuthorDate: 2025-12-09 01:52:04 +0000 Commit: Olivier Certner 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[] = {