sb/intel/ibexpeak: Use common final SPI OPs setup

This also removes the relevant RCBA replays the mainboard dir.

Change-Id: I75dd9d1bcd09d835f205a51c087d52ebb4e166f6
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33038
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Thomas Heijligen <src@posteo.de>

4 files changed, 3 insertions, 95 deletions

diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index 70b393cc18..96033f88df 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -28,34 +28,6 @@
 #include <cpu/x86/lapic.h>
 #include <drivers/lenovo/lenovo.h>
 
-static void mainboard_init(struct device *dev)
-{
-	printk(BIOS_SPEW, "starting SPI configuration\n");
-
-	/* Configure SPI.  */
-	RCBA32(0x3800) = 0x07ff0500;
-	RCBA32(0x3804) = 0x3f046008;
-	RCBA32(0x3808) = 0x0058efc0;
-	RCBA32(0x384c) = 0x92000000;
-	RCBA32(0x3850) = 0x00000a0b;
-	RCBA32(0x3858) = 0x07ff0500;
-	RCBA32(0x385c) = 0x04ff0003;
-	RCBA32(0x3860) = 0x00020001;
-	RCBA32(0x3864) = 0x00000fff;
-	RCBA32(0x3874) = 0;
-	RCBA32(0x3890) = 0xf8400000;
-	RCBA32(0x3894) = 0x143b5006;
-	RCBA32(0x3898) = 0x05200302;
-	RCBA32(0x389c) = 0x0601209f;
-	RCBA32(0x38b0) = 0x00000004;
-	RCBA32(0x38b4) = 0x03040002;
-	RCBA32(0x38c8) = 0x00002005;
-	RCBA32(0x38c4) = 0x00802005;
-	RCBA32(0x3804) = 0x3f04e008;
-
-	printk(BIOS_SPEW, "SPI configured\n");
-}
-
 static void fill_ssdt(struct device *device)
 {
 	drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
@@ -65,7 +37,6 @@ static void mainboard_enable(struct device *dev)
 {
 	u16 pmbase;
 
-	dev->ops->init = mainboard_init;
 	dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
 
 	pmbase = pci_read_config32(pcidev_on_root(0x1f, 0),
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index 28d3bb0958..785e6e8103 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -35,31 +35,6 @@ static void mainboard_enable(struct device *dev)
 {
 	u16 pmbase;
 
-	printk(BIOS_SPEW, "starting SPI configuration\n");
-
-	/* Configure SPI.  */
-	RCBA32(0x3800) = 0x07ff0500;
-	RCBA32(0x3804) = 0x3f046008;
-	RCBA32(0x3808) = 0x0058efc0;
-	RCBA32(0x384c) = 0x92000000;
-	RCBA32(0x3850) = 0x00000a0b;
-	RCBA32(0x3858) = 0x07ff0500;
-	RCBA32(0x385c) = 0x04ff0003;
-	RCBA32(0x3860) = 0x00020001;
-	RCBA32(0x3864) = 0x00000fff;
-	RCBA32(0x3874) = 0;
-	RCBA32(0x3890) = 0xf8400000;
-	RCBA32(0x3894) = 0x143b5006;
-	RCBA32(0x3898) = 0x05200302;
-	RCBA32(0x389c) = 0x0601209f;
-	RCBA32(0x38b0) = 0x00000004;
-	RCBA32(0x38b4) = 0x03040002;
-	RCBA32(0x38c8) = 0x00002005;
-	RCBA32(0x38c4) = 0x00802005;
-	RCBA32(0x3804) = 0x3f04e008;
-
-	printk(BIOS_SPEW, "SPI configured\n");
-
 	int i;
 	const u8 dmp[256] = {
 		0x00, 0x20, 0x00, 0x00, 0x00, 0x02, 0x89, 0xe4, 0x30, 0x00, 0x40, 0x14, 0x00, 0x00, 0x00, 0x11,
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index e7162b1e04..fa1ca92d78 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -38,6 +38,7 @@
 #include "nvs.h"
 #include <southbridge/intel/common/pciehp.h>
 #include <southbridge/intel/common/acpi_pirq_gen.h>
+#include <southbridge/intel/common/spi.h>
 
 #define NMI_OFF	0
 
@@ -785,6 +786,8 @@ static void southbridge_fill_ssdt(struct device *device)
 
 static void lpc_final(struct device *dev)
 {
+	spi_finalize_ops();
+
 	/* Call SMM finalize() handlers before resume */
 	if (CONFIG(HAVE_SMI_HANDLER)) {
 		if (CONFIG(INTEL_CHIPSET_LOCKDOWN) ||
diff --git a/src/southbridge/intel/ibexpeak/pch.h b/src/southbridge/intel/ibexpeak/pch.h
index 04cc21d475..24a7905ed2 100644
--- a/src/southbridge/intel/ibexpeak/pch.h
+++ b/src/southbridge/intel/ibexpeak/pch.h
@@ -455,47 +455,6 @@ void southbridge_configure_default_intmap(void);
 #define   DMISCI_STS	(1 << 9)
 #define TCO2_STS	0x66
 
-/*
- * SPI Opcode Menu setup for SPIBAR lockdown
- * should support most common flash chips.
- */
-
-#define SPI_OPMENU_0 0x01 /* WRSR: Write Status Register */
-#define SPI_OPTYPE_0 0x01 /* Write, no address */
-
-#define SPI_OPMENU_1 0x02 /* BYPR: Byte Program */
-#define SPI_OPTYPE_1 0x03 /* Write, address required */
-
-#define SPI_OPMENU_2 0x03 /* READ: Read Data */
-#define SPI_OPTYPE_2 0x02 /* Read, address required */
-
-#define SPI_OPMENU_3 0x05 /* RDSR: Read Status Register */
-#define SPI_OPTYPE_3 0x00 /* Read, no address */
-
-#define SPI_OPMENU_4 0x20 /* SE20: Sector Erase 0x20 */
-#define SPI_OPTYPE_4 0x03 /* Write, address required */
-
-#define SPI_OPMENU_5 0x9f /* RDID: Read ID */
-#define SPI_OPTYPE_5 0x00 /* Read, no address */
-
-#define SPI_OPMENU_6 0xd8 /* BED8: Block Erase 0xd8 */
-#define SPI_OPTYPE_6 0x03 /* Write, address required */
-
-#define SPI_OPMENU_7 0x0b /* FAST: Fast Read */
-#define SPI_OPTYPE_7 0x02 /* Read, address required */
-
-#define SPI_OPMENU_UPPER ((SPI_OPMENU_7 << 24) | (SPI_OPMENU_6 << 16) | \
-			  (SPI_OPMENU_5 << 8) | SPI_OPMENU_4)
-#define SPI_OPMENU_LOWER ((SPI_OPMENU_3 << 24) | (SPI_OPMENU_2 << 16) | \
-			  (SPI_OPMENU_1 << 8) | SPI_OPMENU_0)
-
-#define SPI_OPTYPE ((SPI_OPTYPE_7 << 14) | (SPI_OPTYPE_6 << 12) | \
-		    (SPI_OPTYPE_5 << 10) | (SPI_OPTYPE_4 << 8) |  \
-		    (SPI_OPTYPE_3 << 6) | (SPI_OPTYPE_2 << 4) |	  \
-		    (SPI_OPTYPE_1 << 2) | (SPI_OPTYPE_0))
-
-#define SPI_OPPREFIX ((0x50 << 8) | 0x06) /* EWSR and WREN */
-
 #define SPIBAR_HSFS                 0x3804   /* SPI hardware sequence status */
 #define  SPIBAR_HSFS_SCIP           (1 << 5) /* SPI Cycle In Progress */
 #define  SPIBAR_HSFS_AEL            (1 << 2) /* SPI Access Error Log */