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 1B26526A085; Tue, 8 Apr 2025 12:05:59 +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=1744113959; cv=none; b=kgaC2AhjAbqBSO+5xMfYE11BWxHfvMQ3/gzZyRh5dHvb4UkFNz74IrjM9xuvDZi/L5SOJEgFfpIuWJwKhUzpM2frfyhMOqtQDxFsJt7eTaZfQaiZqtRDzHZUkAYJpCc7PRifgmeW3GmxbTGZ4ulxVaZLw++qY0wSpLutv10vR98= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113959; c=relaxed/simple; bh=cYDVFdfcf+X1IQAZrsYk+KmaIkmDPiy3Nya6R0Tohiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B/WXX67wLvI0nd+kTbCR7fAETZZfmBDYXjw7vXgJKb+O8Fx5yoWpv7Cpw0OD3Tr6JCACSyvxWTJv8XZfKK4Cp4i4AQ3QyhZeelfHUTpat1tomzijgQR9bEFsUUgglcbtrk4uWojUHzFBR4bh9JXlZ1RxzNVJyrxbTPnxzOqrf8w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Nogn9s4Q; 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="Nogn9s4Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9EE31C4CEE5; Tue, 8 Apr 2025 12:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744113959; bh=cYDVFdfcf+X1IQAZrsYk+KmaIkmDPiy3Nya6R0Tohiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nogn9s4QlDDtiCKdgcVA86HS0MdDlTJ1thwLRfiRaLM6dS87cuaRAOKtuQM9/JjHn RilbZdAyOljDBnNQ55QEOgAywfOk62uyrHIO0HroUpqpf9HODB7I9Dj0rdyaNjeQ85 OYVORyQWH5hr9S2Cg/ZdX1pi9ZynI+IWHkzZjRL8= 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.4 085/154] EDAC/ie31200: Fix the size of EDAC_MC_LAYER_CHIP_SELECT layer Date: Tue, 8 Apr 2025 12:50:26 +0200 Message-ID: <20250408104818.038640461@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104815.295196624@linuxfoundation.org> References: <20250408104815.295196624@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.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qiuxu Zhuo [ Upstream commit d59d844e319d97682c8de29b88d2d60922a683b3 ] The EDAC_MC_LAYER_CHIP_SELECT layer pertains to the rank, not the DIMM. Fix its size to reflect the number of ranks instead of the number of DIMMs. Also delete the unused macros IE31200_{DIMMS,RANKS}. Fixes: 7ee40b897d18 ("ie31200_edac: Introduce the driver") Signed-off-by: Qiuxu Zhuo Signed-off-by: Tony Luck Tested-by: Gary Wang Link: https://lore.kernel.org/r/20250310011411.31685-2-qiuxu.zhuo@intel.com Signed-off-by: Sasha Levin --- drivers/edac/ie31200_edac.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/edac/ie31200_edac.c b/drivers/edac/ie31200_edac.c index 9be43b4f9c506..c11a46fdf3862 100644 --- a/drivers/edac/ie31200_edac.c +++ b/drivers/edac/ie31200_edac.c @@ -83,8 +83,6 @@ (((did) & PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_MASK) == \ PCI_DEVICE_ID_INTEL_IE31200_HB_CFL_MASK)) -#define IE31200_DIMMS 4 -#define IE31200_RANKS 8 #define IE31200_RANKS_PER_CHANNEL 4 #define IE31200_DIMMS_PER_CHANNEL 2 #define IE31200_CHANNELS 2 @@ -419,7 +417,7 @@ static int ie31200_probe1(struct pci_dev *pdev, int dev_idx) nr_channels = how_many_channels(pdev); layers[0].type = EDAC_MC_LAYER_CHIP_SELECT; - layers[0].size = IE31200_DIMMS; + layers[0].size = IE31200_RANKS_PER_CHANNEL; layers[0].is_virt_csrow = true; layers[1].type = EDAC_MC_LAYER_CHANNEL; layers[1].size = nr_channels; -- 2.39.5