mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Borislav Petkov <bp@alien8.de>
To: X86 ML <x86@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>, Borislav Petkov <bp@suse.de>
Subject: [PATCH 5/5] x86, quirks: Shut-up a long-standing gcc warning
Date: Mon,  4 Mar 2013 21:16:20 +0100	[thread overview]
Message-ID: <1362428180-8865-6-git-send-email-bp@alien8.de> (raw)
In-Reply-To: <1362428180-8865-1-git-send-email-bp@alien8.de>

From: Borislav Petkov <bp@suse.de>

So gcc nags about those since forever in randconfig builds.

arch/x86/kernel/quirks.c: In function ‘ati_ixp4x0_rev’:
arch/x86/kernel/quirks.c:361:4: warning: ‘b’ is used uninitialized in this function [-Wuninitialized]
arch/x86/kernel/quirks.c: In function ‘ati_force_enable_hpet’:
arch/x86/kernel/quirks.c:367:4: warning: ‘d’ may be used uninitialized in this function [-Wuninitialized]
arch/x86/kernel/quirks.c:357:6: note: ‘d’ was declared here
arch/x86/kernel/quirks.c:407:21: warning: ‘val’ may be used uninitialized in this function [-Wuninitialized]

This function quirk is called on a SB400 chipset only anyway so the
distant possibility of a PCI access failing becomes almost impossible
there. Even if it did fail, then something else more serious is the
problem.

So zero-out the variables so that gcc shuts up but do a coarse check
on the PCI accesses at the end and signal whether any of them had an
error. They shouldn't but in case they do, we'll at least know and we
can address it.

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 arch/x86/kernel/quirks.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 26ee48a33dc4..04ee1e2e4c02 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -354,18 +354,22 @@ static void ati_force_hpet_resume(void)
 
 static u32 ati_ixp4x0_rev(struct pci_dev *dev)
 {
-	u32 d;
-	u8  b;
+	int err = 0;
+	u32 d = 0;
+	u8  b = 0;
 
-	pci_read_config_byte(dev, 0xac, &b);
+	err = pci_read_config_byte(dev, 0xac, &b);
 	b &= ~(1<<5);
-	pci_write_config_byte(dev, 0xac, b);
-	pci_read_config_dword(dev, 0x70, &d);
+	err |= pci_write_config_byte(dev, 0xac, b);
+	err |= pci_read_config_dword(dev, 0x70, &d);
 	d |= 1<<8;
-	pci_write_config_dword(dev, 0x70, d);
-	pci_read_config_dword(dev, 0x8, &d);
+	err |= pci_write_config_dword(dev, 0x70, d);
+	err |= pci_read_config_dword(dev, 0x8, &d);
 	d &= 0xff;
 	dev_printk(KERN_DEBUG, &dev->dev, "SB4X0 revision 0x%x\n", d);
+
+	WARN_ON_ONCE(err);
+
 	return d;
 }
 
-- 
1.8.1.3.535.ga923c31


  parent reply	other threads:[~2013-03-04 20:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-04 20:16 [PATCH 0/5] x86: Misc fixlets Borislav Petkov
2013-03-04 20:16 ` [PATCH 1/5] x86, smpboot: Remove unused variable Borislav Petkov
2013-03-06  0:24   ` [tip:x86/urgent] " tip-bot for Borislav Petkov
2013-03-04 20:16 ` [PATCH 2/5] x86: Drop KERNEL_IMAGE_START Borislav Petkov
2013-04-03  0:18   ` [tip:x86/cleanups] " tip-bot for Borislav Petkov
2013-03-04 20:16 ` [PATCH 3/5] x86-64, docs, mm: Add vsyscall range to virtual address space layout Borislav Petkov
2013-03-04 21:45   ` Andy Lutomirski
2013-03-04 21:56     ` Borislav Petkov
2013-04-03  0:19   ` [tip:x86/cleanups] " tip-bot for Borislav Petkov
2013-03-04 20:16 ` [PATCH 4/5] x86, msr: Unify variable names Borislav Petkov
2013-04-03  0:20   ` [tip:x86/cleanups] " tip-bot for Borislav Petkov
2013-03-04 20:16 ` Borislav Petkov [this message]
2013-04-03  0:21   ` [tip:x86/cleanups] x86, quirks: Shut-up a long-standing gcc warning tip-bot for Borislav Petkov

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=1362428180-8865-6-git-send-email-bp@alien8.de \
    --to=bp@alien8.de \
    --cc=bp@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --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

Powered by JetHome