From patchwork Mon Jun 26 14:02:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 112959 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7513996vqr; Mon, 26 Jun 2023 07:14:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7F4FzK1OvDx4Dv7DJw/PxuSUYXM+Qw8OoJ6PbF/hZC8GjHf1i5pippuXpJ57WO8EbauTfm X-Received: by 2002:a05:6a20:8427:b0:10a:e9ff:808d with SMTP id c39-20020a056a20842700b0010ae9ff808dmr39940018pzd.0.1687788871020; Mon, 26 Jun 2023 07:14:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687788871; cv=none; d=google.com; s=arc-20160816; b=smr+XFHqUA33ZqUpEhcwWktqvN+0Yyy71WwzB8QJmgxcHyfQWYxU1F+y9dJ9wkUUJO 2WW3TG9UkqNlCSaDfYmdr5Puik3VpFFIOQWjqb+0ozUFqLseA5kZJE+2dNq3olZdeZvd CK1lZkZ81508QfaRBcEjsc992Yy0XvlQ0s3io50hR/4iw8slRnCuDGYQ6lojg/w0BwDF YO8L/mJfuOiuBAaZUQboCo83CdN+jOuNgivIWHyop6iG/BoWn8O7HFhj4p8yh54NWtlx 7kboISAW8B1rQvbCmQ2UGvFc42btgAsi8k/Yzo5qRUvM1u+n2hoDVJrR+zmkUfYWqIM9 6PbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=CdBkkycqxXcREXc5D1EbWSkmzo6fbVJHSEggnxlVBus=; fh=imCAvjsqFPXV5dPQpX0+N56rcg5s/4jRz8T/iImajDg=; b=LLbZL9fysqXu1jCY1UNw6hQELC0akW25o60VKt6s1QQwP6qwzAsZzseswA1K9BwM4E BoBz/4nQT4y+2jsY0PHNN5Wea5yWofLId78W5ebzErHnVZqLLiP7ZOazGaGz78F0x0kb A9AZVQFwvyLzQDcOaSLJtzhiuGDOryfkQ7IonTpuhZMwgqxw2SERN7mdMOnZeiq7Qmfi mNN5ZT9RSp0rnY1Gq6zod1P89yZPHSGHadmyrgczXcUjZ7JgcGkfEQ+GgMWbeQdKNORS fymKNJFKet6YVUlWhJ2k1w2KK+ABST8qjrG4IiL1UIeHm8KgtLG3RJUtQyAM53VDsJX5 Zu1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cSgwPIfB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n3-20020a6563c3000000b00553ebb05d16si5301521pgv.12.2023.06.26.07.14.18; Mon, 26 Jun 2023 07:14:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cSgwPIfB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230384AbjFZOC2 (ORCPT + 99 others); Mon, 26 Jun 2023 10:02:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230328AbjFZOCV (ORCPT ); Mon, 26 Jun 2023 10:02:21 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBBE210F for ; Mon, 26 Jun 2023 07:02:18 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4f954d7309fso4099644e87.1 for ; Mon, 26 Jun 2023 07:02:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687788137; x=1690380137; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CdBkkycqxXcREXc5D1EbWSkmzo6fbVJHSEggnxlVBus=; b=cSgwPIfBnxw4YImYMCYQwiR4LIzRtzR8OuQA7SFtROcUnooNYKZdalS2NoDJc7Rtan qw9kyjIUfzdUIBzs2WtKrjgw8L4lkOLXzHFZ+6F/DP+hKfbkCZAe7XXVPMcC9uq6dHr7 PEPW3KxHrkUTECJXHnYTLGVR67sqhQVGQ1ka3IuwwIamRe46QkmP/37tqlcundgKDrJi S3CUkFZmOh5lIlC1hSvatlEXp/Ymfn3Y9dkdTEEx0lwMHzvuAe8zP2qtTkY+5knnyr+u zvwchZcba0HDWeIT7yarhgtTDWazX1DFqg2MwIg2+0ZHUCL9pwKjNApvSWA7o9M2HDMg P8lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687788137; x=1690380137; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CdBkkycqxXcREXc5D1EbWSkmzo6fbVJHSEggnxlVBus=; b=IKYah+r6twxQI2HlbFF3LFvbh960eO2pXYeQGaUCnLfr7bxqSZILlKlTA3f2shezrI 96eA7fV3xYF16bmwp4+gUQPkxL+zAEGpDF4xHwmLmPc06Ovs0HyGz61up/nYDKTO4JnV Lr/y3ovSoCLtnhTrO2kQaoylI9PXEz/poGM0X9HNoh/ZXPMcqcH1mmAKDL/UtXuCJMe6 Il5nIGXBsiX9GmxxsNKMzuQdZ+KyvCphbSvwjbAzAG+GMkf0XVUMKrL0nGsMCt9cBseX Xf55F2gXgYhuoRJk1rhzwCdZD6ZxSJXSGBQcVC5t63si0n39JDiQfxgemPYR5IlK0TI8 s4NQ== X-Gm-Message-State: AC+VfDyIkXL7L6pEn7fPmcIL7c6jy7AVfQ9Df5Y4jy57lAYeEpx5Oy+5 YwFOSs7SdptyaQmPvfkAzye7fw== X-Received: by 2002:a05:6512:110a:b0:4fb:7bf8:51c8 with SMTP id l10-20020a056512110a00b004fb7bf851c8mr152072lfg.1.1687788136905; Mon, 26 Jun 2023 07:02:16 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id d13-20020ac241cd000000b004db1a7e6decsm1117454lfi.205.2023.06.26.07.02.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 07:02:16 -0700 (PDT) From: Ulf Hansson To: Linus , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ulf Hansson Subject: [GIT PULL] MMC and MEMSTICK updates for v6.5 Date: Mon, 26 Jun 2023 16:02:15 +0200 Message-Id: <20230626140215.83367-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769774902919911663?= X-GMAIL-MSGID: =?utf-8?q?1769774902919911663?= Hi Linus, Here's the PR with the MMC and MEMSTICK updates for v6.5-rc1. Details about the highlights are as usual found in the signed tag. Please pull this in! Kind regards Ulf Hansson The following changes since commit 413db499730248431c1005b392e8ed82c4fa19bf: mmc: usdhi60rol0: fix deferred probing (2023-06-19 13:32:39 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v6.5 for you to fetch changes up to 06b5d4fea89cd699408af12c14b6915d77ceffb0: dt-bindings: mmc: fsl-imx-esdhc: Add imx6ul support (2023-06-22 11:08:10 +0200) ---------------------------------------------------------------- MMC core: - Allow synchronous detection of (e)MMC/SD/SDIO cards - Fixup error check for ioctls for SPI hosts - Disable broken SD-Cache support for Kingston Canvas Go Plus from 11/2019 - Disable broken eMMC-Trim support for Kingston EMMC04G-M627 - Disable broken eMMC-Trim support for Micron MTFC4GACAJCN-1M MMC host: - bcm2835: Convert DT bindings to YAML - mmci: Enable asynchronous probe - mmci: Transform the ux500 HW-busy detection into a proper state machine - mmci: Add support for SW busy-end timeouts for the ux500 variants - mmci_stm32: Add support for sdm32 variant revision v3.0 used on STM32MP25 - mmci_stm32: Improve the tuning sequence - mtk-sd: Tune polling-period to improve performance - sdhci: Fixup DMA configuration for 64-bit DMA mode - sdhci-bcm-kona: Convert DT bindings to YAML - sdhci-msm: Switch to use the new ICE API - sdhci-msm: Add support for the SC8280XP/IPQ6018/QDU1000/QRU1000 variants - sdhci-pci-gli: Add support SD Express cards for GL9767 - sdhci-pci-gli: Add support for the Genesys Logic GL9767 variant ---------------------------------------------------------------- Abel Vesa (1): mmc: sdhci-msm: Switch to the new ICE API Arnd Bergmann (1): memstick r592: make memstick_debug_get_tpc_name() static Bjorn Andersson (1): dt-bindings: mmc: sdhci-msm: Document SC8280XP SDHCI Chevron Li (1): mmc: sdhci: fix DMA configure compatibility issue when 64bit DMA mode is used. Christian Loehle (1): mmc: block: ioctl: do write error check for spi Dennis Zhou (1): mmc: core: Allow mmc_start_host() synchronously detect a card Douglas Anderson (1): mmc: mediatek: Avoid ugly error message when SDIO wakeup IRQ isn't used Florian Fainelli (1): mmc: block: Suppress empty whitespaces in prints Komal Bajaj (1): dt-bindings: mmc: sdhci-msm: Document the QDU1000/QRU1000 compatible Linus Walleij (9): mmc: mmci: Clear busy_status when starting command mmc: mmci: Unwind big if() clause mmc: mmci: Stash status while waiting for busy mmc: mmci: Break out error check in busy detect mmc: mmci: Make busy complete state machine explicit mmc: mmci: Retry the busy start condition mmc: mmci: Use state machine state as exit condition mmc: mmci: Use a switch statement machine mmc: mmci: Break out a helper function Mantas Pucka (1): dt-bindings: mmc: sdhci-msm: add IPQ6018 compatible Marek Vasut (1): mmc: Add MMC_QUIRK_BROKEN_SD_CACHE for Kingston Canvas Go Plus from 11/2019 Oleksij Rempel (1): dt-bindings: mmc: fsl-imx-esdhc: Add imx6ul support Robert Marko (2): mmc: core: disable TRIM on Micron MTFC4GACAJCN-1M mmc: core: disable TRIM on Kingston EMMC04G-M627 Simon Horman (1): mmc: meson-mx-sdhc: Avoid cast to incompatible function type Stanislav Jakubek (1): dt-bindings: mmc: brcm,kona-sdhci: convert to YAML Stefan Wahren (1): dt-bindings: mmc: convert bcm2835-sdhost bindings to YAML Ulf Hansson (5): mmc: Merge branch fixes into next mmc: mmci: Set PROBE_PREFER_ASYNCHRONOUS mmc: Merge branch fixes into next mmc: Merge branch fixes into next mmc: mmci: Add support for SW busy-end timeouts Uwe Kleine-König (1): mmc: dw_mmc: Make dw_mci_pltfm_remove() return void Victor Shih (4): mmc: sdhci-pci-gli: Add Genesys Logic GL9767 support mmc: sdhci-pci-gli: Set SDR104's clock to 205MHz and enable SSC for GL9767 mmc: sdhci: Add VDD2 definition for power control register mmc: sdhci-pci-gli: Add support SD Express card for GL9767 Wenbin Mei (1): mmc: mtk-sd: reduce CIT for better performance Yann Gautier (7): mmc: mmci: stm32: set feedback clock when using delay block dt-bindings: mmc: mmci: Add st,stm32mp25-sdmmc2 compatible mmc: mmci: add stm32_idmabsize_align parameter mmc: mmci: Add support for sdmmc variant revision v3.0 mmc: mmci: stm32: manage block gap hardware flow control mmc: mmci: stm32: prepare other delay block support mmc: mmci: stm32: add delay block support for STM32MP25 Yeqi Fu (1): mmc: core: Remove unnecessary error checks and change return type .../devicetree/bindings/mmc/arm,pl18x.yaml | 7 +- .../bindings/mmc/brcm,bcm2835-sdhost.txt | 23 -- .../bindings/mmc/brcm,bcm2835-sdhost.yaml | 54 +++ .../devicetree/bindings/mmc/brcm,kona-sdhci.txt | 21 -- .../devicetree/bindings/mmc/brcm,kona-sdhci.yaml | 48 +++ .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 1 + .../devicetree/bindings/mmc/sdhci-msm.yaml | 3 + drivers/memstick/host/r592.c | 4 +- drivers/mmc/core/block.c | 35 +- drivers/mmc/core/card.h | 30 +- drivers/mmc/core/core.c | 15 +- drivers/mmc/core/quirks.h | 27 ++ drivers/mmc/core/sd.c | 2 +- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/cqhci.h | 3 + drivers/mmc/host/dw_mmc-bluefield.c | 2 +- drivers/mmc/host/dw_mmc-k3.c | 2 +- drivers/mmc/host/dw_mmc-pltfm.c | 5 +- drivers/mmc/host/dw_mmc-pltfm.h | 2 +- drivers/mmc/host/dw_mmc-starfive.c | 2 +- drivers/mmc/host/meson-mx-sdhc-mmc.c | 8 +- drivers/mmc/host/mmci.c | 208 +++++++++-- drivers/mmc/host/mmci.h | 25 +- drivers/mmc/host/mmci_stm32_sdmmc.c | 179 +++++++-- drivers/mmc/host/mtk-sd.c | 48 ++- drivers/mmc/host/sdhci-msm.c | 223 +++-------- drivers/mmc/host/sdhci-pci-core.c | 1 + drivers/mmc/host/sdhci-pci-gli.c | 406 +++++++++++++++++++++ drivers/mmc/host/sdhci-pci.h | 2 + drivers/mmc/host/sdhci.c | 4 +- drivers/mmc/host/sdhci.h | 7 + include/linux/mmc/card.h | 1 + 32 files changed, 1067 insertions(+), 333 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhost.txt create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhost.yaml delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt create mode 100644 Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.yaml