From nobody Fri Jul 24 04:35:10 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 4h5wC22lV7z6lsc1 for ; Fri, 24 Jul 2026 04:35:10 +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 4h5wC2147Fz3ZBT for ; Fri, 24 Jul 2026 04:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784867710; 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=hz4wGWys5iZlGrcNpR7MiyTwcoPZkabMeM/2zBDhm1g=; b=oTKNWDTvm5xFuYzWVhiaVyIu/NNxovc/r3ZTqpb8ne6pRLalQGh9jfLeg28+OYBIuLFPge KDE1vyFdIzxKQDyz+muFwrvB3GF4HhctfjCl9ZIIeHustuUP0AC+gxMu/PPR0pXe+DwSoY +W37rz2olux/vqufEyju6i0bHx34LDI0l8jBt4hgS0xPYS6EfWD5cNuf7rZLnbd4Dqh9n/ QifqFewyTZLiKQyTmdyP1cGQlosLJvAHl4p/AJyRFlp/xL8j1JS1oJHTpq9QfeIwb1TCCN rpP6pZX18DxnF8dWvcWQsE65wtpmVYeUtp5gehl4BuPadRAvGAJPGYwXjvGAxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784867710; a=rsa-sha256; cv=none; b=JZ6ioqwQ2aj4K5EumW0KWC9I5c4bdTAJY7SfSekbZPgdEmQTjgdOsSYvij+AgmF73IPcPB 7M5Sm9c54NMrsDXb6jP2P1tPclVBnlyq8PUJXlDQKePGUg+XtDDXarXqFIx701ysiuHNkw /hqrBpdNvIKxXIPyjKIvuznPIYEd7I2fUTXFBZngXMQQyU+mIVtU91pS9GaV4MeeyLpHo7 OE6jj5ehZaez31d52R0AlZX9ObVUNweGKWPGIkZaPo0g538nRiIQd+DWHx8juIuIgvBIAI nux0QsjEpZe2+EhM9AiOPQl3WS38TMj9qRhwaTCDKLvY/4xhCfbyMd4fWpTH2w== 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=1784867710; 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=hz4wGWys5iZlGrcNpR7MiyTwcoPZkabMeM/2zBDhm1g=; b=WfE2qXbJEeYsJVzJK328mFiKFugXLTuyP/q6iFOMiTQZZMzLSfpql0MgsurZmSC7poNO8K Emtvfb2H+KBUQt18+eKFE+apwR7yW+77HDFCOGwSu2RBGpzTQAMMoj60eyWstJHi0Doe3H 4GoEzMPYgfqT/sEVoBlQRa1lHs3MO2cshlcf+fYhArdVH1mlhRxMvjxuR2sfEqZKpVrYY0 LheuTMQeoTJxJ4qOkK0tgxGgF0FxlWmG413UgBffdUeGWtZ/0q+9kWjDgdQwznpAlYRxzv viz9dOQ5ti0frbUKBeUnPq542XDcoSrvlA+xXpgmvrrmwZ5/9MM9qu5DTSThmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5wC208NXzcBP for ; Fri, 24 Jul 2026 04:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 397ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 04:35:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: de695c62190f - stable/15 - x86/local_apic.c: Thermal interrupt support: Additional style fixes 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/15 X-Git-Reftype: branch X-Git-Commit: de695c62190f61f512a54a6140397a6bf1315e94 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 04:35:10 +0000 Message-Id: <6a62eb7e.397ba.68839fa4@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=de695c62190f61f512a54a6140397a6bf1315e94 commit de695c62190f61f512a54a6140397a6bf1315e94 Author: Olivier Certner AuthorDate: 2026-07-02 13:05:09 +0000 Commit: Olivier Certner CommitDate: 2026-07-24 04:33:38 +0000 x86/local_apic.c: Thermal interrupt support: Additional style fixes Rename handler function type 'lapic_thermal_handle_function' to the shorter 'lapic_thermal_handler_t'. Move it closer to the function declaration block where it is used. Make it a true function type (no pointer) and add explicit pointer marks on usage. Rename 'lapic_thermal_function_value' to the more immediately clear 'lapic_thermal_function_arg'. In lapic_thermal_enable(), use 'func_arg' as the argument name for the handler argument, which at least refers to function 'func', rather than the generic 'value'. Finally, rename the global handler variable from 'lapic_thermal_function_ptr' to the shorter 'lapic_thermal_function' (dynamic functions can be referenced only through a pointer). MFC with: 87ba088fa310 ("x86/local_apic.c: Add support for installing a thermal interrupt handler") Sponsored by: The FreeBSD Foundation (cherry picked from commit e1f4a8cb8656e64a1fe2b1ab519821b14c4985a0) --- sys/x86/include/apicvar.h | 6 ++++-- sys/x86/x86/local_apic.c | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index cf76977c959b..e0625a38d198 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -198,7 +198,6 @@ extern int *apic_cpuids; extern void (*ipi_vectored)(u_int, int); typedef struct ioapic *ioapic_drv_t; -typedef void (*lapic_thermal_handle_function)(int, void *); void apic_register_enumerator(struct apic_enumerator *enumerator); ioapic_drv_t ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase); @@ -214,6 +213,9 @@ int ioapic_set_triggermode(ioapic_drv_t cookie, u_int pin, enum intr_trigger trigger); int ioapic_set_smi(ioapic_drv_t cookie, u_int pin); +/* First argument: 'cpuid' from 'struct pcpu', second: Opaque cookie. */ +typedef void lapic_thermal_handler_t(int, void *); + void lapic_create(u_int apic_id, int boot_cpu); void lapic_init(vm_paddr_t addr); void lapic_xapic_mode(void); @@ -233,7 +235,7 @@ void apic_enable_vector(u_int apic_id, u_int vector); void apic_disable_vector(u_int apic_id, u_int vector); void apic_free_vector(u_int apic_id, u_int vector, u_int irq); void lapic_calibrate_timer(void); -void lapic_enable_thermal(lapic_thermal_handle_function thermfunc, void *value); +void lapic_enable_thermal(lapic_thermal_handler_t *func, void *func_arg); void lapic_disable_thermal(void); int lapic_enable_pcint(void); void lapic_disable_pcint(void); diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index f8810907127a..1c0132d81bff 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -314,8 +314,8 @@ static uint64_t lapic_ipi_wait_mult; static int __read_mostly lapic_ds_idle_timeout = 1000000; #endif unsigned int max_apic_id; -static void *lapic_thermal_function_value; -static lapic_thermal_handle_function lapic_thermal_function_ptr; +static lapic_thermal_handler_t *lapic_thermal_function; +static void *lapic_thermal_function_arg; static int pcint_refcnt = 0; SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, @@ -1623,13 +1623,13 @@ lapic_enable_mca_elvt(void) void lapic_handle_thermal(void) { - lapic_thermal_handle_function func; + lapic_thermal_handler_t *func; - func = (lapic_thermal_handle_function)atomic_load_acq_ptr( - (void *)&lapic_thermal_function_ptr); + func = (lapic_thermal_handler_t *)atomic_load_acq_ptr( + (uintptr_t *)&lapic_thermal_function); if (func != NULL) - func(PCPU_GET(cpuid), lapic_thermal_function_value); + func(PCPU_GET(cpuid), lapic_thermal_function_arg); lapic_eoi(); } @@ -1645,7 +1645,7 @@ lapic_update_thermal(void *dummy __unused) } void -lapic_enable_thermal(lapic_thermal_handle_function thermfunc, void *value) +lapic_enable_thermal(lapic_thermal_handler_t *func, void *func_arg) { #ifdef DEV_ATPIC /* Fail if the local APIC is not present. */ @@ -1653,9 +1653,9 @@ lapic_enable_thermal(lapic_thermal_handle_function thermfunc, void *value) return; #endif - lapic_thermal_function_value = value; - atomic_store_rel_ptr((uintptr_t *)&lapic_thermal_function_ptr, - (uintptr_t)thermfunc); + lapic_thermal_function_arg = func_arg; + atomic_store_rel_ptr((uintptr_t *)&lapic_thermal_function, + (uintptr_t)func); lvts[APIC_LVT_THERMAL].lvt_masked = 0; @@ -1679,7 +1679,7 @@ lapic_disable_thermal(void) #endif smp_rendezvous(NULL, lapic_update_thermal, NULL, NULL); - atomic_store_rel_ptr((uintptr_t *)&lapic_thermal_function_ptr, + atomic_store_rel_ptr((uintptr_t *)&lapic_thermal_function, (uintptr_t)NULL); }