From: Andreas Herrmann <andreas.herrmann3@amd.com>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org,
Dmitry Adamushko <dmitry.adamushko@gmail.com>
Subject: [PATCH 8/10] x86: microcode_amd: remove (wrong) chipset deivce ID checks
Date: Tue, 16 Dec 2008 19:20:21 +0100 [thread overview]
Message-ID: <20081216182021.GO7013@alberich.amd.com> (raw)
In-Reply-To: <20081216180639.GG7013@alberich.amd.com>
Currently there is no chipset specific ucode. The checks are incorrect
anyway (e.g. pci device IDs are 16 bit and not 8 bit).
Thus I remove the stuff for the time being and will reintroduce it if
it's foreseeable that it is really needed.
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
---
arch/x86/kernel/microcode_amd.c | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index e68e723..2e8af6e 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -108,7 +108,6 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)
static int get_matching_microcode(int cpu, void *mc, int rev)
{
struct microcode_header_amd *mc_header = mc;
- struct pci_dev *nb_pci_dev, *sb_pci_dev;
unsigned int current_cpu_id;
unsigned int equiv_cpu_id = 0x00;
unsigned int i = 0;
@@ -137,32 +136,11 @@ static int get_matching_microcode(int cpu, void *mc, int rev)
return 0;
}
- /* ucode may be northbridge specific */
- if (mc_header->nb_dev_id) {
- nb_pci_dev = pci_get_device(PCI_VENDOR_ID_AMD,
- (mc_header->nb_dev_id & 0xff),
- NULL);
- if ((!nb_pci_dev) ||
- (mc_header->nb_rev_id != nb_pci_dev->revision)) {
- printk(KERN_ERR "microcode: CPU%d NB mismatch\n", cpu);
- pci_dev_put(nb_pci_dev);
- return 0;
- }
- pci_dev_put(nb_pci_dev);
- }
-
- /* ucode may be southbridge specific */
- if (mc_header->sb_dev_id) {
- sb_pci_dev = pci_get_device(PCI_VENDOR_ID_AMD,
- (mc_header->sb_dev_id & 0xff),
- NULL);
- if ((!sb_pci_dev) ||
- (mc_header->sb_rev_id != sb_pci_dev->revision)) {
- printk(KERN_ERR "microcode: CPU%d SB mismatch\n", cpu);
- pci_dev_put(sb_pci_dev);
- return 0;
- }
- pci_dev_put(sb_pci_dev);
+ /* ucode might be chipset specific -- currently we don't support this */
+ if (mc_header->nb_dev_id || mc_header->sb_dev_id) {
+ printk(KERN_WARNING "microcode: CPU%d loading of chipset "
+ "specific code not yet supported\n", cpu);
+ return 0;
}
if (mc_header->patch_id <= rev)
--
1.6.0.4
next prev parent reply other threads:[~2008-12-16 18:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-16 18:06 [PATCH 0/10] x86: microcode_amd: fixes and cleanup Andreas Herrmann
2008-12-16 18:07 ` [PATCH 1/10] x86: microcode_amd: fix wrong handling of equivalent CPU id Andreas Herrmann
2008-12-16 18:08 ` [PATCH 2/10] x86: microcode_amd: fix typos and trailing whitespaces in log messages Andreas Herrmann
2008-12-16 18:11 ` [PATCH 3/10] x86: microcode_amd: fix checkpatch warnings/errors Andreas Herrmann
2008-12-16 18:13 ` [PATCH 4/10] x86: microcode_amd: fix compile warning Andreas Herrmann
2008-12-16 18:14 ` [PATCH 5/10] x86: microcode_amd: don't pass superfluous function pointer for get_ucode_data Andreas Herrmann
2008-12-16 18:16 ` [PATCH 6/10] x86: microcode_amd: replace inline asm by common rdmsr/wrmsr functions Andreas Herrmann
2008-12-16 18:17 ` [PATCH 7/10] x86: microcode_amd: consolidate macro definitions Andreas Herrmann
2008-12-16 18:20 ` Andreas Herrmann [this message]
2008-12-16 18:21 ` [PATCH 9/10] x86: microcode_amd: use 'packed' attribute for structs Andreas Herrmann
2008-12-16 18:22 ` [PATCH 10/10] x86: microcode_amd: modify log messages Andreas Herrmann
2008-12-16 23:22 ` [PATCH 0/10] x86: microcode_amd: fixes and cleanup Dmitry Adamushko
2008-12-16 23:24 ` Dmitry Adamushko
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=20081216182021.GO7013@alberich.amd.com \
--to=andreas.herrmann3@amd.com \
--cc=dmitry.adamushko@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®