linux-kernel - [PATCH V2] mmc: core: improve reasonableness of bus width setting for HS400es

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1531278049-22213-1-git-send-email-hongjiefang@asrmicro.com>
Date:   Wed, 11 Jul 2018 11:00:49 +0800
From:   Hongjie Fang <hongjiefang@...micro.com>
To:     <ulf.hansson@...aro.org>
CC:     <adrian.hunter@...el.com>, <shawn.lin@...k-chips.com>,
        <linus.walleij@...aro.org>, <wsa+renesas@...g-engineering.com>,
        <bst@...gutronix.de>, <jinqian@...gle.com>, <chanho.min@....com>,
        <kyle.roeschley@...com>, <linux-mmc@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>,
        Hongjie Fang <hongjiefang@...micro.com>
Subject: [PATCH V2] mmc: core: improve reasonableness of bus width setting for HS400es

mmc_select_hs400es() calls mmc_select_bus_width() which will continue
to set 4bit transfer mode if fail to set 8bit mode. The bus width
should not be set to 4bit in HS400es.

When fail to set 8bit mode, need return error directly for HS400es.

Signed-off-by: Hongjie Fang <hongjiefang@...micro.com>
---
 drivers/mmc/core/mmc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 4466f5d..4bd6c09 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1021,8 +1021,11 @@ static int mmc_select_bus_width(struct mmc_card *card)
 				 EXT_CSD_BUS_WIDTH,
 				 ext_csd_bits[idx],
 				 card->ext_csd.generic_cmd6_time);
-		if (err)
+		if (err) {
+			if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400ES)
+				return err;
 			continue;
+		}
 
 		bus_width = bus_widths[idx];
 		mmc_set_bus_width(host, bus_width);
-- 
1.9.1