From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AEFC4426EAD for ; Tue, 20 Jan 2026 13:05:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768914359; cv=none; b=qiOdNADExj6oyHqa3cHEVdPh0HjfV3P0v4pBkKAbupIR98GkJ+GR23Q27be3I2juStQBhYjb37nQC3w6g9qcRqwLo4ThyuOq93xGrWtWx0J2QAbLf8uX8fv50pOq5f/Lonb71Pz0pWREJvVjQzkE0Bz4b+iRGY1mlN1Wp3le0y0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768914359; c=relaxed/simple; bh=38IAHOdpLn6t6tLfo2otoeK0C6NJ58OeP3j+f93U6ek=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ZhXCOoAOX0Xea4iILI4uEwx3H0zEEJlnPYskT7Azuln+S8lmaztgntTLhIwjDK00Lm5pf0Q9E86HZHA5dUPbPHj5Y2Xnsu97EU8cA6U72a6IP2Ui+K6qakbO7Zq+pXIAFQ9Lr63wRwZjg+TcmQpQZ8gbDb3gJAGabU4CBQvS7Oc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JGrl7f2E; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JGrl7f2E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6F39C19422; Tue, 20 Jan 2026 13:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1768914359; bh=38IAHOdpLn6t6tLfo2otoeK0C6NJ58OeP3j+f93U6ek=; h=Subject:To:Cc:From:Date:From; b=JGrl7f2EI1DBUV2R7Y6svnVx9cEme+DVMiEsXhMvsIerxqpxnnAD6mNOVPNtgQ3XG 3m67odiG4ciFkiHNot/dWozjpdzwkW6V9AmqIuSShStGAwjSOBUE0y/3BiLRK7iHIu sFfplzOVSNuvX67m2JJHCT2McaI7ImjPQ2/2Nf1k= Subject: FAILED: patch "[PATCH] x86/resctrl: Add missing resctrl initialization for Hygon" failed to apply to 5.10-stable tree To: shenxiaochen@open-hieco.net,bp@alien8.de,reinette.chatre@intel.com Cc: From: Date: Tue, 20 Jan 2026 14:05:56 +0100 Message-ID: <2026012056-existing-collide-49ad@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 6ee98aabdc700b5705e4f1833e2edc82a826b53b # git commit -s git send-email --to '' --in-reply-to '2026012056-existing-collide-49ad@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6ee98aabdc700b5705e4f1833e2edc82a826b53b Mon Sep 17 00:00:00 2001 From: Xiaochen Shen Date: Tue, 9 Dec 2025 14:26:49 +0800 Subject: [PATCH] x86/resctrl: Add missing resctrl initialization for Hygon Hygon CPUs supporting Platform QoS features currently undergo partial resctrl initialization through resctrl_cpu_detect() in the Hygon BSP init helper and AMD/Hygon common initialization code. However, several critical data structures remain uninitialized for Hygon CPUs in the following paths: - get_mem_config()-> __rdt_get_mem_config_amd(): rdt_resource::membw,alloc_capable hw_res::num_closid - rdt_init_res_defs()->rdt_init_res_defs_amd(): rdt_resource::cache hw_res::msr_base,msr_update Add the missing AMD/Hygon common initialization to ensure proper Platform QoS functionality on Hygon CPUs. Fixes: d8df126349da ("x86/cpu/hygon: Add missing resctrl_cpu_detect() in bsp_init helper") Signed-off-by: Xiaochen Shen Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Reinette Chatre Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20251209062650.1536952-2-shenxiaochen@open-hieco.net diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index 3792ab4819dc..10de1594d328 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -825,7 +825,8 @@ static __init bool get_mem_config(void) if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) return __get_mem_config_intel(&hw_res->r_resctrl); - else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) + else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD || + boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) return __rdt_get_mem_config_amd(&hw_res->r_resctrl); return false; @@ -987,7 +988,8 @@ static __init void rdt_init_res_defs(void) { if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) rdt_init_res_defs_intel(); - else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) + else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD || + boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) rdt_init_res_defs_amd(); }