From nobody Sun Jan 18 19:49:19 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 4dvPL752kcz6NqJg for ; Sun, 18 Jan 2026 19:49:19 +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 4dvPL73pvnz3Zwp for ; Sun, 18 Jan 2026 19:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768765759; 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=hXihde+WSk+rDsuKoVzDIETBqOLBfHt/1xW3GMRARlI=; b=pYHAiM/JWKfh5czouAVajmYC1zcUWmb9Pg4RZIQ1Se4rJAns9qYD1fa0Mh4vh6WOgo1lpA CXipJuI8A3Z7VcghLXzfI7/1mPqiAy4RsQyNijKN0PSXtR4wX8tLdtyz515KbGT6eSMOOZ 1/B6N0WHHu6CBWfFNxQOUy+TmohneISrwmigKDHZ7OrkqOfwABt1Qu2j0V0PFNyl7kXNzC TLlXjlKbb1y9yG09zdhFjJ62ovLzlhiQ+4icP4QY7oUg4apZlxXpKZbqAw+TH5fPzS59oQ vWvQyy50Swt15YijoJgnWM4iH0UcxBfKr7QgrKPl9GsH0ujH1zoQfef9itk0ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768765759; 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=hXihde+WSk+rDsuKoVzDIETBqOLBfHt/1xW3GMRARlI=; b=IIjxKJ7K/8jnPUJkWN32pWNlK4o2OekjHpbucbZNUF4ramC4lwvFlL/Q8gM4is85OUfRoO zrLdSxo2jkMoNxDCTcRu7mPfUBTdj8cEY3n7bHbnjJPDNMJPQjbg/cOm57iL0FNLmIJ/T8 Vg6PbLpoWUgmS0q/Im1c1zI1oqb5cu7ulRBgIbdQmbFSDTW7khCLDy47qVhOOX+fN4lBLe AWxyPLieWDTKB7Z2NQCy6xT+o5B+ET5pXsejWLDbqRI3AgBl45cSjDb/saV1lWs70YtyCv GKh26Fe3FWTNpY+Hu59I2jdaOgN8XgdG3wzbzIVftlaaGAJQeybMqBElRSqXJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768765759; a=rsa-sha256; cv=none; b=RTy6j04e/UiwOdOe7/GB+UW/VXsbgEtEWTRGriyEI8vzysMGPEE1DtlRvGSK7AlKmFZoVk 4eAjSXKqWh37UK2VlC7PFYNX8woCPQ5o+FOcBeyQyFJpc5322wpGAX3RtcyIdEQpqDckub RhhH1a+nJITbGPdU5GJzk7qbvun55D7c22VZc+oSqwUjrGjf10/l1CiHXLxyOEauU1dqmL OqBKJP4uVOo4CefgSLMB2wE2XXT1TFIg2Hn8iNBeoo4t2UChwyHVkdvVa7DedVSODXy3e6 HKPVGJJXwJI8vtw+8Qw+ss1K5O6SYkVQlzJN6KyjjNFD9weL70PtR2T6ZAXLbQ== 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 4dvPL738t2z106f for ; Sun, 18 Jan 2026 19:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 95a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 18 Jan 2026 19:49:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4938ee806486 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4938ee8064868f120413405f1b3aa40344a6fabd Auto-Submitted: auto-generated Date: Sun, 18 Jan 2026 19:49:19 +0000 Message-Id: <696d393f.95a3.d446b37@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4938ee8064868f120413405f1b3aa40344a6fabd commit 4938ee8064868f120413405f1b3aa40344a6fabd Author: Konstantin Belousov AuthorDate: 2025-12-09 01:52:04 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-18 19:47:25 +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 --- 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[] = {