mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-09-04 20:19:47 +08:00 
			
		
		
		
	 e13934bdf4
			
		
	
	
		e13934bdf4
		
	
	
	
	
		
			
			commit64b12a68a9"mmc: core: fix prepared requests while doing bkops" is fixing a bug in the wrong way. A bug in the MMCI device driver is fixed by amending the MMC core. Thinking about it: what the pre- and post-callbacks are doing is to essentially map and unmap SG lists for DMA transfers. Why would we not be able to do that just because a BKOPS command is sent inbetween? Having to unprepare/prepare the next asynchronous request for DMA seems wrong. Looking the backtrace in that commit we can see what the real problem actually is: mmci_data_irq() is calling mmci_dma_unmap() twice which is goung to call arm_dma_unmap_sg() twice and v7_dma_inv_range() twice for the same sglist and that will crash. This happens because a request is prepared, then a BKOPS is sent. The IRQ completing the BKOPS command goes through mmci_data_irq() and thinks that a DMA operation has just been completed because dma_inprogress() reports true. It then proceeds to unmap the sglist. But that was wrong! dma_inprogress() should NOT be true because no DMA was actually in progress! We had just prepared the sglist, and the DMA channel dma_current has been configured, but NOT started! Because of this, the sglist is already unmapped when we get our actual data completion IRQ, and we are unmapping the sglist once more, and we get this crash. Therefore, we need to revert this solution pushing the problem to the core and causing problems, and instead augment the implementation such that dma_inprogress() only reports true if some DMA has actually been started. After this we can keep the request prepared during the BKOPS and we need not unprepare/reprepare it. Fixes:64b12a68a9("mmc: core: fix prepared requests while doing bkops") Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
		
			
				
	
	
		
			256 lines
		
	
	
		
			7.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			256 lines
		
	
	
		
			7.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  *  linux/drivers/mmc/host/mmci.h - ARM PrimeCell MMCI PL180/1 driver
 | |
|  *
 | |
|  *  Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify
 | |
|  * it under the terms of the GNU General Public License version 2 as
 | |
|  * published by the Free Software Foundation.
 | |
|  */
 | |
| #define MMCIPOWER		0x000
 | |
| #define MCI_PWR_OFF		0x00
 | |
| #define MCI_PWR_UP		0x02
 | |
| #define MCI_PWR_ON		0x03
 | |
| #define MCI_OD			(1 << 6)
 | |
| #define MCI_ROD			(1 << 7)
 | |
| /*
 | |
|  * The ST Micro version does not have ROD and reuse the voltage registers for
 | |
|  * direction settings.
 | |
|  */
 | |
| #define MCI_ST_DATA2DIREN	(1 << 2)
 | |
| #define MCI_ST_CMDDIREN		(1 << 3)
 | |
| #define MCI_ST_DATA0DIREN	(1 << 4)
 | |
| #define MCI_ST_DATA31DIREN	(1 << 5)
 | |
| #define MCI_ST_FBCLKEN		(1 << 7)
 | |
| #define MCI_ST_DATA74DIREN	(1 << 8)
 | |
| 
 | |
| #define MMCICLOCK		0x004
 | |
| #define MCI_CLK_ENABLE		(1 << 8)
 | |
| #define MCI_CLK_PWRSAVE		(1 << 9)
 | |
| #define MCI_CLK_BYPASS		(1 << 10)
 | |
| #define MCI_4BIT_BUS		(1 << 11)
 | |
| /*
 | |
|  * 8bit wide buses, hardware flow contronl, negative edges and clock inversion
 | |
|  * supported in ST Micro U300 and Ux500 versions
 | |
|  */
 | |
| #define MCI_ST_8BIT_BUS		(1 << 12)
 | |
| #define MCI_ST_U300_HWFCEN	(1 << 13)
 | |
| #define MCI_ST_UX500_NEG_EDGE	(1 << 13)
 | |
| #define MCI_ST_UX500_HWFCEN	(1 << 14)
 | |
| #define MCI_ST_UX500_CLK_INV	(1 << 15)
 | |
| /* Modified PL180 on Versatile Express platform */
 | |
| #define MCI_ARM_HWFCEN		(1 << 12)
 | |
| 
 | |
| /* Modified on Qualcomm Integrations */
 | |
| #define MCI_QCOM_CLK_WIDEBUS_8	(BIT(10) | BIT(11))
 | |
| #define MCI_QCOM_CLK_FLOWENA	BIT(12)
 | |
