From nobody Tue Jan 24 08:54:16 2023 X-Original-To: dev-commits-src-branches@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 4P1LPP0nVNz30x3j; Tue, 24 Jan 2023 08:54:17 +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 4P1LPN6t8Zz3hQr; Tue, 24 Jan 2023 08:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550457; 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=y5tOKIuU8afe906B7bEvJhGGs57cEvWzZfXEUpHGD/U=; b=KDMIx8Ln9kkwRpwQBRr1I/J/yRvNY6COQIphp+ND7N3/+Yts3/HzOOEn9CW5NeD1/WBI7c ftjqpWXbjobIndzEwCIMXJuf8empjPGs1Wq1oOwYg0YZ36dBUahSl7ByAFxDqyE3VksKVI 4mx+Yx2s3JLiYrfui5avlgkHYlotuVp8BUQIQurTYxb0clfAA4PARENBAhiLvTiCCXHvcT DFNx1TThAVJmG+5HYpJ9hRdDh9D0dWTIj0jebFnwvhq6Sy6eFoGBAKLcuyN38MBV9pNsUm KAdomt/f5ku8eXY5H2isB6opODj/DNGM1d1VUu4w27JHzriPprFUuEgBH5z/lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550457; 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=y5tOKIuU8afe906B7bEvJhGGs57cEvWzZfXEUpHGD/U=; b=rq7845zemX0i35hAJRcnNQ1yubVhNUAUFvDbm+JAq6hqsu1yLTBdNpRbJvOjBVKQubNux3 9fox84kxgOhbNTGkEVJ+fVMkFfcsf3Bc8XYYtaMIP0P+gdeFSNY9W6Fb7gcpKBctM5Z3Qe tMO75vSBCvBIDD+juY2j24aWBY3qLT3S5zXv4BUjiGP2uKaFH4CHRFuJ6o1qRxyiH+ERsD /HSETG8PPYqyoMJ3iK4UUM2QUNWBTlEhKqdJthtUY+mVxgvzHaT502p7UJRbocFu3vHsSC HNGF/PmQZGN4ZUBp7R+TaeRdNxw2AJu2dDSTslAcd5W8qqeubvn66k+sy9jkfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674550457; a=rsa-sha256; cv=none; b=FxtpdY1ZAi990SJ/V5kWVLmfoh5Yk+HX8GS3DN7l/uTUh89BDXANlB530m/SoWQ1Y3S+C/ crdIzRM2w48TvxXChjtPwhplfTcZu/LwoSUc6AttrfufEsdjUOAAvM7huNmrFQ6FQSVQIc pRRFufuMU+EVMCc+VdypnoVwTeQOBaRL1YwOqEroX18iktcA2iA0gDm2Qw7jF9Qxtej5Lj oTJS4+nr3JN12K9ZEd+/tS0MJE1nFJvoZYf/m9TAAnzpD/61+6KTXMk2StEmXIDouzEw4h r/rDbN7eGmg9Vr3ooTA1ugD4vMcYywZlnUeJ95w4onHiiOP3b3sofER7uiv+Rg== 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 4P1LPN5Q11z13Nv; Tue, 24 Jan 2023 08:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30O8sGn7036282; Tue, 24 Jan 2023 08:54:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O8sGUq036281; Tue, 24 Jan 2023 08:54:16 GMT (envelope-from git) Date: Tue, 24 Jan 2023 08:54:16 GMT Message-Id: <202301240854.30O8sGUq036281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: a509f71358b7 - stable/13 - linuxkpi: Define `boot_cpu_data.x86_max_cores` List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a509f71358b7ceb9a3846e77cb411ce7bf720791 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a509f71358b7ceb9a3846e77cb411ce7bf720791 commit a509f71358b7ceb9a3846e77cb411ce7bf720791 Author: Jean-Sébastien Pédron AuthorDate: 2022-11-11 17:43:07 +0000 Commit: Emmanuel Vadot CommitDate: 2023-01-24 09:08:01 +0000 linuxkpi: Define `boot_cpu_data.x86_max_cores` Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D36971 (cherry picked from commit 58cf3a69a5590a159b6271b0cb74bbec72245f26) --- sys/compat/linuxkpi/common/include/asm/processor.h | 1 + sys/compat/linuxkpi/common/src/linux_compat.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/asm/processor.h b/sys/compat/linuxkpi/common/include/asm/processor.h index 450192750612..ee2f48b50b44 100644 --- a/sys/compat/linuxkpi/common/include/asm/processor.h +++ b/sys/compat/linuxkpi/common/include/asm/processor.h @@ -36,6 +36,7 @@ struct cpuinfo_x86 { uint8_t x86; uint16_t x86_clflush_size; + uint16_t x86_max_cores; }; #define cpu_relax() cpu_spinwait() diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 082219721de1..0714106ca418 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -2768,6 +2768,7 @@ linux_compat_init(void *arg) #if defined(__i386__) || defined(__amd64__) linux_cpu_has_clflush = (cpu_feature & CPUID_CLFSH); boot_cpu_data.x86_clflush_size = cpu_clflush_line_size; + boot_cpu_data.x86_max_cores = mp_ncpus; boot_cpu_data.x86 = ((cpu_id & 0xf0000) >> 12) | ((cpu_id & 0xf0) >> 4); #endif rw_init(&linux_vma_lock, "lkpi-vma-lock");