| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <699030ea-b1bd-d85a-28bd-1d6735e65df8@intel.com>
Date: Wed, 12 Apr 2023 16:13:03 +0300
From: Adrian Hunter <adrian.hunter@...el.com>
To: Victor Shih <victorshihgli@...il.com>, ulf.hansson@...aro.org
Cc: linux-mmc@...r.kernel.org, linux-kernel@...r.kernel.org,
benchuanggli@...il.com, HL.Liu@...esyslogic.com.tw,
Greg.tu@...esyslogic.com.tw, takahiro.akashi@...aro.org,
dlunev@...omium.org, Victor Shih <victor.shih@...esyslogic.com.tw>,
Ben Chuang <ben.chuang@...esyslogic.com.tw>
Subject: Re: [PATCH V7 23/23] mmc: sdhci-pci-gli: enable UHS-II mode for
GL9755
On 31/03/23 13:55, Victor Shih wrote:
> Changes are:
> * Disable GL9755 overcurrent interrupt when power on/off on UHS-II.
> * Enable the internal clock when do reset on UHS-II mode.
> * Increase timeout value before detecting UHS-II interface.
> * Add vendor settings fro UHS-II mode.
>
> Signed-off-by: Ben Chuang <ben.chuang@...esyslogic.com.tw>
> Signed-off-by: AKASHI Takahiro <takahiro.akashi@...aro.org>
> Signed-off-by: Victor Shih <victor.shih@...esyslogic.com.tw>
> ---
> drivers/mmc/host/Kconfig | 1 +
> drivers/mmc/host/sdhci-pci-gli.c | 276 ++++++++++++++++++++++++++++++-
> 2 files changed, 276 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 06ab111eba3b..b89804d2da16 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -111,6 +111,7 @@ config MMC_SDHCI_PCI
> tristate "SDHCI support on PCI bus"
> depends on MMC_SDHCI && PCI
> select MMC_CQHCI
> + select MMC_SDHCI_UHS2
> select IOSF_MBI if X86
> select MMC_SDHCI_IO_ACCESSORS
> help
> diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
> index 633a8ee8f8c5..eedf6cd5c94a 100644
> --- a/drivers/mmc/host/sdhci-pci-gli.c
> +++ b/drivers/mmc/host/sdhci-pci-gli.c
> @@ -18,6 +18,7 @@
> #include "sdhci-cqhci.h"
> #include "sdhci-pci.h"
> #include "cqhci.h"
> +#include "sdhci-uhs2.h"
>
> /* Genesys Logic extra registers */
> #define SDHCI_GLI_9750_WT 0x800
> @@ -139,9 +140,36 @@
>
> #define PCI_GLI_9755_PLLSSC 0x68
> #define PCI_GLI_9755_PLLSSC_PPM GENMASK(15, 0)
> +#define PCI_GLI_9755_PLLSSC_RTL BIT(24)
> +#define GLI_9755_PLLSSC_RTL_VALUE 0x1
> +#define PCI_GLI_9755_PLLSSC_TRANS_PASS BIT(27)
> +#define GLI_9755_PLLSSC_TRANS_PASS_VALUE 0x1
> +#define PCI_GLI_9755_PLLSSC_RECV GENMASK(29, 28)
> +#define GLI_9755_PLLSSC_RECV_VALUE 0x3
> +#define PCI_GLI_9755_PLLSSC_TRAN GENMASK(31, 30)
> +#define GLI_9755_PLLSSC_TRAN_VALUE 0x3
> +
> +#define PCI_GLI_9755_UHS2_PLL 0x6C
> +#define PCI_GLI_9755_UHS2_PLL_SSC GENMASK(9, 8)
> +#define GLI_9755_UHS2_PLL_SSC_VALUE 0x0
> +#define PCI_GLI_9755_UHS2_PLL_DELAY BIT(18)
> +#define GLI_9755_UHS2_PLL_DELAY_VALUE 0x1
> +#define PCI_GLI_9755_UHS2_PLL_PDRST BIT(27)
> +#define GLI_9755_UHS2_PLL_PDRST_VALUE 0x1
>
> #define PCI_GLI_9755_SerDes 0x70
> +#define PCI_GLI_9755_UHS2_SERDES_INTR GENMASK(2, 0)
> +#define GLI_9755_UHS2_SERDES_INTR_VALUE 0x3
> +#define PCI_GLI_9755_UHS2_SERDES_ZC1 BIT(3)
> +#define GLI_9755_UHS2_SERDES_ZC1_VALUE 0x0
> +#define PCI_GLI_9755_UHS2_SERDES_ZC2 GENMASK(7, 4)
> +#define GLI_9755_UHS2_SERDES_ZC2_DEFAULT 0xB
> +#define GLI_9755_UHS2_SERDES_ZC2_SANDISK 0x0
> #define PCI_GLI_9755_SCP_DIS BIT(19)
> +#define PCI_GLI_9755_UHS2_SERDES_TRAN GENMASK(27, 24)
> +#define GLI_9755_UHS2_SERDES_TRAN_VALUE 0xC
> +#define PCI_GLI_9755_UHS2_SERDES_RECV GENMASK(31, 28)
> +#define GLI_9755_UHS2_SERDES_RECV_VALUE 0xF
>
> #define PCI_GLI_9755_MISC 0x78
> #define PCI_GLI_9755_MISC_SSC_OFF BIT(26)
> @@ -693,6 +721,244 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)
> gl9755_wt_off(pdev);
> }
>
> +static void gl9755_vendor_init(struct sdhci_host *host)
> +{
> + struct sdhci_pci_slot *slot = sdhci_priv(host);
> + struct pci_dev *pdev = slot->chip->pdev;
> + u32 serdes;
> + u32 pllssc;
> + u32 uhs2_pll;
> +
> + gl9755_wt_on(pdev);
> +
> + pci_read_config_dword(pdev, PCI_GLI_9755_SerDes, &serdes);
> + serdes &= ~PCI_GLI_9755_UHS2_SERDES_TRAN;
> + serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_TRAN,
> + GLI_9755_UHS2_SERDES_TRAN_VALUE);
> + serdes &= ~PCI_GLI_9755_UHS2_SERDES_RECV;
> + serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_RECV,
> + GLI_9755_UHS2_SERDES_RECV_VALUE);
> + serdes &= ~PCI_GLI_9755_UHS2_SERDES_INTR;
> + serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_INTR,
> + GLI_9755_UHS2_SERDES_INTR_VALUE);
> + serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC1;
> + serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_ZC1,
> + GLI_9755_UHS2_SERDES_ZC1_VALUE);
> + serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC2;
> + serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_ZC2,
> + GLI_9755_UHS2_SERDES_ZC2_DEFAULT);
> + pci_write_config_dword(pdev, PCI_GLI_9755_SerDes, serdes);
> +
> + pci_read_config_dword(pdev, PCI_GLI_9755_UHS2_PLL, &uhs2_pll);
> + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_SSC;
> + uhs2_pll |= FIELD_PREP(PCI_GLI_9755_UHS2_PLL_SSC,
> + GLI_9755_UHS2_PLL_SSC_VALUE);
> + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_DELAY;
> + uhs2_pll |= FIELD_PREP(PCI_GLI_9755_UHS2_PLL_DELAY,
> + GLI_9755_UHS2_PLL_DELAY_VALUE);
> + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_PDRST;
> + uhs2_pll |= FIELD_PREP(PCI_GLI_9755_UHS2_PLL_PDRST,
> + GLI_9755_UHS2_PLL_PDRST_VALUE);
> + pci_write_config_dword(pdev, PCI_GLI_9755_UHS2_PLL, uhs2_pll);
> +
> + pci_read_config_dword(pdev, PCI_GLI_9755_PLLSSC, &pllssc);
> + pllssc &= ~PCI_GLI_9755_PLLSSC_RTL;
> + pllssc |= FIELD_PREP(PCI_GLI_9755_PLLSSC_RTL,
> + GLI_9755_PLLSSC_RTL_VALUE);
> + pllssc &= ~PCI_GLI_9755_PLLSSC_TRANS_PASS;
> + pllssc |= FIELD_PREP(PCI_GLI_9755_PLLSSC_TRANS_PASS,
> + GLI_9755_PLLSSC_TRANS_PASS_VALUE);
> + pllssc &= ~PCI_GLI_9755_PLLSSC_RECV;
> + pllssc |= FIELD_PREP(PCI_GLI_9755_PLLSSC_RECV,
> + GLI_9755_PLLSSC_RECV_VALUE);
> + pllssc &= ~PCI_GLI_9755_PLLSSC_TRAN;
> + pllssc |= FIELD_PREP(PCI_GLI_9755_PLLSSC_TRAN,
> + GLI_9755_PLLSSC_TRAN_VALUE);
> + pci_write_config_dword(pdev, PCI_GLI_9755_PLLSSC, pllssc);
> +
> + gl9755_wt_off(pdev);
> +}
> +
> +static void gl9755_pre_detect_init(struct sdhci_host *host)
> +{
> + /* GL9755 need more time on UHS2 detect flow */
> + sdhci_writeb(host, 0xA7, SDHCI_UHS2_TIMER_CTRL);
> +}
> +
> +static void gl9755_overcurrent_event_enable(struct sdhci_host *host,
> + bool enable)
> +{
> + u32 mask;
> +
> + mask = sdhci_readl(host, SDHCI_SIGNAL_ENABLE);
> + if (enable)
> + mask |= SDHCI_INT_BUS_POWER;
> + else
> + mask &= ~SDHCI_INT_BUS_POWER;
> +
> + sdhci_writel(host, mask, SDHCI_SIGNAL_ENABLE);
> +
> + mask = sdhci_readl(host, SDHCI_INT_ENABLE);
> + if (enable)
> + mask |= SDHCI_INT_BUS_POWER;
> + else
> + mask &= ~SDHCI_INT_BUS_POWER;
> +
> + sdhci_writel(host, mask, SDHCI_INT_ENABLE);
> +}
> +
> +static void gl9755_set_power(struct sdhci_host *host, unsigned char mode,
> + unsigned short vdd)
> +{
> + u8 pwr = 0;
> +
> + if (mode != MMC_POWER_OFF) {
> + switch (1 << vdd) {
> + case MMC_VDD_165_195:
> + /*
> + * Without a regulator, SDHCI does not support 2.0v
> + * so we only get here if the driver deliberately
> + * added the 2.0v range to ocr_avail. Map it to 1.8v
> + * for the purpose of turning on the power.
> + */
> + case MMC_VDD_20_21:
> + pwr = SDHCI_POWER_180;
> + break;
> + case MMC_VDD_29_30:
> + case MMC_VDD_30_31:
> + pwr = SDHCI_POWER_300;
> + break;
> + case MMC_VDD_32_33:
> + case MMC_VDD_33_34:
> + pwr = SDHCI_POWER_330;
> + break;
> + default:
> + WARN(1, "%s: Invalid vdd %#x\n",
> + mmc_hostname(host->mmc), vdd);
> + break;
> + }
Should be able to use sdhci_get_vdd_value() here
> +
> + pwr |= SDHCI_VDD2_POWER_180;
> + }
> +
> + if (host->pwr == pwr)
> + return;
> +
> + host->pwr = pwr;
> +
> + if (pwr == 0) {
> + gl9755_overcurrent_event_enable(host, false);
> + sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
> + } else {
> + gl9755_overcurrent_event_enable(host, false);
> + sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
> +
> + pwr |= (SDHCI_POWER_ON | SDHCI_VDD2_POWER_ON);
> +
> + sdhci_writeb(host, pwr & 0xf, SDHCI_POWER_CONTROL);
> + /* wait stable */
> + mdelay(5);
> + sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL);
> + /* wait stable */
> + mdelay(5);
> + gl9755_overcurrent_event_enable(host, true);
> + }
> +}
> +
> +static bool sdhci_wait_clock_stable(struct sdhci_host *host)
> +{
> + u16 clk = 0;
> + ktime_t timeout;
> +
> + /* Wait max 20 ms */
> + timeout = ktime_add_ms(ktime_get(), 20);
> + while (1) {
> + bool timedout = ktime_after(ktime_get(), timeout);
> +
> + clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
> + if (clk & SDHCI_CLOCK_INT_STABLE)
> + break;
> + if (timedout) {
> + pr_err("%s: Internal clock never stabilised.\n",
> + mmc_hostname(host->mmc));
> + sdhci_dumpregs(host);
> + return false;
> + }
> + udelay(10);
> + }
This could be:
if (read_poll_timeout_atomic(sdhci_readw, clk, (clk & SDHCI_CLOCK_INT_STABLE),
10, 20000, false, host, SDHCI_CLOCK_CONTROL)) {
pr_err("%s: Internal clock never stabilised.\n",
mmc_hostname(host->mmc));
sdhci_dumpregs(host);
return false;
}
> + return true;
> +}
> +
> +static void gl9755_uhs2_reset_sd_tran(struct sdhci_host *host)
> +{
> + /* do this on UHS2 mode */
> + if (host->mmc->flags & MMC_UHS2_SD_TRAN) {
> + sdhci_uhs2_reset(host, SDHCI_UHS2_SW_RESET_SD);
> + sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
> + sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
> + sdhci_uhs2_clear_set_irqs(host,
> + SDHCI_INT_ALL_MASK,
> + SDHCI_UHS2_INT_ERROR_MASK);
> + }
> +}
> +
> +static void sdhci_gl9755_reset(struct sdhci_host *host, u8 mask)
> +{
> + ktime_t timeout;
> + u16 ctrl2;
> + u16 clk_ctrl;
> +
> + /* need internal clock */
> + if (mask & SDHCI_RESET_ALL) {
> + ctrl2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
> + clk_ctrl = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
> +
> + if ((ctrl2 & SDHCI_CTRL_V4_MODE) &&
> + (ctrl2 & SDHCI_CTRL_UHS2_ENABLE)) {
> + sdhci_writew(host,
> + SDHCI_CLOCK_INT_EN,
> + SDHCI_CLOCK_CONTROL);
> + } else {
> + sdhci_writew(host,
> + SDHCI_CLOCK_INT_EN,
> + SDHCI_CLOCK_CONTROL);
> + sdhci_wait_clock_stable(host);
> + sdhci_writew(host,
> + SDHCI_CTRL_V4_MODE,
> + SDHCI_HOST_CONTROL2);
> + }
> + }
> +
> + sdhci_writeb(host, mask, SDHCI_SOFTWARE_RESET);
> +
> + /* reset sd-tran on UHS2 mode if need to reset cmd/data */
> + if ((mask & SDHCI_RESET_CMD) | (mask & SDHCI_RESET_DATA))
> + gl9755_uhs2_reset_sd_tran(host);
> +
> + if (mask & SDHCI_RESET_ALL)
> + host->clock = 0;
> +
> + /* Wait max 100 ms */
> + timeout = ktime_add_ms(ktime_get(), 100);
> +
> + /* hw clears the bit when it's done */
> + while (1) {
> + bool timedout = ktime_after(ktime_get(), timeout);
> +
> + if (!(sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask))
> + break;
> + if (timedout) {
> + pr_err("%s: Reset 0x%x never completed.\n",
> + mmc_hostname(host->mmc), (int)mask);
> + sdhci_dumpregs(host);
> + /* manual clear */
> + sdhci_writeb(host, 0, SDHCI_SOFTWARE_RESET);
> + return;
> + }
> + udelay(10);
> + }
This could be:
u8 rst;
if (read_poll_timeout_atomic(sdhci_readb, rst, !(rst & mask),
10, 100000, false, host, SDHCI_SOFTWARE_RESET)) {
pr_err("%s: Reset 0x%x never completed.\n",
mmc_hostname(host->mmc), (int)mask);
sdhci_dumpregs(host);
/* manual clear */
sdhci_writeb(host, 0, SDHCI_SOFTWARE_RESET);
return;
}
> +}
> +
> static int gli_probe_slot_gl9750(struct sdhci_pci_slot *slot)
> {
> struct sdhci_host *host = slot->host;
> @@ -713,6 +979,7 @@ static int gli_probe_slot_gl9755(struct sdhci_pci_slot *slot)
> gli_pcie_enable_msi(slot);
> slot->host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
> sdhci_enable_v4_mode(host);
> + gl9755_vendor_init(host);
>
> return 0;
> }
> @@ -1085,17 +1352,24 @@ static const struct sdhci_ops sdhci_gl9755_ops = {
> .read_w = sdhci_gli_readw,
> .read_b = sdhci_gli_readb,
> .set_clock = sdhci_gl9755_set_clock,
> + .set_power = gl9755_set_power,
> .enable_dma = sdhci_pci_enable_dma,
> .set_bus_width = sdhci_set_bus_width,
> - .reset = sdhci_reset,
> + .reset = sdhci_gl9755_reset,
> .set_uhs_signaling = sdhci_set_uhs_signaling,
> .voltage_switch = sdhci_gli_voltage_switch,
> + .dump_uhs2_regs = sdhci_uhs2_dump_regs,
> + .set_timeout = sdhci_uhs2_set_timeout,
> + .irq = sdhci_uhs2_irq,
> + .uhs2_pre_detect_init = gl9755_pre_detect_init,
> };
>
> const struct sdhci_pci_fixes sdhci_gl9755 = {
> .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
> .quirks2 = SDHCI_QUIRK2_BROKEN_DDR50,
> .probe_slot = gli_probe_slot_gl9755,
> + .add_host = sdhci_pci_uhs2_add_host,
> + .remove_host = sdhci_pci_uhs2_remove_host,
> .ops = &sdhci_gl9755_ops,
> #ifdef CONFIG_PM_SLEEP
> .resume = sdhci_pci_gli_resume,
Powered by blists - more mailing lists