| #define MCI_QCOM_CLK_INVERTOUT	BIT(13)
 | |
| 
 | |
| /* select in latch data and command in */
 | |
| #define MCI_QCOM_CLK_SELECT_IN_FBCLK	BIT(15)
 | |
| #define MCI_QCOM_CLK_SELECT_IN_DDR_MODE	(BIT(14) | BIT(15))
 | |
| 
 | |
| #define MMCIARGUMENT		0x008
 | |
| 
 | |
| /* The command register controls the Command Path State Machine (CPSM) */
 | |
| #define MMCICOMMAND		0x00c
 | |
| #define MCI_CPSM_RESPONSE	BIT(6)
 | |
| #define MCI_CPSM_LONGRSP	BIT(7)
 | |
| #define MCI_CPSM_INTERRUPT	BIT(8)
 | |
| #define MCI_CPSM_PENDING	BIT(9)
 | |
| #define MCI_CPSM_ENABLE		BIT(10)
 | |
| /* Command register flag extenstions in the ST Micro versions */
 | |
| #define MCI_CPSM_ST_SDIO_SUSP		BIT(11)
 | |
| #define MCI_CPSM_ST_ENCMD_COMPL		BIT(12)
 | |
| #define MCI_CPSM_ST_NIEN		BIT(13)
 | |
| #define MCI_CPSM_ST_CE_ATACMD		BIT(14)
 | |
| /* Command register flag extensions in the Qualcomm versions */
 | |
| #define MCI_CPSM_QCOM_PROGENA		BIT(11)
 | |
| #define MCI_CPSM_QCOM_DATCMD		BIT(12)
 | |
| #define MCI_CPSM_QCOM_MCIABORT		BIT(13)
 | |
| #define MCI_CPSM_QCOM_CCSENABLE		BIT(14)
 | |
| #define MCI_CPSM_QCOM_CCSDISABLE	BIT(15)
 | |
| #define MCI_CPSM_QCOM_AUTO_CMD19	BIT(16)
 | |
| #define MCI_CPSM_QCOM_AUTO_CMD21	BIT(21)
 | |
| 
 | |
| #define MMCIRESPCMD		0x010
 | |
| #define MMCIRESPONSE0		0x014
 | |
| #define MMCIRESPONSE1		0x018
 | |
| #define MMCIRESPONSE2		0x01c
 | |
| #define MMCIRESPONSE3		0x020
 | |
| #define MMCIDATATIMER		0x024
 | |
| #define MMCIDATALENGTH		0x028
 | |
| 
 | |
| /* The data control register controls the Data Path State Machine (DPSM) */
 | |
| #define MMCIDATACTRL		0x02c
 | |
| #define MCI_DPSM_ENABLE		BIT(0)
 | |
| #define MCI_DPSM_DIRECTION	BIT(1)
 | |
| #define MCI_DPSM_MODE		BIT(2)
 | |
| #define MCI_DPSM_DMAENABLE	BIT(3)
 | |
| #define MCI_DPSM_BLOCKSIZE	BIT(4)
 | |
| /* Control register extensions in the ST Micro U300 and Ux500 versions */
 | |
| #define MCI_DPSM_ST_RWSTART	BIT(8)
 | |
| #define MCI_DPSM_ST_RWSTOP	BIT(9)
 | |
| #define MCI_DPSM_ST_RWMOD	BIT(10)
 | |
| #define MCI_DPSM_ST_SDIOEN	BIT(11)
 | |
| /* Control register extensions in the ST Micro Ux500 versions */
 | |
| #define MCI_DPSM_ST_DMAREQCTL	BIT(12)
 | |
| #define MCI_DPSM_ST_DBOOTMODEEN	BIT(13)
 | |
| #define MCI_DPSM_ST_BUSYMODE	BIT(14)
 | |
| #define MCI_DPSM_ST_DDRMODE	BIT(15)
 | |
| /* Control register extensions in the Qualcomm versions */
 | |
| #define MCI_DPSM_QCOM_DATA_PEND	BIT(17)
 | |
| #define MCI_DPSM_QCOM_RX_DATA_PEND BIT(20)
 | |
| 
 | |
| #define MMCIDATACNT		0x030
 | |
| #define MMCISTATUS		0x034
 | |
| #define MCI_CMDCRCFAIL		(1 << 0)
 | |
| #define MCI_DATACRCFAIL		(1 << 1)
 | |
