Commit 347f6be1 authored by Ben Chuang's avatar Ben Chuang Committed by Ulf Hansson
Browse files

mmc: sdhci-pci-gli: Add CQHCI Support for GL9763E 



Add CQHCI initialization and implement CQHCI operations for GL9763E.
Use bit19 of the register (0x888) to decide whether to disable command
queuing. If the bit is set, the command queuing will be disabled.

Signed-off-by: default avatarBen Chuang <ben.chuang@genesyslogic.com.tw>
Link: https://lore.kernel.org/r/20201005105509.11343-1-ben.chuanggli@gmail.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f23cc3ba

drivers/mmc/host/sdhci-pci-gli.c

+148 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/delay.h>

#include "sdhci.h"

#include "sdhci-pci.h"

#include "cqhci.h"



/*  Genesys Logic extra registers */

#define SDHCI_GLI_9750_WT         0x800
@@ -81,9 +82,16 @@ 
#define   GLI_9763E_VHS_REV_R      0x0

#define   GLI_9763E_VHS_REV_M      0x1

#define   GLI_9763E_VHS_REV_W      0x2

#define PCIE_GLI_9763E_MB	 0x888

#define   GLI_9763E_MB_CMDQ_OFF	   BIT(19)

#define PCIE_GLI_9763E_SCR	 0x8E0

#define   GLI_9763E_SCR_AXI_REQ	   BIT(9)



#define SDHCI_GLI_9763E_CQE_BASE_ADDR	 0x200

#define GLI_9763E_CQE_TRNS_MODE	   (SDHCI_TRNS_MULTI | \

				    SDHCI_TRNS_BLK_CNT_EN | \

				    SDHCI_TRNS_DMA)



#define PCI_GLI_9755_WT       0x800

#define   PCI_GLI_9755_WT_EN    BIT(0)

#define   GLI_9755_WT_EN_ON     0x1
@@ -578,6 +586,30 @@ static int sdhci_pci_gli_resume(struct sdhci_pci_chip *chip) 


	return sdhci_pci_resume_host(chip);

}



static int sdhci_cqhci_gli_resume(struct sdhci_pci_chip *chip)

{

	struct sdhci_pci_slot *slot = chip->slots[0];

	int ret;



	ret = sdhci_pci_gli_resume(chip);

	if (ret)

		return ret;



	return cqhci_resume(slot->host->mmc);

}



static int sdhci_cqhci_gli_suspend(struct sdhci_pci_chip *chip)

{

	struct sdhci_pci_slot *slot = chip->slots[0];

	int ret;



	ret = cqhci_suspend(slot->host->mmc);

	if (ret)

		return ret;



	return sdhci_suspend_host(slot->host);

}

#endif



static void gl9763e_hs400_enhanced_strobe(struct mmc_host *mmc,
@@ -614,6 +646,110 @@ static void sdhci_set_gl9763e_signaling(struct sdhci_host *host, 
	sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);

}



static void sdhci_gl9763e_dumpregs(struct mmc_host *mmc)

{

	sdhci_dumpregs(mmc_priv(mmc));

}



static void sdhci_gl9763e_cqe_pre_enable(struct mmc_host *mmc)

{

	struct cqhci_host *cq_host = mmc->cqe_private;

	u32 value;



	value = cqhci_readl(cq_host, CQHCI_CFG);

	value |= CQHCI_ENABLE;

	cqhci_writel(cq_host, value, CQHCI_CFG);

}



static void sdhci_gl9763e_cqe_enable(struct mmc_host *mmc)

{

	struct sdhci_host *host = mmc_priv(mmc);



	sdhci_writew(host, GLI_9763E_CQE_TRNS_MODE, SDHCI_TRANSFER_MODE);

	sdhci_cqe_enable(mmc);

}



static u32 sdhci_gl9763e_cqhci_irq(struct sdhci_host *host, u32 intmask)

{

	int cmd_error = 0;

	int data_error = 0;



	if (!sdhci_cqe_irq(host, intmask, &cmd_error, &data_error))

		return intmask;



	cqhci_irq(host->mmc, intmask, cmd_error, data_error);



	return 0;

}



static void sdhci_gl9763e_cqe_post_disable(struct mmc_host *mmc)

{

	struct sdhci_host *host = mmc_priv(mmc);

	struct cqhci_host *cq_host = mmc->cqe_private;

	u32 value;



	value = cqhci_readl(cq_host, CQHCI_CFG);

	value &= ~CQHCI_ENABLE;

	cqhci_writel(cq_host, value, CQHCI_CFG);

	sdhci_writew(host, 0x0, SDHCI_TRANSFER_MODE);

}



