From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> To: andy@infradead.org, qipeng.zha@intel.com, dvhart@infradead.org, linux@roeck-us.net Cc: wim@iguana.be, sathyaosid@gmail.com, david.e.box@linux.intel.com, rajneesh.bhardwaj@intel.com, sathyanarayanan.kuppuswamy@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH v4 3/5] watchdog: iTCO_wdt: Add PMC specific noreboot update api Date: Fri, 31 Mar 2017 16:27:50 -0700 [thread overview] Message-ID: <e36dcfd637dd0fff2c3133cea0a541bdd3712418.1491002056.git.sathyanarayanan.kuppuswamy@linux.intel.com> (raw) In-Reply-To: <20170331133728.GA23725@rajaneesh-OptiPlex-9010> In-Reply-To: <e537ff68732d86418982349624fd6de741bccc9b.1491002056.git.sathyanarayanan.kuppuswamy@linux.intel.com> In some SOCs, setting noreboot bit needs modification to PMC GC registers. But not all PMC drivers allow other drivers to memory map their GC region. This could create mem request conflict in watchdog driver. So this patch adds facility to allow PMC drivers to pass noreboot update function to watchdog drivers via platform data. Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> Acked-by: Guenter Roeck <linux@roeck-us.net> --- drivers/watchdog/iTCO_wdt.c | 28 +++++++++++++++++++--------- include/linux/platform_data/itco_wdt.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) Changes since v3: * Rebased on top of latest. Changes since v2: * Removed use of PMC API's directly in watchdog driver. * Added update_noreboot_flag to handle no IPC PMC compatibility issue mentioned by Guenter. diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 3d0abc0..7c34259 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -100,6 +100,8 @@ struct iTCO_wdt_private { */ struct resource *gcs_pmc_res; unsigned long __iomem *gcs_pmc; + /* pmc specific api to update noreboot flag */ + int (*update_noreboot_flag)(bool status); /* the lock for io operations */ spinlock_t io_lock; /* the PCI-device */ @@ -176,9 +178,13 @@ static void iTCO_wdt_set_NO_REBOOT_bit(struct iTCO_wdt_private *p) /* Set the NO_REBOOT bit: this disables reboots */ if (p->iTCO_version >= 2) { - val32 = readl(p->gcs_pmc); - val32 |= no_reboot_bit(p); - writel(val32, p->gcs_pmc); + if (p->update_noreboot_flag) + p->update_noreboot_flag(1); + else { + val32 = readl(p->gcs_pmc); + val32 |= no_reboot_bit(p); + writel(val32, p->gcs_pmc); + } } else if (p->iTCO_version == 1) { pci_read_config_dword(p->pci_dev, 0xd4, &val32); val32 |= no_reboot_bit(p); @@ -193,11 +199,14 @@ static int iTCO_wdt_unset_NO_REBOOT_bit(struct iTCO_wdt_private *p) /* Unset the NO_REBOOT bit: this enables reboots */ if (p->iTCO_version >= 2) { - val32 = readl(p->gcs_pmc); - val32 &= ~enable_bit; - writel(val32, p->gcs_pmc); - - val32 = readl(p->gcs_pmc); + if (p->update_noreboot_flag) + return p->update_noreboot_flag(0); + else { + val32 = readl(p->gcs_pmc); + val32 &= ~enable_bit; + writel(val32, p->gcs_pmc); + val32 = readl(p->gcs_pmc); + } } else if (p->iTCO_version == 1) { pci_read_config_dword(p->pci_dev, 0xd4, &val32); val32 &= ~enable_bit; @@ -426,13 +435,14 @@ static int iTCO_wdt_probe(struct platform_device *pdev) return -ENODEV; p->iTCO_version = pdata->version; + p->update_noreboot_flag = pdata->update_noreboot_flag; p->pci_dev = to_pci_dev(dev->parent); /* * Get the Memory-Mapped GCS or PMC register, we need it for the * NO_REBOOT flag (TCO v2 and v3). */ - if (p->iTCO_version >= 2) { + if (p->iTCO_version >= 2 && !p->update_noreboot_flag) { p->gcs_pmc_res = platform_get_resource(pdev, IORESOURCE_MEM, ICH_RES_MEM_GCS_PMC); diff --git a/include/linux/platform_data/itco_wdt.h b/include/linux/platform_data/itco_wdt.h index f16542c..ea1efb7 100644 --- a/include/linux/platform_data/itco_wdt.h +++ b/include/linux/platform_data/itco_wdt.h @@ -14,6 +14,7 @@ struct itco_wdt_platform_data { char name[32]; unsigned int version; + int (*update_noreboot_flag)(bool status); }; #endif /* _ITCO_WDT_H_ */ -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> To: andy-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org, qipeng.zha-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, dvhart-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org, linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org Cc: wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org, sathyaosid-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, david.e.box-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, rajneesh.bhardwaj-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, sathyanarayanan.kuppuswamy-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, platform-driver-x86-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH v4 3/5] watchdog: iTCO_wdt: Add PMC specific noreboot update api Date: Fri, 31 Mar 2017 16:27:50 -0700 [thread overview] Message-ID: <e36dcfd637dd0fff2c3133cea0a541bdd3712418.1491002056.git.sathyanarayanan.kuppuswamy@linux.intel.com> (raw) In-Reply-To: <20170331133728.GA23725@rajaneesh-OptiPlex-9010> In-Reply-To: <e537ff68732d86418982349624fd6de741bccc9b.1491002056.git.sathyanarayanan.kuppuswamy-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> In some SOCs, setting noreboot bit needs modification to PMC GC registers. But not all PMC drivers allow other drivers to memory map their GC region. This could create mem request conflict in watchdog driver. So this patch adds facility to allow PMC drivers to pass noreboot update function to watchdog drivers via platform data. Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Acked-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> --- drivers/watchdog/iTCO_wdt.c | 28 +++++++++++++++++++--------- include/linux/platform_data/itco_wdt.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) Changes since v3: * Rebased on top of latest. Changes since v2: * Removed use of PMC API's directly in watchdog driver. * Added update_noreboot_flag to handle no IPC PMC compatibility issue mentioned by Guenter. diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 3d0abc0..7c34259 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -100,6 +100,8 @@ struct iTCO_wdt_private { */ struct resource *gcs_pmc_res; unsigned long __iomem *gcs_pmc; + /* pmc specific api to update noreboot flag */ + int (*update_noreboot_flag)(bool status); /* the lock for io operations */ spinlock_t io_lock; /* the PCI-device */ @@ -176,9 +178,13 @@ static void iTCO_wdt_set_NO_REBOOT_bit(struct iTCO_wdt_private *p) /* Set the NO_REBOOT bit: this disables reboots */ if (p->iTCO_version >= 2) { - val32 = readl(p->gcs_pmc); - val32 |= no_reboot_bit(p); - writel(val32, p->gcs_pmc); + if (p->update_noreboot_flag) + p->update_noreboot_flag(1); + else { + val32 = readl(p->gcs_pmc); + val32 |= no_reboot_bit(p); + writel(val32, p->gcs_pmc); + } } else if (p->iTCO_version == 1) { pci_read_config_dword(p->pci_dev, 0xd4, &val32); val32 |= no_reboot_bit(p); @@ -193,11 +199,14 @@ static int iTCO_wdt_unset_NO_REBOOT_bit(struct iTCO_wdt_private *p) /* Unset the NO_REBOOT bit: this enables reboots */ if (p->iTCO_version >= 2) { - val32 = readl(p->gcs_pmc); - val32 &= ~enable_bit; - writel(val32, p->gcs_pmc); - - val32 = readl(p->gcs_pmc); + if (p->update_noreboot_flag) + return p->update_noreboot_flag(0); + else { + val32 = readl(p->gcs_pmc); + val32 &= ~enable_bit; + writel(val32, p->gcs_pmc); + val32 = readl(p->gcs_pmc); + } } else if (p->iTCO_version == 1) { pci_read_config_dword(p->pci_dev, 0xd4, &val32); val32 &= ~enable_bit; @@ -426,13 +435,14 @@ static int iTCO_wdt_probe(struct platform_device *pdev) return -ENODEV; p->iTCO_version = pdata->version; + p->update_noreboot_flag = pdata->update_noreboot_flag; p->pci_dev = to_pci_dev(dev->parent); /* * Get the Memory-Mapped GCS or PMC register, we need it for the * NO_REBOOT flag (TCO v2 and v3). */ - if (p->iTCO_version >= 2) { + if (p->iTCO_version >= 2 && !p->update_noreboot_flag) { p->gcs_pmc_res = platform_get_resource(pdev, IORESOURCE_MEM, ICH_RES_MEM_GCS_PMC); diff --git a/include/linux/platform_data/itco_wdt.h b/include/linux/platform_data/itco_wdt.h index f16542c..ea1efb7 100644 --- a/include/linux/platform_data/itco_wdt.h +++ b/include/linux/platform_data/itco_wdt.h @@ -14,6 +14,7 @@ struct itco_wdt_platform_data { char name[32]; unsigned int version; + int (*update_noreboot_flag)(bool status); }; #endif /* _ITCO_WDT_H_ */ -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-03-31 23:32 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-18 2:06 [PATCH v3 1/5] platform/x86: intel_pmc_ipc: fix gcr offset Kuppuswamy Sathyanarayanan 2017-03-18 2:06 ` Kuppuswamy Sathyanarayanan 2017-03-18 2:06 ` [PATCH v3 2/5] platform/x86: intel_pmc_ipc: Add pmc gcr read/write/update api's Kuppuswamy Sathyanarayanan 2017-03-18 2:06 ` Kuppuswamy Sathyanarayanan 2017-03-31 13:47 ` Rajneesh Bhardwaj 2017-03-31 13:47 ` Rajneesh Bhardwaj 2017-03-18 2:06 ` [PATCH v3 3/5] watchdog: iTCO_wdt: Add PMC specific noreboot update api Kuppuswamy Sathyanarayanan 2017-03-18 2:06 ` Kuppuswamy Sathyanarayanan 2017-03-18 2:06 ` Kuppuswamy Sathyanarayanan 2017-03-28 9:12 ` [v3,3/5] " Guenter Roeck 2017-03-28 9:12 ` Guenter Roeck 2017-03-28 9:12 ` Guenter Roeck 2017-03-18 2:06 ` [PATCH v3 4/5] platform/x86: intel_pmc_ipc: Fix iTCO GCS memory mapping failure Kuppuswamy Sathyanarayanan 2017-03-18 2:06 ` Kuppuswamy Sathyanarayanan 2017-03-31 14:01 ` Rajneesh Bhardwaj 2017-03-31 14:01 ` Rajneesh Bhardwaj 2017-03-31 17:22 ` sathyanarayanan kuppuswamy 2017-03-31 17:22 ` sathyanarayanan kuppuswamy 2017-03-31 17:22 ` sathyanarayanan kuppuswamy 2017-03-18 2:06 ` [PATCH v3 5/5] platform/x86: intel_pmc_ipc: use gcr mem base for S0ix counter read Kuppuswamy Sathyanarayanan 2017-03-18 2:06 ` Kuppuswamy Sathyanarayanan 2017-03-18 2:06 ` Kuppuswamy Sathyanarayanan 2017-03-31 13:54 ` Rajneesh Bhardwaj 2017-03-31 13:54 ` Rajneesh Bhardwaj 2017-03-31 13:54 ` Rajneesh Bhardwaj 2017-03-31 15:08 ` Shanth Murthy 2017-03-31 15:08 ` Shanth Murthy 2017-03-31 13:37 ` [PATCH v3 1/5] platform/x86: intel_pmc_ipc: fix gcr offset Rajneesh Bhardwaj 2017-03-31 13:37 ` Rajneesh Bhardwaj 2017-03-31 23:27 ` [PATCH v4 " Kuppuswamy Sathyanarayanan 2017-03-31 23:27 ` Kuppuswamy Sathyanarayanan 2017-03-31 23:27 ` [PATCH v4 2/5] platform/x86: intel_pmc_ipc: Add pmc gcr read/write/update api's Kuppuswamy Sathyanarayanan 2017-03-31 23:27 ` Kuppuswamy Sathyanarayanan 2017-04-02 13:58 ` Andy Shevchenko 2017-04-02 13:58 ` Andy Shevchenko 2017-04-03 1:51 ` Sathyanarayanan Kuppuswamy Natarajan 2017-04-03 1:51 ` Sathyanarayanan Kuppuswamy Natarajan 2017-04-03 1:51 ` Sathyanarayanan Kuppuswamy Natarajan 2017-04-04 13:23 ` Andy Shevchenko 2017-04-04 13:23 ` Andy Shevchenko 2017-04-04 20:14 ` sathyanarayanan kuppuswamy 2017-04-04 20:14 ` sathyanarayanan kuppuswamy 2017-03-31 23:27 ` Kuppuswamy Sathyanarayanan [this message] 2017-03-31 23:27 ` [PATCH v4 3/5] watchdog: iTCO_wdt: Add PMC specific noreboot update api Kuppuswamy Sathyanarayanan 2017-03-31 23:27 ` Kuppuswamy Sathyanarayanan 2017-04-02 14:04 ` Andy Shevchenko 2017-04-02 14:04 ` Andy Shevchenko 2017-04-03 1:55 ` Sathyanarayanan Kuppuswamy Natarajan 2017-04-03 1:55 ` Sathyanarayanan Kuppuswamy Natarajan 2017-03-31 23:27 ` [PATCH v4 4/5] platform/x86: intel_pmc_ipc: Fix iTCO GCS memory mapping failure Kuppuswamy Sathyanarayanan 2017-03-31 23:27 ` Kuppuswamy Sathyanarayanan 2017-04-02 14:10 ` Andy Shevchenko 2017-04-02 14:10 ` Andy Shevchenko 2017-04-03 1:53 ` Sathyanarayanan Kuppuswamy Natarajan 2017-04-03 1:53 ` Sathyanarayanan Kuppuswamy Natarajan 2017-04-03 1:53 ` Sathyanarayanan Kuppuswamy Natarajan 2017-03-31 23:27 ` [PATCH v4 5/5] platform/x86: intel_pmc_ipc: use gcr mem base for S0ix counter read Kuppuswamy Sathyanarayanan 2017-03-31 23:27 ` Kuppuswamy Sathyanarayanan 2017-04-02 14:11 ` [PATCH v4 1/5] platform/x86: intel_pmc_ipc: fix gcr offset Andy Shevchenko 2017-04-02 14:11 ` Andy Shevchenko 2017-04-02 14:11 ` Andy Shevchenko 2017-04-03 1:51 ` Sathyanarayanan Kuppuswamy Natarajan 2017-04-03 1:51 ` Sathyanarayanan Kuppuswamy Natarajan 2017-04-03 1:51 ` Sathyanarayanan Kuppuswamy Natarajan 2017-04-04 0:24 ` [PATCH v5 1/6] " Kuppuswamy Sathyanarayanan 2017-04-04 0:24 ` Kuppuswamy Sathyanarayanan 2017-04-04 0:24 ` Kuppuswamy Sathyanarayanan 2017-04-04 0:24 ` [PATCH v5 2/6] platform/x86: intel_pmc_ipc: Add pmc gcr read/write/update api's Kuppuswamy Sathyanarayanan 2017-04-04 0:24 ` Kuppuswamy Sathyanarayanan 2017-04-04 13:53 ` Andy Shevchenko 2017-04-04 13:53 ` Andy Shevchenko 2017-04-04 22:07 ` sathyanarayanan kuppuswamy 2017-04-04 22:07 ` sathyanarayanan kuppuswamy 2017-04-04 22:07 ` sathyanarayanan kuppuswamy 2017-04-04 0:24 ` [PATCH v5 3/6] watchdog: iTCO_wdt: Add PMC specific noreboot update api Kuppuswamy Sathyanarayanan 2017-04-04 0:24 ` Kuppuswamy Sathyanarayanan 2017-04-04 13:48 ` Andy Shevchenko 2017-04-04 13:48 ` Andy Shevchenko 2017-04-04 0:24 ` [PATCH v5 4/6] watchdog: iTCO_wdt: cleanup set/unset no_reboot calls Kuppuswamy Sathyanarayanan 2017-04-04 0:24 ` Kuppuswamy Sathyanarayanan 2017-04-04 3:22 ` Guenter Roeck 2017-04-04 3:22 ` Guenter Roeck 2017-04-04 3:22 ` Guenter Roeck 2017-04-04 13:49 ` Andy Shevchenko 2017-04-04 13:49 ` Andy Shevchenko 2017-04-04 0:24 ` [PATCH v5 5/6] platform/x86: intel_pmc_ipc: Fix iTCO_wdt GCS memory mapping failure Kuppuswamy Sathyanarayanan 2017-04-04 0:24 ` Kuppuswamy Sathyanarayanan 2017-04-04 0:24 ` Kuppuswamy Sathyanarayanan 2017-04-04 13:53 ` Andy Shevchenko 2017-04-04 13:53 ` Andy Shevchenko 2017-04-04 0:24 ` [PATCH v5 6/6] platform/x86: intel_pmc_ipc: use gcr mem base for S0ix counter read Kuppuswamy Sathyanarayanan 2017-04-04 0:24 ` Kuppuswamy Sathyanarayanan 2017-04-04 13:51 ` Andy Shevchenko 2017-04-04 13:51 ` Andy Shevchenko 2017-04-04 22:15 ` sathyanarayanan kuppuswamy 2017-04-04 22:15 ` sathyanarayanan kuppuswamy 2017-04-04 22:15 ` sathyanarayanan kuppuswamy 2017-04-04 13:25 ` [PATCH v4 1/5] platform/x86: intel_pmc_ipc: fix gcr offset Andy Shevchenko 2017-04-04 13:25 ` Andy Shevchenko 2017-04-04 21:32 ` sathyanarayanan kuppuswamy 2017-04-04 21:32 ` sathyanarayanan kuppuswamy 2017-04-05 22:54 ` [PATCH v6 1/6] " Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` [PATCH v6 2/6] platform/x86: intel_pmc_ipc: Add pmc gcr read/write/update api's Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` [PATCH v6 3/6] watchdog: iTCO_wdt: cleanup set/unset no_reboot_bit functions Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` [PATCH v6 4/6] watchdog: iTCO_wdt: Add PMC specific noreboot update api Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` Kuppuswamy Sathyanarayanan 2017-04-06 11:42 ` Guenter Roeck 2017-04-06 11:42 ` Guenter Roeck 2017-04-05 22:54 ` [PATCH v6 5/6] platform/x86: intel_pmc_ipc: Fix iTCO_wdt GCS memory mapping failure Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` Kuppuswamy Sathyanarayanan 2017-04-06 21:37 ` Andy Shevchenko 2017-04-06 21:37 ` Andy Shevchenko 2017-04-05 22:54 ` [PATCH v6 6/6] platform/x86: intel_pmc_ipc: use gcr mem base for S0ix counter read Kuppuswamy Sathyanarayanan 2017-04-05 22:54 ` Kuppuswamy Sathyanarayanan 2017-04-06 15:16 ` [PATCH v6 1/6] platform/x86: intel_pmc_ipc: fix gcr offset Rajneesh Bhardwaj 2017-04-06 15:16 ` Rajneesh Bhardwaj
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=e36dcfd637dd0fff2c3133cea0a541bdd3712418.1491002056.git.sathyanarayanan.kuppuswamy@linux.intel.com \ --to=sathyanarayanan.kuppuswamy@linux.intel.com \ --cc=andy@infradead.org \ --cc=david.e.box@linux.intel.com \ --cc=dvhart@infradead.org \ --cc=linux-kernel@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 \ --cc=rajneesh.bhardwaj@intel.com \ --cc=sathyaosid@gmail.com \ --cc=wim@iguana.be \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.