| #define MCI_CMDTIMEOUT		(1 << 2)
 | |
| #define MCI_DATATIMEOUT		(1 << 3)
 | |
| #define MCI_TXUNDERRUN		(1 << 4)
 | |
| #define MCI_RXOVERRUN		(1 << 5)
 | |
| #define MCI_CMDRESPEND		(1 << 6)
 | |
| #define MCI_CMDSENT		(1 << 7)
 | |
| #define MCI_DATAEND		(1 << 8)
 | |
| #define MCI_STARTBITERR		(1 << 9)
 | |
| #define MCI_DATABLOCKEND	(1 << 10)
 | |
| #define MCI_CMDACTIVE		(1 << 11)
 | |
| #define MCI_TXACTIVE		(1 << 12)
 | |
| #define MCI_RXACTIVE		(1 << 13)
 | |
| #define MCI_TXFIFOHALFEMPTY	(1 << 14)
 | |
| #define MCI_RXFIFOHALFFULL	(1 << 15)
 | |
| #define MCI_TXFIFOFULL		(1 << 16)
 | |
| #define MCI_RXFIFOFULL		(1 << 17)
 | |
| #define MCI_TXFIFOEMPTY		(1 << 18)
 | |
| #define MCI_RXFIFOEMPTY		(1 << 19)
 | |
| #define MCI_TXDATAAVLBL		(1 << 20)
 | |
| #define MCI_RXDATAAVLBL		(1 << 21)
 | |
| /* Extended status bits for the ST Micro variants */
 | |
| #define MCI_ST_SDIOIT		(1 << 22)
 | |
| #define MCI_ST_CEATAEND		(1 << 23)
 | |
| #define MCI_ST_CARDBUSY		(1 << 24)
 | |
| 
 | |
| #define MMCICLEAR		0x038
 | |
| #define MCI_CMDCRCFAILCLR	(1 << 0)
 | |
| #define MCI_DATACRCFAILCLR	(1 << 1)
 | |
| #define MCI_CMDTIMEOUTCLR	(1 << 2)
 | |
| #define MCI_DATATIMEOUTCLR	(1 << 3)
 | |
| #define MCI_TXUNDERRUNCLR	(1 << 4)
 | |
| #define MCI_RXOVERRUNCLR	(1 << 5)
 | |
| #define MCI_CMDRESPENDCLR	(1 << 6)
 | |
| #define MCI_CMDSENTCLR		(1 << 7)
 | |
| #define MCI_DATAENDCLR		(1 << 8)
 | |
| #define MCI_STARTBITERRCLR	(1 << 9)
 | |
| #define MCI_DATABLOCKENDCLR	(1 << 10)
 | |
| /* Extended status bits for the ST Micro variants */
 | |
| #define MCI_ST_SDIOITC		(1 << 22)
 | |
| #define MCI_ST_CEATAENDC	(1 << 23)
 | |
| #define MCI_ST_BUSYENDC		(1 << 24)
 | |
| 
 | |
| #define MMCIMASK0		0x03c
 | |
| #define MCI_CMDCRCFAILMASK	(1 << 0)
 | |
| #define MCI_DATACRCFAILMASK	(1 << 1)
 | |
| #define MCI_CMDTIMEOUTMASK	(1 << 2)
 | |
| #define MCI_DATATIMEOUTMASK	(1 << 3)
 | |
| #define MCI_TXUNDERRUNMASK	(1 << 4)
 | |
| #define MCI_RXOVERRUNMASK	(1 << 5)
 | |
| #define MCI_CMDRESPENDMASK	(1 << 6)
 | |
| #define MCI_CMDSENTMASK		(1 << 7)
 | |
| #define MCI_DATAENDMASK		(1 << 8)
 | |
| #define MCI_STARTBITERRMASK	(1 << 9)
 | |
| #define MCI_DATABLOCKENDMASK	(1 << 10)
 | |
| #define MCI_CMDACTIVEMASK	(1 << 11)
 | |
| #define MCI_TXACTIVEMASK	(1 << 12)
 | |
| #define MCI_RXACTIVEMASK	(1 << 13)
 | |
| #define MCI_TXFIFOHALFEMPTYMASK	(1 << 14)
 | |
| #define MCI_RXFIFOHALFFULLMASK	(1 << 15)
 | |
| #define MCI_TXFIFOFULLMASK	(1 << 16)
 | |
| #define MCI_RXFIFOFULLMASK	(1 << 17)
 | |