static const struct cqhci_host_ops sdhci_gl9763e_cqhci_ops = {

	.enable         = sdhci_gl9763e_cqe_enable,

	.disable        = sdhci_cqe_disable,

	.dumpregs       = sdhci_gl9763e_dumpregs,

	.pre_enable     = sdhci_gl9763e_cqe_pre_enable,

	.post_disable   = sdhci_gl9763e_cqe_post_disable,

};



static int gl9763e_add_host(struct sdhci_pci_slot *slot)

{

	struct device *dev = &slot->chip->pdev->dev;

	struct sdhci_host *host = slot->host;

	struct cqhci_host *cq_host;

	bool dma64;

	int ret;



	ret = sdhci_setup_host(host);

	if (ret)

		return ret;



	cq_host = devm_kzalloc(dev, sizeof(*cq_host), GFP_KERNEL);

	if (!cq_host) {

		ret = -ENOMEM;

		goto cleanup;

	}



	cq_host->mmio = host->ioaddr + SDHCI_GLI_9763E_CQE_BASE_ADDR;

	cq_host->ops = &sdhci_gl9763e_cqhci_ops;



	dma64 = host->flags & SDHCI_USE_64_BIT_DMA;

	if (dma64)

		cq_host->caps |= CQHCI_TASK_DESC_SZ_128;



	ret = cqhci_init(cq_host, host->mmc, dma64);

	if (ret)

		goto cleanup;



	ret = __sdhci_add_host(host);

	if (ret)

		goto cleanup;



	return 0;



cleanup:

	sdhci_cleanup_host(host);

	return ret;

}



static void sdhci_gl9763e_reset(struct sdhci_host *host, u8 mask)

{

	if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL) &&

	    host->mmc->cqe_private)

		cqhci_deactivate(host->mmc);

	sdhci_reset(host, mask);

}



static void gli_set_gl9763e(struct sdhci_pci_slot *slot)

{

	struct pci_dev *pdev = slot->chip->pdev;
@@ -636,7 +772,9 @@ static void gli_set_gl9763e(struct sdhci_pci_slot *slot) 


static int gli_probe_slot_gl9763e(struct sdhci_pci_slot *slot)

{

	struct pci_dev *pdev = slot->chip->pdev;

	struct sdhci_host *host = slot->host;

	u32 value;



	host->mmc->caps |= MMC_CAP_8_BIT_DATA |

			   MMC_CAP_1_8V_DDR |
@@ -646,6 +784,11 @@ static int gli_probe_slot_gl9763e(struct sdhci_pci_slot *slot) 
			    MMC_CAP2_HS400_ES |

			    MMC_CAP2_NO_SDIO |

			    MMC_CAP2_NO_SD;



	pci_read_config_dword(pdev, PCIE_GLI_9763E_MB, &value);

	if (!(value & GLI_9763E_MB_CMDQ_OFF))

		host->mmc->caps2 |= MMC_CAP2_CQE | MMC_CAP2_CQE_DCMD;



	gli_pcie_enable_msi(slot);

	host->mmc_host_ops.hs400_enhanced_strobe =

					gl9763e_hs400_enhanced_strobe;
@@ -699,9 +842,10 @@ static const struct sdhci_ops sdhci_gl9763e_ops = { 
	.set_clock		= sdhci_set_clock,

	.enable_dma		= sdhci_pci_enable_dma,

	.set_bus_width		= sdhci_set_bus_width,

	.reset			= sdhci_reset,

	.reset			= sdhci_gl9763e_reset,

	.set_uhs_signaling	= sdhci_set_gl9763e_signaling,

	.voltage_switch		= sdhci_gli_voltage_switch,

	.irq                    = sdhci_gl9763e_cqhci_irq,

};



const struct sdhci_pci_fixes sdhci_gl9763e = {
@@ -709,6 +853,8 @@ const struct sdhci_pci_fixes sdhci_gl9763e = { 
	.probe_slot	= gli_probe_slot_gl9763e,

	.ops            = &sdhci_gl9763e_ops,

#ifdef CONFIG_PM_SLEEP

	.resume         = sdhci_pci_gli_resume,

	.resume		= sdhci_cqhci_gli_resume,

	.suspend	= sdhci_cqhci_gli_suspend,

#endif

	.add_host       = gl9763e_add_host,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE