From nobody Fri Jan 10 04:28:14 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 4YTpYV5zMrz5khsP; Fri, 10 Jan 2025 04:28:14 +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 4YTpYV5MyQz4bpM; Fri, 10 Jan 2025 04:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736483294; 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=3lraqGNcZ6m5R+7u12Iiyj4jCKh90pKsT7AnW4HqX6c=; b=KF4maAsurHNFj2QrRYueac+HXPdV0JgfD4AagvII/Hc7y6R0q8BuCkFLt6Q9BewCd9BWYv ObMdNjwcvtSCcVkWnc2UCoxkrCVZ5jWCWgmhdZ9P8wqJEt2SYDkMs6OHFx6QP6hMCOW8TP N3cogICFCHBGPKkozR3k3OME2BC53W3mL0wXE0Cfy0uORSjoC4ZTJGmnVEXR5+mj/K/+Kz ZskJUn+OOeTdGlgpRrfGObI3/REEG/AJEUOHFme71LX5Ts9MlaIHcMDqwztGuAgus6lOlS cxR2zGVKCNABHg//NGszPx+WKvlfrup1PeZ+l3uHFUeWKYbi7HLHdcXNgsnIzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736483294; 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=3lraqGNcZ6m5R+7u12Iiyj4jCKh90pKsT7AnW4HqX6c=; b=SRqeWwmJxXYl8DDS5zcxL2wZ9j12dL5+aPkkVb7vyoavu29lMOVUHU84cM+cnbkN3w9Q5c BcjTSS2BJE5YWNcZk0G6QYZ6DTf+DodChEIMfuT/9OMG30lfHMHP2hZulH+GQQ7cAp/5pR 2iLmH8GLxk5m7e67xZvXGqEf7EsFLFf6TsiLNP6uVdMJrGrPgaVW+qbR2yx9GddwAkxQd5 cYGJXsEiLmW7eIzmVH22u1ZN6ppqOUxLgsA68YxdLSOO5+NjFq62g87+Mlhux2+e8iOxHk JEe8er3el6KdFZ+fhBOOoECPxMyYm5mLgXTNOxXPDeqfMD1+mxckzdMHp2qI+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736483294; a=rsa-sha256; cv=none; b=cS7sSwUw74LX8o1G4SpknHJsKa5iULkxLxySh9AoO2eh3ivOdY0eqmbsGKi0GC/obNItMU HhpC6Qk5hsg98US9SlWdD4MDtzKGpJXAfbIMJBJyGjhPLzZOGzpC2erotUDCcY74WZRtpv pdsEgIP4aqRY6AsK8qk+i0Fc6A+9tJ7RAw256ClcZmWO29DBLnv3n34B3CDjRnqQGLrLfo 0GQrP4TORxClsJkLvpIuRPUs2izCphnXl+dB3QY3wsJFOZyk24curjNnwel5X4sTX4xyRP u37oAiGat7DTP502ZfSYq6wo92wp0on9CjpiolkWOouUT+akuRPF0Kssdjw54Q== 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 4YTpYV4ymdzx1F; Fri, 10 Jan 2025 04:28:14 +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 50A4SE76062739; Fri, 10 Jan 2025 04:28:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50A4SETP062736; Fri, 10 Jan 2025 04:28:14 GMT (envelope-from git) Date: Fri, 10 Jan 2025 04:28:14 GMT Message-Id: <202501100428.50A4SETP062736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 16f0d01f9ca1 - main - arm64: apple: fix aic for !SMP configurations 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16f0d01f9ca1e28bede9a493329c5d66e317d88f Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=16f0d01f9ca1e28bede9a493329c5d66e317d88f commit 16f0d01f9ca1e28bede9a493329c5d66e317d88f Author: Kyle Evans AuthorDate: 2025-01-10 04:27:50 +0000 Commit: Kyle Evans CommitDate: 2025-01-10 04:28:05 +0000 arm64: apple: fix aic for !SMP configurations Allocate sc_cpuids anyways, even if it's just a single entry, to minimize functional diff between SMP and !SMP. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D48289 --- sys/arm64/apple/apple_aic.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/arm64/apple/apple_aic.c b/sys/arm64/apple/apple_aic.c index b500099a5430..c9ce3b4d2165 100644 --- a/sys/arm64/apple/apple_aic.c +++ b/sys/arm64/apple/apple_aic.c @@ -137,9 +137,9 @@ struct apple_aic_softc { u_int sc_ndie; #ifdef SMP struct apple_aic_irqsrc sc_ipi_srcs[AIC_NIPIS]; - u_int *sc_cpuids; /* cpu index to AIC CPU ID */ uint32_t *sc_ipimasks; #endif + u_int *sc_cpuids; /* cpu index to AIC CPU ID */ }; static u_int aic_next_cpu; @@ -215,6 +215,7 @@ apple_aic_attach(device_t dev) #ifdef SMP sc->sc_ipimasks = malloc(sizeof(*sc->sc_ipimasks) * mp_maxid + 1, M_DEVBUF, M_WAITOK | M_ZERO); +#endif sc->sc_cpuids = malloc(sizeof(*sc->sc_cpuids) * mp_maxid + 1, M_DEVBUF, M_WAITOK | M_ZERO); @@ -223,8 +224,6 @@ apple_aic_attach(device_t dev) if (bootverbose) device_printf(dev, "BSP CPU %d: whoami %x\n", cpu, sc->sc_cpuids[cpu]); -#endif - name = device_get_nameunit(dev); for (i = 0; i < sc->sc_ndie; i++) {