On 10/06/19 9:53 PM, Raul E Rangel wrote: > sdhci_send_tuning uses mmc->ios.bus_width to determine the block size. > Without this patch the block size would be set incorrectly when the > bus_width == 8 which results in tuning failing. > > Signed-off-by: Raul E Rangel <rrangel@xxxxxxxxxxxx> Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> > --- > > drivers/mmc/host/sdhci-pci-o2micro.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c > index b29bf4e7dcb48..dd21315922c87 100644 > --- a/drivers/mmc/host/sdhci-pci-o2micro.c > +++ b/drivers/mmc/host/sdhci-pci-o2micro.c > @@ -115,6 +115,7 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) > */ > if (mmc->ios.bus_width == MMC_BUS_WIDTH_8) { > current_bus_width = mmc->ios.bus_width; > + mmc->ios.bus_width = MMC_BUS_WIDTH_4; > sdhci_set_bus_width(host, MMC_BUS_WIDTH_4); > } > > @@ -126,8 +127,10 @@ static int sdhci_o2_execute_tuning(struct mmc_host *mmc, u32 opcode) > > sdhci_end_tuning(host); > > - if (current_bus_width == MMC_BUS_WIDTH_8) > + if (current_bus_width == MMC_BUS_WIDTH_8) { > + mmc->ios.bus_width = MMC_BUS_WIDTH_8; > sdhci_set_bus_width(host, current_bus_width); > + } > > host->flags &= ~SDHCI_HS400_TUNING; > return 0; >