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 D9D3A25FA13; Tue, 8 Apr 2025 11:43:41 +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=1744112621; cv=none; b=gIhYap7n/K01FuczgQuPvfCkhiRPo5L/rbhusroP9sGp03hL8l2IyGHXjLOP7IcjCg5JBlI3L/8usjUCHJZ2cnfoSrsKdiFVdjA+WYfHO23hTz8xKAZ3mJKgkl44uyxhqUjnKNpkwHGeyVWf0UzdDwjfigMO4s22CrOjyZ1z9D0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112621; c=relaxed/simple; bh=6NtuvQLk9zBdBpoTnG+BWjJF//oB7+7kwkdoXooRt8c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F6b8+FxUor61JCo8+Tie92ayBjL1YdsOJpHSeziWIvoi5BLtwdR8NYC3Pkty1DVzKJaR/tgitaJO//aHWEPxwgx+FjIF4o3xXKwo/zn723XIk/vFml42dqsPfi0SsdxXzq5D+LwAtwhAbO5sJiHjlj9u2Lza99lwahIhJvTPDpY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bnxuYwek; 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="bnxuYwek" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1DEFC4CEE5; Tue, 8 Apr 2025 11:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744112621; bh=6NtuvQLk9zBdBpoTnG+BWjJF//oB7+7kwkdoXooRt8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bnxuYwekXoztAjcR8B9eAGI1/4RYUdTqtDT1VZQHjKV/HJEN3vRbfI6GlEQrQc4SA DE0O+07dhNtXhJz1oROXDaaNoGqYKHTRjk/33Ox5GlBxK88aITIf9vJEc4obcZ5N6T XHTv5rMzrEGW4ZKwOiPneYpVUdtdTVREQLf1UEpA= 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 5.15 137/279] EDAC/ie31200: Fix the DIMM size mask for several SoCs Date: Tue, 8 Apr 2025 12:48:40 +0200 Message-ID: <20250408104830.039775814@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104826.319283234@linuxfoundation.org> References: <20250408104826.319283234@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 5.15-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 de89df8ff06ee..ead3646294b68 100644 --- a/drivers/edac/ie31200_edac.c +++ b/drivers/edac/ie31200_edac.c @@ -154,6 +154,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) @@ -367,7 +368,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