mmc: dw_mmc: Allow lower TMOUT value than maximum
Subsystems (2)
PATCH v2 1/1 mmc: dw_mmc: Allow lower TMOUT value than maximum
The TMOUT register is always set with a full value for every transfer, which (with a 200MHz clock) will give a full DRTO of ~84 milliseconds. Since the software dto_timer acts as a backup in cases when this timeout is not long enough, it is normally not a problem. But setting a full value makes it impossible to test shorter timeouts, when for example testing data read times on different SD cards.
Add a function to set any value smaller than the maximum of 0xFFFFFF.
---
v2:
- Calculate new value before checking boundaries
- Include CLKDIV register to get proper value
drivers/mmc/host/dw_mmc.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
drivers/mmc/host/dw_mmc.c +31 -1
@@ -1283,6 +1283,36 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)mci_writel (host,CTYPE , (slot->ctype << slot->id)); } +static void dw_mci_set_data_timeout (struct dw_mci *host, +unsigned int timeout_ns) +{ +unsigned int clk_div, tmp, tmout; + + clk_div = (mci_readl (host,CLKDIV ) &0xFF ) *2 ; +if (clk_div ==0 ) + clk_div =1 ; + + tmp =DIV_ROUND_UP_ULL ((u64 )timeout_ns * host->bus_hz, +NSEC_PER_SEC * clk_div); + +if (!tmp || tmp >0xFFFFFF ) { +/* Set maximum */ + tmout =0xFFFFFFFF ; + goto tmout_done; + } + +/* TMOUT[7:0] (RESPONSE_TIMEOUT) */ + tmout =0xFF ;/* Set maximum */ + +/* TMOUT[31:8] (DATA_TIMEOUT) */ + tmout |= (tmp &0xFFFFFF ) <<8 ; + +tmout_done: +mci_writel (host,TMOUT , tmout); +dev_dbg (host->dev,"timeout_ns: %u => TMOUT[31:8]: 0x%06x" , + timeout_ns, tmout >>8 ); +} +static void __dw_mci_start_request (struct dw_mci *host,struct dw_mci_slot *slot,struct mmc_command *cmd)
@@ -1303,7 +1333,7 @@ static void __dw_mci_start_request(struct dw_mci *host, data = cmd->data;if (data) { -mci_writel (host,TMOUT ,0xFFFFFFFF ); +dw_mci_set_data_timeout (host, data->timeout_ns);mci_writel (host,BYTCNT , data->blksz*data->blocks);mci_writel (host,BLKSIZ , data->blksz); }
Signature · 1 line
2.20.1
Jaehoon Chung
maintainerHi Marten,
Quoted 31 lines · Mårten Lindahl
The TMOUT register is always set with a full value for every transfer, which (with a 200MHz clock) will give a full DRTO of ~84 milliseconds. Since the software
dto_timeracts as a backup in cases when this timeout is not long enough, it is normally not a problem. But setting a full value makes it impossible to test shorter timeouts, when for example testing data read times on different SD cards.Add a function to set any value smaller than the maximum of
0xFFFFFF.Signed-off-by Mårten Lindahl <[email protected]>---
v2:
- Calculate new value before checking boundaries
- Include CLKDIV register to get proper valuedrivers/mmc/host/dw_mmc.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)drivers/mmc/host/dw_mmc.c +4
-0@@ -1283,6 +1283,36 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)mci_writel (host,CTYPE , (slot->ctype << slot->id)); } +static void dw_mci_set_data_timeout (struct dw_mci *host, +unsigned int timeout_ns) +{ +unsigned int clk_div, tmp, tmout;
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1299
Quoted 10 lines
drivers/mmc/host/dw_mmc.c +10
-0+ + clk_div = (mci_readl (host,CLKDIV ) &0xFF ) *2 ; +if (clk_div ==0 ) + clk_div =1 ; + + tmp =DIV_ROUND_UP_ULL ((u64 )timeout_ns * host->bus_hz, +NSEC_PER_SEC * clk_div); + +if (!tmp || tmp >0xFFFFFF ) { +/* Set maximum */
"Set maximum value about all Timeout"?
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1302
Quoted 3 lines
drivers/mmc/host/dw_mmc.c +3
-0+ tmout =0xFFFFFFFF ; + goto tmout_done; + }
It doesn't need to use "goto". Instead, if-else can be used.
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1305
Quoted 3 lines
drivers/mmc/host/dw_mmc.c +3
-0+ +/* TMOUT[7:0] (RESPONSE_TIMEOUT) */ + tmout =0xFF ;/* Set maximum */
To prevent a confusion, how about add "Set a maximum response timeout" And this line can be removed.
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1308
Quoted 3 lines
drivers/mmc/host/dw_mmc.c +3
-0+ +/* TMOUT[31:8] (DATA_TIMEOUT) */ + tmout |= (tmp &0xFFFFFF ) <<8 ;
tmout = (0xFF | ((tmp & 0xFFFFFF) << 8));
The entire code can be below
if (!tmp || ....)
tmout = 0xFFFFFFFF; else tmout = (0xFF | ((tmp & 0xFFFFFF) << 8));
writel(TMOUT, ...)
How about this?
Best Regards,
Jaehoon Chung
Quoted 20 lines
drivers/mmc/host/dw_mmc.c +8
-1+ +tmout_done: +mci_writel (host,TMOUT , tmout); +dev_dbg (host->dev,"timeout_ns: %u => TMOUT[31:8]: 0x%06x" , + timeout_ns, tmout >>8 ); +} +static void __dw_mci_start_request (struct dw_mci *host,struct dw_mci_slot *slot,struct mmc_command *cmd)@@ -1303,7 +1333,7 @@ static void __dw_mci_start_request(struct dw_mci *host, data = cmd->data;if (data) { -mci_writel (host,TMOUT ,0xFFFFFFFF ); +dw_mci_set_data_timeout (host, data->timeout_ns);mci_writel (host,BYTCNT , data->blksz*data->blocks);mci_writel (host,BLKSIZ , data->blksz); }
Quoted 1 line · Jaehoon Chung
Hi Marten,
Hi Jaehoon!
Quoted 29 lines · Mårten Lindahl
Quoted 27 lines
The TMOUT register is always set with a full value for every transfer, which (with a 200MHz clock) will give a full DRTO of ~84 milliseconds. Since the software
dto_timeracts as a backup in cases when this timeout is not long enough, it is normally not a problem. But setting a full value makes it impossible to test shorter timeouts, when for example testing data read times on different SD cards.Add a function to set any value smaller than the maximum of
0xFFFFFF.Signed-off-by Mårten Lindahl <[email protected]>---
v2:
- Calculate new value before checking boundaries
- Include CLKDIV register to get proper valuedrivers/mmc/host/dw_mmc.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)drivers/mmc/host/dw_mmc.c +0
-0@@ -1283,6 +1283,36 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)mci_writel (host,CTYPE , (slot->ctype << slot->id)); }
Quoted 16 lines
Quoted 4 lines
drivers/mmc/host/dw_mmc.c +4
-0+static void dw_mci_set_data_timeout (struct dw_mci *host, +unsigned int timeout_ns) +{ +unsigned int clk_div, tmp, tmout;drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1299
Quoted 10 lines
drivers/mmc/host/dw_mmc.c +10
-0+ + clk_div = (mci_readl (host,CLKDIV ) &0xFF ) *2 ; +if (clk_div ==0 ) + clk_div =1 ; + + tmp =DIV_ROUND_UP_ULL ((u64 )timeout_ns * host->bus_hz, +NSEC_PER_SEC * clk_div); + +if (!tmp || tmp >0xFFFFFF ) { +/* Set maximum */ "Set maximum value about all Timeout"?
Do you mean just changing the comment here? Or do you wonder about the 0xFFFFFF check? 0xFFFFFF is the upper limit for this HW timer. If we want to support a longer timer than this, a software timer should be used, but in a separate patch.
Quoted 6 lines
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1302
Quoted 4 lines
drivers/mmc/host/dw_mmc.c +3
-0+ tmout =0xFFFFFFFF ; + goto tmout_done; + }It doesn't need to use "goto". Instead, if-else can be used.
If you prefer it I can change goto to if-else
Quoted 7 lines
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1305
Quoted 4 lines
drivers/mmc/host/dw_mmc.c +3
-0+ +/* TMOUT[7:0] (RESPONSE_TIMEOUT) */ + tmout =0xFF ;/* Set maximum */ To prevent a confusion, how about add "Set a maximum response timeout" And this line can be removed.
But if removing the lines above, the comment will also be removed. I see your point, but couldn't there be more confusion by merging both fields into one line? My intention was to specify the TMOUT register fields separately to make it more clear.
Quoted 9 lines
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1308
Quoted 4 lines
drivers/mmc/host/dw_mmc.c +3
-0+ +/* TMOUT[31:8] (DATA_TIMEOUT) */ + tmout |= (tmp &0xFFFFFF ) <<8 ;tmout = (
0xFF| ((tmp &0xFFFFFF) << 8));The entire code can be below
Quoted 8 lines
if (!tmp || ....)
tmout = 0xFFFFFFFF; else tmout = (0xFF | ((tmp & 0xFFFFFF) << 8));
writel(TMOUT, ...)How about this?
I agree that this is smaller code, but as I said above it may not be clear that there are more than one field in the TMOUT register. Wouldn't it raise questions about the 0xFF?
Kind regards
Mårten
Quoted 25 lines
Best Regards,
Jaehoon ChungQuoted 20 lines
drivers/mmc/host/dw_mmc.c +8
-1+ +tmout_done: +mci_writel (host,TMOUT , tmout); +dev_dbg (host->dev,"timeout_ns: %u => TMOUT[31:8]: 0x%06x" , + timeout_ns, tmout >>8 ); +} +static void __dw_mci_start_request (struct dw_mci *host,struct dw_mci_slot *slot,struct mmc_command *cmd)@@ -1303,7 +1333,7 @@ static void __dw_mci_start_request(struct dw_mci *host, data = cmd->data;if (data) { -mci_writel (host,TMOUT ,0xFFFFFFFF ); +dw_mci_set_data_timeout (host, data->timeout_ns);mci_writel (host,BYTCNT , data->blksz*data->blocks);mci_writel (host,BLKSIZ , data->blksz); }
Jaehoon Chung
maintainerQuoted 51 lines · Marten Lindahl
Quoted 1 line · Jaehoon Chung
Hi Marten,
Hi Jaehoon!
Quoted 29 lines · Mårten Lindahl
Quoted 27 lines
The TMOUT register is always set with a full value for every transfer, which (with a 200MHz clock) will give a full DRTO of ~84 milliseconds. Since the software
dto_timeracts as a backup in cases when this timeout is not long enough, it is normally not a problem. But setting a full value makes it impossible to test shorter timeouts, when for example testing data read times on different SD cards.Add a function to set any value smaller than the maximum of
0xFFFFFF.Signed-off-by Mårten Lindahl <[email protected]>---
v2:
- Calculate new value before checking boundaries
- Include CLKDIV register to get proper valuedrivers/mmc/host/dw_mmc.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)drivers/mmc/host/dw_mmc.c +0
-0@@ -1283,6 +1283,36 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)mci_writel (host,CTYPE , (slot->ctype << slot->id)); }Quoted 16 lines
Quoted 4 lines
drivers/mmc/host/dw_mmc.c +4
-0+static void dw_mci_set_data_timeout (struct dw_mci *host, +unsigned int timeout_ns) +{ +unsigned int clk_div, tmp, tmout;drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1299
Quoted 10 lines
drivers/mmc/host/dw_mmc.c +10
-0+ + clk_div = (mci_readl (host,CLKDIV ) &0xFF ) *2 ; +if (clk_div ==0 ) + clk_div =1 ; + + tmp =DIV_ROUND_UP_ULL ((u64 )timeout_ns * host->bus_hz, +NSEC_PER_SEC * clk_div); + +if (!tmp || tmp >0xFFFFFF ) { +/* Set maximum */ "Set maximum value about all Timeout"?
Quoted 4 lines
Do you mean just changing the comment here? Or do you wonder about the
0xFFFFFFcheck?0xFFFFFFis the upper limit for this HW timer. If we want to support a longer timer than this, a software timer should be used, but in a separate patch.
My mean is how about changing the comment to clarify than now. At below, tmout is set to maximum value about data/response timeout.
Quoted 9 lines
Quoted 7 lines
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1302
Quoted 5 lines
drivers/mmc/host/dw_mmc.c +3
-0+ tmout =0xFFFFFFFF ; + goto tmout_done; + }It doesn't need to use "goto". Instead, if-else can be used.
If you prefer it I can change goto to if-else
Well, it's just my preference. If you're ok, I hope that so.
Quoted 9 lines
Quoted 8 lines
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1305
Quoted 5 lines
drivers/mmc/host/dw_mmc.c +3
-0+ +/* TMOUT[7:0] (RESPONSE_TIMEOUT) */ + tmout =0xFF ;/* Set maximum */ To prevent a confusion, how about add "Set a maximum response timeout" And this line can be removed.
Quoted 4 lines
But if removing the lines above, the comment will also be removed. I see your point, but couldn't there be more confusion by merging both fields into one line? My intention was to specify the TMOUT register fields separately to make it more clear.
Agreed. It's more clear than my opinion.
Best Regards,
Jaehoon Chung
Quoted 52 lines
Quoted 10 lines
drivers/mmc/host/dw_mmc.c static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · line 1308
Quoted 5 lines
drivers/mmc/host/dw_mmc.c +3
-0+ +/* TMOUT[31:8] (DATA_TIMEOUT) */ + tmout |= (tmp &0xFFFFFF ) <<8 ;tmout = (
0xFF| ((tmp &0xFFFFFF) << 8));The entire code can be below
Quoted 8 lines
if (!tmp || ....)
tmout = 0xFFFFFFFF; else tmout = (0xFF | ((tmp & 0xFFFFFF) << 8));
writel(TMOUT, ...)How about this?
I agree that this is smaller code, but as I said above it may not be clear that there are more than one field in the TMOUT register. Wouldn't it raise questions about the
0xFF?Kind regards
MårtenQuoted 25 lines
Best Regards,
Jaehoon ChungQuoted 20 lines
drivers/mmc/host/dw_mmc.c +8
-1+ +tmout_done: +mci_writel (host,TMOUT , tmout); +dev_dbg (host->dev,"timeout_ns: %u => TMOUT[31:8]: 0x%06x" , + timeout_ns, tmout >>8 ); +} +static void __dw_mci_start_request (struct dw_mci *host,struct dw_mci_slot *slot,struct mmc_command *cmd)@@ -1303,7 +1333,7 @@ static void __dw_mci_start_request(struct dw_mci *host, data = cmd->data;if (data) { -mci_writel (host,TMOUT ,0xFFFFFFFF ); +dw_mci_set_data_timeout (host, data->timeout_ns);mci_writel (host,BYTCNT , data->blksz*data->blocks);mci_writel (host,BLKSIZ , data->blksz); }