Received-SPF: pass (google.com: domain of linux-kernel+bounces-98851-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <9df559c6-fa17-4784-ba5c-7d4d51ab4411@amd.com>
Date: Mon, 11 Mar 2024 09:06:46 -0400
User-Agent: Mozilla Thunderbird
From: Yazen Ghannam <yazen.ghannam@amd.com>
Subject: Re: linux-next: build failure after merge of the edac tree
To: Borislav Petkov <bp@alien8.de>
Cc: yazen.ghannam@amd.com, Stephen Rothwell <sfr@canb.auug.org.au>,
 Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
 Tony Luck <tony.luck@intel.com>, Thomas Gleixner <tglx@linutronix.de>,
 Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
 Peter Zijlstra <peterz@infradead.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20240227134352.6deda860@canb.auug.org.au>
 <e367a4ad-3431-4cf8-9c0c-1205e00b907c@amd.com>
 <20240309094651.GAZewwC3u3U7DhXBdo@fat_crate.local>
Content-Language: en-US
In-Reply-To: <20240309094651.GAZewwC3u3U7DhXBdo@fat_crate.local>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?M0dCTmZsbzAyUTV4Sm9GTTczQ0JNaGQ0V1ppQjNoWGMxdHdBMDMwNTdrZWRI?=
 =?utf-8?B?TTZaWXRIUS9XenFCUU9UaitOaHBWcFpwNGlVQ0hFVzZaY1NBamh4R1ZrcFlu?=
 =?utf-8?B?TWJaMVN6K2ZpSWlMZnhLcHpBWmFBTGhZeEF3RU1iYWRDNE1PTC9BbC9nbUZp?=
 =?utf-8?B?M0Z0UDd0MHQ5a1pQVGtvZGExbHdQV0J5K1F3b0lYcjRRbVpyU0RDOTlKdktl?=
 =?utf-8?B?ZEJYa1U0MVcwMHB3OGkraDdKWWsrc29BVCs4WStSZXVEOFE1dUxMVWt6OSt4?=
 =?utf-8?B?ZWh5NEFDYXFGaVpGTUZBTmFuMzRFZTVJdmNyMEZOOGpmTHVScGpDQTA0cm55?=
 =?utf-8?B?NG9ubU9JOUNodjVnYnJabmxDTmpvSmp4UDYvRWFBcjAzUjNBVlV0d01ZVjVZ?=
 =?utf-8?B?YzdEVUdHZWhtZ3VkL2c5dDJGREE0bStTazVnSjNPQ1FzZFFqR1lsUlhkRXZI?=
 =?utf-8?B?V0RDZ0Z0a21oUlJ4Y2VubUZjTy9oSzJuN0puZ3UyR3U5NUZ1dnNqWUxjRGdV?=
 =?utf-8?B?QWZCUzgxT1BUYlhrekY5aktSa0ZEcnk3YzJ2UHNXd1hGLzZkWnZBK2F1Y204?=
 =?utf-8?B?ODFGSlIrTHNtdElPRnB1aUMzMGFkL3ltWXBJcURVM01OVWtuZmZFcXlVQ0oy?=
 =?utf-8?B?dXlORUJKdEZ5Y3hnelg2VU5IYjY5eVNsVlFKZzNtOXNOdWpLT01MWnc0Q0Q5?=
 =?utf-8?B?N0JLTHd6QjFHU0RaWjE4d0VDQUlkZ1RkdkhxZzlvOEdaTytRL2s0YWh4RVAx?=
 =?utf-8?B?Z3N1RzlFQUZPVzVyZU1JT080MWZsdkx1OFc4SGl5cXR1UkRMV2U1NG5aUE1X?=
 =?utf-8?B?M3Y1T0RONkJmYTNiMXFYOUxybkpySUgzNVZtMm1oSEladzVUWlA2UGZ4VnRN?=
 =?utf-8?B?ZEtKdWZYcTl4UkZYdWdnZi83VHRFV1l1SDVGMTZyWmFSaDNqVCtaYWpJYmFU?=
 =?utf-8?B?NTlXa09MSHM2L2VFSUs5QnU0ZDg5MFA3MVVjMjFlRjdpeEtBUDYrZ09vNVdI?=
 =?utf-8?B?RGIrenBLWDhjckNiSlJLdzlaakJtdDBGbUZ3bjFmN3Qwb0FhYjV2YkV2UG5h?=
 =?utf-8?B?c3dNYWVPZ0NDT2JLVTU1S1lYTVpUZkF1UlpHNzVBRFBvYUtWUVlxUmozaTlG?=
 =?utf-8?B?Ny85VWh1cXJZMTVUM0x3VVZlbmdmejVadDArbDU3WkUvejlzRkxrdFlROEdG?=
 =?utf-8?B?dFB0M05KS0FUdWJmOVZuQUQ1ak9GS0Q0M0t6SDRyUlIzUVMrUm5QRldMODlE?=
 =?utf-8?B?UzZYSTBBTEM1aktMSE1XR3ltWElFREx1Y3BVZDg3RHZJUVgxV0RyWXNBc3R1?=
 =?utf-8?B?REl1d3hkRUVPU01sS2I0MUVLVzVra3NsdVc5aDNOekJkWkRLQ1lPenVOUGly?=
 =?utf-8?B?Vm9NTXd5MVF1bEZzdWQ0c2NPUzQzd2k0czdjV0Zxa08vKzB2NFpheW1Gc3FG?=
 =?utf-8?B?aHk3aWw1dkk0MFArME1lUVlmeWN3NU9nQm96RjdyWGF3L2djVHYyTm1WVnBm?=
 =?utf-8?B?TDdoOXdDeitERCtzSFZGdXZmYnhIQmwyanRxcnZRZVlRWFVjY0h0OWN5aEVP?=
 =?utf-8?B?YnBGemJwOFdGc0NxbHF2cUswRXJMNVR1czdUL0RCc2NPQVhRR2lKejdLVG9F?=
 =?utf-8?B?M2NuMU9wMnJtcEhjYjJNZ3E4T2ZjeXowU0dxWGlNZm5XdlkwVmpqRXhlOEV4?=
 =?utf-8?B?S0c5c2lOaXo2dzlKSmMwU3VlN2ZBNFFraU85L0ZhQUJVRjNBamVjY3NhR2xj?=
 =?utf-8?B?Qk1PYVB0WWFWWlVBK3NyN0wzVGFibmJoSnEwWGJTdVYvMFlQWS9DYmRwTjFp?=
 =?utf-8?B?b2VWNFV0ZFg4MjB2eERBYVQ2OVIxWWFJaVdvcDgxVFluL2tsMUhkeFlPWEx3?=
 =?utf-8?B?V2Z3cklJZ3FseFZ4bnIrc2pqdzg1Z0g1ZjdUK0hUdS9IWlRQOERhU3VYVlVx?=
 =?utf-8?B?dGtTMjlnNG4wVnh1U0FjSDdNa0VDUHRJQkZXRVFHR3pQVXgwdldlSTZEcnRU?=
 =?utf-8?B?a0w4dlljdVlNTjB2L1NrRHB2b0I0SFlrSmgvZGNKSHJ6Z3NHeU1XUFRkMkYy?=
 =?utf-8?B?RUVWbDFqZ1BVbHEvTUNkNFFFRUlUSHUwaU0vajkya0pqbHdBRW1kWXlETytE?=
 =?utf-8?Q?hPJHeKR5dc5jyBywYLnSM77/y?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e22dd108-17df-4d3f-9a16-08dc41cc1ce2
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3109.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2024 13:06:49.5235
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: FDVk5iyvFUhJqKK7sgz7WDhDje2XR8mxWjy0d9FIEAInWp2v5B+51GQxBUv5szFsL0EI6GaKJ/DShQ4WK+YGZw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7182


On 3/9/2024 4:46 AM, Borislav Petkov wrote:
> On Fri, Mar 08, 2024 at 05:43:26PM -0500, Yazen Ghannam wrote:
>>> diff --git a/drivers/ras/amd/atl/umc.c b/drivers/ras/amd/atl/umc.c
>>> index 08c6dbd44c62..65a0ab651ee2 100644
>>> --- a/drivers/ras/amd/atl/umc.c
>>> +++ b/drivers/ras/amd/atl/umc.c
>>> @@ -315,7 +315,7 @@ static u8 get_die_id(struct atl_err *err)
>>>    	 * For CPUs, this is the AMD Node ID modulo the number
>>>    	 * of AMD Nodes per socket.
>>>    	 */
>>> -	return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
>>> +	return topology_die_id(err->cpu) % topology_amd_nodes_per_pkg();
>>
>> "topology_die_id -> topology_amd_node_id" is also needed.
> 
> Are you saying topology_die_id() was already wrong?
> 
> Because even before the topo rewrite, this was
> 
>    - cpuinfo_x86.topo.die_id:
> 
>      The physical ID of the die. This information is retrieved via CPUID.
> 
> while this code talks about the AMD node thing.
> 

We used to save AMD Node ID into topology_die_id() before the following:
03fa6bea5a3e ("x86/cpu: Make topology_amd_node_id() use the actual node info")

>> Does this need to be fixed up in the RAS tree?
> 
> I'll give a diff to Linus when I send the pull request.
> 

Thanks,
Yazen