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 E71C32135CD; Tue, 8 Apr 2025 12:10:23 +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=1744114224; cv=none; b=V2IG85HdcNGGlyYLcPDwT1lsWzj+EFqwNaDFe0GNbMrjLYdNchR0TnGNBUWfMwqKVkSoN33vDHQKaeibHbljyEEa8+DTrgotWGpQ1D2jBiSctCTOrecnCz8BOr84vde3PXHSJCjX0OPWGnIQYUV6dsVZlpeVWS4/eB2G00kbJM4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744114224; c=relaxed/simple; bh=yWA2MD78hS0LUptvJ0F+1UCTinBOssDeCSLgTc9d1Z0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kpFmZlis8mm18S0Cthm39ROeQLbmsBaORKzgxJPhLuI4HlIhAalwAFuMPeqY+UzZDLMTnbkrsMIc4x9M2eYSkdoGwP6I8ArXZ7UdlhEVzahNm6QIWwiRUy+F4145dUL119cwosbEa3OiCoUpVS/yYvBFq+OPROi5/XSQIG/VZe4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FcI+ok1r; 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="FcI+ok1r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66B59C4CEE5; Tue, 8 Apr 2025 12:10:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744114223; bh=yWA2MD78hS0LUptvJ0F+1UCTinBOssDeCSLgTc9d1Z0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FcI+ok1r8NIxtmJRzO3oaqFekhtrAA8lIa9jrM/8sb89CDSSlmnCPoJb+k0kheZ+1 nj1G7ZxcldLW1HXOYd7NFkvqxeUZ+2FxEuBG4ghWyzdmTxFzglt7JENaBCsYBWG5ES 71aYTx1Vnlxdp8dcXf+n5KgC0X6de9mUb6V7WNbU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qiuxu Zhuo , Tony Luck , Gary Wang , Sasha Levin Subject: [PATCH 6.13 027/499] EDAC/ie31200: Fix the DIMM size mask for several SoCs Date: Tue, 8 Apr 2025 12:43:59 +0200 Message-ID: <20250408104851.922744935@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104851.256868745@linuxfoundation.org> References: <20250408104851.256868745@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qiuxu Zhuo [ Upstream commit 3427befbbca6b19fe0e37f91d66ce5221de70bf1 ] The DIMM size mask for {Sky, Kaby, Coffee} Lake is not bits{7:0}, but bits{5:0}. Fix it. Fixes: 953dee9bbd24 ("EDAC, ie31200_edac: Add Skylake support") Signed-off-by: Qiuxu Zhuo Signed-off-by: Tony Luck Tested-by: Gary Wang Link: https://lore.kernel.org/r/20250310011411.31685-3-qiuxu.zhuo@intel.com Signed-off-by: Sasha Levin --- drivers/edac/ie31200_edac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/edac/ie31200_edac.c b/drivers/edac/ie31200_edac.c index c3d34d1fc9ad7..da4008c22f0d3 100644 --- a/drivers/edac/ie31200_edac.c +++ b/drivers/edac/ie31200_edac.c @@ -165,6 +165,7 @@ #define IE31200_MAD_DIMM_0_OFFSET 0x5004 #define IE31200_MAD_DIMM_0_OFFSET_SKL 0x500C #define IE31200_MAD_DIMM_SIZE GENMASK_ULL(7, 0) +#define IE31200_MAD_DIMM_SIZE_SKL GENMASK_ULL(5, 0) #define IE31200_MAD_DIMM_A_RANK BIT(17) #define IE31200_MAD_DIMM_A_RANK_SHIFT 17 #define IE31200_MAD_DIMM_A_RANK_SKL BIT(10) @@ -378,7 +379,7 @@ static void __iomem *ie31200_map_mchbar(struct pci_dev *pdev) static void __skl_populate_dimm_info(struct dimm_data *dd, u32 addr_decode, int chan) { - dd->size = (addr_decode >> (chan << 4)) & IE31200_MAD_DIMM_SIZE; + dd->size = (addr_decode >> (chan << 4)) & IE31200_MAD_DIMM_SIZE_SKL; dd->dual_rank = (addr_decode & (IE31200_MAD_DIMM_A_RANK_SKL << (chan << 4))) ? 1 : 0; dd->x16_width = ((addr_decode & (IE31200_MAD_DIMM_A_WIDTH_SKL << (chan << 4))) >> (IE31200_MAD_DIMM_A_WIDTH_SKL_SHIFT + (chan << 4))); -- 2.39.5