diff options
| author | Luis R. Rodriguez <mcgrof@suse.com> | 2015-07-17 17:07:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 03:42:54 -0400 |
| commit | f5530d5af835ffa82a0607f5f1977d63ac02551f (patch) | |
| tree | 0101c0d147484d6310ad2a3d19ef9374ac2152b1 /drivers | |
| parent | fd0a1b8607ef311a2c800dd54c9a4a3583756ea6 (diff) | |
x86/mm/pat, drivers/media/ivtv: Move the PAT warning and replace WARN() with pr_warn()
On built-in kernels this warning will always splat, even if no ivtvfb
hardware is present, as this is part of the module init:
if (WARN(pat_enabled(),
"ivtvfb needs PAT disabled, boot with nopat kernel parameter\n")) {
Fix that by shifting the PAT requirement check out under the code
that does the "quasi-probe" for the device.
This device driver relies on an existing driver to find its own devices,
it looks for that device driver and its own found devices, then uses
driver_for_each_device() to try to see if it can probe each of those
devices as a frambuffer device with ivtvfb_init_card().
We tuck the PAT requiremenet check then on the ivtvfb_init_card() call
making the check at least require an ivtv device present before
complaining.
Reported-by: Fengguang Wu <fengguang.wu@intel.com> [0-day test robot]
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: andy@silverblocksystems.net
Cc: benh@kernel.crashing.org
Cc: bp@suse.de
Cc: dan.j.williams@intel.com
Cc: dledford@redhat.com
Cc: jkosina@suse.cz
Cc: julia.lawall@lip6.fr
Cc: luto@amacapital.net
Cc: mchehab@osg.samsung.com
Link: http://lkml.kernel.org/r/1437167245-28273-3-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/pci/ivtv/ivtvfb.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/pci/ivtv/ivtvfb.c index 4cb365d4ffdc..8b95eefb610b 100644 --- a/drivers/media/pci/ivtv/ivtvfb.c +++ b/drivers/media/pci/ivtv/ivtvfb.c | |||
| @@ -38,6 +38,8 @@ | |||
| 38 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 38 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
| 42 | |||
| 41 | #include <linux/module.h> | 43 | #include <linux/module.h> |
| 42 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
| 43 | #include <linux/fb.h> | 45 | #include <linux/fb.h> |
| @@ -1171,6 +1173,13 @@ static int ivtvfb_init_card(struct ivtv *itv) | |||
| 1171 | { | 1173 | { |
| 1172 | int rc; | 1174 | int rc; |
| 1173 | 1175 | ||
| 1176 | #ifdef CONFIG_X86_64 | ||
| 1177 | if (pat_enabled()) { | ||
| 1178 | pr_warn("ivtvfb needs PAT disabled, boot with nopat kernel parameter\n"); | ||
| 1179 | return -ENODEV; | ||
| 1180 | } | ||
| 1181 | #endif | ||
| 1182 | |||
| 1174 | if (itv->osd_info) { | 1183 | if (itv->osd_info) { |
| 1175 | IVTVFB_ERR("Card %d already initialised\n", ivtvfb_card_id); | 1184 | IVTVFB_ERR("Card %d already initialised\n", ivtvfb_card_id); |
| 1176 | return -EBUSY; | 1185 | return -EBUSY; |
| @@ -1265,12 +1274,6 @@ static int __init ivtvfb_init(void) | |||
| 1265 | int registered = 0; | 1274 | int registered = 0; |
| 1266 | int err; | 1275 | int err; |
| 1267 | 1276 | ||
| 1268 | #ifdef CONFIG_X86_64 | ||
| 1269 | if (WARN(pat_enabled(), | ||
| 1270 | "ivtvfb needs PAT disabled, boot with nopat kernel parameter\n")) { | ||
| 1271 | return -ENODEV; | ||
| 1272 | } | ||
| 1273 | #endif | ||
| 1274 | 1277 | ||
| 1275 | if (ivtvfb_card_id < -1 || ivtvfb_card_id >= IVTV_MAX_CARDS) { | 1278 | if (ivtvfb_card_id < -1 || ivtvfb_card_id >= IVTV_MAX_CARDS) { |
| 1276 | printk(KERN_ERR "ivtvfb: ivtvfb_card_id parameter is out of range (valid range: -1 - %d)\n", | 1279 | printk(KERN_ERR "ivtvfb: ivtvfb_card_id parameter is out of range (valid range: -1 - %d)\n", |
