From patchwork Tue Feb 27 02:43:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 207011 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2456012dyb; Mon, 26 Feb 2024 18:44:23 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWSOdedIGE5KuPLXOpH1eKPeGftV996L3bdRoU2ULb2lLbHhhEppuY9h44IxEfRBJDELYrjUg5ljo/W/3FP2mwmWv9gDQ== X-Google-Smtp-Source: AGHT+IETXTfjQ4pqQCQOcnDrEOb5PaAhNIQG535lN+Jl7dv2nKXASVx6rD86l6KedxmtO4nxG603 X-Received: by 2002:a17:906:35cd:b0:a43:2aef:b5ea with SMTP id p13-20020a17090635cd00b00a432aefb5eamr3571301ejb.66.1709001863148; Mon, 26 Feb 2024 18:44:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709001863; cv=pass; d=google.com; s=arc-20160816; b=QfZzLhPj6G8hojHklNhOjNG/uaK1K8DpUNtqUKaE/XiMm8MSyNDROLIIKYu70o7raE fKku10PNGPjlkuEaJUZp8DuYBEFiAAzr5cEGbAOe9Quh5Q/+PkkREBi9U/wuyti/AKoz VFa507SaneA8BvP6cJC2Ys8PEpkHpvMPaQbxOTASs/WJGfQPIOF6nC3Srz5eW3aP6Mas doIoD1tunpzrOLvezuwQ42XsLsFpx9AZhVqdiY0IcE+TJoUj74UrNZBUmiJXAVZOqFI2 io41iVydJpEFsP7xRJGg/sEr7je6Jy3CuGKnR+1EoR1sB1Q4w36EnzUMq03YlGSCXlSf ip4w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=Rila1gg/PwUEodNHF5d59wbHdMS0gxNf9i+WHdZ8M2A=; fh=IpFJW+rElBNH7ZMpEE1z7+KgDwsTMt9SaeQLgcyJDd4=; b=viBpwvFMIIM7hkvDGS4naMT6rlw8iyk/VKWQn+OEC61Uz6I7c9v85APby/+MqqNU/I 17VmL6f7R1xooPM5r0wjII8aRSgPJB9Vnp2DZc2sBjRpVbqVAtAeToas4OdJqIdIF470 vOGkZZqMIUh9m9iTl10UF1l0hB7iHLsGbvP7eRQvPWgi2zKxcLMWl08Mwqi23knUKCgQ qtK7RSo1X2TELKrMhQP5v1x1aXF8+x6y0Gg8j53DUqRhx/ldNTYJ8AQVxk9/IgKQi01P vK2nnHfy9xSUy59YJ2jnMUfXEuD27qEkL2kt6lIl7T4VMLos4wOQiH+sx6b3ioV80DID m0WA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=bwT5wfSp; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-82622-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82622-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id bn7-20020a170906c0c700b00a3e730bc98bsi302387ejb.395.2024.02.26.18.44.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 18:44:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82622-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=bwT5wfSp; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-82622-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82622-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id AB3FB1F23F9F for ; Tue, 27 Feb 2024 02:44:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CAB111EB35; Tue, 27 Feb 2024 02:44:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="bwT5wfSp" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 57EDC1D54C; Tue, 27 Feb 2024 02:43:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709001841; cv=none; b=R/3uqtVFq6Ezq0soYqmozocnUJiGdo7t6Ya0VRE6cz6zsUYmhLv/soO/FtAz1kA1/3lH5j5T27nYdMfEmKNRVoGjZocGgYGs/9NB93NMgIMNWFuunze9de8N352iGmLcy1kUiSkP5SKUwz0ARutoz/B2azv70CC0FR3BO6BKisc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709001841; c=relaxed/simple; bh=iiGq6K19zAQWXKWSjpFfhyZI2qumKee2vIntciyHMTg=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=j63lL3n2KMgBO9l5x9o/pHZ8qpdFaOtV7CpDj4YtyjTdZW/YvnWV+55emasUbHopHxbFByhENW+IwgJ8JOb+Cj7hGD5pA7O2LS4Un1VuUw8CvkmMqi++nczTlchh2AHy0sGNZDhfb5V0Q7dbSVfx3rM8FSTc5Sr4OpMeJexwIDQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=bwT5wfSp; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1709001836; bh=Rila1gg/PwUEodNHF5d59wbHdMS0gxNf9i+WHdZ8M2A=; h=Date:From:To:Cc:Subject:From; b=bwT5wfSpEIGceao1id0C/PfJ5URlDJBnh1fe+lWEHnp8zLh7ZnPc4QPEiYSmaUoZr JTExUEqk77vvuzu4Ey8j9GSOJ/fe5zBr4ZEnvBdMWxGRhcq7AXVlPAZdGPDCsZAncE 4S3zOJXHuFJLSp647Y2diQyfMu/+17XhvhYHMl8CFIrB6rCtieAdKupHogCnARgjj2 +7pGyKJGS619gGD1uSgGyD8uSpUO+aTw8fGO6EzxOdcBFqXl0rzqugefL2e2hqzjs2 XACihR3JJDxL3nF4pod41oqCTWUPIyPrJjUXQKmLIBSc63f2lzlbDk2cr0J+8SQeM+ TNL4PWkY11sSA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (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) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TkMHt6pdzz4wbQ; Tue, 27 Feb 2024 13:43:54 +1100 (AEDT) Date: Tue, 27 Feb 2024 13:43:52 +1100 From: Stephen Rothwell To: Mauro Carvalho Chehab , Borislav Petkov , Tony Luck , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Yazen Ghannam , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the edac tree Message-ID: <20240227134352.6deda860@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792018337156728460 X-GMAIL-MSGID: 1792018337156728460 Hi all, After merging the edac tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/ras/amd/atl/umc.c: In function 'get_die_id': drivers/ras/amd/atl/umc.c:318:44: error: implicit declaration of function 'amd_get_nodes_per_socket' [-Werror=implicit-function-declaration] 318 | return topology_die_id(err->cpu) % amd_get_nodes_per_socket(); | ^~~~~~~~~~~~~~~~~~~~~~~~ Caused by commit 3f3174996be6 ("RAS: Introduce AMD Address Translation Library") interacting with commit c749ce393b8f ("x86/cpu: Use common topology code for AMD") from the tip tree. I applied the following merge resolution patch. From: Stephen Rothwell Date: Tue, 27 Feb 2024 13:22:56 +1100 Subject: [PATCH] fix up for "RAS: Introduce AMD Address Translation Library" interacting with "x86/cpu: Use common topology code for AMD" Signed-off-by: Stephen Rothwell --- drivers/ras/amd/atl/umc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); } #define UMC_CHANNEL_NUM GENMASK(31, 20)