Skip to contentSkip to conversation

staging: mt7621-mmc: correctness fixes

PATCH Superseded George Hilliard 2 participants 5 messages Mar 26, 2019 – Mar 27, 2019

Subsystems (3)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover staging: mt7621-mmc: correctness fixes

Coding style fixup and rebase of v3, and resubmit of the Kconfig patch that got dropped from v2. No other changes.

Thanks for your continued attention and reviews!

George

#1 lore raw

PATCH v4 1/2 staging: mt7621-mmc: Remove obsolete Kconfig flags

These values are not referred to anywhere else in the kernel. Card detect is controlled by the device tree property "mediatek,cd-poll", and there is no driver support for eMMC whatsoever.

---
v2: Rewrite of v1
v3: [Not present]
v4: Resubmit of v2

 drivers/staging/mt7621-mmc/Kconfig | 8 --------
 1 file changed, 8 deletions(-)
drivers/staging/mt7621-mmc/Kconfig +0 -8
index 1eb79cd6e22f..01f231dd8511 100644
@@ -6,11 +6,3 @@ config MTK_AEE_KDUMP
 	bool "MTK AEE KDUMP"
 	depends on MTK_MMC
 
-config MTK_MMC_CD_POLL
-	bool "Card Detect with Polling"
-	depends on MTK_MMC
-
-config MTK_MMC_EMMC_8BIT
-	bool "eMMC 8-bit support"
-	depends on MTK_MMC && RALINK_MT7628
-
Signature · 1 line
2.21.0
#2 lore raw

PATCH v4 2/2 staging: mt7621-mmc: Initialize completions a single time during probe

In reply to George Hilliard

The module was initializing completions whenever it was going to wait on them, and not when the completion was allocated. This is incorrect according to the completion docs:

Calling init_completion() on the same completion object twice is most likely a bug [...]

Re-initialization is also unnecessary because the module never uses complete_all(). Fix this by only ever initializing the completion a single time, and log if the completions are not consumed as intended (this is not a fatal problem, but should not go unnoticed).

---
v2: rewrite of v1
v3: Remove BUG_ON() calls
v4: Indent style fixup

 drivers/staging/mt7621-mmc/sd.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/staging/mt7621-mmc/sd.c +14 -4
index e346167754bd..ed63bd3ba6cc 100644
@@ -466,7 +466,11 @@ static unsigned int msdc_command_start(struct msdc_host   *host,
 	host->cmd     = cmd;
 	host->cmd_rsp = resp;
 
-	init_completion(&host->cmd_done);
+	// The completion should have been consumed by the previous command
+	// response handler, because the mmc requests should be serialized
+	if(completion_done(&host->cmd_done))
+		dev_err(mmc_dev(host->mmc),
+		        "previous command was not handled\n");
 
 	sdr_set_bits(host->base + MSDC_INTEN, wints);
 	sdc_send_cmd(rawcmd, cmd->arg);
@@ -488,7 +492,6 @@ static unsigned int msdc_command_resp(struct msdc_host   *host,
 		    MSDC_INT_ACMD19_DONE;
 
 	BUG_ON(in_interrupt());
-	//init_completion(&host->cmd_done);
 	//sdr_set_bits(host->base + MSDC_INTEN, wints);
 
 	spin_unlock(&host->lock);
@@ -670,7 +673,13 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq)
 		//msdc_clr_fifo(host);  /* no need */
 
 		msdc_dma_on();  /* enable DMA mode first!! */
-		init_completion(&host->xfer_done);
+
+		// The completion should have been consumed by the previous
+		// xfer response handler, because the mmc requests should be
+		// serialized
+		if(completion_done(&host->cmd_done))
+			dev_err(mmc_dev(host->mmc),
+			        "previous transfer was not handled\n");
 
 		/* start the command first*/
 		if (msdc_command_start(host, cmd, CMD_TIMEOUT) != 0)
@@ -696,7 +705,6 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq)
 		/* for read, the data coming too fast, then CRC error
 		 *  start DMA no business with CRC.
 		 */
-		//init_completion(&host->xfer_done);
 		msdc_dma_start(host);
 
 		spin_unlock(&host->lock);
@@ -1687,6 +1695,8 @@ static int msdc_drv_probe(struct platform_device *pdev)
 	}
 	msdc_init_gpd_bd(host, &host->dma);
 
+	init_completion(&host->cmd_done);
+	init_completion(&host->xfer_done);
 	INIT_DELAYED_WORK(&host->card_delaywork, msdc_tasklet_card);
 	spin_lock_init(&host->lock);
 	msdc_init_hw(host);
Signature · 1 line
2.21.0
#3 lore raw

Re: [PATCH v4 2/2] staging: mt7621-mmc: Initialize completions a single time during probe

Quoted 26 lines · George Hilliard

The module was initializing completions whenever it was going to wait on them, and not when the completion was allocated. This is incorrect according to the completion docs:

Calling init_completion() on the same completion object twice is most likely a bug [...]

Re-initialization is also unnecessary because the module never uses complete_all(). Fix this by only ever initializing the completion a single time, and log if the completions are not consumed as intended (this is not a fatal problem, but should not go unnoticed).

---
v2: rewrite of v1
v3: Remove BUG_ON() calls
v4: Indent style fixup

 drivers/staging/mt7621-mmc/sd.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/staging/mt7621-mmc/sd.c +0 -0
index e346167754bd..ed63bd3ba6cc 100644

drivers/staging/mt7621-mmc/sd.c static unsigned int msdc_command_start(struct msdc_host *host, · line 471

Quoted 7 lines
drivers/staging/mt7621-mmc/sd.c +3 -1
@@ -466,7 +466,11 @@ static unsigned int msdc_command_start(struct msdc_host   *host,
 	host->cmd     = cmd;
 	host->cmd_rsp = resp;
 
-	init_completion(&host->cmd_done);
+	// The completion should have been consumed by the previous command
+	// response handler, because the mmc requests should be serialized
+	if(completion_done(&host->cmd_done))

Did you run your patch through checkpatch.pl? It should have reported an error here :(

#4 lore raw

Re: [PATCH v4 2/2] staging: mt7621-mmc: Initialize completions a single time during probe

Quoted 9 lines · Greg Kroah-Hartman

drivers/staging/mt7621-mmc/sd.c static unsigned int msdc_command_start(struct msdc_host *host, · line 471

Quoted 4 lines · George Hilliard
drivers/staging/mt7621-mmc/sd.c +3 -1
-     init_completion(&host->cmd_done);
+     // The completion should have been consumed by the previous command
+     // response handler, because the mmc requests should be serialized
+     if(completion_done(&host->cmd_done))

Did you run your patch through checkpatch.pl? It should have reported an error here :(

No, I didn't. My mistake, sorry. Will fix up and resend again.

George