From: Guenter Roeck <linux@roeck-us.net>
To: Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
andy@infradead.org, qipeng.zha@intel.com, dvhart@infradead.org
Cc: wim@iguana.be, sathyaosid@gmail.com, david.e.box@linux.intel.com,
rajneesh.bhardwaj@intel.com, platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org
Subject: Re: [PATCH v6 4/6] watchdog: iTCO_wdt: Add PMC specific noreboot update api
Date: Thu, 6 Apr 2017 04:42:04 -0700 [thread overview]
Message-ID: <7c48df01-b641-40d9-95d3-8724d34f5c8d@roeck-us.net> (raw)
In-Reply-To: <686dfb634cc072d66080f6983900eefde8d85b5e.1491428146.git.sathyanarayanan.kuppuswamy@linux.intel.com>
On 04/05/2017 03:54 PM, Kuppuswamy Sathyanarayanan wrote:
> 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 | 20 ++++++++++++++------
> include/linux/platform_data/itco_wdt.h | 4 ++++
> 2 files changed, 18 insertions(+), 6 deletions(-)
>
> Changes since v5:
> * Added priv_data to pass private data to no_reboot_bit update function.
> * Changed update_noreboot_flag() to update_no_reboot_bit
>
> Changes since v4:
> * Fixed some style issues.
> * used false for 0 and true for 1 in update_noreboot_flag function.
>
> 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 d8768a2..3f00029 100644
> --- a/drivers/watchdog/iTCO_wdt.c
> +++ b/drivers/watchdog/iTCO_wdt.c
> @@ -106,6 +106,8 @@ struct iTCO_wdt_private {
> struct pci_dev *pci_dev;
> /* whether or not the watchdog has been suspended */
> bool suspended;
> + /* no reboot API private data */
> + void *no_reboot_priv;
> /* no reboot update function pointer */
> int (*update_no_reboot_bit)(void *p, bool set);
> };
> @@ -225,6 +227,8 @@ void iTCO_wdt_no_reboot_bit_setup(struct iTCO_wdt_private *p)
> p->update_no_reboot_bit = update_no_reboot_bit_pci;
> else
> p->update_no_reboot_bit = update_no_reboot_bit_def;
> +
> + p->no_reboot_priv = p;
> }
>
> static int iTCO_wdt_start(struct watchdog_device *wd_dev)
> @@ -237,7 +241,7 @@ static int iTCO_wdt_start(struct watchdog_device *wd_dev)
> iTCO_vendor_pre_start(p->smi_res, wd_dev->timeout);
>
> /* disable chipset's NO_REBOOT bit */
> - if (p->update_no_reboot_bit(p, false)) {
> + if (p->update_no_reboot_bit(p->no_reboot_priv, false)) {
> spin_unlock(&p->io_lock);
> pr_err("failed to reset NO_REBOOT flag, reboot disabled by hardware/BIOS\n");
> return -EIO;
> @@ -278,7 +282,7 @@ static int iTCO_wdt_stop(struct watchdog_device *wd_dev)
> val = inw(TCO1_CNT(p));
>
> /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
> - p->update_no_reboot_bit(p, true);
> + p->update_no_reboot_bit(p->no_reboot_priv, true);
>
> spin_unlock(&p->io_lock);
>
> @@ -442,14 +446,18 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
>
> p->iTCO_version = pdata->version;
> p->pci_dev = to_pci_dev(dev->parent);
> + p->no_reboot_priv = pdata->no_reboot_priv;
>
This is really only for the if case below, and would be wrong otherwise.
> - iTCO_wdt_no_reboot_bit_setup(p);
> + if (pdata->update_no_reboot_bit)
> + p->update_no_reboot_bit = pdata->update_no_reboot_bit;
Can you move that initialization here ? Or, even better, pass pdata to
iTCO_wdt_no_reboot_bit_setup() and initialize it there.
> + else
> + iTCO_wdt_no_reboot_bit_setup(p);
>
> /*
> * 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 && !pdata->update_no_reboot_bit) {
> p->gcs_pmc_res = platform_get_resource(pdev,
> IORESOURCE_MEM,
> ICH_RES_MEM_GCS_PMC);
> @@ -459,14 +467,14 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
> }
>
> /* Check chipset's NO_REBOOT bit */
> - if (p->update_no_reboot_bit(p, false) &&
> + if (p->update_no_reboot_bit(p->no_reboot_priv, false) &&
> iTCO_vendor_check_noreboot_on()) {
> pr_info("unable to reset NO_REBOOT flag, device disabled by hardware/BIOS\n");
> return -ENODEV; /* Cannot reset NO_REBOOT bit */
> }
>
> /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
> - p->update_no_reboot_bit(p, true);
> + p->update_no_reboot_bit(p->no_reboot_priv, true);
>
> /* The TCO logic uses the TCO_EN bit in the SMI_EN register */
> if (!devm_request_region(dev, p->smi_res->start,
> diff --git a/include/linux/platform_data/itco_wdt.h b/include/linux/platform_data/itco_wdt.h
> index f16542c..0e95527 100644
> --- a/include/linux/platform_data/itco_wdt.h
> +++ b/include/linux/platform_data/itco_wdt.h
> @@ -14,6 +14,10 @@
> struct itco_wdt_platform_data {
> char name[32];
> unsigned int version;
> + /* private data to be passed to update_no_reboot_bit API */
> + void *no_reboot_priv;
> + /* pointer for platform specific no reboot update function */
> + int (*update_no_reboot_bit)(void *priv, bool set);
> };
>
> #endif /* _ITCO_WDT_H_ */
>
next prev parent reply other threads:[~2017-04-06 11:42 UTC|newest]
Thread overview: 52+ 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 ` [PATCH v3 2/5] platform/x86: intel_pmc_ipc: Add pmc gcr read/write/update api's Kuppuswamy Sathyanarayanan
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-28 9:12 ` [v3,3/5] " 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-31 14:01 ` Rajneesh Bhardwaj
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-31 13:54 ` Rajneesh Bhardwaj
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 23:27 ` [PATCH v4 " 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-04-02 13:58 ` Andy Shevchenko
2017-04-03 1:51 ` Sathyanarayanan Kuppuswamy Natarajan
2017-04-04 13:23 ` Andy Shevchenko
2017-04-04 20:14 ` sathyanarayanan kuppuswamy
2017-03-31 23:27 ` [PATCH v4 3/5] watchdog: iTCO_wdt: Add PMC specific noreboot update api Kuppuswamy Sathyanarayanan
2017-04-02 14:04 ` Andy Shevchenko
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-04-02 14:10 ` Andy Shevchenko
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-04-02 14:11 ` [PATCH v4 1/5] platform/x86: intel_pmc_ipc: fix gcr offset Andy Shevchenko
2017-04-03 1:51 ` Sathyanarayanan Kuppuswamy Natarajan
2017-04-04 0:24 ` [PATCH v5 1/6] " 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 13:53 ` Andy Shevchenko
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 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 3:22 ` Guenter Roeck
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 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 13:51 ` Andy Shevchenko
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 21:32 ` sathyanarayanan kuppuswamy
2017-04-05 22:54 ` [PATCH v6 1/6] " 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 ` [PATCH v6 3/6] watchdog: iTCO_wdt: cleanup set/unset no_reboot_bit functions Kuppuswamy Sathyanarayanan
2017-04-05 22:54 ` [PATCH v6 4/6] watchdog: iTCO_wdt: Add PMC specific noreboot update api Kuppuswamy Sathyanarayanan
2017-04-06 11:42 ` Guenter Roeck [this message]
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-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-06 15:16 ` [PATCH v6 1/6] platform/x86: intel_pmc_ipc: fix gcr offset 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=7c48df01-b641-40d9-95d3-8724d34f5c8d@roeck-us.net \
--to=linux@roeck-us.net \
--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=platform-driver-x86@vger.kernel.org \
--cc=qipeng.zha@intel.com \
--cc=rajneesh.bhardwaj@intel.com \
--cc=sathyanarayanan.kuppuswamy@linux.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: 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).