From nobody Wed Feb 11 17:21:22 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B29ABC6FD1F for ; Sun, 12 Mar 2023 13:10:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229743AbjCLNK6 (ORCPT ); Sun, 12 Mar 2023 09:10:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229509AbjCLNKz (ORCPT ); Sun, 12 Mar 2023 09:10:55 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4AB84614A for ; Sun, 12 Mar 2023 06:10:52 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id g17so12449119lfv.4 for ; Sun, 12 Mar 2023 06:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678626650; h=cc:to:subject:date:from:in-reply-to:message-id:from:to:cc:subject :date:message-id:reply-to; bh=tDIef+aPGuB5wQknGJ7abVMxEUnE+NE/6MUxxwCrbfI=; b=NMdrxhVttGmcRNAsGiInCqSOxvErRHAm7Ww0QEvoQulpE8GIZZmdUI6Qc8Bar5z5iO XKZ8HNJwJG6TmE8bGZW5D/Am6Uj4VNukG0U/N0ts2NEWCJtgWV8Rc+/PNQIg0p6Dl8Zk L+xSPXHyeoRAsOamDZ0bsYg9iPod2caaCBGSpht57kYSTpF6NK+6ikirzMyCQq2OsX0b nUYDf4sopMYkRHd6L8Zs7tSQPmaORyXkXePnFGlX+alkIVTuKbOHyTDyaZtXLZmOnffm c+GAaXydNZbd1A402ZN/wSeIkMMIgVn1bMdm9OdvGG/lI64E45a3wdpEf/eOu95e6iPk +psA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678626650; h=cc:to:subject:date:from:in-reply-to:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=tDIef+aPGuB5wQknGJ7abVMxEUnE+NE/6MUxxwCrbfI=; b=FJTP/k2eQvDYpQbMo0is+/jl1WTR9lJRPq/3yIKgzUEbV4OL83QYIqPZmyfxeV56hg 0JHMam/NAb2F/IS6T741Ui8J1wiw3KMsVV+xZO8J6KnsRSV2hQqsFyrOLn0DO9WWRpUv jKGbYArIerl+DbLnejA9b7BYXpdO/SayFGVb/0ETYft0Ok5pAiKoNlqG0RZs7AfWPz1q FEyjF4v1G6De4yUSwHEdNeHSa9uk7W9mKq3b8AYqtOB2y4fW8WVRn6kjHSnDqJvWip3M rZpU5my1pXUmERU0OFn+vfSP3jlxYP0FBQTF1so7SazQiVeuxpsWb7LBikqX6qOpxowQ yWwg== X-Gm-Message-State: AO0yUKXIUOYcpjHbAjP+G3Cw4Yv96jFNC3yDcvqcCxpb6F9esnQtl+qb ab0kAd58siVLRio0oLPcGE9k1UXxHKv1adDX X-Google-Smtp-Source: AK7set/ZuhOlFPVW8Ud3ll9chVvSzx40ZBlSOIUr5smic+z5WIGbrzDYvp/9sDRqVhSJvYVnDiSZ5A== X-Received: by 2002:ac2:539a:0:b0:4cc:b784:c47e with SMTP id g26-20020ac2539a000000b004ccb784c47emr8446381lfh.62.1678626650658; Sun, 12 Mar 2023 06:10:50 -0700 (PDT) Received: from 0001-dt-bindings-exynos-dw-mshc-common-add-exynos78xx-var.patch (46-138-144-249.dynamic.spd-mgts.ru. [46.138.144.249]) by smtp.gmail.com with ESMTPSA id c24-20020a2e6818000000b00290716d65dcsm644822lja.136.2023.03.12.06.10.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 06:10:50 -0700 (PDT) Message-Id: <1678626510.1783316-1-sleirsgoevy@gmail.com> In-Reply-To: <1678626510.1783316-0-sleirsgoevy@gmail.com> From: Sergey Lisov Date: Sun, 12 Mar 2023 16:03:15 +0300 Subject: [PATCH v3 1/2] dt-bindings: exynos-dw-mshc-common: add exynos78xx variants To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Alim Akhtar , Jaehoon Chung Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some Samsung Exynos boards using the arm64 architecture have DW MMC controllers configured for a 32-bit data bus but a 64-bit FIFO. On these systems the 64-bit FIFO registers must be accessed in two 32-bit halves. Add two new compatible strings, "samsung,exynos78xx-dw-mshc" and "samsung,exynos78xx-dw-mshc-smu" respectively, to denote exynos78xx boards that need this quirk. But it's very possible that all "samsung,exynos7-dw-mshc" boards are actually affected. --- .../devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 ++ arch/arm64/boot/dts/exynos/exynos7885.dtsi | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.y= aml b/Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml index fdaa18481..a72a67792 100644 --- a/Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml +++ b/Documentation/devicetree/bindings/mmc/samsung,exynos-dw-mshc.yaml @@ -22,6 +22,8 @@ properties: - samsung,exynos5420-dw-mshc-smu - samsung,exynos7-dw-mshc - samsung,exynos7-dw-mshc-smu + - samsung,exynos78xx-dw-mshc + - samsung,exynos78xx-dw-mshc-smu - axis,artpec8-dw-mshc =20 reg: diff --git a/arch/arm64/boot/dts/exynos/exynos7885.dtsi b/arch/arm64/boot/d= ts/exynos/exynos7885.dtsi index 23c2e0bb0..4b94ac9da 100644 --- a/arch/arm64/boot/dts/exynos/exynos7885.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos7885.dtsi @@ -294,7 +294,7 @@ pmu_system_controller: system-controller@11c80000 { }; =20 mmc_0: mmc@13500000 { - compatible =3D "samsung,exynos7-dw-mshc-smu"; + compatible =3D "samsung,exynos78xx-dw-mshc-smu"; reg =3D <0x13500000 0x2000>; interrupts =3D ; #address-cells =3D <1>; --=20 2.38.3 From nobody Wed Feb 11 17:21:22 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA04EC6FA99 for ; Sun, 12 Mar 2023 13:11:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229790AbjCLNL2 (ORCPT ); Sun, 12 Mar 2023 09:11:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229516AbjCLNLX (ORCPT ); Sun, 12 Mar 2023 09:11:23 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3C9746168 for ; Sun, 12 Mar 2023 06:11:18 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id n2so12395959lfb.12 for ; Sun, 12 Mar 2023 06:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678626677; h=cc:to:subject:date:from:in-reply-to:message-id:from:to:cc:subject :date:message-id:reply-to; bh=cPk/h023+CvWv4LEM2Nr7aafr5OCIjbP3l84sbGJHt4=; b=XY8AVNVP5dEHJTmFxc4ksUBSmPwKk5JDrbVEdyCik/N+CAdsLTjHdgMiyD76nLQcCs 3HKgg6+JsKLXxkzLqNIHnUhT2w7Hm2yD8qNvdyCWZbCyVNDbpflbz1AIaqR9LlQ9Y2m8 b2zvrqGCLUGjZnq2e6GhnxGslfBIYqsoRoE4rMpy6prNpsgz491Hwdz3+FLz4ZysrZvQ BFzgCsWYlqiwpWT3jLqtE/8aKVzTEhqT8nnBgREk6pwQodrapSWESQZqupdthKHJ815t 8M79Wcl+yuukM4CIE9gpBgTyID8A/E096Kcebz8bzOVW29N+d1x21cNuZXGKv3vfn//E DPlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678626677; h=cc:to:subject:date:from:in-reply-to:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=cPk/h023+CvWv4LEM2Nr7aafr5OCIjbP3l84sbGJHt4=; b=q32WGCVbjGf0SnIAaM5IABissvaOkZnOzpB1J0yrg7bPXDAD0MJt5O6WnK59+FGBSX BL80D+9klij7JzPiYw01hut5KjetB/aXIqNM0uefH8DHY0YmOMwmia7jShUR949N6ivP gcYBK3zethThw/X4ZhrkaTHQDAb5UnAAgfoK8+/6xkpXFwaYYDf97cGx/4kCzBWtzjas pHSXK/WDnAqpeCh4reXKoQt0qWDs1rNiH/Haiq0b0InecGjApYV9bdohmyXJ0Jfz8QXQ RjPjRe++DsFPLOy4xwRvuOxOdYmf4jJnJdLB9yWhnTd36IUrcn2R4cHRrPHpXORMPrEx vxLA== X-Gm-Message-State: AO0yUKV3374Ss1q9WlVNA+IWVcqC78d/UkEwGoWOAyzQ2c/oCFsQGoeR 7XnY26lSbnir2kobXlPGeOzexGjplDIw3bJQ X-Google-Smtp-Source: AK7set8sT3CON4KnINuUb5f6/L3yUw25eCvc9Rk+ceC4F4ZalU5i6VMcWqhP9Q894KzfUdCc4e+A2Q== X-Received: by 2002:ac2:531c:0:b0:4db:38a2:e985 with SMTP id c28-20020ac2531c000000b004db38a2e985mr8031293lfh.62.1678626676727; Sun, 12 Mar 2023 06:11:16 -0700 (PDT) Received: from 0002-mmc-dw_mmc-add-an-option-to-force-32-bit-access-to-6.patch (46-138-144-249.dynamic.spd-mgts.ru. [46.138.144.249]) by smtp.gmail.com with ESMTPSA id g3-20020a19ee03000000b004db1afe388asm652445lfb.163.2023.03.12.06.11.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 06:11:16 -0700 (PDT) Message-Id: <1678626510.1783316-2-sleirsgoevy@gmail.com> In-Reply-To: <1678626510.1783316-0-sleirsgoevy@gmail.com> From: Sergey Lisov Date: Sun, 12 Mar 2023 16:03:15 +0300 Subject: [PATCH v3 2/2] mmc: dw_mmc: add an option to force 32-bit access to 64-bit FIFO To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Alim Akhtar , Jaehoon Chung Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some Samsung Exynos boards using the arm64 architecture have DW MMC controllers configured for a 32-bit data bus but a 64-bit FIFO. On these systems the 64-bit FIFO registers must be accessed in two 32-bit halves. --- drivers/mmc/host/dw_mmc-exynos.c | 41 ++++++++++- drivers/mmc/host/dw_mmc.c | 122 ++++++++++++++++++++++++++++++- drivers/mmc/host/dw_mmc.h | 2 + 3 files changed, 162 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exy= nos.c index 9f20ac524..768774f22 100644 --- a/drivers/mmc/host/dw_mmc-exynos.c +++ b/drivers/mmc/host/dw_mmc-exynos.c @@ -28,6 +28,8 @@ enum dw_mci_exynos_type { DW_MCI_TYPE_EXYNOS5420_SMU, DW_MCI_TYPE_EXYNOS7, DW_MCI_TYPE_EXYNOS7_SMU, + DW_MCI_TYPE_EXYNOS78XX, + DW_MCI_TYPE_EXYNOS78XX_SMU, DW_MCI_TYPE_ARTPEC8, }; =20 @@ -70,6 +72,12 @@ static struct dw_mci_exynos_compatible { }, { .compatible =3D "samsung,exynos7-dw-mshc-smu", .ctrl_type =3D DW_MCI_TYPE_EXYNOS7_SMU, + }, { + .compatible =3D "samsung,exynos78xx-dw-mshc", + .ctrl_type =3D DW_MCI_TYPE_EXYNOS78XX, + }, { + .compatible =3D "samsung,exynos78xx-dw-mshc-smu", + .ctrl_type =3D DW_MCI_TYPE_EXYNOS78XX_SMU, }, { .compatible =3D "axis,artpec8-dw-mshc", .ctrl_type =3D DW_MCI_TYPE_ARTPEC8, @@ -86,6 +94,8 @@ static inline u8 dw_mci_exynos_get_ciu_div(struct dw_mci = *host) return EXYNOS4210_FIXED_CIU_CLK_DIV; else if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) return SDMMC_CLKSEL_GET_DIV(mci_readl(host, CLKSEL64)) + 1; else @@ -101,7 +111,8 @@ static void dw_mci_exynos_config_smu(struct dw_mci *hos= t) * set for non-ecryption mode at this time. */ if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS5420_SMU || - priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU) { + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU) { mci_writel(host, MPSBEGIN0, 0); mci_writel(host, MPSEND0, SDMMC_ENDING_SEC_NR_MAX); mci_writel(host, MPSCTRL0, SDMMC_MPSCTRL_SECURE_WRITE_BIT | @@ -127,6 +138,12 @@ static int dw_mci_exynos_priv_init(struct dw_mci *host) DQS_CTRL_GET_RD_DELAY(priv->saved_strobe_ctrl); } =20 + if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU) { + /* Quirk needed for certain Exynos SoCs */ + host->quirks |=3D DW_MMC_QUIRK_FIFO64_32; + } + if (priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) { /* Quirk needed for the ARTPEC-8 SoC */ host->quirks |=3D DW_MMC_QUIRK_EXTENDED_TMOUT; @@ -144,6 +161,8 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_m= ci *host, u32 timing) =20 if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) clksel =3D mci_readl(host, CLKSEL64); else @@ -153,6 +172,8 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_m= ci *host, u32 timing) =20 if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) mci_writel(host, CLKSEL64, clksel); else @@ -223,6 +244,8 @@ static int dw_mci_exynos_resume_noirq(struct device *de= v) =20 if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) clksel =3D mci_readl(host, CLKSEL64); else @@ -231,6 +254,8 @@ static int dw_mci_exynos_resume_noirq(struct device *de= v) if (clksel & SDMMC_CLKSEL_WAKEUP_INT) { if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) mci_writel(host, CLKSEL64, clksel); else @@ -410,6 +435,8 @@ static inline u8 dw_mci_exynos_get_clksmpl(struct dw_mc= i *host) =20 if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) return SDMMC_CLKSEL_CCLK_SAMPLE(mci_readl(host, CLKSEL64)); else @@ -423,6 +450,8 @@ static inline void dw_mci_exynos_set_clksmpl(struct dw_= mci *host, u8 sample) =20 if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) clksel =3D mci_readl(host, CLKSEL64); else @@ -430,6 +459,8 @@ static inline void dw_mci_exynos_set_clksmpl(struct dw_= mci *host, u8 sample) clksel =3D SDMMC_CLKSEL_UP_SAMPLE(clksel, sample); if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) mci_writel(host, CLKSEL64, clksel); else @@ -444,6 +475,8 @@ static inline u8 dw_mci_exynos_move_next_clksmpl(struct= dw_mci *host) =20 if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) clksel =3D mci_readl(host, CLKSEL64); else @@ -454,6 +487,8 @@ static inline u8 dw_mci_exynos_move_next_clksmpl(struct= dw_mci *host) =20 if (priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7 || priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS7_SMU || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX || + priv->ctrl_type =3D=3D DW_MCI_TYPE_EXYNOS78XX_SMU || priv->ctrl_type =3D=3D DW_MCI_TYPE_ARTPEC8) mci_writel(host, CLKSEL64, clksel); else @@ -633,6 +668,10 @@ static const struct of_device_id dw_mci_exynos_match[]= =3D { .data =3D &exynos_drv_data, }, { .compatible =3D "samsung,exynos7-dw-mshc-smu", .data =3D &exynos_drv_data, }, + { .compatible =3D "samsung,exynos78xx-dw-mshc", + .data =3D &exynos_drv_data, }, + { .compatible =3D "samsung,exynos78xx-dw-mshc-smu", + .data =3D &exynos_drv_data, }, { .compatible =3D "axis,artpec8-dw-mshc", .data =3D &artpec_drv_data, }, {}, diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 581614196..9fe816c61 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2575,6 +2575,119 @@ static void dw_mci_pull_data64(struct dw_mci *host,= void *buf, int cnt) } } =20 +/* + Some dw_mmc devices have 64-bit FIFOs, but expect them to be + accessed using two 32-bit accesses. If such controller is used + with a 64-bit kernel, this has to be done explicitly. + + XXX: Is this issue specific to Exynos7? +*/ + +static inline uint64_t mci_fifo_readq_32(void __iomem *addr) +{ + uint64_t ans; + uint32_t proxy[2]; + + proxy[0] =3D mci_fifo_readl(addr); + proxy[1] =3D mci_fifo_readl(addr+4); + memcpy(&ans, proxy, 8); + return ans; +} + +static inline void mci_fifo_writeq_32(void __iomem *addr, uint64_t value) +{ + uint32_t proxy[2]; + + memcpy(proxy, &value, 8); + mci_fifo_writel(addr, proxy[0]); + mci_fifo_writel(addr+4, proxy[1]); +} + +static void dw_mci_push_data64_32(struct dw_mci *host, void *buf, int cnt) +{ + struct mmc_data *data =3D host->data; + int init_cnt =3D cnt; + + /* try and push anything in the part_buf */ + if (unlikely(host->part_buf_count)) { + int len =3D dw_mci_push_part_bytes(host, buf, cnt); + + buf +=3D len; + cnt -=3D len; + + if (host->part_buf_count =3D=3D 8) { + mci_fifo_writeq_32(host->fifo_reg, host->part_buf); + host->part_buf_count =3D 0; + } + } +#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS + if (unlikely((unsigned long)buf & 0x7)) { + while (cnt >=3D 8) { + u64 aligned_buf[16]; + int len =3D min(cnt & -8, (int)sizeof(aligned_buf)); + int items =3D len >> 3; + int i; + /* memcpy from input buffer into aligned buffer */ + memcpy(aligned_buf, buf, len); + buf +=3D len; + cnt -=3D len; + /* push data from aligned buffer into fifo */ + for (i =3D 0; i < items; ++i) + mci_fifo_writeq_32(host->fifo_reg, aligned_buf[i]); + } + } else +#endif + { + u64 *pdata =3D buf; + + for (; cnt >=3D 8; cnt -=3D 8) + mci_fifo_writeq_32(host->fifo_reg, *pdata++); + buf =3D pdata; + } + /* put anything remaining in the part_buf */ + if (cnt) { + dw_mci_set_part_bytes(host, buf, cnt); + /* Push data if we have reached the expected data length */ + if ((data->bytes_xfered + init_cnt) =3D=3D + (data->blksz * data->blocks)) + mci_fifo_writeq_32(host->fifo_reg, host->part_buf); + } +} + +static void dw_mci_pull_data64_32(struct dw_mci *host, void *buf, int cnt) +{ +#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS + if (unlikely((unsigned long)buf & 0x7)) { + while (cnt >=3D 8) { + /* pull data from fifo into aligned buffer */ + u64 aligned_buf[16]; + int len =3D min(cnt & -8, (int)sizeof(aligned_buf)); + int items =3D len >> 3; + int i; + + for (i =3D 0; i < items; ++i) + aligned_buf[i] =3D mci_fifo_readq_32(host->fifo_reg); + + /* memcpy from aligned buffer into output buffer */ + memcpy(buf, aligned_buf, len); + buf +=3D len; + cnt -=3D len; + } + } else +#endif + { + u64 *pdata =3D buf; + + for (; cnt >=3D 8; cnt -=3D 8) + *pdata++ =3D mci_fifo_readq_32(host->fifo_reg); + buf =3D pdata; + } + if (cnt) { + host->part_buf =3D mci_fifo_readq_32(host->fifo_reg); + dw_mci_pull_final_bytes(host, buf, cnt); + } +} + static void dw_mci_pull_data(struct dw_mci *host, void *buf, int cnt) { int len; @@ -3367,8 +3480,13 @@ int dw_mci_probe(struct dw_mci *host) width =3D 16; host->data_shift =3D 1; } else if (i =3D=3D 2) { - host->push_data =3D dw_mci_push_data64; - host->pull_data =3D dw_mci_pull_data64; + if ((host->quirks & DW_MMC_QUIRK_FIFO64_32)) { + host->push_data =3D dw_mci_push_data64_32; + host->pull_data =3D dw_mci_pull_data64_32; + } else { + host->push_data =3D dw_mci_push_data64; + host->pull_data =3D dw_mci_pull_data64; + } width =3D 64; host->data_shift =3D 3; } else { diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index 4ed81f94f..edd642b92 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -280,6 +280,8 @@ struct dw_mci_board { =20 /* Support for longer data read timeout */ #define DW_MMC_QUIRK_EXTENDED_TMOUT BIT(0) +/* Force 32-bit access to the FIFO */ +#define DW_MMC_QUIRK_FIFO64_32 BIT(1) =20 #define DW_MMC_240A 0x240a #define DW_MMC_280A 0x280a --=20 2.38.3