From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8ED703BD241 for ; Thu, 11 Jun 2026 09:37:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781170654; cv=none; b=t1Meeq1JX1EOvGaoxIzhXggQzou1jukiATGExXVuykAcRbBYA7cCLwLJQD+iV0uuVlSlqAX85bEGoltH05w7Go7iZnZM3OaUQX7ArCDhVgzXKo38jrMoJzAN2nOIPWH1HYYEReI/EWCkHAd1xVfU9ldFdk1exYacUGENHh5UBzY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781170654; c=relaxed/simple; bh=qNDCZ3s2+BeRVYDQwhkS7VHfE7GSVj/YTmjyxLwGJHo=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dfdjvMrUBkParKMIaE5oPYm7hzhq+Rr3FEBQU+gBSCkz6h3aElJSRjKPDWWXN/o68qFuc9EbBL473wJ8S25ZPsHuxCRlzm+BQ4C9pTfNlaBUiLflJjUIkEJOKprZJ7af073rzW/QUVvpDkyI3QMvdE0JDGfabKttcDCGwsmfytc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=N33dTj2d; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N33dTj2d" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-45ef189aa1cso5700426f8f.0 for ; Thu, 11 Jun 2026 02:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781170652; x=1781775452; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=ZL5FenLXXncXQuI1FqBjdO6QXMmgEWyCnYxNBYcyD7s=; b=N33dTj2dC1rTzDUxhKKjLwsuwHAFLedjTH7E/YfGeqrAE7kpKiIgVhuxAaNGLCvqm2 KtwJ2b2Wp2LnNEwnHfMmE4qc0ZQ42BX1vS9jn1OcPagxWdnevWS2Wj0McpUwVhGENFL1 OPSnqi/NT0gZsQjuHNv4wjhujbJZi1XxVnQ51mOk3LIO5dmRSBKuj+m7QqvPXO4VIB9q 7eu4s0z6thfn3E8twnYyy13npMgf3hb3/OT1tPnwKSLEoX5HEqgMxXCsawnY3+zFkpOC uvZumGnno+9F70EESjsfzqlic1wNUm8SYFptQLKgu9v0JE8RLqwNK9CuWF9GlKPBdbHV H3Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781170652; x=1781775452; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZL5FenLXXncXQuI1FqBjdO6QXMmgEWyCnYxNBYcyD7s=; b=flxqI3UGLdz1vDoe2BZyhTSzRxgqu9HOXBr03h6ePVdNjNC98B/eOQq+CSLKrvsJQl YbOmKvrMuTraLtGe9qMeRrFcuXKqVW8lLj3ENrG96AtjCvg4DRhb4lRlwoTp+xFqSDqQ Rr0iwkxubofqozsyQkyMM93gn1N1MLwS9VdIwtoWaVKCra6i+BCbe44crGUdwXm4UI7A f+igabJNELcKxTtxsq7jO/7SEBcLtJq6SdqX6xsAJPEJ4MuxwatOiinNLeXyYOTct02M 5ZxCK/ilhg1jotp5w2T8Rh3/0VoQeSk5wyJy/m4BlrOZolYb+f1DaauedfuErw/dI7Mt wezw== X-Forwarded-Encrypted: i=1; AFNElJ+wmmeueHpwyQW5iMAi7h3zPxUbIyDp5HmsObG5ULCPOJbveLpig0CS2sWwU3+ConzuLq2JnOAYP1zG5Vw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzj8DnG7LER69gotPtQb+oshQjQoFNypv4sSzjK3tAhZ/SwxjlL pQEF/M5keoroAOpWHh8awlgprdyoylRnFOFcKRoxYLM9tpFjSJvclhvs X-Gm-Gg: Acq92OFkgYBo8yRu2LMssbzsYgPcvTvLQE3qiPT3qP5gMJ+D7s8tO7wxGlUlWH9kQZe VNz68YB6gRPffb7eV+vPVE3ha8lkIsROTGPjBspbi+zvs/Da39n1oRTMjONk8sXm6MrjgTq4ijV QbM6R/dkjbWQc6szFTa++X3mgKMI6fRPY+9OKsK/FxZAo3mjr3fzBhzr49CnHQSoGasAD69Zye9 RzmxumamEgH/Rsv02oeVih7+ExA1KZOvyipvjlX91uJKC6dcOClzq9BroN/f60ibCj1TOb4TzuM 0Ej5FS/NXzXXgNLA//8f9YnepEqxGUMyAUJnmPdcn/zs115wzBg83SZAjDt8UPYJeivYPH4gMp0 NLRjvHpZlSQjtbmMlg+pYkJWHv3NyX9N+ZOLM/4aZp8K7Z+a83tw11qD2lnQYQ5blGPKHECkQ5v Ko+3NYOmOf9jHpWaUtpRKKAis2rGvrB20AAgBhuMenyXXQIFlWBjZzwrSTzNuXRi4LPLDkgkU= X-Received: by 2002:a05:6000:4013:b0:45e:fa7b:a7cf with SMTP id ffacd0b85a97d-4606747756fmr2716997f8f.2.1781170651827; Thu, 11 Jun 2026 02:37:31 -0700 (PDT) Received: from pumpkin (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46028a6dcbdsm66962567f8f.7.2026.06.11.02.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 02:37:31 -0700 (PDT) Date: Thu, 11 Jun 2026 10:37:27 +0100 From: David Laight To: "Ahmed S. Darwish" Cc: Borislav Petkov , Dave Hansen , Ingo Molnar , Thomas Gleixner , Andrew Cooper , "H. Peter Anvin" , Christian Ludloff , Maciej Wieczor-Retman , Sohil Mehta , John Ogness , x86@kernel.org, x86-cpuid@lists.linux.dev, LKML Subject: Re: [PATCH v7 015/120] x86/cpu: Use parsed CPUID(0x80000002) to CPUID(0x80000004) Message-ID: <20260611103727.04329c2a@pumpkin> In-Reply-To: <20260528153923.403473-16-darwi@linutronix.de> References: <20260528153923.403473-1-darwi@linutronix.de> <20260528153923.403473-16-darwi@linutronix.de> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; arm-unknown-linux-gnueabihf) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 28 May 2026 17:37:37 +0200 "Ahmed S. Darwish" wrote: > For CPU brand string enumeration, use parsed CPUID(0x80000002) to > CPUID(0x80000004) instead of invoking direct CPUID queries. > > This centralizes CPUID invocation to the system's CPUID parser. > > Signed-off-by: Ahmed S. Darwish > --- > arch/x86/kernel/cpu/common.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c > index 9b05a747161f..3d5b5df544d1 100644 > --- a/arch/x86/kernel/cpu/common.c > +++ b/arch/x86/kernel/cpu/common.c > @@ -826,16 +826,18 @@ static const struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {}; > > static void get_model_name(struct cpuinfo_x86 *c) > { > - unsigned int *v; > + const struct leaf_0x80000002_0 *l2 = cpuid_leaf(c, 0x80000002); > + const struct leaf_0x80000003_0 *l3 = cpuid_leaf(c, 0x80000003); > + const struct leaf_0x80000004_0 *l4 = cpuid_leaf(c, 0x80000004); > char *p, *q, *s; > > - if (c->extended_cpuid_level < 0x80000004) > + if (!l2 || !l3 || !l4) > return; > > - v = (unsigned int *)c->x86_model_id; > - cpuid(0x80000002, &v[0], &v[1], &v[2], &v[3]); > - cpuid(0x80000003, &v[4], &v[5], &v[6], &v[7]); > - cpuid(0x80000004, &v[8], &v[9], &v[10], &v[11]); > + *(struct leaf_0x80000002_0 *)&c->x86_model_id[0] = *l2; > + *(struct leaf_0x80000003_0 *)&c->x86_model_id[16] = *l3; > + *(struct leaf_0x80000004_0 *)&c->x86_model_id[32] = *l4; Those assignment are nasty. You could probably use an anon union to do: c->x86_model_id_leaf_2 = *l2; -- David > + > c->x86_model_id[48] = 0; > > /* Trim whitespace */