From nobody Tue Nov 18 18:02:41 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 4d9ssG0dGfz6HWsX for ; Tue, 18 Nov 2025 18:02:42 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9ssF2zXYz3HpL for ; Tue, 18 Nov 2025 18:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488961; 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=P84FGAAjj2UF57YNHx4Z3r8bsCU86/ACWMRF5+BGQqs=; b=iDkvsZJExRVf9tQXddMLq7N/0kCnhIj7TDl3itUTGQhNnhgyKneBey69jmT922aCZ+N1NM sqK+3h50gA7LlDOw34+HS8Y8qasimzY3zmI9UpdScadQFPTWb3U+6vFOH/1BTApqSZOONV 8LmKdL8W4ZFitS3XAo3B/46fpcM3JoNvvhe6VL/FljnhsB6odu/V1rAX9kbbLayxEHqK26 3Axy0et08KK7NTMyas1Wfo167oKyW0jXJ2qwhK/vjo4UmFiITtGEezaEj2/H1RYWTy85AS uIhBvKvoQ7hNO6Z3ZllWWMrXyi40bc5hyZMYTjqkSzAT/d+v8fcIw6RR45Jsdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763488961; 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=P84FGAAjj2UF57YNHx4Z3r8bsCU86/ACWMRF5+BGQqs=; b=tuBF6dfQyU2uVOdn+VwuKOsegtpuxWpibW8whUAVhcOQpqHwj90N1Hg3+m79zsVD3iNNr0 x2z+tPy2Rd+D4f+66jE0jPmREoeqKuQNWxdAfJd6TBEZgW5TGQrFqFBQsiLg5WYF5p/gyM WTUpmNJ9Jrnk3qqVEpGOK2i6owK5eiuuUQ4Q2LXE3eRY3uVDlmgu8DFGhwsPw1arlDCfAt cFUD7tnRMV2w+Ch/Nl2eE3iy28ScltEiiaUupyNAWbcgKsfLjCE1ouQ0/OiuphXAfTTSXE w124KDQog/iUKNkNDdC0eplkVi5ArQZL6IY5OC1Fp4HsZ4Bp73jVZGrROyo0jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763488961; a=rsa-sha256; cv=none; b=BO0zrEk/jaHmmIUV0F8/3nTMT7O9AAHzXybKf+rAOik6/wAaC90BNDPb2/VD87Ld0Zcudb y++oOfs73VOHR5lH/wFfwrbES7TVxd5qaHDJ3pZRGYG4l8sHtvi5zT1m2y4OqzfcLSm2ZX UrqZnkBXsAAgfDkE4P/CKI0T1GGk5RpPK6z3kwr6VyPqfLJ33IyljazFcUzqZuT1xLNld9 oHIuXTXJqbiOqVAovruNtBZg/n2UlVfti7HrCOYm3DuP4LqsL+aLGpp0uq2aQZkzMuzijc zGugMbv9RgSvxl3tVAfWuovZMxlnufa2Fdbk15v8hvxLM7b6QzI5wh2eHgn5kw== 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 4d9ssF2XqYz14TV for ; Tue, 18 Nov 2025 18:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 220bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 18:02:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a695ac2ce8bc - main - arm64: Move intr_pic_init_secondary earlier 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: a695ac2ce8bc8e8b989359002659063f2e056dcf Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 18:02:41 +0000 Message-Id: <691cb4c1.220bb.22f9ecf6@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a695ac2ce8bc8e8b989359002659063f2e056dcf commit a695ac2ce8bc8e8b989359002659063f2e056dcf Author: Andrew Turner AuthorDate: 2025-11-18 18:00:32 +0000 Commit: Andrew Turner CommitDate: 2025-11-18 18:00:32 +0000 arm64: Move intr_pic_init_secondary earlier This may have been called after intr_irq_shuffle. For most interrupt controllers this appears to be safe, however for the GICv5 we need to read a per-CPU ID register before we can assign interrupts to a given CPU. Fix the race by moving intr_pic_init_secondary earlier in the boot, after devices have been enumerated and before the interrupts are moved to their assigned CPUs. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53685 --- sys/arm64/arm64/mp_machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 0bdd2ecfd8a7..ba673ce9d6ee 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -270,6 +270,8 @@ init_secondary(uint64_t cpu) install_cpu_errata(); enable_cpu_feat(CPU_FEAT_AFTER_DEV); + intr_pic_init_secondary(); + /* Signal we are done */ atomic_add_int(&aps_started, 1); @@ -288,8 +290,6 @@ init_secondary(uint64_t cpu) ("pmap0 doesn't match cpu %ld's ttbr0", cpu)); pcpup->pc_curpmap = pmap0; - intr_pic_init_secondary(); - /* Start per-CPU event timers. */ cpu_initclocks_ap();