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 A9B171D0792; Wed, 2 Oct 2024 14:12:11 +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=1727878331; cv=none; b=LBT9BEjxqIL+FxQj7yqIl1EYId8ipaH/xboVnILmZ6quiAbZw3W89O5fOCM2yxg0rKdptPpAVJpNuA2667huuHKnYclRTnztW42gIk7cT6+a7nBK99Qmwljziw9RwpWrQPfqEjht53tASM0HJZNie7vqFqPSRNKSBzdDdO1CC1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727878331; c=relaxed/simple; bh=KKYtYRflm24f6/zcHL01COV6CQ8LeF7mlX5AQLg2IO8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HwS05uJAE0xNIg1DbAAerm2jfxt8Y/MCc8C5tZbYZaAGrq2YVr8UCP8LrlR6ygTTjM86mAH3JxEOsebFisbmKxngJxHAMXSMs8zIekqO1aAPJuQMZciwSv6jrrH9k0u5293FYV1RYut0h6dKWiDoD69U+O4CT9bnkKRNEToV1zY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dUGQ+7jo; 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="dUGQ+7jo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31D30C4CEC2; Wed, 2 Oct 2024 14:12:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727878331; bh=KKYtYRflm24f6/zcHL01COV6CQ8LeF7mlX5AQLg2IO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dUGQ+7joRKnEWDEz7SY6T1U70EI8/H048QR2ooBNZPtxSaf3hsbfw0mq0UcK+D4K+ VMMr7mNJulg7Mn/NXjFThXqiHuvKaXPgT/FglYtlYdzyJzKjQtwTP5hT3ZMhvi+o3k B8yt7M6gDWLOKP+Ek/kW6xHUl3WP2dqrTy61mkLw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chengchang Tang , Junxian Huang , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.10 378/634] RDMA/hns: Fix 1bit-ECC recovery address in non-4K OS Date: Wed, 2 Oct 2024 14:57:58 +0200 Message-ID: <20241002125826.018289311@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125811.070689334@linuxfoundation.org> References: <20241002125811.070689334@linuxfoundation.org> User-Agent: quilt/0.67 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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chengchang Tang [ Upstream commit ce196f6297c7f3ab7780795e40efd6c521f60c8b ] The 1bit-ECC recovery address read from HW only contain bits 64:12, so it should be fixed left-shifted 12 bits when used. Currently, the driver will shift the address left by PAGE_SHIFT when used, which is wrong in non-4K OS. Fixes: 2de949abd6a5 ("RDMA/hns: Recover 1bit-ECC error of RAM on chip") Signed-off-by: Chengchang Tang Signed-off-by: Junxian Huang Link: https://patch.msgid.link/20240906093444.3571619-8-huangjunxian6@hisilicon.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 5483d04b3ab7e..349b68d7e7db6 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -6285,7 +6285,7 @@ static u64 fmea_get_ram_res_addr(u32 res_type, __le64 *data) res_type == ECC_RESOURCE_SCCC) return le64_to_cpu(*data); - return le64_to_cpu(*data) << PAGE_SHIFT; + return le64_to_cpu(*data) << HNS_HW_PAGE_SHIFT; } static int fmea_recover_others(struct hns_roce_dev *hr_dev, u32 res_type, -- 2.43.0