Skip to contentSkip to conversation

mmc: core: Normalize the error handling branch in sd_read_ext_regs()

PATCH In review Zhen Lei 2 participants 3 messages Nov 30, 2022 MMC, SD and SDIO

lore
Share & tools
lore

Zhen Lei

author
#0 lore raw

PATCH v2 1/1 mmc: core: Normalize the error handling branch in sd_read_ext_regs()

1. Use pr_err() to output the error message.
2. Add the description of why success 0 is returned in case "non-supported SD ext reg layout".

Fixes c784f92769ae ("mmc: core: Read the SD function extension registers for power management")
---
 drivers/mmc/core/sd.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/mmc/core/sd.c +8 -3
index 3662bf5320ce56d..93ee53f74427c38 100644
@@ -1259,7 +1259,7 @@ static int sd_read_ext_regs(struct mmc_card *card)
 	 */
 	err = sd_read_ext_reg(card, 0, 0, 0, 512, gen_info_buf);
 	if (err) {
-		pr_warn("%s: error %d reading general info of SD ext reg\n",
+		pr_err("%s: error %d reading general info of SD ext reg\n",
 			mmc_hostname(card->host), err);
 		goto out;
 	}
@@ -1273,7 +1273,12 @@ static int sd_read_ext_regs(struct mmc_card *card)
 	/* Number of extensions to be find. */
 	num_ext = gen_info_buf[4];
 
-	/* We support revision 0, but limit it to 512 bytes for simplicity. */
+	/*
+	 * We only support revision 0, and limit it to 512 bytes for simplicity.
+	 * In other cases, success 0 is returned, because the card remains
+	 * functional and all but the new features from the SD function
+	 * extensions registers can still be used.
+	 */
 	if (rev != 0 || len > 512) {
 		pr_warn("%s: non-supported SD ext reg layout\n",
 			mmc_hostname(card->host));
@@ -1288,7 +1293,7 @@ static int sd_read_ext_regs(struct mmc_card *card)
 	for (i = 0; i < num_ext; i++) {
 		err = sd_parse_ext_reg(card, gen_info_buf, &next_ext_addr);
 		if (err) {
-			pr_warn("%s: error %d parsing SD ext reg\n",
+			pr_err("%s: error %d parsing SD ext reg\n",
 				mmc_hostname(card->host), err);
 			goto out;
 		}
Signature · 1 line
2.25.1
#1 lore raw
Quoted 9 lines · Zhen Lei

1. Use pr_err() to output the error message.
2. Add the description of why success 0 is returned in case "non-supported SD ext reg layout".

Fixes c784f92769ae ("mmc: core: Read the SD function extension registers for power management")
---
 drivers/mmc/core/sd.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Sorry, I forgot to add the version difference description.

v1 --> v2:
Add a description instead of returning an error code.

v1:
https://lkml.org/lkml/2022/11/30/240

Quoted 38 lines
drivers/mmc/core/sd.c +8 -3
index 3662bf5320ce56d..93ee53f74427c38 100644
@@ -1259,7 +1259,7 @@ static int sd_read_ext_regs(struct mmc_card *card)
 	 */
 	err = sd_read_ext_reg(card, 0, 0, 0, 512, gen_info_buf);
 	if (err) {
-		pr_warn("%s: error %d reading general info of SD ext reg\n",
+		pr_err("%s: error %d reading general info of SD ext reg\n",
 			mmc_hostname(card->host), err);
 		goto out;
 	}
@@ -1273,7 +1273,12 @@ static int sd_read_ext_regs(struct mmc_card *card)
 	/* Number of extensions to be find. */
 	num_ext = gen_info_buf[4];
 
-	/* We support revision 0, but limit it to 512 bytes for simplicity. */
+	/*
+	 * We only support revision 0, and limit it to 512 bytes for simplicity.
+	 * In other cases, success 0 is returned, because the card remains
+	 * functional and all but the new features from the SD function
+	 * extensions registers can still be used.
+	 */
 	if (rev != 0 || len > 512) {
 		pr_warn("%s: non-supported SD ext reg layout\n",
 			mmc_hostname(card->host));
@@ -1288,7 +1293,7 @@ static int sd_read_ext_regs(struct mmc_card *card)
 	for (i = 0; i < num_ext; i++) {
 		err = sd_parse_ext_reg(card, gen_info_buf, &next_ext_addr);
 		if (err) {
-			pr_warn("%s: error %d parsing SD ext reg\n",
+			pr_err("%s: error %d parsing SD ext reg\n",
 				mmc_hostname(card->host), err);
 			goto out;
 		}
Signature · 2 lines
Regards,
  Zhen Lei
#2 lore raw
In reply to Zhen Lei
Quoted 7 lines · Zhen Lei

1. Use pr_err() to output the error message.
2. Add the description of why success 0 is returned in case "non-supported SD ext reg layout".

Fixes c784f92769ae ("mmc: core: Read the SD function extension registers for power management")

Applied for next, thanks!

Kind regards
Uffe

Quoted 43 lines
---
 drivers/mmc/core/sd.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/mmc/core/sd.c +8 -4
index 3662bf5320ce56d..93ee53f74427c38 100644
@@ -1259,7 +1259,7 @@ static int sd_read_ext_regs(struct mmc_card *card)
         */
        err = sd_read_ext_reg(card, 0, 0, 0, 512, gen_info_buf);
        if (err) {
-               pr_warn("%s: error %d reading general info of SD ext reg\n",
+               pr_err("%s: error %d reading general info of SD ext reg\n",
                        mmc_hostname(card->host), err);
                goto out;
        }
@@ -1273,7 +1273,12 @@ static int sd_read_ext_regs(struct mmc_card *card)
        /* Number of extensions to be find. */
        num_ext = gen_info_buf[4];
 
-       /* We support revision 0, but limit it to 512 bytes for simplicity. */
+       /*
+        * We only support revision 0, and limit it to 512 bytes for simplicity.
+        * In other cases, success 0 is returned, because the card remains
+        * functional and all but the new features from the SD function
+        * extensions registers can still be used.
+        */
        if (rev != 0 || len > 512) {
                pr_warn("%s: non-supported SD ext reg layout\n",
                        mmc_hostname(card->host));
@@ -1288,7 +1293,7 @@ static int sd_read_ext_regs(struct mmc_card *card)
        for (i = 0; i < num_ext; i++) {
                err = sd_parse_ext_reg(card, gen_info_buf, &next_ext_addr);
                if (err) {
-                       pr_warn("%s: error %d parsing SD ext reg\n",
+                       pr_err("%s: error %d parsing SD ext reg\n",
                                mmc_hostname(card->host), err);
                        goto out;
                }
--

2.25.1