| Message ID | 1407996435.6245.15.camel@debian-rtk5880 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 14 August 2014 08:06, Roger Tseng <rogerable@realtek.com> wrote: > On Wed, 2014-08-13 at 17:09 +0200, Ulf Hansson wrote: >> On 11 August 2014 10:32, <rogerable@realtek.com> wrote: >> > From: Roger Tseng <rogerable@realtek.com> >> > >> > Current code erroneously fill the last byte of R2 response with an undefined >> > value. In addition, it is impossible to obtain the real values since the >> > controller actually 'offloads' the last byte(CRC7, end bit) while receiving R2 >> > response. This could cause mmc stack to obtain inconsistent CID from the same >> > card after resume and misidentify it as a different card. >> > >> > Fix by assigning a dummy value 0x01 to the last byte of R2 response. >> > >> > Signed-off-by: Roger Tseng <rogerable@realtek.com> >> >> Thanks! Queued for 3.18. >> >> I guess this should go for stable as well? > Yes. However, since rtsx_usb* is present in 3.16 and later, this patch > will not apply on 3.15.y or older. Should I separately send an adapted > version to stable? I haven't pushed this externally yet. I will drop the patch from my 3.18 branch. Then, let's split the patch into two, one for usb and one for pci - that should simplify patch management. Additionally, you should include a Cc tag with proper hashmark telling which kernel each patch should be included into. Kind regards Uffe -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c index 54849d8..ca31279 100644 --- a/drivers/mmc/host/rtsx_pci_sdmmc.c +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c @@ -412,7 +412,13 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host, } if (rsp_type == SD_RSP_TYPE_R2) { + /* + * The controller offloads the last byte {CRC-7, stop bit 1'b1} + * of response type R2. Assign a dummy CRC, 0, and stop bit to + * the byte(ptr[16], goes into the LSB of resp[3] later). + */ ptr[16] = 1; + for (i = 0; i < 4; i++) { cmd->resp[i] = get_unaligned_be32(ptr + 1 + i * 4); dev_dbg(sdmmc_dev(host), "cmd->resp[%d] = 0x%08x\n", diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index ca08df1..727a88d 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -435,7 +435,13 @@ static void sd_send_cmd_get_rsp(struct rtsx_usb_sdmmc *host, } if (rsp_type == SD_RSP_TYPE_R2) { + /* + * The controller offloads the last byte {CRC-7, stop bit 1'b1} + * of response type R2. Assign a dummy CRC, 0, and stop bit to + * the byte(ptr[16], goes into the LSB of resp[3] later). + */ ptr[16] = 1; + for (i = 0; i < 4; i++) { cmd->resp[i] = get_unaligned_be32(ptr + 1 + i * 4);