From: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
To: platform-driver-x86@vger.kernel.org
Cc: dvhart@infradead.org, andy@infradead.org,
linux-kernel@vger.kernel.org, rajneesh.bhardwaj@intel.com,
Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
Subject: [PATCH v1 1/5] platform/x86: intel_pmc_ipc: Fix register names
Date: Thu, 16 Nov 2017 15:48:13 +0530 [thread overview]
Message-ID: <1510827497-25188-2-git-send-email-souvik.k.chakravarty@intel.com> (raw)
In-Reply-To: <1510827497-25188-1-git-send-email-souvik.k.chakravarty@intel.com>
GCR TELEM register names have been fixed as per the External Design
Sepcification (EDS) of Apollolake and GeminiLake. This makes it
possible to fetch the complete 64-bit S0ix counter using exported APIs.
This patch also fixes some alignment issues in the macro definition
section.
Signed-off-by: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
---
arch/x86/include/asm/intel_pmc_ipc.h | 10 ++++++----
drivers/platform/x86/intel_pmc_ipc.c | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/x86/include/asm/intel_pmc_ipc.h b/arch/x86/include/asm/intel_pmc_ipc.h
index fac89eb..b41f388 100644
--- a/arch/x86/include/asm/intel_pmc_ipc.h
+++ b/arch/x86/include/asm/intel_pmc_ipc.h
@@ -3,8 +3,8 @@
/* Commands */
#define PMC_IPC_PMIC_ACCESS 0xFF
-#define PMC_IPC_PMIC_ACCESS_READ 0x0
-#define PMC_IPC_PMIC_ACCESS_WRITE 0x1
+#define PMC_IPC_PMIC_ACCESS_READ 0x0
+#define PMC_IPC_PMIC_ACCESS_WRITE 0x1
#define PMC_IPC_USB_PWR_CTRL 0xF0
#define PMC_IPC_PMIC_BLACKLIST_SEL 0xEF
#define PMC_IPC_PHY_CONFIG 0xEE
@@ -25,8 +25,10 @@
/* GCR reg offsets from gcr base*/
#define PMC_GCR_PMC_CFG_REG 0x08
-#define PMC_GCR_TELEM_DEEP_S0IX_REG 0x78
-#define PMC_GCR_TELEM_SHLW_S0IX_REG 0x80
+#define PMC_GCR_TELEM_DEEP_S0IX_LO_REG 0x78
+#define PMC_GCR_TELEM_DEEP_S0IX_HI_REG 0x7C
+#define PMC_GCR_TELEM_SHLW_S0IX_LO_REG 0x80
+#define PMC_GCR_TELEM_SHLW_S0IX_HI_REG 0x84
#if IS_ENABLED(CONFIG_INTEL_PMC_IPC)
diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c
index e03fa314..1c096e7 100644
--- a/drivers/platform/x86/intel_pmc_ipc.c
+++ b/drivers/platform/x86/intel_pmc_ipc.c
@@ -883,8 +883,8 @@ int intel_pmc_s0ix_counter_read(u64 *data)
if (!ipcdev.has_gcr_regs)
return -EACCES;
- deep = gcr_data_readq(PMC_GCR_TELEM_DEEP_S0IX_REG);
- shlw = gcr_data_readq(PMC_GCR_TELEM_SHLW_S0IX_REG);
+ deep = gcr_data_readq(PMC_GCR_TELEM_DEEP_S0IX_LO_REG);
+ shlw = gcr_data_readq(PMC_GCR_TELEM_SHLW_S0IX_LO_REG);
*data = S0IX_RESIDENCY_IN_USECS(deep, shlw);
--
2.7.4
next prev parent reply other threads:[~2017-11-16 13:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 10:18 [PATCH v1 0/5] platform/x86: intel_telemetry: Fix counters and formatting Souvik Kumar Chakravarty
2017-11-16 10:18 ` Souvik Kumar Chakravarty [this message]
2017-11-17 12:49 ` [PATCH v1 1/5] platform/x86: intel_pmc_ipc: Fix register names Andy Shevchenko
2017-11-16 10:18 ` [PATCH v1 2/5] platform/x86: intel_telemetry: Fix suspend stats Souvik Kumar Chakravarty
2017-11-17 13:27 ` Andy Shevchenko
2017-11-16 10:18 ` [PATCH v1 3/5] platform/x86: intel_telemetry: Fix local variables Souvik Kumar Chakravarty
2017-11-17 13:29 ` Andy Shevchenko
2017-11-16 10:18 ` [PATCH v1 4/5] platform/x86: intel_telemetry: Remove redundancies Souvik Kumar Chakravarty
2017-11-17 13:33 ` Andy Shevchenko
2017-11-16 10:18 ` [PATCH v1 5/5] platform/x86: intel_telemetry: Improve S0ix logs Souvik Kumar Chakravarty
2017-11-17 13:36 ` Andy Shevchenko
2017-11-17 13:37 ` [PATCH v1 0/5] platform/x86: intel_telemetry: Fix counters and formatting Andy Shevchenko
2017-11-20 3:12 ` Chakravarty, Souvik K
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1510827497-25188-2-git-send-email-souvik.k.chakravarty@intel.com \
--to=souvik.k.chakravarty@intel.com \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rajneesh.bhardwaj@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®