Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/68823 )
Change subject: sb600spi.c: Drop "Promontory" support ......................................................................
sb600spi.c: Drop "Promontory" support
The "Promontory" code is riddled with issues, some of them can result in soft bricks. Moreover, Promontory doesn't have a SPI controller.
Drop support for "Promontory" in flashrom for now: it's holding back the entire project and it's unlikely that it'll be fixed in a timely manner.
Change-Id: I1457946dce68321b496d9ffa40a0c5ab46455f72 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M sb600spi.c 1 file changed, 16 insertions(+), 42 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/23/68823/1
diff --git a/sb600spi.c b/sb600spi.c index 6020145..2e7be81 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -48,7 +48,6 @@ CHIPSET_HUDSON234, CHIPSET_BOLTON, CHIPSET_YANGTZE, - CHIPSET_PROMONTORY, };
#define FIFO_SIZE_OLD 8 @@ -124,18 +123,6 @@ if (rev == 0x4a) { msg_pdbg("Yangtze detected.\n"); return CHIPSET_YANGTZE; - /** - * FCH chipsets called 'Promontory' are one's with the - * so-called SPI100 ip core that uses memory mapping and - * not a ring buffer for transactions. Typically this is - * found on both Stoney Ridge and Zen platforms. - * - * The revisions I have found by searching various lspci - * outputs are as follows: 0x4b, 0x59, 0x61 & 0x71. - */ - } else if (rev == 0x4b || rev == 0x51 || rev == 0x59 || rev == 0x61 || rev == 0x71) { - msg_pdbg("Promontory (rev 0x%02x) detected.\n", rev); - return CHIPSET_PROMONTORY; } else { msg_pwarn("FCH device found but SMBus revision 0x%02x does not match known values.\n" "Please report this to flashrom@flashrom.org and include this log and\n" @@ -572,18 +559,6 @@ return amd_imc_shutdown(dev); }
-static int promontory_read_memmapped(struct flashctx *flash, uint8_t *buf, - unsigned int start, unsigned int len) -{ - struct sb600spi_data * data = (struct sb600spi_data *)flash->mst->spi.data; - if (!data->flash) { - map_flash(flash); - data->flash = flash; /* keep a copy of flashctx for unmap() on tear-down. */ - } - mmio_readn((void *)(flash->virtual_memory + start), buf, len); - return 0; -} - static int sb600spi_shutdown(void *data) { struct sb600spi_data *sb600_data = data; @@ -623,20 +598,6 @@ .probe_opcode = default_spi_probe_opcode, };
-static const struct spi_master spi_master_promontory = { - .max_data_read = MAX_DATA_READ_UNLIMITED, - .max_data_write = FIFO_SIZE_YANGTZE - 3, - .command = spi100_spi_send_command, - .multicommand = default_spi_send_multicommand, - .map_flash_region = physmap, - .unmap_flash_region = physunmap, - .read = promontory_read_memmapped, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, - .shutdown = sb600spi_shutdown, - .probe_opcode = default_spi_probe_opcode, -}; - int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev) { struct pci_dev *smbus_dev; @@ -740,7 +701,6 @@ case CHIPSET_SB89XX: case CHIPSET_HUDSON234: case CHIPSET_YANGTZE: - case CHIPSET_PROMONTORY: msg_pdbg(", SpiBusy=%i", (tmp >> 31) & 0x1); default: break; } @@ -817,8 +777,6 @@ register_spi_master(&spi_master_sb600, data); else if (amd_gen == CHIPSET_YANGTZE) register_spi_master(&spi_master_yangtze, data); - else - register_spi_master(&spi_master_promontory, data);
return 0; }