From nobody Sun Aug 30 04:04:46 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 4hXdmt5dWNz6q8J8 for ; Sun, 30 Aug 2026 04:04:46 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hXdmt52y9z3Gp0 for ; Sun, 30 Aug 2026 04:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788062686; 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=yKn0ImLSNMSP3LvdkkaMzBXMLl1/p8EqdwQiC4o96PI=; b=iIxoLUZ+5vUY4kFCba4sSYMNM/IWla82nBfG0uf7hZ9SO6DNNtEBUe7Ey0P/MlLosdCLHv oGCHdPwBTbyPG/6PzybJYOI6kJjD/spmh8Of4IfppwtjldRb37TDFffFFPdHDl0NChBMF5 7s3wYFZ6o3YlAFxeUiA0Ze11Nxa7U46IDhAz0fyYB3s4zLTYzVZNqCi9gz1oaibNW2c81P OlZIw0vHEMF+TXTIrvLDsSrAZ3fGfA6rxuw9D1DN+ncLtZ/jKlj+qwOP7A/jGmq0BzvXkg 6m6uo7qhIs+OZOeMQZlZNsMeLplWBYQV+nhIbtpYHW/gsKWim3E7X8KFSGoT4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788062686; a=rsa-sha256; cv=none; b=bjMkxcM2c1xvq4yDCyb/pImA0gie/2ZhrVb+dnqliWUOEwF9yAXXQ3srxb68xMH0Y6BOU/ cvn5vB/nRKUeuZgRajxWD9TGMXGRRnlM9W0jaAL7JdhPGAVyJ3nEnch+LKtBobphScWKW1 0Jl6dQHDxwPpT3JMUmIhg3NF4Mv8iVkWjw1OQYwF297Qpc6V217Ee9GMve6k1RrH6HvxAd 1Vn8NJvtaCm/lMjFzHYjWROhOeY3CyU1rEgJGi2GCfkVpSNWb8uHEWvds2FYvP+Wzm064j +7ESyVoLiZxvWE/Q5P+g7rpQKvwXWlrWt8Pw4F3bTlNPh0/58Rj9xmB5OLCjGg== 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=1788062686; 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=yKn0ImLSNMSP3LvdkkaMzBXMLl1/p8EqdwQiC4o96PI=; b=DsGtFteTBv658e0CYKH/F2ASHFa7aNgVsYSMp3TCt9uEdsk3x3TXDqSRITxKInOOQHk2s9 OjFcx8ed6fNrWX6JV7VBxBWG4zTm3xfgnAWLKqfEYkQMqEtb5do3FeG9OLQmTxqid/kr1p CpCjNAzKQPkvnXPB5uI4ft4W4dJgiASDWxIAgbM8zo7omrTMjL7lkzKDKdRvkWn2FVO7Cd YBB8sAdYEsIlkqAOlJsy6s+zO/3HgN34ce5NdvYFiHNAHboz8r7J7OeH2AY4uLRVtXwA3w 5iDg+1JrDMDJ2z8TB41keGRRvIe15qu1OtIYdeylpnjE/U5Af3nQiL2A1SYYLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hXdmt3jFmz18Kt for ; Sun, 30 Aug 2026 04:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f9cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 30 Aug 2026 04:04:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 26d5c4fc04df - main - powerpc64/powernv: Migrate XICS to PIC_AP_INIT 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26d5c4fc04dff332e47dd5249034160b8613c232 Auto-Submitted: auto-generated Date: Sun, 30 Aug 2026 04:04:46 +0000 Message-Id: <6a93abde.1f9cb.24384a6d@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=26d5c4fc04dff332e47dd5249034160b8613c232 commit 26d5c4fc04dff332e47dd5249034160b8613c232 Author: Justin Hibbits AuthorDate: 2026-08-30 04:03:34 +0000 Commit: Justin Hibbits CommitDate: 2026-08-30 04:04:30 +0000 powerpc64/powernv: Migrate XICS to PIC_AP_INIT Get rid of the powernv-specific AP callback and use the new-ish PIC_AP_INIT() PIC KPI instead. --- sys/powerpc/pseries/xics.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sys/powerpc/pseries/xics.c b/sys/powerpc/pseries/xics.c index 6195307114b7..2a6db5e5b200 100644 --- a/sys/powerpc/pseries/xics.c +++ b/sys/powerpc/pseries/xics.c @@ -75,8 +75,7 @@ static void xicp_mask(device_t, u_int, void *priv); static void xicp_unmask(device_t, u_int, void *priv); #ifdef POWERNV -extern void (*powernv_smp_ap_extra_init)(void); -static void xicp_smp_cpu_startup(void); +static void xicp_ap_init(device_t); #endif static device_method_t xicp_methods[] = { @@ -92,6 +91,9 @@ static device_method_t xicp_methods[] = { DEVMETHOD(pic_ipi, xicp_ipi), DEVMETHOD(pic_mask, xicp_mask), DEVMETHOD(pic_unmask, xicp_unmask), +#ifdef POWERNV + DEVMETHOD(pic_ap_init, xicp_ap_init), +#endif DEVMETHOD_END }; @@ -275,11 +277,6 @@ xicp_attach(device_t dev) 1 /* Number of IPIs */, FALSE); root_pic = dev; -#ifdef POWERNV - if (sc->xics_emu) - powernv_smp_ap_extra_init = xicp_smp_cpu_startup; -#endif - return (0); } @@ -554,14 +551,14 @@ xicp_unmask(device_t dev, u_int irq, void *priv) } #ifdef POWERNV -/* This is only used on POWER9 systems with the XIVE's XICS emulation. */ +/* Only meaningful on POWER9 systems using the XIVE's XICS-emulation mode. */ static void -xicp_smp_cpu_startup(void) +xicp_ap_init(device_t dev) { struct xicp_softc *sc; if (mfmsr() & PSL_HV) { - sc = device_get_softc(root_pic); + sc = device_get_softc(dev); if (sc->xics_emu) opal_call(OPAL_INT_SET_CPPR, 0xff);