linux-watchdog.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Yong, Jonathan" <jonathan.yong@intel.com>
To: linux-watchdog@vger.kernel.org, platform-driver-x86@vger.kernel.org
Cc: qipeng.zha@intel.com, linux@roeck-us.net, dvhart@infradead.org,
	linux-kernel.vger.kernel.org@vger.kernel.org,
	jonathan.yong@intel.com
Subject: [PATCH v2 2/2] x86: Fix Apollo Lake Watchdog address in PMC driver
Date: Fri, 17 Jun 2016 00:33:32 +0000	[thread overview]
Message-ID: <1466123612-50633-3-git-send-email-jonathan.yong@intel.com> (raw)
In-Reply-To: <1466123612-50633-1-git-send-email-jonathan.yong@intel.com>

The TCO I/O base is 40h rather than the usual 30h, and the re_reboot
bit is at ACPIBASE+8.

Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com>
---
 drivers/platform/x86/intel_pmc_ipc.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c
index 6f497e8..b86e1bc 100644
--- a/drivers/platform/x86/intel_pmc_ipc.c
+++ b/drivers/platform/x86/intel_pmc_ipc.c
@@ -85,7 +85,7 @@
  * platform device and to export resources for those functions.
  */
 #define TCO_DEVICE_NAME			"iTCO_wdt"
-#define SMI_EN_OFFSET			0x30
+#define SMI_EN_OFFSET			0x40
 #define SMI_EN_SIZE			4
 #define TCO_BASE_OFFSET			0x60
 #define TCO_REGS_SIZE			16
@@ -94,6 +94,8 @@
 #define TELEM_SSRAM_SIZE		240
 #define TELEM_PMC_SSRAM_OFFSET		0x1B00
 #define TELEM_PUNIT_SSRAM_OFFSET	0x1A00
+#define TCO_PMC_OFFSET			0x8
+#define TCO_PMC_SIZE			0x4
 
 static const int iTCO_version = 3;
 
@@ -502,7 +504,7 @@ static struct resource tco_res[] = {
 
 static struct itco_wdt_platform_data tco_info = {
 	.name = "Apollo Lake SoC",
-	.version = 3,
+	.version = 5,
 };
 
 #define TELEMETRY_RESOURCE_PUNIT_SSRAM	0
@@ -572,8 +574,8 @@ static int ipc_create_tco_device(void)
 	res->end = res->start + SMI_EN_SIZE - 1;
 
 	res = tco_res + TCO_RESOURCE_GCR_MEM;
-	res->start = ipcdev.gcr_base;
-	res->end = res->start + ipcdev.gcr_size - 1;
+	res->start = ipcdev.gcr_base + TCO_PMC_OFFSET;
+	res->end = res->start + TCO_PMC_SIZE - 1;
 
 	ret = platform_device_add_resources(pdev, tco_res, ARRAY_SIZE(tco_res));
 	if (ret) {
-- 
2.7.3


  parent reply	other threads:[~2016-06-17  0:33 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-18  3:26 [PATCH 0/2] Correct iTCO Watchdog for Apollo Lake Yong, Jonathan
2016-05-18  3:26 ` [PATCH 1/2] watchdog: iTCO-wdt handle 5th variation " Yong, Jonathan
2016-05-18 14:37   ` Guenter Roeck
2016-05-18  3:26 ` [PATCH 2/2] x86: Fix Apollo Lake Watchdog address in PMC driver Yong, Jonathan
2016-05-18  4:03   ` Guenter Roeck
2016-05-18  4:48     ` Yong, Jonathan
2016-05-18 14:37       ` Guenter Roeck
2016-05-24 20:13         ` Darren Hart
2016-05-25  7:55           ` Yong, Jonathan
2016-06-02  8:28             ` Yong, Jonathan
2016-06-07 22:03               ` Darren Hart
2016-06-13  4:42                 ` Yong, Jonathan
2016-06-17  0:33 ` [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake Yong, Jonathan
2016-06-17  0:33   ` [PATCH v2 1/2] watchdog: iTCO-wdt handle 5th variation " Yong, Jonathan
2016-06-23 13:39     ` Guenter Roeck
2016-06-17  0:33   ` Yong, Jonathan [this message]
2016-06-23 13:39     ` [PATCH v2 2/2] x86: Fix Apollo Lake Watchdog address in PMC driver Guenter Roeck
2016-07-17 20:16   ` [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake Wim Van Sebroeck
2016-07-18  0:00     ` Yong, Jonathan
2016-06-17  0:36 ` Yong, Jonathan
2016-06-17  0:36   ` [PATCH v2 1/2] watchdog: iTCO-wdt handle 5th variation " Yong, Jonathan
2016-06-17  0:36   ` [PATCH v2 2/2] x86: Fix Apollo Lake Watchdog address in PMC driver Yong, Jonathan
2016-06-22  4:53   ` [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake Yong, Jonathan
2016-06-22  6:01     ` Guenter Roeck
2016-06-23  5:02       ` Darren Hart
2016-06-23 13:37         ` Guenter Roeck

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=1466123612-50633-3-git-send-email-jonathan.yong@intel.com \
    --to=jonathan.yong@intel.com \
    --cc=dvhart@infradead.org \
    --cc=linux-kernel.vger.kernel.org@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=qipeng.zha@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;
as well as URLs for NNTP newsgroup(s).