From nobody Mon Aug 14 20:19:51 2023 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 4RPm3C49WJz4mJGT; Mon, 14 Aug 2023 20:19:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPm3C3XlKz4Q36; Mon, 14 Aug 2023 20:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692044391; 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=t9vvNC+yMJ5ehQ6kbqe8Bbjd7SNGyPdZuWgoVeNdztE=; b=E0s8gADQFVAqwaTyjVDcAzVzO9DK7kcwfl8pl5K1NeBpMg2DT9kbEq7lFRvxYcZl9z1INc oViuUmpXdMV0kJQdDnlNpxngX1w9+9pRgK9MuZlyIkWRIsOoxpUus3BVNEEg5ZN7zHznPe sM7pBMlX7Mo1w06vY0LV7WXovWg47UZKFcmLCfR13g2YKIHqFxtugevByzNtVbavAHwEvc /XXY3/CHbFal8psEe0OyNr56gsxbYgtnUULZrxG+7rxDatm7B5xdc+lZhADyuCwYLrtoz0 cFEkvHfduUIwFKTvMOSsxcqbtBXWXot49bXMFQu118xRXLHTO76/VEk8l6LGjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692044391; 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=t9vvNC+yMJ5ehQ6kbqe8Bbjd7SNGyPdZuWgoVeNdztE=; b=x6t5ZzR1q5nLbTw6gztSKp6+qKDCsNqkMHKYDKXw6BMCzTzbdOL6jvAyCvANfpJyWdhhp2 x8QsHN29myIKGTALjWfidivLKxGIpDu4SAhzNELgarAecfV6y8pE3PEHAYX3TVYs+uk0Fe 9L+IMtfAgDVm/90HWq7hAWUCpegIgD99WsQ/AyxhYmDgEsp5v/f6VGbZDz6MXET+AW78Ax 2AGcc5WMC4+Q3ZaU/flSpF7ddIGLaueGOn8Dhq+V3WGZX61QjU8kwLmVUuHyEyRR6E68F7 yvtzXC0ZlBt+ayCh2VeCyhvqyWIr3WPJhLIe5tFT7m/Sa8zQ6vnHibjLOM7w9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692044391; a=rsa-sha256; cv=none; b=PKQpa8VbxcvqwBN/7qOhvzlN/Mda+kwQOoemircxZ41msBuTUD+IrXMTGSYGkGIcqI75HC NZTV6SK4+TYlKPjU7Hjn5ADTtkxsNm112oN4C3G9h8eK83czLnbDu1sFaZKImF+GTf9RZg DmKrMPytVbWiJHTRFLboK2jLZtH08S6itAEoI7Yedhr3l1bq/D5qkvqZG2xOgXlDfV6/x3 vxippEahlOpEPFLcWkbIeeWZ/nJH7R04lGQ0P9M15hUAXpCr45DrPOE7YLF4j2D9pz/DcH wJQKXwzIgr0ZxstckDi1h+0tnK1FxX7XHsaytI79E3JoniptuTPtwUymWluuOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPm3C2VHQzhdH; Mon, 14 Aug 2023 20:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EKJpK0094596; Mon, 14 Aug 2023 20:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EKJpZC094593; Mon, 14 Aug 2023 20:19:51 GMT (envelope-from git) Date: Mon, 14 Aug 2023 20:19:51 GMT Message-Id: <202308142019.37EKJpZC094593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a51f81c2e53f - main - x86: move EARLY_AP_STARTUP into DEFAULTS 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a51f81c2e53f4968f5594822c44ed8da4d2416f6 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a51f81c2e53f4968f5594822c44ed8da4d2416f6 commit a51f81c2e53f4968f5594822c44ed8da4d2416f6 Author: Ed Maste AuthorDate: 2023-08-07 21:49:57 +0000 Commit: Ed Maste CommitDate: 2023-08-14 20:17:48 +0000 x86: move EARLY_AP_STARTUP into DEFAULTS EARLY_AP_STARTUP was introduced in 2016 (commit fdce57a04219) with note: As a transition aid, the new behavior is moved under a new kernel option (EARLY_AP_STARTUP). This will allow the option to be turned off if need be during initial testing. I hope to enable this on x86 by default in a followup commit ... It was enabled by default, but became effectively mandatory (on x86) some time later. Move it to DEFAULTS to avoid an unbootable system if the option is left out of a custom kernel configuration file. Reported by: wollman Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41352 --- sys/amd64/conf/DEFAULTS | 2 ++ sys/amd64/conf/FIRECRACKER | 1 - sys/amd64/conf/GENERIC | 1 - sys/amd64/conf/MINIMAL | 1 - sys/i386/conf/DEFAULTS | 2 ++ sys/i386/conf/GENERIC | 1 - sys/i386/conf/MINIMAL | 1 - 7 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index bc8a268e1ea4..7a3c54f974ab 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -5,6 +5,8 @@ machine amd64 +options EARLY_AP_STARTUP + # Bus support. device isa diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER index ba00d674cf4e..b9cf11543245 100644 --- a/sys/amd64/conf/FIRECRACKER +++ b/sys/amd64/conf/FIRECRACKER @@ -115,7 +115,6 @@ options NETGDB # netgdb(4) client support # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP # Pseudo devices. device crypto # core crypto support diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 822567ebe4bd..a3adb3ff8fd0 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -124,7 +124,6 @@ options NETGDB # netgdb(4) client support # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index b69706f97690..f52fbb375f6d 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -80,7 +80,6 @@ options KDB_TRACE # Print a stack trace for a panic. # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index f4956183b85c..8ed95641af6f 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -5,6 +5,8 @@ machine i386 +options EARLY_AP_STARTUP + # Bus support. device isa options ISAPNP diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index d2bc5b195963..877898777749 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -109,7 +109,6 @@ options NETGDB # netgdb(4) client support # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC -options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index d939201d85a9..a2aab1660209 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -88,7 +88,6 @@ options KDB_TRACE # Print a stack trace for a panic. # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP device apic # CPU frequency control