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;
From:   Charl Liu <charl.liu@bayhubtech.com>
To:     adrian.hunter@intel.com, ulf.hansson@linaro.org,
        linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     shaper.liu@bayhubtech.com, chevron.li@bayhubtech.com,
        thomas.hu@bayhubtech.com, xiaoguang.yu@bayhubtech.com,
        shirley.her@bayhubtech.com
Subject: [PATCH V2 1/1] mmc:sdhci:Fix the SD tuning issue that the SDHCI_TRANSFER_MODE is cleared incorrectly
Date:   Thu,  3 Nov 2022 23:42:21 -0700
Message-Id: <20221104064221.812-1-charl.liu@bayhubtech.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?238UJnGVantirW1FbiQSyOfVuFUunGLrrMAjoHQXE4OJ6gkoaEtOMosAPxIT?=
 =?us-ascii?Q?NRt7zMI7XxRhYdLoUr5/GjD5MGm7oGK51FPG6PyD61qpsck3AKNh3KyIBq5n?=
 =?us-ascii?Q?2nNUx3bcTcwYjKLOqkJm+W/2sI5oCtVJafYdQ4012VpbotJGrtfZUdSGbnsz?=
 =?us-ascii?Q?m+eEYSDu6UdQcfkgXpi85ayy3v2B8g15CM2vVmrysF1OFFo9+KbYVf4QIXNb?=
 =?us-ascii?Q?tOXI2qf+dP9qbgYB4SGnWb+xJ/cTyjuDjHqG0Zz50s0gXcO3AGUZYBNFlHGm?=
 =?us-ascii?Q?zYz5eg6dY9vSD+in9HY5k3l6v1P1Mahnwe7Hva3nppfHJJbDJCOmXSrGmzc9?=
 =?us-ascii?Q?JSMMBOkIbzu6kyB3j6VYQQy8Bqp4ZrXNyh0plxQB6Ov/d5oP56dj4s7QgA/I?=
 =?us-ascii?Q?LGbB6+2/j51fz1bNeUOopvkpQKQQcVekQXOP1PZngXzxme05tSlG38ThYnqG?=
 =?us-ascii?Q?zIgI2iNv6VjR3dwFuSZJpx8epUlbxBb154EEpCn9Gph3/+leOhn+UGJq8Mwa?=
 =?us-ascii?Q?Ay2nG/jnlC5RgZXzMNkrcjz09qZJivvWdZ2yvHlotSGuRxB9yfTR9lwFmFMn?=
 =?us-ascii?Q?bLJIeYiALcSgDdAcvbiB50sZSbG2e7JDdF/59v1r0UCek1GKsURsteS/Wv4M?=
 =?us-ascii?Q?twZdqjyN1yA6e5aQXJvQ0p6f0HkOyv7WZhwqm/jUZv8IlzKFH45tRn4gzXgP?=
 =?us-ascii?Q?SDFRdaVbtxv2Occ/W2cUmxH3717JXbNC5kMLD5PrTWjQFmdDDAYp5MTAEEdi?=
 =?us-ascii?Q?Re3eGhSWcgVbqfkV7aTAaG3+QenFApuCI/Pl+gyVQfCyFDQKKRAo+KSl6ZS0?=
 =?us-ascii?Q?xAuT9yALf0wmPf0M3G+tD4qSxVxHzjF/Oj5/1Ww7OYH3ZwKo1Qp9l5EBXrpA?=
 =?us-ascii?Q?3JlzoClGTyGn0xPiGh1a3B1wFFnQX1abvbSPO4l/ZHltgs3pcTG8JOE4ZAyC?=
 =?us-ascii?Q?BQelZYqx4Ul7xZu+zkAOX+zVzAjzdFRUY+X8g97wTY8rj7P7q8deya5pnxGA?=
 =?us-ascii?Q?T7pbIxOsJyn/WvdL7QKCg7H/lv1BfgPusl9rRqtC3tm6pbrI4Q1AtF5KLlhU?=
 =?us-ascii?Q?wgtIS+wQyl9KoQt4DQLQPzCwVU6XYzh4aGzREUw/YTZiNNjOmy2J7lX1Vh8u?=
 =?us-ascii?Q?u2VDqy3vsgHzZmei9aAxWLkLICkYjw6ZWAQjE5z2Rxhx9R1RdlQExK0ub4dQ?=
 =?us-ascii?Q?DUyAmFtf9fiyN1Ziq13u+lWePxh0paUjCkRnQORJH4Nb36mXHu8P3XFvAkkS?=
 =?us-ascii?Q?GhX6/R5OXpKa1tADQDYTwyUAQF1qsovvxgFRbjh+xCxRlD6drIw4aCL2yq4t?=
 =?us-ascii?Q?2/1U2xQZUSyg8pJ8Agqhit1OWsxFQrRBXShwp+0TdRjCDHt+jhDqWSn11J+z?=
 =?us-ascii?Q?7jVG2dGxQ7kaIzRPQxTkrmJqyXLvCjXEMjjEskfVMjHBBZcLEY9plPrTyO65?=
 =?us-ascii?Q?MMZdVPoXPdFL1mDpuNGKcdrsZep0TugSoCbloOkJyq2x/K6S383u9wGEjtVJ?=
 =?us-ascii?Q?xDHPmpCOrjMmaAlD/9QC5PG6NH+PN+h8dTWN4HBU/DClFEFVAVcffRbi/ViT?=
 =?us-ascii?Q?R11Ys6BUYUIhhBrpIQyMARCNHrFVbg6HCoHuxQ5sYeiMb59pE29P5OGdMz4h?=
 =?us-ascii?Q?BfzK5h7zYKDYXs3kl22nxK4nqNM0dJiqX56SjwyGrlY8TFMu+Gl4VmqATBpd?=
 =?us-ascii?Q?qwBG9w=3D=3D?=
X-OriginatorOrg: bayhubtech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c2dc505e-0eb2-42f1-74eb-08dabe2fc1d4
X-MS-Exchange-CrossTenant-AuthSource: MN2PR16MB2781.namprd16.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2022 06:42:35.2263
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 0a7aae2b-8f2e-44df-ba2f-42de7f93c642
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YpfRKbxCa0cq+nSdBUuaiIpRzEuBgre9Zz882qOQdYoDFFFJaHH6ywml3I9JEFcrKqVWVPkzft+mXEsz38xEEO7umafH8yiG0u/ZiUbsPPw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR16MB2686
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=ham 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When cmd->opcode == MMC_SEND_TUNING_BLOCK, the SDHCI_TRANSFER_MODE
should also be kept

Signed-off-by: Charl Liu <charl.liu@bayhubtech.com>
---
change in V1:
Keeping the SDHCI_TRANSFER_MODE when cmd->opcode == MMC_END_TUNING_BLOCK

change in V2:
add the mmc_op_tuning interface to judge if the opcode is tuning CMD
---
 drivers/mmc/host/sdhci.c | 2 +-
 include/linux/mmc/mmc.h  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 22152029e14c..9388628215ca 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1430,7 +1430,7 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,
 		if (host->quirks2 &
 			SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD) {
 			/* must not clear SDHCI_TRANSFER_MODE when tuning */
-			if (cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200)
+			if (!mmc_op_tuning(cmd->opcode))
 				sdhci_writew(host, 0x0, SDHCI_TRANSFER_MODE);
 		} else {
 		/* clear Auto CMD settings for no data CMDs */
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index d9a65c6a8816..d809bdfcc59b 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -99,6 +99,12 @@ static inline bool mmc_op_multi(u32 opcode)
 	       opcode == MMC_READ_MULTIPLE_BLOCK;
 }
 
+static inline bool mmc_op_tuning(u32 opcode)
+{
+	return opcode == MMC_SEND_TUNING_BLOCK ||
+	       opcode == MMC_SEND_TUNING_BLOCK_HS200;
+}
+
 /*
  * MMC_SWITCH argument format:
  *
-- 
2.32.0