Received-SPF: pass (google.com: domain of linux-kernel+bounces-144654-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <52c08a01-8357-44dd-b727-a06438ec6c30@intel.com>
Date: Mon, 15 Apr 2024 10:18:39 +0300
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] sdhci: Fix SD card detection issue
To: Richard Clark <richard.xnu.clark@gmail.com>, ulf.hansson@linaro.org
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
 linux-arm-kernel@lists.infradead.org
References: <20240415070620.133143-1-richard.xnu.clark@gmail.com>
Content-Language: en-US
From: Adrian Hunter <adrian.hunter@intel.com>
Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki,
 Business Identity Code: 0357606 - 4, Domiciled in Helsinki
In-Reply-To: <20240415070620.133143-1-richard.xnu.clark@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 15/04/24 10:06, Richard Clark wrote:
> The mmc_gpio_get_cd(...) will return 0 called from sdhci_get_cd(...), which means
> the card is not present. Actually, the card detection pin is active low by default
> according to the SDHCI psec, thus the card detection result is not correct, more

SDHCI spec covers the SDHCI lines.  GPIO is separate.

> specificly below if condition is true in mmc_rescan(...):
> 	...
> 	if (mmc_card_is_removable(host) && host->ops->get_cd &&
> 		host->ops->get_cd(host) == 0) {
> 		...
> 		goto out;
> 	}
> The SD card device will have no chance to be created.
> 
> This commit fixes this detection issue via the MMC_CAP2_CD_ACTIVE_HIGH cap2 flag,
> parsed from the 'cd-inverted' property of DT.

What hardware / driver is it?

> 
> Signed-off-by: Richard Clark <richard.xnu.clark@gmail.com>
> ---
>  drivers/mmc/host/sdhci.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index c79f73459915..79f33a161ca8 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -2483,6 +2483,9 @@ static int sdhci_get_cd(struct mmc_host *mmc)
>  	 * Try slot gpio detect, if defined it take precedence
>  	 * over build in controller functionality
>  	 */
> +	if (!(mmc->caps2 & MMC_CAP2_CD_ACTIVE_HIGH))
> +		gpio_cd = !gpio_cd;

MMC_CAP2_CD_ACTIVE_HIGH is already handled in 
mmc_gpiod_request_cd(), and this turns an error (gpio_cd < 0)
into 0, which is not right.

> +
>  	if (gpio_cd >= 0)
>  		return !!gpio_cd;
>