From patchwork Mon Apr 22 10:37:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Shih X-Patchwork-Id: 791128 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 E282C14F129; Mon, 22 Apr 2024 10:38:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713782314; cv=none; b=eA9uZfC/JnVJjDPAPU9Mni8IH3vyDuGdYgESdUDgn0vGtwcQ/0zI67mGk0AxdXYerlSQaGKtzf3jQB9plP7z42MMXAU0aYkYlxAefr5TEY3M8cmfFAxrnBYdGr/avTn/I54Ow7R7+2O0MWGNjqahA1/TaE9TJN2MoEwAfYdoOlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713782314; c=relaxed/simple; bh=Em+1iM7UjRlQFiQoAFaPprAi1J+cKVhKD3y/KqQGlKo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=J+mYRiUfJz8mX8VjXG9zZ2tI773N0rb92rw/sFANJeFLT0gtc9MaJzcdlCIX+mjItr8vBDvVoyD5r5+v1oLyeF5lyQbvao846ZBEHgD9tk4+EboJu/JwxS8QrcsiM2olSz2bo8WMloWdfIECgHClSO5p257tTbC3x7KJydumdRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=St8hI3QK; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="St8hI3QK" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1e5aa82d1f6so31715985ad.0; Mon, 22 Apr 2024 03:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713782312; x=1714387112; 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=6Iw1PUokAqJ1D2w/TGTijtfgoqnVb9QcWh1oQYEMsdg=; b=St8hI3QKy9wuddk4VxfxiDV6dwADhaz55xkUKgBwwvOt++xkiYs+epIB6hqQ+dp+X4 MBZer1hq8KIL8FvSpm3MRMS5AlERb38VOsho3RBVmOQt+bQUGVijNo+3kATMtq20zQwD r1YU6fBCn993B930UnFFgchPmEyVA7JWmmM/8+DFoalBkbLY9NN7duuLJBE7JmA9pzG5 qGtekn7RTDdLItEJvfqF9ptTQEaQrKYuJUwLrjl1m3Z60n4Mgdow9I5IBB2rjULUyfAe khMvfioumNmyRIGSeUBrBqtF3R/CvH5CGbWiTfifj1X/2MCMFzkhLYiW8ZzBHOCl2xAq DQCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713782312; x=1714387112; 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=6Iw1PUokAqJ1D2w/TGTijtfgoqnVb9QcWh1oQYEMsdg=; b=uagh+hI33Ei5xwpwh0cK7p5e+HZg8yjA/2bNKWrs3u28hPl5uSYNYASylRb6C7vrYG qY/4uF8qoNdmZnR5eSs8rSfRVo9mBVr52P69YcYMU5GHtzKct0LJ8IWKcgQUI50eEGWX PaKHtHpEksXAP7RFD6q76tuEFSflZeZVJDkBWhj2lBinReB9xj5b19lAcD8BsNle8LcO vIVuT8FMcBk+9mhFnk0mNe9vQZWxgQxtyk5sCVxRNuo3NrEJ+w4yatlHGgZeZCwY9HY6 mO1S7LlRKdmxY/+GZSBTtJ4IfZ0Qm6aHn/7j5Nb5s0qRk/VB7nQ1vT6GE3csEAzB4zl/ giuQ== X-Forwarded-Encrypted: i=1; AJvYcCWPc1Mdx7WYbnb/JcQ59Eh9MkKnjozqlxon68Ri+HETnTXX3IOhqTlr/rYraM+7Z7BJt9ykq8mD8gWyWiEKjnsEfoS0J/sbyyboP5OF X-Gm-Message-State: AOJu0YwtoLQBoEf0ufRPOoVMV2gZ0zSKsxBYvS3euRwB0nHJx0133+kY Qzac6mx/7WOKH/khe6oLGep3Df8xfEqu1VUf0UiXdseCqIk8hXOTBedNSmo+ X-Google-Smtp-Source: AGHT+IGmDF2Y4YaGkkExoEAiiDzMe1eP5gJsaWuFQ1C3bUrNIF1W9DRpb3S2Aw9r/tw7PvunQ0LPfQ== X-Received: by 2002:a17:902:e807:b0:1e0:c0b9:589e with SMTP id u7-20020a170902e80700b001e0c0b9589emr21130636plg.25.1713782312292; Mon, 22 Apr 2024 03:38:32 -0700 (PDT) Received: from localhost.localdomain (2001-b400-e33b-6ac4-2bfb-4656-8624-cdbd.emome-ip6.hinet.net. [2001:b400:e33b:6ac4:2bfb:4656:8624:cdbd]) by smtp.gmail.com with ESMTPSA id c1-20020a170903234100b001e3dff1e4d5sm7807904plh.135.2024.04.22.03.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 03:38:32 -0700 (PDT) From: Victor Shih To: ulf.hansson@linaro.org, adrian.hunter@intel.com Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, benchuanggli@gmail.com, HL.Liu@genesyslogic.com.tw, Greg.tu@genesyslogic.com.tw, takahiro.akashi@linaro.org, dlunev@chromium.org, Victor Shih , Ben Chuang , Victor Shih Subject: [PATCH V15 10/22] mmc: sdhci-uhs2: dump UHS-II registers Date: Mon, 22 Apr 2024 18:37:33 +0800 Message-Id: <20240422103745.14725-11-victorshihgli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240422103745.14725-1-victorshihgli@gmail.com> References: <20240422103745.14725-1-victorshihgli@gmail.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Victor Shih Dump UHS-II specific registers, if available, in sdhci_dumpregs() for informative/debugging use. Signed-off-by: Ben Chuang Signed-off-by: AKASHI Takahiro Signed-off-by: Victor Shih --- Updates in V14: - Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the sdhci_uhs2_dump_regs(). Updates in V7: - Use sdhci_uhs2_mode() to simplify code. Updates in V6: - Remove unnecessary code. --- drivers/mmc/host/sdhci-uhs2.c | 30 ++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 4 ++++ drivers/mmc/host/sdhci.c | 3 +++ drivers/mmc/host/sdhci.h | 1 + 4 files changed, 38 insertions(+) diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c index 608f8ad5aaed..9cb0f1b2a37d 100644 --- a/drivers/mmc/host/sdhci-uhs2.c +++ b/drivers/mmc/host/sdhci-uhs2.c @@ -18,6 +18,36 @@ #define DRIVER_NAME "sdhci_uhs2" #define DBG(f, x...) \ pr_debug(DRIVER_NAME " [%s()]: " f, __func__, ## x) +#define SDHCI_UHS2_DUMP(f, x...) \ + pr_err("%s: " DRIVER_NAME ": " f, mmc_hostname(host->mmc), ## x) + +void sdhci_uhs2_dump_regs(struct sdhci_host *host) +{ + if (!(mmc_card_uhs2(host->mmc))) + return; + + SDHCI_UHS2_DUMP("==================== UHS2 ==================\n"); + SDHCI_UHS2_DUMP("Blk Size: 0x%08x | Blk Cnt: 0x%08x\n", + sdhci_readw(host, SDHCI_UHS2_BLOCK_SIZE), + sdhci_readl(host, SDHCI_UHS2_BLOCK_COUNT)); + SDHCI_UHS2_DUMP("Cmd: 0x%08x | Trn mode: 0x%08x\n", + sdhci_readw(host, SDHCI_UHS2_CMD), + sdhci_readw(host, SDHCI_UHS2_TRANS_MODE)); + SDHCI_UHS2_DUMP("Int Stat: 0x%08x | Dev Sel : 0x%08x\n", + sdhci_readw(host, SDHCI_UHS2_DEV_INT_STATUS), + sdhci_readb(host, SDHCI_UHS2_DEV_SELECT)); + SDHCI_UHS2_DUMP("Dev Int Code: 0x%08x\n", + sdhci_readb(host, SDHCI_UHS2_DEV_INT_CODE)); + SDHCI_UHS2_DUMP("Reset: 0x%08x | Timer: 0x%08x\n", + sdhci_readw(host, SDHCI_UHS2_SW_RESET), + sdhci_readw(host, SDHCI_UHS2_TIMER_CTRL)); + SDHCI_UHS2_DUMP("ErrInt: 0x%08x | ErrIntEn: 0x%08x\n", + sdhci_readl(host, SDHCI_UHS2_INT_STATUS), + sdhci_readl(host, SDHCI_UHS2_INT_STATUS_ENABLE)); + SDHCI_UHS2_DUMP("ErrSigEn: 0x%08x\n", + sdhci_readl(host, SDHCI_UHS2_INT_SIGNAL_ENABLE)); +} +EXPORT_SYMBOL_GPL(sdhci_uhs2_dump_regs); /*****************************************************************************\ * * diff --git a/drivers/mmc/host/sdhci-uhs2.h b/drivers/mmc/host/sdhci-uhs2.h index e993f41ffb7f..2bfe18d29bca 100644 --- a/drivers/mmc/host/sdhci-uhs2.h +++ b/drivers/mmc/host/sdhci-uhs2.h @@ -174,4 +174,8 @@ #define SDHCI_UHS2_EMBED_CTRL_PTR 0xE6 #define SDHCI_UHS2_VENDOR_PTR 0xE8 +struct sdhci_host; + +void sdhci_uhs2_dump_regs(struct sdhci_host *host); + #endif /* __SDHCI_UHS2_H */ diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index c79f73459915..27ea5b875c29 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -110,6 +110,9 @@ void sdhci_dumpregs(struct sdhci_host *host) } } + if (host->ops->dump_uhs2_regs) + host->ops->dump_uhs2_regs(host); + if (host->ops->dump_vendor_regs) host->ops->dump_vendor_regs(host); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 51751e82434d..782c399fae15 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -720,6 +720,7 @@ struct sdhci_ops { void (*request_done)(struct sdhci_host *host, struct mmc_request *mrq); void (*dump_vendor_regs)(struct sdhci_host *host); + void (*dump_uhs2_regs)(struct sdhci_host *host); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS