From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CD785C25B74 for ; Tue, 21 May 2024 13:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BvnAffPdhz4fWEZISlcVamPLkA1fDKMlq0SeU5bsR6A=; b=QhxqRmehocFRlo JglI0FskMmRRZ95C3m0j8r+ZcRZ+2uS0CR9B0p3UgZjXQ2YHA9wCWjzXjo4hHLtZIGDoHWXQGZxhE djgTdKt/A8qG7zDY8/7/95qODYtSb0zC55jlIP+DBdtFt0Aq0Z12plC2xYx0XBWf5vqgehKU/ErPG m8xQeNztULyEejy9peJF97LsE/DNyc3Fz/xaW8jirrSv8DE7nA19V134a6kM+VtfLTVfyfMWgkPXS kUiO0AGAVD2lQ/9TLjRDnC8L1/o/IzL9ydjsNLeWj7/048jR9JtzxdphArALbiDQEnI4cOMNgv+PL hxrhDKyD0absmMoXULeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s9P65-0000000HWN8-1IIv; Tue, 21 May 2024 13:00:05 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s9P60-0000000HWLh-3ROC for linux-arm-kernel@lists.infradead.org; Tue, 21 May 2024 13:00:03 +0000 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a59b81d087aso802053466b.3 for ; Tue, 21 May 2024 06:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1716296399; x=1716901199; darn=lists.infradead.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :date:from:from:to:cc:subject:date:message-id:reply-to; bh=YN/7AOVfwDQ9fuglKdggECs2cWRXnj0qk72xVYmNKJg=; b=OMXw3ZoN38GoguaBxEy/hTmwGMXs1nubEFK0UGvoa0OeIQ6QJrF+v/X0H3Cis0ovFb FcDISeoKbH3pRBsDab3XWB+JatyHZh5H94TkFIsdd9JvJR46WF2fl8yxhU8N2fF0sRwe z8yHvEnmkT/5rTv4qPxyv4ayW1z5SzvfKky17m/nmOj8EiAp3IyeA932SxCuphDGVAf+ EQ8LUHkqCZQhIk9RoPvQ2l+bgdcL12aHh28edpLC6MEFecWE2gpDjYp6sLh/Al0YT+nR 8PLMrHUlDgbsXUudxVVhAWzFBViyyc0J0caYw8nicru94orx3+iI34pZwDa87gj2Rb+T 5m9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716296399; x=1716901199; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YN/7AOVfwDQ9fuglKdggECs2cWRXnj0qk72xVYmNKJg=; b=ULtheH+Td6q/cGicTRQDwQxlSFykBbGX112sRWgPwXt634P/jwTHL4AaAnfXVxBIaB NA5zoasPQTzI2jafj2MKC9dg5q+oAwdqKQbnXcefsMFVBx4aTISPRNX1Vi8M00z+BaVy 9TP8h/KXS9UQCWJWreUnmFNQIRIlifza5rcBaUVpXRWFigGYIkn3ri0Xd++GnSWgxheN uulW9Ik5efV6X/blcIas5BP9fR6LpQECPDM/4Jr2XqIatXeuA1u8f43IUSe564ic1F/B 3NjNzfx4zQ/db7xqZdDCsP2QBghZ4EwMsVoGLd6yzh5a51nhnN+vxvhAXNhfESQTiJt6 YeWg== X-Forwarded-Encrypted: i=1; AJvYcCULtB3kZhuDAkV/BLGWOct/FAGceg87h/CVyiMQU3pvlKef+UIlwDnYOmBpmdx3eD37PGJ8fs49fAxnH4pim+bXkUVQqeYEmxQ5OMj0D1w3XCicJsc= X-Gm-Message-State: AOJu0YzzTxQxDTZzllE2QTIXEMv/vICp5GZy4vjU+pxuVEs4dtY3AeYf Vgz832NPtt479D1Dpe9AmJRUnX70rzzzhOYlNXYYi8//sB+vBDtrjtC59ZzcSMw= X-Google-Smtp-Source: AGHT+IFjhxZDVLttBWKH935kkHgsg4zmcHt0zQ1giV2/zPz++FzpgzwbsrswxD91J1qdmWSrgzUpJw== X-Received: by 2002:a17:906:4882:b0:a59:a727:1e81 with SMTP id a640c23a62f3a-a5a2d57a381mr3123533366b.20.1716296398569; Tue, 21 May 2024 05:59:58 -0700 (PDT) Received: from localhost (host-87-18-209-253.retail.telecomitalia.it. [87.18.209.253]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a179c7ebcsm1601785066b.117.2024.05.21.05.59.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 05:59:58 -0700 (PDT) From: Andrea della Porta X-Google-Original-From: Andrea della Porta Date: Tue, 21 May 2024 15:00:08 +0200 To: Stefan Wahren Cc: Andrea della Porta , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden , Marc Zyngier , Broadcom internal kernel review list , Ulf Hansson , Adrian Hunter , Kamal Dasu , Al Cooper , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: Re: [PATCH v3 3/4] mmc: sdhci-brcmstb: Add BCM2712 support Message-ID: Mail-Followup-To: Stefan Wahren , Andrea della Porta , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden , Marc Zyngier , Broadcom internal kernel review list , Ulf Hansson , Adrian Hunter , Kamal Dasu , Al Cooper , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240521_060000_878107_EEAFBEAA X-CRM114-Status: GOOD ( 35.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 14:26 Tue 21 May , Stefan Wahren wrote: > Hi Andrea, > = > Am 21.05.24 um 10:35 schrieb Andrea della Porta: > > Broadcom BCM2712 SoC has an SDHCI card controller using the SDIO CFG > > register block present on other STB chips. Add support for BCM2712 > > SD capabilities of this chipset. > > The silicon is SD Express capable but this driver port does not current= ly > > include that feature yet. > > Based on downstream driver by raspberry foundation maintained kernel. > > = > > Signed-off-by: Andrea della Porta > > --- > > drivers/mmc/host/sdhci-brcmstb.c | 65 ++++++++++++++++++++++++++++++++ > > 1 file changed, 65 insertions(+) > > = > > diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-= brcmstb.c > > index 9053526fa212..b349262da36e 100644 > > --- a/drivers/mmc/host/sdhci-brcmstb.c > > +++ b/drivers/mmc/host/sdhci-brcmstb.c > > @@ -30,6 +30,21 @@ > > = > > #define SDHCI_ARASAN_CQE_BASE_ADDR 0x200 > > = > > +#define SDIO_CFG_CQ_CAPABILITY 0x4c > > +#define SDIO_CFG_CQ_CAPABILITY_FMUL GENMASK(13, 12) > > + > > +#define SDIO_CFG_CTRL 0x0 > > +#define SDIO_CFG_CTRL_SDCD_N_TEST_EN BIT(31) > > +#define SDIO_CFG_CTRL_SDCD_N_TEST_LEV BIT(30) > > + > > +#define SDIO_CFG_MAX_50MHZ_MODE 0x1ac > > +#define SDIO_CFG_MAX_50MHZ_MODE_STRAP_OVERRIDE BIT(31) > > +#define SDIO_CFG_MAX_50MHZ_MODE_ENABLE BIT(0) > > + > > +#define MMC_CAP_HSE_MASK (MMC_CAP2_HSX00_1_2V | MMC_CAP2_HSX00_1_8V) > > +/* Select all SD UHS type I SDR speed above 50MB/s */ > > +#define MMC_CAP_UHS_I_SDR_MASK (MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104) > > + > > struct sdhci_brcmstb_priv { > > void __iomem *cfg_regs; > > unsigned int flags; > > @@ -38,6 +53,7 @@ struct sdhci_brcmstb_priv { > > }; > > = > > struct brcmstb_match_priv { > > + void (*cfginit)(struct sdhci_host *host); > > void (*hs400es)(struct mmc_host *mmc, struct mmc_ios *ios); > > struct sdhci_ops *ops; > > const unsigned int flags; > > @@ -168,6 +184,38 @@ static void sdhci_brcmstb_set_uhs_signaling(struct= sdhci_host *host, > > sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); > > } > > = > > +static void sdhci_brcmstb_cfginit_2712(struct sdhci_host *host) > > +{ > > + struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); > > + struct sdhci_brcmstb_priv *brcmstb_priv =3D sdhci_pltfm_priv(pltfm_ho= st); > > + u32 reg, base_clk_mhz; > > + > > + /* > > + * If we support a speed that requires tuning, > > + * then select the delay line PHY as the clock source. > > + */ > > + if ((host->mmc->caps & MMC_CAP_UHS_I_SDR_MASK) || (host->mmc->caps2 &= MMC_CAP_HSE_MASK)) { > > + reg =3D readl(brcmstb_priv->cfg_regs + SDIO_CFG_MAX_50MHZ_MODE); > > + reg &=3D ~SDIO_CFG_MAX_50MHZ_MODE_ENABLE; > > + reg |=3D SDIO_CFG_MAX_50MHZ_MODE_STRAP_OVERRIDE; > > + writel(reg, brcmstb_priv->cfg_regs + SDIO_CFG_MAX_50MHZ_MODE); > > + } > > + > > + if ((host->mmc->caps & MMC_CAP_NONREMOVABLE) || > > + (host->mmc->caps & MMC_CAP_NEEDS_POLL)) { > > + /* Force presence */ > > + reg =3D readl(brcmstb_priv->cfg_regs + SDIO_CFG_CTRL); > > + reg &=3D ~SDIO_CFG_CTRL_SDCD_N_TEST_LEV; > > + reg |=3D SDIO_CFG_CTRL_SDCD_N_TEST_EN; > > + writel(reg, brcmstb_priv->cfg_regs + SDIO_CFG_CTRL); > > + } > > + > > + /* Guesstimate the timer frequency (controller base clock) */ > > + base_clk_mhz =3D max_t(u32, clk_get_rate(pltfm_host->clk) / (1000 * 1= 000), 1); > > + reg =3D SDIO_CFG_CQ_CAPABILITY_FMUL | base_clk_mhz; > > + writel(reg, brcmstb_priv->cfg_regs + SDIO_CFG_CQ_CAPABILITY); > This part assumes the clock isn't changed afterwards, see below ... > > +} > > + > > static void sdhci_brcmstb_dumpregs(struct mmc_host *mmc) > > { > > sdhci_dumpregs(mmc_priv(mmc)); > > @@ -200,6 +248,14 @@ static struct sdhci_ops sdhci_brcmstb_ops =3D { > > .set_uhs_signaling =3D sdhci_set_uhs_signaling, > > }; > > = > > +static struct sdhci_ops sdhci_brcmstb_ops_2712 =3D { > > + .set_clock =3D sdhci_set_clock, > > + .set_power =3D sdhci_set_power_and_bus_voltage, > > + .set_bus_width =3D sdhci_set_bus_width, > > + .reset =3D sdhci_reset, > > + .set_uhs_signaling =3D sdhci_set_uhs_signaling, > > +}; > > + > > static struct sdhci_ops sdhci_brcmstb_ops_7216 =3D { > > .set_clock =3D sdhci_brcmstb_set_clock, > > .set_bus_width =3D sdhci_set_bus_width, > > @@ -214,6 +270,11 @@ static struct sdhci_ops sdhci_brcmstb_ops_74165b0 = =3D { > > .set_uhs_signaling =3D sdhci_brcmstb_set_uhs_signaling, > > }; > > = > > +static const struct brcmstb_match_priv match_priv_2712 =3D { > > + .cfginit =3D sdhci_brcmstb_cfginit_2712, > > + .ops =3D &sdhci_brcmstb_ops_2712, > > +}; > > + > > static struct brcmstb_match_priv match_priv_7425 =3D { > > .flags =3D BRCMSTB_MATCH_FLAGS_NO_64BIT | > > BRCMSTB_MATCH_FLAGS_BROKEN_TIMEOUT, > > @@ -238,6 +299,7 @@ static struct brcmstb_match_priv match_priv_74165b0= =3D { > > }; > > = > > static const struct of_device_id __maybe_unused sdhci_brcm_of_match[]= =3D { > > + { .compatible =3D "brcm,bcm2712-sdhci", .data =3D &match_priv_2712 }, > > { .compatible =3D "brcm,bcm7425-sdhci", .data =3D &match_priv_7425 }, > > { .compatible =3D "brcm,bcm7445-sdhci", .data =3D &match_priv_7445 }, > > { .compatible =3D "brcm,bcm7216-sdhci", .data =3D &match_priv_7216 }, > > @@ -370,6 +432,9 @@ static int sdhci_brcmstb_probe(struct platform_devi= ce *pdev) > > (host->mmc->caps2 & MMC_CAP2_HS400_ES)) > > host->mmc_host_ops.hs400_enhanced_strobe =3D match_priv->hs400es; > > = > > + if (match_priv->cfginit) > > + match_priv->cfginit(host); > > + > I'm not sure this is the right place to call cfginit. > sdhci_brcmstb_cfginit_2712 retrives the current controller base clock, > but at the end of=A0 sdhci_brcmstb_probe this clock frequency could be > adjusted by the device property "clock-frequency". So i'm not sure this > is intended. Some tests reveal that cfginit() must be called for certain type of UHS SD = cards, = otherwise those cards do not work at all. This of course does not mean that= the calling sequence is correctly ordererd and it may just work out of luck. I'm investigating... Many thanks, Andrea > > /* > > * Supply the existing CAPS, but clear the UHS modes. This > > * will allow these modes to be specified by device tree > = _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel