From nobody Wed May 28 13:34:59 2025 X-Original-To: dev-commits-src-main@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 4b6r8h2HbQz5xVBx; Wed, 28 May 2025 13:35:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8h1mZLz3M0f; Wed, 28 May 2025 13:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439300; 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=UxOe0D28XPJyWSdhwgVKRQ49/hDN1QfACST2pEshrZU=; b=sxpewJpdfrBxY8ZTUIOg2bqXbSKfhdMQxMwDr1Cs4ykAhz8DflvueDISuZT6pMDzKBGOAV EDW0cvOU7/yCdDFeRR8kfsTfx8eDHvPx7K0A3sjDhjgXCdp4q84T+7Pp26GNhJQMp5Wt99 btP2HbR0pK9w8I8pp3L3q3g9yvKX1CNB9FxTJ00XR6AZkTK9hweiaaX+BIgWJO72HqFl/R SMuMOorquD/MoYgnbtJGVqFYFAE+0OzIb382gKTWVgAPokFOm8p2ON+ypzsn2OFIhYaU// 9zf3ww3cPKgeSNaUkYQEjTwd+zjAWBKOK7fqrSWLLOXJVQpIudM1hJJz7dEN6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439300; a=rsa-sha256; cv=none; b=ixdUdZLB5IuWl7J/gGexzWjJ1NAWqbe/vM9h8uC/DpG0R3ctocBXw6eBLzLGNEvBabo3dy 3l0CenGdBvdln0xxW6hXtSQ6CFRdxcnHBBws3IsAK6sCxzebbLlakOkdxS1RUVgj4/FFR9 NaahU/2lE6fOisrUNSEIcih2XzhR4CggksuXOlxnRPn2uLwhFzvlh0njAbCe83N86lhbAI nxJS3uhcKQpXA9MG5fbxELtym7FwSoWJVJdkqZFppMXzUporLTlo88vWznTcnomLL4eJzl LkC/HakinlP0gQYQPCxS/C1Zc/c7j4tre4KeJ8tEp3rcYgRGgY2BKfr1swo27Q== 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=1748439300; 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=UxOe0D28XPJyWSdhwgVKRQ49/hDN1QfACST2pEshrZU=; b=J4OfLyB12ATXkYa+KimLdbcPuS9fo7CmZoqA63u20W/BCmrrf1BVm0ZEqt7n4phiTlsOu9 u55qY0hLsoEqUNbeFq+sc19+PpEN3aoTF3a/1Frkzl6bUKRltpSXpktz7KZ79aCjg488h5 hZqKfpY468TWk4Qx0vr8EPVrYrHROcBExBf3RzstY3/RO3RVehIMl2sSXtGPNgt3sm1+FK XYcoqhGy2cZBHs9iRuIyIegIjOGCYF+6PgsTSuO+yX6HraQ4b0Vf2PiBnnVkxWeVzhFsge b6G7SNYxA0icyhYFL7kGEVSnzjqjDHJg3c1Uh4VvZTxRh8uShrA+wyI08PtrrQ== 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 4b6r8h0yq1zgdB; Wed, 28 May 2025 13:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54SDYx9A017434; Wed, 28 May 2025 13:34:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDYxDP017431; Wed, 28 May 2025 13:34:59 GMT (envelope-from git) Date: Wed, 28 May 2025 13:34:59 GMT Message-Id: <202505281334.54SDYxDP017431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 40d2b3135204 - main - arm64: Split out the loop to wait for APs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40d2b313520451493d799d83612c664bd766a3ec Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=40d2b313520451493d799d83612c664bd766a3ec commit 40d2b313520451493d799d83612c664bd766a3ec Author: Andrew Turner AuthorDate: 2025-05-27 19:38:04 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:50:11 +0000 arm64: Split out the loop to wait for APs This will be reused in a later change. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50365 --- sys/arm64/arm64/mp_machdep.c | 45 ++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index bca6487e487a..4ef0019d3f8f 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -139,11 +139,30 @@ is_boot_cpu(uint64_t target_cpu) return (PCPU_GET_MPIDR(cpuid_to_pcpu[0]) == (target_cpu & CPU_AFF_MASK)); } +static bool +wait_for_aps(void) +{ + for (int i = 0, started = 0; i < 2000; i++) { + if (atomic_load_acq_int(&smp_started) != 0) { + return (true); + } + /* + * Don't time out while we are making progress. Some large + * systems can take a while to start all CPUs. + */ + if (smp_cpus > started) { + i = 0; + started = smp_cpus; + } + DELAY(1000); + } + + return (false); +} + static void release_aps(void *dummy __unused) { - int i, started; - /* Only release CPUs if they exist */ if (mp_ncpus == 1) return; @@ -164,24 +183,10 @@ release_aps(void *dummy __unused) printf("Release APs..."); - started = 0; - for (i = 0; i < 2000; i++) { - if (atomic_load_acq_int(&smp_started) != 0) { - printf("done\n"); - return; - } - /* - * Don't time out while we are making progress. Some large - * systems can take a while to start all CPUs. - */ - if (smp_cpus > started) { - i = 0; - started = smp_cpus; - } - DELAY(1000); - } - - printf("APs not started\n"); + if (wait_for_aps()) + printf("done\n"); + else + printf("APs not started\n"); } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL);