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 903E7268691; Tue, 8 Apr 2025 10:59:29 +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=1744109969; cv=none; b=t+/frCs9R9uGhpkI6FoiENLQ+o7+QxKbLc9wgJhFsgARCHymCLGFxCdtMYgeg2ijfeLTDpyZpN3XmmJ9tDVpLxxtzLuDJXjxcosdCDetVsTWrkIleel6+ZQyGPjx0aVmBedKZOu0crTaE04rZjiyPgPqJSB2xHJ78GiVEdJa9Vw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744109969; c=relaxed/simple; bh=bmMDKX0ZXoCH6MTwKCaPcBpgGJzNOw/F+5ZAwWDRV1c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ajH+W4x31CpgZotq9PoNEDexk9sB7FUK3dMk7kXrk0pJCW8eF4xihiZnjoINYWOH62/fqII/ojcMHrszP2xzLSGuod759GdOCHE/7zHONzcX+M+7Cx/+ef/yI312j40zkI133lW9a+uRS7nkohZsnK1pV2yeqTSr/LBDKTrjXKs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aeJeGDd3; 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="aeJeGDd3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20441C4CEE5; Tue, 8 Apr 2025 10:59:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744109969; bh=bmMDKX0ZXoCH6MTwKCaPcBpgGJzNOw/F+5ZAwWDRV1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aeJeGDd3sBVcTLZZbyue/YiQkyGUs/oRFoeR3Svxe8IsoE3NPSi+6NFEl/9l8x3Zc gl9XFVyJ2aZ7Ll/7x8rKXBXF87R8M0KsbNyyF2P0qAZmiQbx3rWX2FXHAXWHXJf2j6 UYU4kxlKOIiRdcMB3fbceV1qEehrWEfxpxg4iFd8= 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.10 119/227] EDAC/ie31200: Fix the size of EDAC_MC_LAYER_CHIP_SELECT layer Date: Tue, 8 Apr 2025 12:48:17 +0200 Message-ID: <20250408104823.909341420@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.353768086@linuxfoundation.org> References: <20250408104820.353768086@linuxfoundation.org> User-Agent: quilt/0.68 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 5.10-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 c47963240b659..662a79dda74eb 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