From patchwork Tue Jun 10 11:16:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 895438 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47F31223DC5 for ; Tue, 10 Jun 2025 11:16:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749554208; cv=none; b=ZlafCraDSgiXVninmFhgFKl+m7LrN4vWObS7qXdjfFUTzW88W/9/pGD3KF+A4xnOjgwdfGeHFRc687Bn0DQRX7Ln0ruEltsp0es4Xom+K13cl5yaD8rNNNP5+kI8Sogff/KZLlmh1CPdhN4oRmfBUssApsHiHPmpqIpTwXPPPPI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749554208; c=relaxed/simple; bh=zDeUcuv0yIbt+CHEosHsPE/6OpchOeANXKzL+3pPZ5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZJ2Jkpftb57bhTqUl38MQBITSh2IVyFwYmyh3dC6nxeMjHiHsYv9BhCNxdQt8TQmsPJXd2iDXk1yS643SyuqyUKdofJ1/DzG96asQ9vSnyPlOo3UQcvwCDGw6Gs1Nx8q0JAHrUl7yppJ4uzUD5Nr6k2JCeU2/7h543uyA3oSoh4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=AHOfRn2K; arc=none smtp.client-ip=209.85.167.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="AHOfRn2K" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-54afb5fcebaso6351036e87.3 for ; Tue, 10 Jun 2025 04:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749554204; x=1750159004; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DaisSQk71updXPXwWenQ0eCHUVGGjGQ9tauWhBJXRks=; b=AHOfRn2K352HHbttT5Z+D+yaoRH+pl23mWkGaVrmPF9XQR4JzyFwi3b/fTOsTmxwF7 9W8LWPlVJx6ubYiMoIzvkijlsDVDKHCjpAn3mucnMiJFYhDGh7uLqGSSZGE3ccTRSVsG 6AoFRduNmUnnNODVMcKrkuq0B+D+TR70ypXCyNG6mxDxNPle8Dq/9/ZgSDTs20muYBey M+ohTt6ooiKFv3gnmrHa3E7G3p6WKiOaDAioKQ9hjZcFCK6fTyaYlx6GJiAuZYtUL66F 6ob/q5GRukWsibxHcoLGYoWDyyCJCLjBk0GF1uZos5KbmiVd05jTDpzl6J0o2XjtK16r RcMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749554204; x=1750159004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DaisSQk71updXPXwWenQ0eCHUVGGjGQ9tauWhBJXRks=; b=KnvrKgDN6PA7pESsQcZHodMT1A8WAdOcZGnW/8uVlxs960snSH6ZVQLCweYT+82PmR ksKk6Kdma2QcxaIC3jYIZpqCyIHfHZcuDXdolRVDG2DnyFbAJ6vDJuS7XYLy38w4Ql3S 1uKgTQA6f4ItgffTpepzYXvdYn60bOE3V8J+/XFBRSwCc70ELgrts0mP8mX7vwSM0xAS KoqIF4FI8CBdvV7kjNyWa0lv2l1pmsRk6l5QiWSHNfTsGqtrHkMSo/RVUOyDfXmoqVnM Ze2jPL/7oAfwqIdfCt68ICpimq0RvwrWvdZVMXj09I/l4nL0jXIKXkbU5rLojIb9stru Q3Eg== X-Gm-Message-State: AOJu0Yxm/Cre7M2tfQn2kZGNr3NR2a8p+8V0ENzsO58IeEVARJy2dJZE sbD717U4XXkRBJQR6CnBFqY68OwAd70lG/IdY2DrKvD3W9JSFI5F7FIZr8dhiXhr3Ihutn4XW7r FOTnfIAA= X-Gm-Gg: ASbGncs2CuQQXmUDU7FCxK6k/yzXnTg1Sfq6DLSwHn13wCLVLLO2UPvDUDvG3aD1OnQ BZmt5b4/YZOhc8gnjUohPd2JWJbw+R1o9PBSW0g+q+Zo+0y3QFZWhL4eoo7VNIJKCm4elFAlEOu 7zBU8ifPAjMSr2kGITfa5csNT7cKYnaAYCVqp9aw+aDy8TaPe1j5MZYdoZ7HzIfDxebWrAwYG0l LMP1Wt/wYbpNpHDua0t+1p06as9k6jBTLOZIlA3ScEfWTTzc9DUtA8k4cdPNZ4asmnNxyWifUSA OslfyghzvbcAxmjJNuSA9cJiEodUqA5lEWfjZipbuQXdTagqfxTvF9ed/ki9MoF4a4atubGyqC5 4eaf+r+pjvUK0ER/GTwAXaoE8Qg5b0tGs3h94 X-Google-Smtp-Source: AGHT+IFY3VnRE9UcSrBVBH5iOgtbkmizeDx0kmpdz4+rinUwu3zbjO++INcIj2dBpGSkxIptNQK/Jw== X-Received: by 2002:a05:6512:1318:b0:553:515a:5ebd with SMTP id 2adb3069b0e04-55394745ef6mr667032e87.8.1749554204142; Tue, 10 Jun 2025 04:16:44 -0700 (PDT) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-55367722481sm1500146e87.126.2025.06.10.04.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 04:16:42 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Ricky Wu , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode() Date: Tue, 10 Jun 2025 13:16:23 +0200 Message-ID: <20250610111633.504366-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250610111633.504366-1-ulf.hansson@linaro.org> References: <20250610111633.504366-1-ulf.hansson@linaro.org> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In the error path of sd_set_power_mode() we don't update host->power_mode, which could lead to an imbalance of the runtime PM usage count. Fix this by always updating host->power_mode. Signed-off-by: Ulf Hansson --- drivers/mmc/host/rtsx_usb_sdmmc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index d229c2b83ea9..8c35cb85a9c0 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -1029,9 +1029,7 @@ static int sd_set_power_mode(struct rtsx_usb_sdmmc *host, err = sd_power_on(host); } - if (!err) - host->power_mode = power_mode; - + host->power_mode = power_mode; return err; } From patchwork Tue Jun 10 11:16:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 895662 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 537BA226161 for ; Tue, 10 Jun 2025 11:16:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749554209; cv=none; b=ZxcWh6l1qF/s81d36ifX4lHlcO3YIu8bTm8mZw/ndQBXGGJCjk2cpTliPHkR7avXQr9A9MNn4NEpSaleFJdvKnmZ/aibyl29gWH7vZ8yV8w3VvbbFt1VMGGXXxVsAd8yB2PyGe7hq/h05vq9bg7UzWbKalbv8X+ojX/+wAylze8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749554209; c=relaxed/simple; bh=wLLJmOQJ18uLKIlN2M5/WYRzh0iJEMOdjCRJqqaJhYc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d4tVFRdpdEQIw7ez8IK8zwujLdxBuYuOkfwuUl2J+fPKX8B5wPmV99RSqdNTMWrSNjmU+Z9ROUbDyxehmqD86YQNOuGdPy33/1fgyLlG8cIP9MYn6PKyzaXjdvIpegsUfwR6nn+5xTBCWnFz1gVIu+L/IX8N3SJhdR8OGutb8M4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=jg7tMin0; arc=none smtp.client-ip=209.85.167.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="jg7tMin0" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-552206ac67aso6449901e87.2 for ; Tue, 10 Jun 2025 04:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749554205; x=1750159005; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wnN9sQ1yphiBQx4a25u6KZxAXJc9uNDdDG1dBOTP22E=; b=jg7tMin0YEmDGDyZKwBYm9HuBxAe14hARHx4C9Djb+h2Dc6aSdvkTJL464MJKN8w7u 6hRqytAQg3HPKOq/j20LPkSJNG0DVMIpqH4SUPyzzlg9AglUOAyWyL9AbAKwOMii/guZ KxStum5BVMMShgnzo7h+LOI6sYhubUXyUg2I7ZQI4nwFHXuesX40SWT/3yggnqurIfQY ai3miKs26pzfYpqfVGvfAvp1OZ8Iwpf65UwkF2CXrSBVT6oFcjJgCX/+IbMDHJRbVdkz JRLwWtxIvzLmLrRW9FfgyUmRD1kDtytSn+744CUWsP0ALMjYluo8X+v5YgqOOIt/sU9k F2Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749554205; x=1750159005; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wnN9sQ1yphiBQx4a25u6KZxAXJc9uNDdDG1dBOTP22E=; b=NeY2WF6xERPL3bwqIshuaUVk4O3EpJw8qttGCuR7B1HhD7gwm74FiXWcpHN/zyeToo 2kkcUcL1Dw+IdLUJhhKmYmKCjcxdbpqz5j58qeFB6Rk3YdU2H8JHGQc3JWQKv5FPbim6 rrS/H3hPS8Amo+sDWJrIJBHKdm3I3rBLng6LmdxlRIdfncJvxJo+zTMbv6/4bvCGlf64 CMUas+XOfu9BWQQH/yBcA/mFBorvMF5FOwVsGEZZWlx7NtZdOom+4jV37WwP5rVtXA5R 0yxVlF8v5qaJV7HculDChq2xh+ckpJ6d58vLfbBicR+Nk5shWc+pCqRbgfayzBs/ujMu fJXg== X-Gm-Message-State: AOJu0Yy7BKgNSW3wIQS1ntqMeaM9lRXNHEjbrWW47FcXdrRB8URR1dAc qtY6w6uLR2jDJRgAqAMWCU9T2A5GXvMCehaUwZY1WHwxcgyQtCYP7IB0mAZbidryoDASKbxTCRr +xxVvREE= X-Gm-Gg: ASbGncuL7Ih/ZnclRdaZZhr48z4OsG8oKkYOYtQmF/H5jcbpSxkbNQG+8xY7hZiY6kG hah/g5W2Z71Z6w1zSxWElr0JMtUX+6nReQmSmW2FF1Fs/vZLaDavh0BeRjW1S3tTft009Q4NM74 Yvk+QNlpEqUzYxBWxqnFGo2nj/u7RJilczxBTmd64Q0slRQ1jiIO8aa2/2QNL0AYKL9fS0d9pgc kw9BsTZOEFJ/6DFGJSSPlPUUU3MJvQETsnAedpAKgmXV+NlVG0dY+g065gjFfESJy/25Z4nbO5w x5luJs8VegH66Ue0VU9JXd/yReN6ASR9FGVVaVRsN/7pZCCy7pcYV8T642WtV7avl/AlHRXMQrb vPNzMnJeDaBOJYqSBCuFOwuCsZGv29zdpI836 X-Google-Smtp-Source: AGHT+IGmpHd8lIlZVdZTjU5PAjkevrDkv0bWhCAiyYC16cFI40T3Wsvz/AvzpYrW0BRCpDYvuwv1wQ== X-Received: by 2002:ac2:53ac:0:b0:553:20f2:2e77 with SMTP id 2adb3069b0e04-55366e33a1emr3605992e87.55.1749554205189; Tue, 10 Jun 2025 04:16:45 -0700 (PDT) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-55367722481sm1500146e87.126.2025.06.10.04.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 04:16:44 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Ricky Wu , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] mmc: rtsx_usb_sdmmc: Print debug-messages at power-on/off errors Date: Tue, 10 Jun 2025 13:16:24 +0200 Message-ID: <20250610111633.504366-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250610111633.504366-1-ulf.hansson@linaro.org> References: <20250610111633.504366-1-ulf.hansson@linaro.org> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 It should be useful to know when we fail to power-on/off a card. Let's therefore print debug-messages when this happens. Signed-off-by: Ulf Hansson --- drivers/mmc/host/rtsx_usb_sdmmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index 8c35cb85a9c0..c204cdeaee3e 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -1023,10 +1023,14 @@ static int sd_set_power_mode(struct rtsx_usb_sdmmc *host, if (power_mode == MMC_POWER_OFF) { err = sd_power_off(host); + if (err) + dev_dbg(sdmmc_dev(host), "power-off (err = %d)\n", err); pm_runtime_put_noidle(sdmmc_dev(host)); } else { pm_runtime_get_noresume(sdmmc_dev(host)); err = sd_power_on(host); + if (err) + dev_dbg(sdmmc_dev(host), "power-on (err = %d)\n", err); } host->power_mode = power_mode; From patchwork Tue Jun 10 11:16:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 895437 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DCD128C879 for ; Tue, 10 Jun 2025 11:16:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749554211; cv=none; b=j4Q9+p4ovU3DomV9a8Uajvy7N4x3wMmoKUuhgboLvIQzoKtq8IHdEvLXPxmCOld3PKBdv+Vp8nep64CplrDW1IkkIyMMMOMUYPndRFgdHHK2COoxsbyYcZleAeH310zQWVjNazRcB5H/EL7JpWzWIUaDfDUHMKkH44Wj6hNGX0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749554211; c=relaxed/simple; bh=Q2G+6qC4eXTH3lTxHkq3eblVciHhR4sMPJfXSbMcZXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d+QK06TXBPyBlBLCx+1sMztAMHF4bMlJ3wRgfPhwvf/QpRrpLemyvyqjsyCg8yLJpM8PU+gLxQconDqjGGowazSpAVzzBn35c/iPMPCeae9Ft3+gv8eoUZgiysquEkahotjkOwtwXNrA3Vs2V1cUQdbGZSti8KRjurSRbn2SB/U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=K3Sbiz9/; arc=none smtp.client-ip=209.85.167.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="K3Sbiz9/" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-552206ac67aso6449931e87.2 for ; Tue, 10 Jun 2025 04:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749554207; x=1750159007; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wb7O/WfyRrI7BVa8uAeHS7SpLGTdVUHqO49VpFjc3ic=; b=K3Sbiz9/ydJUT61nEBgHGRWgUAxRmf2A5lbQhaTtJ3lH25p2Xg+ObsJrhs0To3KtXj LVH5bQKcs0XdZ5Uv/2yE+lM8DT7qE8ExHJzFFpJ4qc1DiadOb1JPwlTjKv7Hem7Bgl5S Gxl7C6u0GMjYnrbEg3vTSNkJPKyt4yMP+lNYXSqtK1nCLKHbXkqWEP7Szp4EBPGCd/sB y8CMhov3xxpLh56a2mnbsu2DJ58eI9ORnvICrjxiT1bhR7FuuGgrK9DqjDxhMkM6PjIf dMTZJGForgji1gWABYdiNET59PUnn+XkzLlP/F/SRmNZqHKzhCnOvQp+SOdMj0cN8+cq LV3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749554207; x=1750159007; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wb7O/WfyRrI7BVa8uAeHS7SpLGTdVUHqO49VpFjc3ic=; b=ZBES4+BrPgNQAbSHq1Ghd+0Kc9fvUJuyhJRI+56FQuyhFgTgMYI+Qbv8Wiw0S0l6d6 H1u8T1bj7FbaEuXwoylOBpPrbVqsv85zshfbuNjp3997DVMjkxUwwFFeok/9knjNFnWe dCHFM7oPPcnLrBYH0L0UWbCH041aAb6gWWEC0x0tEp5YeDG/3erW7dy/xc+NdRbHstGy SJrM25sKz+KVFPaQVU71fBSVdLtHJT+S4grMGpgrxAEmk1Chn+zTm2EYuRdn9LYJA3qP I3qQm22xwNuT+PQP/gH1S+AJ+JAWAQ7uhdIytSwYy/iAg6DXTa92f3v0DCpG6ux8APYj zvyQ== X-Gm-Message-State: AOJu0Yx7Kfx9PQ6ODjv44HAG6mo7pOtD/mA7F3MM0VkY5O5L1mQCKYAv c81sdDnhLA7i/kdCVzDA7XOTf2AsYyB1Z2uyxec8LNa+OiG4mH/cJ7qbHoB4DA7RtONWGHvVG3J peAe8u6k= X-Gm-Gg: ASbGncu0KaXc10hvFY5rDcp6uuG9zhUG/Uy7cfbvJY4iFDmpqdP8lP4Q+SROYkmHoSn A3PXeCCTOK7JsczltP1efS+ahlCUcLhd6tXMiSonqjhGPPATON6djSCNlyZCaJQXJuEMD/Ul2UB h9bC7TnbbadCL1xJ3WnPNpP7z/7mOG380IChrs9VqzCQJiWPb4FCY3GZKoOyahHdj4mDtYm4Tin 0DLU3djJ5NXt/9selsLUaT2NpPGcM87USGXpBRlMbM4lylIBp2HALa0rLToTvP3dLspYVsbbHet EVizFHv2hVXV99YQrTvU+T96+6u0TfDT5IUxwiDpbRZiRtcO0ilHqcgrDAOToDA84H7KOgnRv9t LpbgSL38t8c+qmOe341KnTgD6knZttUG6C1DP X-Google-Smtp-Source: AGHT+IGcJjeSLPZhPYZFF9acT9CaBa+tleHeWD/nvlbTe8RESEGmC/LAyYSFCjwYD71GvdSbOrVrtw== X-Received: by 2002:a05:6512:3b82:b0:553:5e35:b250 with SMTP id 2adb3069b0e04-55366c0262bmr4758736e87.32.1749554207032; Tue, 10 Jun 2025 04:16:47 -0700 (PDT) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-55367722481sm1500146e87.126.2025.06.10.04.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 04:16:45 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Ricky Wu , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] mmc: rtsx_usb_sdmmc: Convert sd_set_power_mode() into void Date: Tue, 10 Jun 2025 13:16:25 +0200 Message-ID: <20250610111633.504366-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250610111633.504366-1-ulf.hansson@linaro.org> References: <20250610111633.504366-1-ulf.hansson@linaro.org> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The sdmmc_set_ios() is the only caller of sd_set_power_mode() and it ignores the return code. Let's therefore convert sd_set_power_mode() into a void function instead. Signed-off-by: Ulf Hansson --- drivers/mmc/host/rtsx_usb_sdmmc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index c204cdeaee3e..af45bac019d2 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -1010,7 +1010,7 @@ static int sd_power_off(struct rtsx_usb_sdmmc *host) return sd_pull_ctl_disable_qfn24(ucr); } -static int sd_set_power_mode(struct rtsx_usb_sdmmc *host, +static void sd_set_power_mode(struct rtsx_usb_sdmmc *host, unsigned char power_mode) { int err; @@ -1019,7 +1019,7 @@ static int sd_set_power_mode(struct rtsx_usb_sdmmc *host, power_mode = MMC_POWER_ON; if (power_mode == host->power_mode) - return 0; + return; if (power_mode == MMC_POWER_OFF) { err = sd_power_off(host); @@ -1034,7 +1034,6 @@ static int sd_set_power_mode(struct rtsx_usb_sdmmc *host, } host->power_mode = power_mode; - return err; } static int sd_set_timing(struct rtsx_usb_sdmmc *host, From patchwork Tue Jun 10 11:16:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 895661 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 916A328DF3E for ; Tue, 10 Jun 2025 11:16:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749554212; cv=none; b=cYStIdj2qyEq9vlSD2bXLNxNPfygpJB3OlR4W/YaER4ALCa6XnCNTiY9UI9S1hEIONxf6OMUx4L/ZuO5Ay5WmSWZixp2DcFEW7Pip6peo1qEN+p2eXAcysIuXF1H4JY0lRNqOeZol5e3sDJLWAxlVCelAKuMrcrKt5gHqbNIXZA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749554212; c=relaxed/simple; bh=RUnyAMGtHh+/vEL4sflSpEFAoSQObmIYvyugmKssooo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cufkDmHgxiV3g0ror23gjFZbs/24xdb7oOnGAbc47HSP3szea2bWIWbleW6zme677iE0Z5z7fF425NffVEkUb8tQIwjJUhvYC0+fLNKzaYGxPC5Y7mo1kSAOEidXCIorBcXxp9hhAILk0KtoTByZjDHItrIkXqJ9PVP+qdF3y1g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=fEj2Gubg; arc=none smtp.client-ip=209.85.167.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="fEj2Gubg" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-55220699ba8so6676927e87.2 for ; Tue, 10 Jun 2025 04:16:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749554208; x=1750159008; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GWS6iCfw+rN1nm0C9pkCk8oe46JcwKDDliTDyR8kmr0=; b=fEj2Gubg1GXhS1CkD/hOnUPCBm08bI3qFh3o/zUwJROXgMYYo+8o3hi8wYssqdjGLH V3bPoW7jN1eymaKUH0rTb3Ev+EY77Sbfcdbx8Iz4S8GvTtMcGsIdj7FvfXRCtg5QYyIm PHSpcRtGyH65gnsymHmoZVsNd2nF2TS7YgL5G5/ySbTyrZyyOxSV+7wsDjJPZVuXbMTz 3HOR6Wm2hkDdvjbJcf4xy20+3Se1Ew1ZQhB9sUwGuuJEKP2gXpMlahYU6F93XVD8kzNS J+qrDHigdjuHNxYgO98lpbUqHJLMoYVifCpE9tENjchJwwVZdqFiFEFuEPZMLind3jmv ULmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749554208; x=1750159008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GWS6iCfw+rN1nm0C9pkCk8oe46JcwKDDliTDyR8kmr0=; b=o9dk2ePqEeS7nAL2Cqh+iGolGqy/DbUryxFTLMGvNYyLAXDzlb+oSpmX5rHNOovQhD 3nXoeDKmsd6Y+zAFxw2ggZ+MIuTdh00dTTwyHKlgUfcVR+vEdIlhLOCl03+YIjIupwaC uqdlnbIt//JsiKGHlEd7V5wAie8yX+1kwQClclpTRhqZ4KZpq3VBe1mco6Nt3eioeKCp karjAPq9AYJpX2qPKsnjONO4PvkJiH0rwwnfiiFMsvDTosXuWUGmB2OLVo8Wjci4A6me pGWcqfp5p2OtpEoobRRboMtNlAxVeSueRpAyCN7BswUmbu7qeXpfVvOXN06W5gxJ5pnR ZvMA== X-Gm-Message-State: AOJu0Ywzrr6qxTY/zLPvIRcJRnsvuYnRIF0ayDKkDL2LKCn244Zo3PK3 GcPkWDSp4tluc9JTJM4w5uOEoadMtaorgoBy9LEDut8/zKUwqR+8Ib17nVCuPpEyXLT2mBNmIno a9mnVyn8= X-Gm-Gg: ASbGncvjpdcGT6hbtuEUwTqWbB3nDhMxTcAqwPwVMqhsWxeNyuDb/L43e5iFSWf5YJ7 HCl3eHw1P1KcFQfEIeu0PxOWcvOylgikGCfV6qKLpDlq/Om/xUjelv+Q4olgytx7/9z83wEqrPC az1UAUOaqTdumrP+DWx3zepe0IaMlp4fA04TT51d93qcLKC1hJc6G4ddU+6JdBAWwpPNjdXr887 sbswfwHXT4XbgSfdLU3LTpcR8GnOH5nZBp/BaqRHedmqvFnDcEaD+Q6cQ1GB17odUTQKkJoNIor MhSxKohSfT8P0EdWSjStkl8CFsfUOEtyvH3NSwsswhD+qG6ozVDFW3p7boG8iTmv1ri/Abx4J1D ujwm8CYhlWiazioUg8MXtFR/aFdbReVype0pi X-Google-Smtp-Source: AGHT+IHE+pv8n7aP2OaZM/clNWkmC54/7jafLxvDCyYVgdGlQISWH7wYhIrRa9Iq6Ak/oNlfAese7A== X-Received: by 2002:a05:6512:3e06:b0:553:291f:92d with SMTP id 2adb3069b0e04-55366c38ec2mr4260599e87.57.1749554208364; Tue, 10 Jun 2025 04:16:48 -0700 (PDT) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-55367722481sm1500146e87.126.2025.06.10.04.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 04:16:47 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Ricky Wu , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] mmc: rtsx_usb_sdmmc: Re-work the code in sd_set_power_mode() Date: Tue, 10 Jun 2025 13:16:26 +0200 Message-ID: <20250610111633.504366-5-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250610111633.504366-1-ulf.hansson@linaro.org> References: <20250610111633.504366-1-ulf.hansson@linaro.org> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 It's only at MMC_POWER_OFF and at MMC_POWER_UP when some operations must be carried out in sd_set_power_mode(). The code is a bit obfuscated in this regards. Let's convert it into a switch-case-clause to make this clear. Signed-off-by: Ulf Hansson --- drivers/mmc/host/rtsx_usb_sdmmc.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index af45bac019d2..c1fdcc334c8f 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -1015,22 +1015,30 @@ static void sd_set_power_mode(struct rtsx_usb_sdmmc *host, { int err; - if (power_mode != MMC_POWER_OFF) - power_mode = MMC_POWER_ON; - if (power_mode == host->power_mode) return; - if (power_mode == MMC_POWER_OFF) { + switch (power_mode) { + case MMC_POWER_OFF: err = sd_power_off(host); if (err) dev_dbg(sdmmc_dev(host), "power-off (err = %d)\n", err); pm_runtime_put_noidle(sdmmc_dev(host)); - } else { + break; + + case MMC_POWER_UP: pm_runtime_get_noresume(sdmmc_dev(host)); err = sd_power_on(host); if (err) dev_dbg(sdmmc_dev(host), "power-on (err = %d)\n", err); + break; + + case MMC_POWER_ON: + case MMC_POWER_UNDEFINED: + break; + + default: + break; } host->power_mode = power_mode;