lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: microcode_amd: remove (wrong) chipset deivce ID checks

Browse Source 
Impact: remove dead/incorrect code

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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Andreas Herrmann
2008-12-16 19:20:21 +01:00
committed by Ingo Molnar
parent 6cc9b6d94b
commit 98415301ea
1 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/x86/kernel/microcode_amd.c
View File

@@ -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) static int get_matching_microcode(int cpu, void *mc, int rev)
{ {
struct microcode_header_amd *mc_header = mc; struct microcode_header_amd *mc_header = mc;
struct pci_dev *nb_pci_dev, *sb_pci_dev;
unsigned int current_cpu_id; unsigned int current_cpu_id;
unsigned int equiv_cpu_id = 0x00; unsigned int equiv_cpu_id = 0x00;
unsigned int i = 0; unsigned int i = 0;
@@ -137,32 +136,11 @@ static int get_matching_microcode(int cpu, void *mc, int rev)
return 0; return 0;
} }
/* ucode may be northbridge specific */ /* ucode might be chipset specific -- currently we don't support this */
if (mc_header->nb_dev_id) { if (mc_header->nb_dev_id || mc_header->sb_dev_id) {
nb_pci_dev = pci_get_device(PCI_VENDOR_ID_AMD, printk(KERN_WARNING "microcode: CPU%d loading of chipset "
(mc_header->nb_dev_id & 0xff), "specific code not yet supported\n", cpu);
NULL); return 0;
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);
} }
if (mc_header->patch_id <= rev) if (mc_header->patch_id <= rev)