From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 1D81A4EFFC0; Tue, 13 Oct 2026 12:02:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791892932; cv=none; b=CZHT5w0FsOQwvzomUdFRoo+aANOqdMnSSV1sDsmeytamFXE1ZUPUxvsvl/IV9UJi3njjSR8iAByOXlzo9xuc4qHerW0NnUyGNQt9VtsUURNBe1ChtK/jOgva4jvzvxk63hMvznpLXnmADyMvty7/ZNxs1Zlt9OEoHTSRV16RPz0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791892932; c=relaxed/simple; bh=xiY3ZAr9wMAXyzOrFkUgJcO++M6MeWpoSMoFuLqo/Ow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cva8fEvMOoZx9pkWaPIbLu811kDY1+wsFzAioHNGN0OEws2yBCKFkhslVCjHFrOGW0MSs/Vh9E7BMNvpTn/WbGWTtz+yeqqXuruCF7u/dpVd/vMGwkhSHmiRkUmZ2v9pJSRQFOxLX6g+arf25WDgiaiKZS5P4ZEICOyuBe02bdY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=h4Sfid00; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="h4Sfid00" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E82D1F000FF; Tue, 13 Oct 2026 12:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791892931; bh=1uU5cjRLEau/qCfm+QZt1RKgHLTa69G0Okk3rH0Ntx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h4Sfid000Vy89U+3YzgYWWind5WciMFozjNxOBnbD6jAUpw6nnXgxD3RA4n59nbTh P3l+S5Cv+ztp4kySD3dUgzOMOg4WVKWxsL+9aMOYNVkPmN1cSHqDVAuVND3BA/5Tsc yql2XgnqbMhZSj/3EHkhsukmH0j8ziP2lIwOX8oE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yazen Ghannam , Vishal Badole , "Borislav Petkov (AMD)" Subject: [PATCH 6.18 054/621] EDAC/amd64: Mask UMC chip select to the four implemented selects Date: Tue, 13 Oct 2026 13:30:49 +0200 Message-ID: <20261013112922.145960903@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261013112920.855194808@linuxfoundation.org> References: <20261013112920.855194808@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vishal Badole commit 7484bc43ba6b8e189b482db5b75e7842890a82b1 upstream. For DRAM ECC errors, the chip select value can be found in the MCA_SYND[ErrorInformation] field. ErrorInformation[2:0] was first documented in Zen1. The 3 bit field implied that up to 8 chip selects may be used. However, all Zen-based systems have only ever had up to 4 chip selects. So only bits [1:0] would contain a valid chip select value. Future systems are redefining the field to ErrorInformation[1:0]. This matches the existing 'up to 4 chip selects' implementations. And it frees up the extra bit for other decoding. Change the current chip select mask from 0x7 to 0x3 to prepare for the decode change. Fixes: 713ad54675fd ("EDAC, amd64: Define and register UMC error decode function") Suggested-by: Yazen Ghannam Signed-off-by: Vishal Badole Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Yazen Ghannam Cc: Link: https://patch.msgid.link/20261002113204.3358815-2-Vishal.Badole@amd.com Signed-off-by: Greg Kroah-Hartman --- drivers/edac/amd64_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2796,13 +2796,13 @@ static inline void decode_bus_error(int * the instance_id. For example, instance_id=0xYXXXXX where Y is the channel * number. * - * For DRAM ECC errors, the Chip Select number is given in bits [2:0] of + * For DRAM ECC errors, the Chip Select number is given in bits [1:0] of * the MCA_SYND[ErrorInformation] field. */ static void umc_get_err_info(struct mce *m, struct err_info *err) { err->channel = (m->ipid & GENMASK(31, 0)) >> 20; - err->csrow = m->synd & 0x7; + err->csrow = m->synd & 0x3; } static void decode_umc_error(int node_id, struct mce *m)