| #define MCI_TXFIFOEMPTYMASK	(1 << 18)
 | |
| #define MCI_RXFIFOEMPTYMASK	(1 << 19)
 | |
| #define MCI_TXDATAAVLBLMASK	(1 << 20)
 | |
| #define MCI_RXDATAAVLBLMASK	(1 << 21)
 | |
| /* Extended status bits for the ST Micro variants */
 | |
| #define MCI_ST_SDIOITMASK	(1 << 22)
 | |
| #define MCI_ST_CEATAENDMASK	(1 << 23)
 | |
| #define MCI_ST_BUSYENDMASK	(1 << 24)
 | |
| 
 | |
| #define MMCIMASK1		0x040
 | |
| #define MMCIFIFOCNT		0x048
 | |
| #define MMCIFIFO		0x080 /* to 0x0bc */
 | |
| 
 | |
| #define MCI_IRQENABLE	\
 | |
| 	(MCI_CMDCRCFAILMASK|MCI_DATACRCFAILMASK|MCI_CMDTIMEOUTMASK|	\
 | |
| 	MCI_DATATIMEOUTMASK|MCI_TXUNDERRUNMASK|MCI_RXOVERRUNMASK|	\
 | |
| 	MCI_CMDRESPENDMASK|MCI_CMDSENTMASK|MCI_STARTBITERRMASK)
 | |
| 
 | |
| /* These interrupts are directed to IRQ1 when two IRQ lines are available */
 | |
| #define MCI_IRQ1MASK \
 | |
| 	(MCI_RXFIFOHALFFULLMASK | MCI_RXDATAAVLBLMASK | \
 | |
| 	 MCI_TXFIFOHALFEMPTYMASK)
 | |
| 
 | |
| #define NR_SG		128
 | |
| 
 | |
| struct clk;
 | |
| struct variant_data;
 | |
| struct dma_chan;
 | |
| 
 | |
| struct mmci_host_next {
 | |
| 	struct dma_async_tx_descriptor	*dma_desc;
 | |
| 	struct dma_chan			*dma_chan;
 | |
| 	s32				cookie;
 | |
| };
 | |
| 
 | |
| struct mmci_host {
 | |
| 	phys_addr_t		phybase;
 | |
| 	void __iomem		*base;
 | |
| 	struct mmc_request	*mrq;
 | |
| 	struct mmc_command	*cmd;
 | |
| 	struct mmc_data		*data;
 | |
| 	struct mmc_host		*mmc;
 | |
| 	struct clk		*clk;
 | |
| 	bool			singleirq;
 | |
| 
 | |
| 	spinlock_t		lock;
 | |
| 
 | |
| 	unsigned int		mclk;
 | |
| 	/* cached value of requested clk in set_ios */
 | |
| 	unsigned int		clock_cache;
 | |
| 	unsigned int		cclk;
 | |
| 	u32			pwr_reg;
 | |
| 	u32			pwr_reg_add;
 | |
| 	u32			clk_reg;
 | |
| 	u32			datactrl_reg;
 | |
| 	u32			busy_status;
 | |
| 	bool			vqmmc_enabled;
 | |
| 	struct mmci_platform_data *plat;
 | |
| 	struct variant_data	*variant;
 | |
| 
 | |
| 	u8			hw_designer;
 | |
| 	u8			hw_revision:4;
 | |
| 
 | |
| 	struct timer_list	timer;
 | |
| 	unsigned int		oldstat;
 | |
| 
 | |
| 	/* pio stuff */
 | |
| 	struct sg_mapping_iter	sg_miter;
 | |
| 	unsigned int		size;
 | |
| 	int (*get_rx_fifocnt)(struct mmci_host *h, u32 status, int remain);
 | |
| 
 | |
| #ifdef CONFIG_DMA_ENGINE
 | |
| 	/* DMA stuff */
 | |
| 	struct dma_chan		*dma_current;
 | |
| 	struct dma_chan		*dma_rx_channel;
 | |
| 	struct dma_chan		*dma_tx_channel;
 | |
| 	struct dma_async_tx_descriptor	*dma_desc_current;
 | |
| 	struct mmci_host_next	next_data;
 | |
| 	bool			dma_in_progress;
 | |
| 
 | |
| #define dma_inprogress(host)	((host)->dma_in_progress)
 | |
| #else
 | |
| #define dma_inprogress(host)	(0)
 | |
| #endif
 | |
| };
 | |
| 
 |