raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

drivers: mmc: handle 1024-byte SD General Info lengths

Browse Source 
The spec allows for up to two 512-byte pages to be allocated for the
Extension Register General Info block, so allocate accordingly.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
This commit is contained in:
Jonathan Bell
2024-03-26 14:58:58 +00:00
committed by Dom Cobley
parent a59b956ef3
commit a6abe66f80
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/mmc/core/sd.c
View File

@@ -1195,7 +1195,7 @@ static int mmc_sd_read_ext_regs(struct mmc_card *card)
if (!(card->scr.cmds & SD_SCR_CMD48_SUPPORT)) if (!(card->scr.cmds & SD_SCR_CMD48_SUPPORT))
return 0; return 0;
gen_info_buf = kzalloc(512, GFP_KERNEL); gen_info_buf = kzalloc(1024, GFP_KERNEL);
if (!gen_info_buf) if (!gen_info_buf)
return -ENOMEM; return -ENOMEM;
@@ -1226,14 +1226,23 @@ static int mmc_sd_read_ext_regs(struct mmc_card *card)
num_ext = gen_info_buf[4]; num_ext = gen_info_buf[4];
/* /*
* We only support revision 0 and limit it to 512 bytes for simplicity. * We only support revision 0 and up to the spec-defined maximum of 1K.
* No matter what, let's return zero to allow us to continue using the * No matter what, let's return zero to allow us to continue using the
* card, even if we can't support the features from the SD function * card, even if we can't support the features from the SD function
* extensions registers. * extensions registers.
*/ */
if (rev != 0 || len > 512) { if (rev != 0 || len > 1024) {
pr_warn("%s: non-supported SD ext reg layout\n", pr_warn("%s: non-supported SD ext reg layout rev %u length %u\n",
mmc_hostname(card->host)); mmc_hostname(card->host), rev, len);
goto out;
}
/* If the General Information block spills into the next page, read the rest */
if (len > 512)
err = mmc_sd_read_ext_reg(card, 0, 1, 0, 512, &gen_info_buf[512]);
if (err) {
pr_err("%s: error %d reading page 1 of general info of SD ext reg\n",
mmc_hostname(card->host), err);
goto out; goto out;
} }