openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-30 08:23:42 +02:00
Code Issues Releases Wiki Activity

sb600spi.c: Fold up debug logic into determine_generation()

Browse Source 
Change-Id: I6c722e29b321285bf20fb5ee30c912dcdd83411b
Signed-off-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/36425
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Edward O'Callaghan 2019-10-29 18:18:18 +11:00 committed by Nico Huber
parent c0a27e1f17
commit 9355e6faf6
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sb600spi.c
View File

@ -91,7 +91,8 @@ static int find_smbus_dev_rev(uint16_t vendor, uint16_t device)
return pci_read_byte(smbus_dev, PCI_REVISION_ID); return pci_read_byte(smbus_dev, PCI_REVISION_ID);
} }
static void determine_generation(struct pci_dev *dev) /* Determine the chipset's version and identify the respective SMBUS device. */
static int determine_generation(struct pci_dev *dev)
{ {
amd_gen = CHIPSET_AMD_UNKNOWN; amd_gen = CHIPSET_AMD_UNKNOWN;
msg_pdbg2("Trying to determine the generation of the SPI interface... "); msg_pdbg2("Trying to determine the generation of the SPI interface... ");
@ -101,7 +102,7 @@ static void determine_generation(struct pci_dev *dev)
} else if (dev->device_id == 0x439d) { } else if (dev->device_id == 0x439d) {
int rev = find_smbus_dev_rev(0x1002, 0x4385); int rev = find_smbus_dev_rev(0x1002, 0x4385);
if (rev < 0) if (rev < 0)
return; return -1;
if (rev >= 0x39 && rev <= 0x3D) { if (rev >= 0x39 && rev <= 0x3D) {
amd_gen = CHIPSET_SB7XX; amd_gen = CHIPSET_SB7XX;
msg_pdbg("SB7xx/SP5100 detected.\n"); msg_pdbg("SB7xx/SP5100 detected.\n");
@ -127,7 +128,7 @@ static void determine_generation(struct pci_dev *dev)
if (mmio_readb(sb600_spibar + i) != 0xff) { if (mmio_readb(sb600_spibar + i) != 0xff) {
amd_gen = CHIPSET_YANGTZE; amd_gen = CHIPSET_YANGTZE;
msg_pdbg("found.\n"); msg_pdbg("found.\n");
return; return 0;
} }
} }
msg_pdbg("not found. Assuming Hudson.\n"); msg_pdbg("not found. Assuming Hudson.\n");
@ -135,7 +136,7 @@ static void determine_generation(struct pci_dev *dev)
#else #else
int rev = find_smbus_dev_rev(0x1022, 0x780B); int rev = find_smbus_dev_rev(0x1022, 0x780B);
if (rev < 0) if (rev < 0)
return; return -1;
if (rev >= 0x11 && rev <= 0x15) { if (rev >= 0x11 && rev <= 0x15) {
amd_gen = CHIPSET_HUDSON234; amd_gen = CHIPSET_HUDSON234;
msg_pdbg("Hudson-2/3/4 detected.\n"); msg_pdbg("Hudson-2/3/4 detected.\n");
@ -153,7 +154,7 @@ static void determine_generation(struct pci_dev *dev)
} else if (dev->device_id == 0x790e) { } else if (dev->device_id == 0x790e) {
int rev = find_smbus_dev_rev(0x1022, 0x790B); int rev = find_smbus_dev_rev(0x1022, 0x790B);
if (rev < 0) if (rev < 0)
return; return -1;
if (rev == 0x4a) { if (rev == 0x4a) {
amd_gen = CHIPSET_YANGTZE; amd_gen = CHIPSET_YANGTZE;
msg_pdbg("Yangtze detected.\n"); msg_pdbg("Yangtze detected.\n");
@ -170,6 +171,11 @@ static void determine_generation(struct pci_dev *dev)
"Please report this to flashrom@flashrom.org and include this log and\n" "Please report this to flashrom@flashrom.org and include this log and\n"
"the output of lspci -nnvx, thanks!\n", "the output of lspci -nnvx, thanks!\n",
__func__, dev->vendor_id, dev->device_id); __func__, dev->vendor_id, dev->device_id);
if (amd_gen == CHIPSET_AMD_UNKNOWN) {
msg_perr("Could not determine chipset generation.");
return -1;
}
return 0;
} }
static void reset_internal_fifo_pointer(void) static void reset_internal_fifo_pointer(void)
@ -565,11 +571,8 @@ int sb600_probe_spi(struct pci_dev *dev)
*/ */
sb600_spibar += tmp & 0xfff; sb600_spibar += tmp & 0xfff;
determine_generation(dev); if (determine_generation(dev) < 0)
if (amd_gen == CHIPSET_AMD_UNKNOWN) {
msg_perr("Could not determine chipset generation.");
return ERROR_NONFATAL; return ERROR_NONFATAL;
}
/* How to read the following table and similar ones in this file: /* How to read the following table and similar ones in this file:
* "?" means we have no datasheet for this chipset generation or it doesn't have any relevant info. * "?" means we have no datasheet for this chipset generation or it doesn't have any relevant info.