GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flashrom: further cleanups to enable_flash_cs5536 

- Remove the "enable write to flash" message, as the caller appears to
   already report that.

 - Move the 'modprobe msr' suggestions to the first lseek64 error handling, as
   we get an error there already.

 - Rename a perror string from "read" to "read msr", as we use the latter
   already in this function for another read.

Signed-off-by: Mart Raudsepp <mart.raudsepp@artecdesign.ee>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3101 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Mart Raudsepp 2008-02-11 14:32:45 +00:00 committed by Uwe Hermann
parent 5eb25bf48f
commit 9792a034e4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/flashrom/chipset_enable.c
View File

@ -259,18 +259,17 @@ static int enable_flash_cs5536(struct pci_dev *dev, const char *name)
if (lseek64(fd_msr, (off64_t) MSR_RCONF_DEFAULT, SEEK_SET) == -1) { if (lseek64(fd_msr, (off64_t) MSR_RCONF_DEFAULT, SEEK_SET) == -1) {
perror("lseek64"); perror("lseek64");
printf("Cannot operate on MSR. Did you run 'modprobe msr'?\n");
close(fd_msr); close(fd_msr);
return -1; return -1;
} }
if (read(fd_msr, buf, 8) != 8) { if (read(fd_msr, buf, 8) != 8) {
perror("read"); perror("read msr");
close(fd_msr); close(fd_msr);
return -1; return -1;
} }
printf("Enabling Geode MSR to write to flash.\n");
if (buf[7] != 0x22) { if (buf[7] != 0x22) {
buf[7] &= 0xfb; buf[7] &= 0xfb;
if (lseek64(fd_msr, (off64_t) MSR_RCONF_DEFAULT, SEEK_SET) == -1) { if (lseek64(fd_msr, (off64_t) MSR_RCONF_DEFAULT, SEEK_SET) == -1) {
@ -281,7 +280,6 @@ static int enable_flash_cs5536(struct pci_dev *dev, const char *name)
if (write(fd_msr, buf, 8) < 0) { if (write(fd_msr, buf, 8) < 0) {
perror("msr write"); perror("msr write");
printf("Cannot write to MSR. Did you run 'modprobe msr'?\n");
close(fd_msr); close(fd_msr);
return -1; return -1;
} }
@ -309,7 +307,6 @@ static int enable_flash_cs5536(struct pci_dev *dev, const char *name)
} }
if (write(fd_msr, buf, 8) < 0) { if (write(fd_msr, buf, 8) < 0) {
perror("msr write"); perror("msr write");
printf("Cannot write to MSR. Did you run 'modprobe msr'?\n");
close(fd_msr); close(fd_msr);
return -1; return -1;
} }