From nobody Thu Feb 16 11:56:32 2023 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 4PHYM51kxLz3q5xF; Thu, 16 Feb 2023 11:56:33 +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 4PHYM50lQ7z4BGr; Thu, 16 Feb 2023 11:56:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548593; 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=kPdEn97Af+GPo1ETBrfm1j2N9RwOPGsFTKg+jWD/Pa0=; b=A1i6DdAgPIJkeUUmvEKHvWCezBQW2ZUDyj4jYeW98wrqE+edLXztWpp7tNOvH/KvZa7Syx 63tMv+wUtLPWCnPVpPwmpNezO1uEURNbX1A0KliADKGwQKVufKddxQrGIXafI63m99Joez m6/pQUQ641Dw2yHSM7Usd/7+8OzSR7zu7LOpUNxr7TvR7GSK5Rxi8K3YPLQsQ2Odk0bmcT wClP8LvaQXTL5YvNwfB0CR1qi8l0k6MoDEaRA+gDIwwew/pX4ucEtcegjqclnzK/Za9f1K GFx3EnSl2GfQTdvUOdSNKPsAaj67855+7QX6f6h1FsLigU8IptNPZk+N7tgkvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548593; 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=kPdEn97Af+GPo1ETBrfm1j2N9RwOPGsFTKg+jWD/Pa0=; b=x3P74tiOX1n6lGPtadHOdinwnyAcNyPmQeBtmz4KYUIvaScZtzpn+eDLXeXURC+DbRG0Vy GyrxrxuiYqi272Y8ZxVzCs9nYT/RKe0bkV0EnWlIbYJ7uI4667Ws30ThxvV9bu/MOCfv1k 4OVgj6v/3AHq9npARaKbkZnCvvQ6yOpAt0vMpi7BFC6rd4GzogxIDDct2KQOf9D1aamKEc CZGlJ67s149VAgqkfgm6t07fiyY4BQsg0LoSfBl7CrKF0hS2p37hY4hlQ75r3CojBQTQCY LSEOkBoQe9qg6xta4VFSEa5ndcIO/qp/as67dgKMmJgT0UwfrAOT/ELSqKXvSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676548593; a=rsa-sha256; cv=none; b=AXqGeA4LyzKdTzZggb700orIwl2YnjPZwrXO91qmWuG3D2tZb/uiJCcsDXj9P4bGzN5qna wIwwKka9LNZYk+SM74rHYjWt/42DqQ8V3LYld89PdvX+9aZ1QsFxKhScNcVmyXF4LnEZvL eScxNv5iUQ4+7w/8UcpjoGfDNF98CpldPYntcZWlsx8yvd0v/EHTEGHcTZPcW9uU/3f8XY PMZKPBVzhdlnCzotqcA4wPZBhN4PlVL4sHRpSQAs/MRPO7KPRbeZ7T7EZjBclRAS0wVKJI 1d6hLVyz1CyxpzGR4WZN8Xsm1+5cuc89MYt6DFXydcdTCpN+bLtBtg4qd33xFg== 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 4PHYM46jg5z137k; Thu, 16 Feb 2023 11:56:32 +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 31GBuWce056338; Thu, 16 Feb 2023 11:56:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GBuWC7056337; Thu, 16 Feb 2023 11:56:32 GMT (envelope-from git) Date: Thu, 16 Feb 2023 11:56:32 GMT Message-Id: <202302161156.31GBuWC7056337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: 708dc3db0417 - stable/13 - linuxkpi: Define `cpu_data(cpu)` 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 708dc3db0417b2e53d70e88cabb48a3018b632f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=708dc3db0417b2e53d70e88cabb48a3018b632f3 commit 708dc3db0417b2e53d70e88cabb48a3018b632f3 Author: Jean-Sébastien Pédron AuthorDate: 2023-02-10 15:38:43 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-16 11:55:20 +0000 linuxkpi: Define `cpu_data(cpu)` `cpu_data(cpu)` evaluates to a `struct cpuinfo_x86` filled with attributes of the given CPU number. The CPU number is an index in the `__cpu_data[]` array with MAXCPU entries. On FreeBSD, we simply initialize all of them like we do with `boot_cpu_data`. While here, we add the `x86_model` field to the `struct cpuinfo_x86`. We use `CPUID_TO_MODEL()` to set it. At the same time, we fix the value of `x86` which should have been set to the CPU family. It was using the same implementation as `CPUID_TO_MODEL()` before. It now uses `CPUID_TO_FAMILY()`. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D38542 (cherry picked from commit a27902c1838836b3fb00cd660ce37a4f20bd7991) --- sys/compat/linuxkpi/common/include/asm/intel-family.h | 3 +++ sys/compat/linuxkpi/common/include/asm/processor.h | 3 +++ sys/compat/linuxkpi/common/src/linux_compat.c | 11 ++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/asm/intel-family.h b/sys/compat/linuxkpi/common/include/asm/intel-family.h new file mode 100644 index 000000000000..1dae979b3c5e --- /dev/null +++ b/sys/compat/linuxkpi/common/include/asm/intel-family.h @@ -0,0 +1,3 @@ +/* Public domain. */ + +#define INTEL_FAM6_ROCKETLAKE 0xA7 diff --git a/sys/compat/linuxkpi/common/include/asm/processor.h b/sys/compat/linuxkpi/common/include/asm/processor.h index 86d4ab9de98f..9e784396c63a 100644 --- a/sys/compat/linuxkpi/common/include/asm/processor.h +++ b/sys/compat/linuxkpi/common/include/asm/processor.h @@ -35,11 +35,14 @@ #if defined(__i386__) || defined(__amd64__) struct cpuinfo_x86 { uint8_t x86; + uint8_t x86_model; uint16_t x86_clflush_size; uint16_t x86_max_cores; }; extern struct cpuinfo_x86 boot_cpu_data; +extern struct cpuinfo_x86 __cpu_data[]; +#define cpu_data(cpu) __cpu_data[cpu] #endif #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 0714106ca418..4ceb33c348f6 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -2747,6 +2747,7 @@ io_mapping_create_wc(resource_size_t base, unsigned long size) #if defined(__i386__) || defined(__amd64__) bool linux_cpu_has_clflush; struct cpuinfo_x86 boot_cpu_data; +struct cpuinfo_x86 __cpu_data[MAXCPU]; #endif cpumask_t * @@ -2769,7 +2770,15 @@ linux_compat_init(void *arg) 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); + boot_cpu_data.x86 = CPUID_TO_FAMILY(cpu_id); + boot_cpu_data.x86_model = CPUID_TO_MODEL(cpu_id); + + for (i = 0; i < MAXCPU; i++) { + __cpu_data[i].x86_clflush_size = cpu_clflush_line_size; + __cpu_data[i].x86_max_cores = mp_ncpus; + __cpu_data[i].x86 = CPUID_TO_FAMILY(cpu_id); + __cpu_data[i].x86_model = CPUID_TO_MODEL(cpu_id); + } #endif rw_init(&linux_vma_lock, "lkpi-vma-lock");