From nobody Mon Feb 16 06:18: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 4fDszN3vcSz6SLKB for ; Mon, 16 Feb 2026 06:18:40 +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 4fDszN1Ljpz3N2p for ; Mon, 16 Feb 2026 06:18:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771222720; 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=dhJUe+BfCWw8bGQLwD/iyIqp5PHGG6XC50/koJFxcMk=; b=ovXwBmqtdYUfAmoVdBOxEmKSs0Cr+IS6TDdPMCcui67wtMlVqOjj9oB084qz4oFGXP3hmR iJB7f40ApKME+o6KvXaB34dKSMC6xIWB4gtGWb6cGUx8FPnEiKnJ+eOHhp+NF7QahvLG0w qvZ3nGIj/I5QfZuDe1Jc1w4qqqw9jIgejBETPCxUgHWDHmnoGxb/Azd/kad07e98CXFwip aVU72anKve74HRM9jmDmrDNrTht0bIk81DXqyFZs0rBRvtuyw5sUqzjglvdCvBINzDFXv8 kkqiNH+ALdTikFZxOUUmUOsyoj77Cz7Ba1FhSHCntryTyY2DHzPjlQzRS5Y3wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771222720; a=rsa-sha256; cv=none; b=JhfOYSTgqMRA+r7nQiQU7MZlg1CWe/2Iuny6a5vs53X9SWWYdmdIFiJqvsBRncvuV5/uKC gof2Iv6Z1oYdSWX+xghQs8kKvZUyu4SFv0jlRp6M1v64TQBZFQ+zG/5cie/GzdhJlnT+EM z2WDqDzMuD8gS1RK9GKPPGBVpdmRNFGvXWSp45NIUETe0EG+NsSWzyjqAyLqdCILDYBgyL l68QE2klJ2qWOsp214Jnc+6O+PckigNDRr8gcYQB/PrOTDZv93j1/gEYEqj/JKMF5Gbi/K D85T8KH6SdnNSwWMn/FXmJEMG5g+LHcUin3xkYw9arPMqzVc6PwG5+l1TchTkQ== 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=1771222720; 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=dhJUe+BfCWw8bGQLwD/iyIqp5PHGG6XC50/koJFxcMk=; b=OQc97l1NwZQRmJ+fwbU4ACShHsAeDNSz73/mCZVX10n7kxuIbzJxuHT6Xq4tJOx7RmH9EH w+PVaSvypYITGtKWyR3PUQDeK3/OWuNBzn81qYq/v4WQh3n6w15aITDSsmYzOjVALdRE+k qITd+eMYrSDjR7wvC/oVTQYBQLX470R/3snxaOTIheceh37T1pCexHChz5a63ESeAFovQr JMmr8jiemkchSdQ9Xz1/GpGqoiIz8mGzc7xPlDs35Wg7WlZbDgHPz4QJa1fp7LZbIexNej 9G7fmg46Gk4+nSWxrYmeJiRuL076OQwpXW60pIhMahWyw11ZfP8Aj2kxMzRoRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDszN0k5Bz1QKG for ; Mon, 16 Feb 2026 06:18:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b433 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 06:18:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a6c0d8bf434a - stable/15 - amd64/acpica/acpi_wakeup.c: do not store to WARMBOOT_OFF in efi_boot case 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: a6c0d8bf434a22fe81c029606d4241efb4adce5a Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 06:18:40 +0000 Message-Id: <6992b6c0.3b433.27da10df@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6c0d8bf434a22fe81c029606d4241efb4adce5a commit a6c0d8bf434a22fe81c029606d4241efb4adce5a Author: Konstantin Belousov AuthorDate: 2026-02-10 01:37:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-16 06:12:28 +0000 amd64/acpica/acpi_wakeup.c: do not store to WARMBOOT_OFF in efi_boot case (cherry picked from commit 5f3192b3fddd974db36af0279403aba1371c68ec) --- sys/amd64/acpica/acpi_wakeup.c | 59 ++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 99565fbb69ca..54fe1e47a502 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -76,9 +76,6 @@ static cpuset_t suspcpus; static void acpi_stop_beep(void *); -static int acpi_wakeup_ap(struct acpi_softc *, int); -static void acpi_wakeup_cpus(struct acpi_softc *); - #define ACPI_WAKEPT_PAGES 7 #define WAKECODE_FIXUP(offset, type, val) do { \ @@ -129,24 +126,22 @@ acpi_wakeup_ap(struct acpi_softc *sc, int cpu) #define BIOS_WARM (0x0a) static void -acpi_wakeup_cpus(struct acpi_softc *sc) +acpi_wakeup_cpus_bios(struct acpi_softc *sc) { uint32_t mpbioswarmvec; int cpu; u_char mpbiosreason; - if (!efi_boot) { - /* save the current value of the warm-start vector */ - mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); - outb(CMOS_REG, BIOS_RESET); - mpbiosreason = inb(CMOS_DATA); - - /* setup a vector to our boot code */ - *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; - *((volatile u_short *)WARMBOOT_SEG) = sc->acpi_wakephys >> 4; - outb(CMOS_REG, BIOS_RESET); - outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ - } + /* save the current value of the warm-start vector */ + mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); + outb(CMOS_REG, BIOS_RESET); + mpbiosreason = inb(CMOS_DATA); + + /* setup a vector to our boot code */ + *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; + *((volatile u_short *)WARMBOOT_SEG) = sc->acpi_wakephys >> 4; + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ /* Wake up each AP. */ for (cpu = 1; cpu < mp_ncpus; cpu++) { @@ -160,12 +155,26 @@ acpi_wakeup_cpus(struct acpi_softc *sc) } } - if (!efi_boot) { - /* restore the warmstart vector */ - *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, mpbiosreason); +} + +static void +acpi_wakeup_cpus_efi(struct acpi_softc *sc) +{ + int cpu; - outb(CMOS_REG, BIOS_RESET); - outb(CMOS_DATA, mpbiosreason); + /* Wake up each AP. */ + for (cpu = 1; cpu < mp_ncpus; cpu++) { + if (!CPU_ISSET(cpu, &suspcpus)) + continue; + if (acpi_wakeup_ap(sc, cpu) == 0) { + panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)", + cpu, cpu_apic_ids[cpu]); + } } } @@ -264,8 +273,12 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); lapic_xapic_mode(); - if (!CPU_EMPTY(&suspcpus)) - acpi_wakeup_cpus(sc); + if (!CPU_EMPTY(&suspcpus)) { + if (efi_boot) + acpi_wakeup_cpus_efi(sc); + else + acpi_wakeup_cpus_bios(sc); + } } if (!CPU_EMPTY(&suspcpus))