From nobody Tue Nov 26 13:20:46 2024 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E8992038B6; Fri, 18 Oct 2024 10:54:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729248893; cv=none; b=bpyPNylRx9lP+CSMiTyoQIwdrFd6fP+QBzkqWQXSrIz/LmLZohmk86/SKexuCYPPSBGc7Ltql6UX4aLRj+IMy+yYFLCX+gD025I7KBuxBc/19gw0n6p4X+xswNi536vcPP67g6v3DCjDOOExR+Jojrluf3ec+VIvPHV1h78h+Zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729248893; c=relaxed/simple; bh=yBPWMM+UcxmD8WxaMTZD9fPg9PqlDCKf90o5THqyUNM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lUn0+CjVKyBPr+xBWRJXrGHPDXQWBmRpnobiMhs3GzMxGeYsXWXroEZYcs9J5nzAtukR8k4brVv4fJ/TgHDIlBoHbH6UPU4s2NWQ8b0g17+xGZBHw4Zzw/bBwBPMPI42CDXeC9nn4Io/ZUv4cnC4mKcyireenznYVjhm25kQAYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=d1vP1vQz; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d1vP1vQz" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-20cbb1cf324so16550295ad.0; Fri, 18 Oct 2024 03:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729248891; x=1729853691; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ec3ffwGVG4T3zOAIwR5JyB4bVTuiuJxx1Z4oCNcuYcM=; b=d1vP1vQz5dwScLDYpS1U2+GVHDpdmoe9OEu3r2FqVCzskFN8ID0n1G3j+0Q5XuiWgX bYw10ek3tvA/Rr0vqQCe4oS/lgqZ4W5zmIgl7PTvZZWjREnpqAzeTIpatizhgAmenMU1 kLkrCMOc00Ipq78OYr30BWDOR3DD45Ae6kKd3hKMu4c7cnvFcW/IupQ5s15okVB5UH25 qzZdn5kPZaCvFk8yERuL+HeR6Cvf3dmvjS/+otpknaHLY3xrbxLScewWSCCXBmLAELym 51OviNJ+TNy5Lr93Nq66LIsB66rPPdv4eOfxYpNv0cyKenBerRhefDLWtiW3NrHEJUz5 W+UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729248891; x=1729853691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ec3ffwGVG4T3zOAIwR5JyB4bVTuiuJxx1Z4oCNcuYcM=; b=FyjKAqupvmGKEFavkEvVaETUszFuFv15UUHd8Zicq9QkJWa2S5/jrlhCt3BNmsfTnt 210fhpn6DQirrEwaabIgtQzgoOT3rXvUuOrpEypqobelgNpdqe5fBAQ1MpEIbwuJ3kxt kRA6q4bNJooDgF+e+wjXmyCCknS0Jf+J2a8swBTjfuo2aTIg0z2EI55Z01vAXyzqPVZ9 kkHgT9KjWK9+3MJYo9lDyCwoOXuqIhhB98M0Haq6TIdw7Kf+M7hYcc1NQaIlUrklLg3U rf7rrnNhL6qBprrcm2yE1K+Jiu34O2Q/Wv5f+1Qt6vqgAc5Q4EVVbpZ6xuCiYvhe3yd6 N7rQ== X-Forwarded-Encrypted: i=1; AJvYcCWtpG0k6SdvmZZnZWbA289M3t6DRAgl09L0jtXlT5BpwK1S+108XNp/59MiuaRq6G2J6eNr1fPi2sC5OyA=@vger.kernel.org X-Gm-Message-State: AOJu0YyNgjqUi4dBJ+vO2y40EcY1Ro9JMxXYqZBao6lcfO/S2ygiUREK BmoAcPC7Z/7fxbXSxgrponebiYTFsn3S6jIHoU6VN8J2k8Rrj2qm X-Google-Smtp-Source: AGHT+IEWCC4hpoyQQVJAuUqw2ESqRolwckpXTH1hyDS1mEzDwU6iKL6pvTFIVlCY/xkQNJSs4AteQQ== X-Received: by 2002:a17:902:e552:b0:20c:5cdd:a9e with SMTP id d9443c01a7336-20e5a7968e8mr26784785ad.28.1729248891385; Fri, 18 Oct 2024 03:54:51 -0700 (PDT) Received: from localhost.localdomain ([2402:7500:47a:11ee:3789:3bcf:d64f:bc9a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20e5a8fa20esm10237455ad.234.2024.10.18.03.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 03:54:51 -0700 (PDT) From: Victor Shih To: ulf.hansson@linaro.org, adrian.hunter@intel.com Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, benchuanggli@gmail.com, Lucas.Lai@genesyslogic.com.tw, HL.Liu@genesyslogic.com.tw, Greg.tu@genesyslogic.com.tw, dlunev@chromium.org, Victor Shih , Ben Chuang , AKASHI Takahiro , Victor Shih , Lucas Lai Subject: [PATCH V23 15/16] mmc: sdhci-pci-gli: enable UHS-II mode for GL9755 Date: Fri, 18 Oct 2024 18:53:32 +0800 Message-Id: <20241018105333.4569-16-victorshihgli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241018105333.4569-1-victorshihgli@gmail.com> References: <20241018105333.4569-1-victorshihgli@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Victor Shih 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. * Remove sdhci_gli_enable_internal_clock functon unused clk_ctrl variable. * Make a function sdhci_gli_wait_software_reset_done() for gl9755 reset. * Remove unnecessary code from sdhci_gl9755_reset(). Signed-off-by: Ben Chuang Signed-off-by: AKASHI Takahiro Signed-off-by: Victor Shih Signed-off-by: Lucas Lai --- Updates in V21: - Remove unnecessary code from sdhci_gl9755_reset(). Updates in V20: - Remove sdhci_gli_enable_internal_clock functon unused clk_ctrl variable. - Make a function sdhci_gli_wait_software_reset_done() for gl9755 reset. Updates in V19: - Add sdhci_gli_enable_internal_clock() to simplify the code in the sdhci_gl9755_reset(). Updates in V17: - Rname gl9755_overcurrent_event_enable() to sdhci_gli_overcurrent_event_enable(). Updates in V15: - Adjust gl9755_vendor_init() to the correct function. Updates in V13: - Ues uhs2_sd_tran to stead MMC_UHS2_SD_TRAN. Updates in V9: - Rename gl9755_pre_detect_init() to sdhci_gli_pre_detect_init(). - Rename gl9755_uhs2_reset_sd_tran() to sdhci_gli_uhs2_reset_sd_tran(). Updates in V8: - Use sdhci_get_vdd_value() to simplify code in gl9755_set_power(). - Use read_poll_timeout_atomic() to simplify code in sdhci_wait_clock_stable(). - Use read_poll_timeout_atomic() to simplify code in sdhci_gl9755_reset(). Updates in V7: - Drop using gl9755_post_attach_sd(). --- drivers/mmc/host/sdhci-pci-gli.c | 235 ++++++++++++++++++++++++++++++- 1 file changed, 234 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-= gli.c index 0f81586a19df..708138eecaa7 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" =20 /* Genesys Logic extra registers */ #define SDHCI_GLI_9750_WT 0x800 @@ -139,9 +140,36 @@ =20 #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 0x0 +#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 =20 #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 =20 #define PCI_GLI_9755_MISC 0x78 #define PCI_GLI_9755_MISC_SSC_OFF BIT(26) @@ -779,6 +807,203 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *= slot) gl9755_wt_off(pdev); } =20 +static void gl9755_vendor_init(struct sdhci_host *host) +{ + struct sdhci_pci_slot *slot =3D sdhci_priv(host); + struct pci_dev *pdev =3D 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 &=3D ~PCI_GLI_9755_UHS2_SERDES_TRAN; + serdes |=3D FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_TRAN, + GLI_9755_UHS2_SERDES_TRAN_VALUE); + serdes &=3D ~PCI_GLI_9755_UHS2_SERDES_RECV; + serdes |=3D FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_RECV, + GLI_9755_UHS2_SERDES_RECV_VALUE); + serdes &=3D ~PCI_GLI_9755_UHS2_SERDES_INTR; + serdes |=3D FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_INTR, + GLI_9755_UHS2_SERDES_INTR_VALUE); + serdes &=3D ~PCI_GLI_9755_UHS2_SERDES_ZC1; + serdes |=3D FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_ZC1, + GLI_9755_UHS2_SERDES_ZC1_VALUE); + serdes &=3D ~PCI_GLI_9755_UHS2_SERDES_ZC2; + serdes |=3D 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 &=3D ~PCI_GLI_9755_UHS2_PLL_SSC; + uhs2_pll |=3D FIELD_PREP(PCI_GLI_9755_UHS2_PLL_SSC, + GLI_9755_UHS2_PLL_SSC_VALUE); + uhs2_pll &=3D ~PCI_GLI_9755_UHS2_PLL_DELAY; + uhs2_pll |=3D FIELD_PREP(PCI_GLI_9755_UHS2_PLL_DELAY, + GLI_9755_UHS2_PLL_DELAY_VALUE); + uhs2_pll &=3D ~PCI_GLI_9755_UHS2_PLL_PDRST; + uhs2_pll |=3D 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 &=3D ~PCI_GLI_9755_PLLSSC_RTL; + pllssc |=3D FIELD_PREP(PCI_GLI_9755_PLLSSC_RTL, + GLI_9755_PLLSSC_RTL_VALUE); + pllssc &=3D ~PCI_GLI_9755_PLLSSC_TRANS_PASS; + pllssc |=3D FIELD_PREP(PCI_GLI_9755_PLLSSC_TRANS_PASS, + GLI_9755_PLLSSC_TRANS_PASS_VALUE); + pllssc &=3D ~PCI_GLI_9755_PLLSSC_RECV; + pllssc |=3D FIELD_PREP(PCI_GLI_9755_PLLSSC_RECV, + GLI_9755_PLLSSC_RECV_VALUE); + pllssc &=3D ~PCI_GLI_9755_PLLSSC_TRAN; + pllssc |=3D 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 sdhci_gli_pre_detect_init(struct sdhci_host *host) +{ + /* Need more time on UHS2 detect flow */ + sdhci_writeb(host, 0xA7, SDHCI_UHS2_TIMER_CTRL); +} + +static void sdhci_gli_overcurrent_event_enable(struct sdhci_host *host, bo= ol enable) +{ + u32 mask; + + mask =3D sdhci_readl(host, SDHCI_SIGNAL_ENABLE); + if (enable) + mask |=3D SDHCI_INT_BUS_POWER; + else + mask &=3D ~SDHCI_INT_BUS_POWER; + + sdhci_writel(host, mask, SDHCI_SIGNAL_ENABLE); + + mask =3D sdhci_readl(host, SDHCI_INT_ENABLE); + if (enable) + mask |=3D SDHCI_INT_BUS_POWER; + else + mask &=3D ~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 =3D 0; + + if (mode !=3D MMC_POWER_OFF) { + pwr =3D sdhci_get_vdd_value(vdd); + if (!pwr) + WARN(1, "%s: Invalid vdd %#x\n", mmc_hostname(host->mmc), vdd); + pwr |=3D SDHCI_VDD2_POWER_180; + } + + if (host->pwr =3D=3D pwr) + return; + + host->pwr =3D pwr; + + if (pwr =3D=3D 0) { + sdhci_gli_overcurrent_event_enable(host, false); + sdhci_writeb(host, 0, SDHCI_POWER_CONTROL); + } else { + sdhci_gli_overcurrent_event_enable(host, false); + sdhci_writeb(host, 0, SDHCI_POWER_CONTROL); + + pwr |=3D (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); + sdhci_gli_overcurrent_event_enable(host, true); + } +} + +static bool sdhci_wait_clock_stable(struct sdhci_host *host) +{ + u16 clk =3D 0; + + if (read_poll_timeout_atomic(sdhci_readw, clk, (clk & SDHCI_CLOCK_INT_STA= BLE), + 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 sdhci_gli_enable_internal_clock(struct sdhci_host *host) +{ + u16 ctrl2; + + ctrl2 =3D sdhci_readw(host, SDHCI_HOST_CONTROL2); + + sdhci_writew(host, SDHCI_CLOCK_INT_EN, SDHCI_CLOCK_CONTROL); + + if (!((ctrl2 & SDHCI_CTRL_V4_MODE) && + (ctrl2 & SDHCI_CTRL_UHS2_ENABLE))) { + sdhci_wait_clock_stable(host); + sdhci_writew(host, SDHCI_CTRL_V4_MODE, SDHCI_HOST_CONTROL2); + } +} + +static int sdhci_gli_wait_software_reset_done(struct sdhci_host *host, u8 = mask) +{ + u8 rst; + + /* hw clears the bit when it's done */ + 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), (in= t)mask); + sdhci_dumpregs(host); + /* manual clear */ + sdhci_writeb(host, 0, SDHCI_SOFTWARE_RESET); + return -ETIMEDOUT; + } + + return 0; +} + +static void sdhci_gli_uhs2_reset_sd_tran(struct sdhci_host *host) +{ + /* do this on UHS2 mode */ + if (host->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) +{ + /* need internal clock */ + if (mask & SDHCI_RESET_ALL) + sdhci_gli_enable_internal_clock(host); + + 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)) + sdhci_gli_uhs2_reset_sd_tran(host); + + if (mask & SDHCI_RESET_ALL) + host->clock =3D 0; + + sdhci_gli_wait_software_reset_done(host, mask); +} + static inline void gl9767_vhs_read(struct pci_dev *pdev) { u32 vhs_enable; @@ -1086,6 +1311,7 @@ static int gli_probe_slot_gl9755(struct sdhci_pci_slo= t *slot) gli_pcie_enable_msi(slot); slot->host->mmc->caps2 |=3D MMC_CAP2_NO_SDIO; sdhci_enable_v4_mode(host); + gl9755_vendor_init(host); =20 return 0; } @@ -1524,17 +1750,24 @@ static const struct sdhci_ops sdhci_gl9755_ops =3D { .read_w =3D sdhci_gli_readw, .read_b =3D sdhci_gli_readb, .set_clock =3D sdhci_gl9755_set_clock, + .set_power =3D gl9755_set_power, .enable_dma =3D sdhci_pci_enable_dma, .set_bus_width =3D sdhci_set_bus_width, - .reset =3D sdhci_reset, + .reset =3D sdhci_gl9755_reset, .set_uhs_signaling =3D sdhci_set_uhs_signaling, .voltage_switch =3D sdhci_gli_voltage_switch, + .dump_uhs2_regs =3D sdhci_uhs2_dump_regs, + .set_timeout =3D sdhci_uhs2_set_timeout, + .irq =3D sdhci_uhs2_irq, + .uhs2_pre_detect_init =3D sdhci_gli_pre_detect_init, }; =20 const struct sdhci_pci_fixes sdhci_gl9755 =3D { .quirks =3D SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, .quirks2 =3D SDHCI_QUIRK2_BROKEN_DDR50, .probe_slot =3D gli_probe_slot_gl9755, + .add_host =3D sdhci_pci_uhs2_add_host, + .remove_host =3D sdhci_pci_uhs2_remove_host, .ops =3D &sdhci_gl9755_ops, #ifdef CONFIG_PM_SLEEP .resume =3D sdhci_pci_gli_resume, --=20 2.25.1