Commit 63008768 authored by James Hogan's avatar James Hogan Committed by Chris Ball
Browse files

mmc: dw_mmc: move host->data_offset init earlier 



host->data_offset is initialised at the end of the probe function
depending on the VERID register, and is used for PIO operations. Move
this initialisation earlier, before IRQs or slots are initialised, to be
sure that PIO won't occur prior to host->data_offset being initialised.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Acked-by: default avatarSeungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent e6f34e2f

drivers/mmc/host/dw_mmc.c

+12 −12
Original line number Diff line number Diff line
@@ -2293,6 +2293,18 @@ int dw_mci_probe(struct dw_mci *host) 
	mci_writel(host, CLKENA, 0);

	mci_writel(host, CLKSRC, 0);



	/*

	 * In 2.40a spec, Data offset is changed.

	 * Need to check the version-id and set data-offset for DATA register.

	 */

	host->verid = SDMMC_GET_VERID(mci_readl(host, VERID));

	dev_info(host->dev, "Version ID is %04x\n", host->verid);



	if (host->verid < DW_MMC_240A)

		host->data_offset = DATA_OFFSET;

	else

		host->data_offset = DATA_240A_OFFSET;



	tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host);

	host->card_workqueue = alloc_workqueue("dw-mci-card",

			WQ_MEM_RECLAIM | WQ_NON_REENTRANT, 1);
@@ -2341,18 +2353,6 @@ int dw_mci_probe(struct dw_mci *host) 
		goto err_workqueue;

	}



	/*

	 * In 2.40a spec, Data offset is changed.

	 * Need to check the version-id and set data-offset for DATA register.

	 */

	host->verid = SDMMC_GET_VERID(mci_readl(host, VERID));

	dev_info(host->dev, "Version ID is %04x\n", host->verid);



	if (host->verid < DW_MMC_240A)

		host->data_offset = DATA_OFFSET;

	else

		host->data_offset = DATA_240A_OFFSET;



	if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO)

		dev_info(host->dev, "Internal DMAC interrupt fix enabled.\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE