Commit b3f4783c authored by Aurelien Jarno's avatar Aurelien Jarno Committed by Yi Yang
Browse files

Revert "mmc: dw_mmc: Fix IDMAC operation with pages bigger than 4K" 

stable inclusion
from stable-v6.6.63
commit 56de724c58c07a7ca3aac027cfd2ccb184ed9e4e
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB9574
CVE: CVE-2024-53127

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=56de724c58c07a7ca3aac027cfd2ccb184ed9e4e

--------------------------------

commit 1635e407a4a64d08a8517ac59ca14ad4fc785e75 upstream.

The commit 8396c793ffdf ("mmc: dw_mmc: Fix IDMAC operation with pages
bigger than 4K") increased the max_req_size, even for 4K pages, causing
various issues:
- Panic booting the kernel/rootfs from an SD card on Rockchip RK3566
- Panic booting the kernel/rootfs from an SD card on StarFive JH7100
- "swiotlb buffer is full" and data corruption on StarFive JH7110

At this stage no fix have been found, so it's probably better to just
revert the change.

This reverts commit 8396c793ffdf28bb8aee7cfe0891080f8cab7890.

Cc: stable@vger.kernel.org
Cc: Sam Protsenko <semen.protsenko@linaro.org>
Fixes: 8396c793ffdf ("mmc: dw_mmc: Fix IDMAC operation with pages bigger than 4K")
Closes: https://lore.kernel.org/linux-mmc/614692b4-1dbe-31b8-a34d-cb6db1909bb7@w6rz.net/
Closes: https://lore.kernel.org/linux-mmc/CAC8uq=Ppnmv98mpa1CrWLawWoPnu5abtU69v-=G-P7ysATQ2Pw@mail.gmail.com/


Signed-off-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Message-ID: <20241110114700.622372-1-aurelien@aurel32.net>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarYi Yang <yiyang13@huawei.com>
parent 6125ba4e

drivers/mmc/host/dw_mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -2952,8 +2952,8 @@ static int dw_mci_init_slot(struct dw_mci *host) 
	if (host->use_dma == TRANS_MODE_IDMAC) {

		mmc->max_segs = host->ring_size;

		mmc->max_blk_size = 65535;

		mmc->max_req_size = DW_MCI_DESC_DATA_LENGTH * host->ring_size;

		mmc->max_seg_size = mmc->max_req_size;

		mmc->max_seg_size = 0x1000;

		mmc->max_req_size = mmc->max_seg_size * host->ring_size;

		mmc->max_blk_count = mmc->max_req_size / 512;

	} else if (host->use_dma == TRANS_MODE_EDMAC) {

		mmc->max_segs = 64;