From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751427AbdCRCTq (ORCPT ); Fri, 17 Mar 2017 22:19:46 -0400 Received: from mga07.intel.com ([134.134.136.100]:63627 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751101AbdCRCTm (ORCPT ); Fri, 17 Mar 2017 22:19:42 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,178,1486454400"; d="scan'208";a="945654136" From: Kuppuswamy Sathyanarayanan 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 v3 3/5] watchdog: iTCO_wdt: Add PMC specific noreboot update api Date: Fri, 17 Mar 2017 19:06:20 -0700 Message-Id: <08193e33a1114de5401eb135691dea93dc9ec2a7.1489801590.git.sathyanarayanan.kuppuswamy@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1ee0cc63c5ad4d4581fa46ae5e72001f0ac341c0.1489801590.git.sathyanarayanan.kuppuswamy@linux.intel.com> References: <1ee0cc63c5ad4d4581fa46ae5e72001f0ac341c0.1489801590.git.sathyanarayanan.kuppuswamy@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- drivers/watchdog/iTCO_wdt.c | 28 +++++++++++++++++++--------- include/linux/platform_data/itco_wdt.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mga07.intel.com ([134.134.136.100]:63627 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751101AbdCRCTm (ORCPT ); Fri, 17 Mar 2017 22:19:42 -0400 From: Kuppuswamy Sathyanarayanan 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 v3 3/5] watchdog: iTCO_wdt: Add PMC specific noreboot update api Date: Fri, 17 Mar 2017 19:06:20 -0700 Message-Id: <08193e33a1114de5401eb135691dea93dc9ec2a7.1489801590.git.sathyanarayanan.kuppuswamy@linux.intel.com> In-Reply-To: <1ee0cc63c5ad4d4581fa46ae5e72001f0ac341c0.1489801590.git.sathyanarayanan.kuppuswamy@linux.intel.com> References: <1ee0cc63c5ad4d4581fa46ae5e72001f0ac341c0.1489801590.git.sathyanarayanan.kuppuswamy@linux.intel.com> Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.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 --- drivers/watchdog/iTCO_wdt.c | 28 +++++++++++++++++++--------- include/linux/platform_data/itco_wdt.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kuppuswamy Sathyanarayanan Subject: [PATCH v3 3/5] watchdog: iTCO_wdt: Add PMC specific noreboot update api Date: Fri, 17 Mar 2017 19:06:20 -0700 Message-ID: <08193e33a1114de5401eb135691dea93dc9ec2a7.1489801590.git.sathyanarayanan.kuppuswamy@linux.intel.com> References: <1ee0cc63c5ad4d4581fa46ae5e72001f0ac341c0.1489801590.git.sathyanarayanan.kuppuswamy@linux.intel.com> Return-path: In-Reply-To: <1ee0cc63c5ad4d4581fa46ae5e72001f0ac341c0.1489801590.git.sathyanarayanan.kuppuswamy-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Sender: linux-watchdog-owner-u79uwXL29TY76Z2rM5mHXA@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 List-Id: platform-driver-x86.vger.kernel.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 --- drivers/watchdog/iTCO_wdt.c | 28 +++++++++++++++++++--------- include/linux/platform_data/itco_wdt.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) 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