From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v3 3/9] x86/quirks: Introduce hpet_dev_print_force_hpet_address() helper
Date: Wed, 22 Jan 2020 13:23:00 +0200 [thread overview]
Message-ID: <20200122112306.64598-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200122112306.64598-1-andriy.shevchenko@linux.intel.com>
Introduce hpet_dev_print_force_hpet_address() helper to unify printing
forced HPET address. No functional change intended.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/kernel/quirks.c | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 5b96654aacc0..ce8fc9bec43b 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -68,6 +68,11 @@ static enum {
ATI_FORCE_HPET_RESUME,
} force_hpet_resume_type;
+static void hpet_dev_print_force_hpet_address(struct device *dev)
+{
+ dev_printk(KERN_DEBUG, dev, "Force enabled HPET at 0x%lx\n", force_hpet_address);
+}
+
static void __iomem *rcba_base;
static void ich_force_hpet_resume(void)
@@ -125,8 +130,7 @@ static void ich_force_enable_hpet(struct pci_dev *dev)
/* HPET is enabled in HPTC. Just not reported by BIOS */
val = val & 0x3;
force_hpet_address = 0xFED00000 | (val << 12);
- dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at "
- "0x%lx\n", force_hpet_address);
+ hpet_dev_print_force_hpet_address(&dev->dev);
iounmap(rcba_base);
return;
}
@@ -149,8 +153,7 @@ static void ich_force_enable_hpet(struct pci_dev *dev)
"Failed to force enable HPET\n");
} else {
force_hpet_resume_type = ICH_FORCE_HPET_RESUME;
- dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at "
- "0x%lx\n", force_hpet_address);
+ hpet_dev_print_force_hpet_address(&dev->dev);
}
}
@@ -223,8 +226,7 @@ static void old_ich_force_enable_hpet(struct pci_dev *dev)
if (val & 0x4) {
val &= 0x3;
force_hpet_address = 0xFED00000 | (val << 12);
- dev_printk(KERN_DEBUG, &dev->dev, "HPET at 0x%lx\n",
- force_hpet_address);
+ hpet_dev_print_force_hpet_address(&dev->dev);
return;
}
@@ -244,8 +246,7 @@ static void old_ich_force_enable_hpet(struct pci_dev *dev)
/* HPET is enabled in HPTC. Just not reported by BIOS */
val &= 0x3;
force_hpet_address = 0xFED00000 | (val << 12);
- dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at "
- "0x%lx\n", force_hpet_address);
+ hpet_dev_print_force_hpet_address(&dev->dev);
cached_dev = dev;
force_hpet_resume_type = OLD_ICH_FORCE_HPET_RESUME;
return;
@@ -316,8 +317,7 @@ static void vt8237_force_enable_hpet(struct pci_dev *dev)
*/
if (val & 0x80) {
force_hpet_address = (val & ~0x3ff);
- dev_printk(KERN_DEBUG, &dev->dev, "HPET at 0x%lx\n",
- force_hpet_address);
+ hpet_dev_print_force_hpet_address(&dev->dev);
return;
}
@@ -331,8 +331,7 @@ static void vt8237_force_enable_hpet(struct pci_dev *dev)
pci_read_config_dword(dev, 0x68, &val);
if (val & 0x80) {
force_hpet_address = (val & ~0x3ff);
- dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at "
- "0x%lx\n", force_hpet_address);
+ hpet_dev_print_force_hpet_address(&dev->dev);
cached_dev = dev;
force_hpet_resume_type = VT8237_FORCE_HPET_RESUME;
return;
@@ -412,8 +411,7 @@ static void ati_force_enable_hpet(struct pci_dev *dev)
force_hpet_address = val;
force_hpet_resume_type = ATI_FORCE_HPET_RESUME;
- dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at 0x%lx\n",
- force_hpet_address);
+ hpet_dev_print_force_hpet_address(&dev->dev);
cached_dev = dev;
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS,
@@ -444,8 +442,7 @@ static void nvidia_force_enable_hpet(struct pci_dev *dev)
pci_read_config_dword(dev, 0x44, &val);
force_hpet_address = val & 0xfffffffe;
force_hpet_resume_type = NVIDIA_FORCE_HPET_RESUME;
- dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at 0x%lx\n",
- force_hpet_address);
+ hpet_dev_print_force_hpet_address(&dev->dev);
cached_dev = dev;
}
@@ -509,8 +506,7 @@ static void e6xx_force_enable_hpet(struct pci_dev *dev)
force_hpet_address = 0xFED00000;
force_hpet_resume_type = NONE_FORCE_HPET_RESUME;
- dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at "
- "0x%lx\n", force_hpet_address);
+ hpet_dev_print_force_hpet_address(&dev->dev);
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E6XX_CU,
e6xx_force_enable_hpet);
--
2.24.1
next prev parent reply other threads:[~2020-01-22 11:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 11:22 [PATCH v3 0/9] x86: Easy way of detecting MS Surface 3 Andy Shevchenko
2020-01-22 11:22 ` [PATCH v3 1/9] x86/platform: Rename x86/apple.h -> x86/machine.h Andy Shevchenko
2020-01-22 11:22 ` [PATCH v3 2/9] x86/quirks: Add missed include to satisfy static checker Andy Shevchenko
2020-01-22 11:23 ` Andy Shevchenko [this message]
2020-01-22 11:23 ` [PATCH v3 4/9] x86/quirks: Join string literals back Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 5/9] x86/quirks: Convert DMI matching to use a table Andy Shevchenko
2020-03-16 15:27 ` Alexander Shishkin
2020-03-16 15:54 ` Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 6/9] x86/quirks: Add a DMI quirk for Microsoft Surface 3 Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 7/9] platform/x86: surface3_wmi: Switch DMI table match to a test of variable Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 8/9] ASoC: rt5645: " Andy Shevchenko
2020-01-22 11:23 ` [PATCH v3 9/9] ASoC: Intel: " Andy Shevchenko
2020-02-14 14:24 ` [PATCH v3 0/9] x86: Easy way of detecting MS Surface 3 Andy Shevchenko
2020-03-16 15:33 ` Alexander Shishkin
2020-03-16 15:52 ` Andy Shevchenko
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=20200122112306.64598-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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).