mmc: mtk-sd: Fix MMC_CAP2_CRYPTO flag setting
authorAndy-ld Lu <andy-ld.lu@mediatek.com>
Mon, 11 Nov 2024 08:49:31 +0000 (16:49 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 12 Nov 2024 18:36:30 +0000 (19:36 +0100)
Currently, the MMC_CAP2_CRYPTO flag is set by default for eMMC hosts.
However, this flag should not be set for hosts that do not support inline
encryption.

The 'crypto' clock, as described in the documentation, is used for data
encryption and decryption. Therefore, only hosts that are configured with
this 'crypto' clock should have the MMC_CAP2_CRYPTO flag set.

Fixes: 7b438d0377fb ("mmc: mtk-sd: add Inline Crypto Engine clock control")
Fixes: ed299eda8fbb ("mmc: mtk-sd: fix devm_clk_get_optional usage")
Signed-off-by: Andy-ld Lu <andy-ld.lu@mediatek.com>
Cc: stable@vger.kernel.org
Message-ID: <20241111085039.26527-1-andy-ld.lu@mediatek.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/mtk-sd.c

index 022526a..efb0d2d 100644 (file)
@@ -2907,7 +2907,8 @@ static int msdc_drv_probe(struct platform_device *pdev)
                host->crypto_clk = devm_clk_get_optional(&pdev->dev, "crypto");
                if (IS_ERR(host->crypto_clk))
                        return PTR_ERR(host->crypto_clk);
-               mmc->caps2 |= MMC_CAP2_CRYPTO;
+               else if (host->crypto_clk)
+                       mmc->caps2 |= MMC_CAP2_CRYPTO;
        }
 
        host->irq = platform_get_irq(pdev, 0);