[coreboot-gerrit] Change in coreboot[master]: soc/intel/common: Provide common block fast_spi_flash_ctrlr
Martin Roth (Code Review)
gerrit at coreboot.org
Fri May 5 23:40:53 CEST 2017
Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/19575 )
Change subject: soc/intel/common: Provide common block fast_spi_flash_ctrlr
......................................................................
soc/intel/common: Provide common block fast_spi_flash_ctrlr
Now that we have a common block driver for fast spi flash controller,
provide spi_ctrlr structure that can be used by different platforms
for defining the bus-ctrlr mapping. Only cs 0 is considered valid.
Change-Id: I7228ae885018d1e23e6e80dd8ce227b0d99d84a6
Signed-off-by: Furquan Shaikh <furquan at chromium.org>
Reviewed-on: https://review.coreboot.org/19575
Reviewed-by: Aaron Durbin <adurbin at chromium.org>
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
---
M src/soc/intel/apollolake/spi.c
M src/soc/intel/common/block/fast_spi/fast_spi_flash.c
M src/soc/intel/common/block/include/intelblocks/fast_spi.h
M src/soc/intel/skylake/spi.c
4 files changed, 25 insertions(+), 36 deletions(-)
Approvals:
Aaron Durbin: Looks good to me, approved
build bot (Jenkins): Verified
diff --git a/src/soc/intel/apollolake/spi.c b/src/soc/intel/apollolake/spi.c
index 87d4d01..9a651ee 100644
--- a/src/soc/intel/apollolake/spi.c
+++ b/src/soc/intel/apollolake/spi.c
@@ -15,28 +15,11 @@
*/
#include <console/console.h>
+#include <intelblocks/fast_spi.h>
#include <spi-generic.h>
-/* SPI controller managing the fast SPI. */
-static int fast_spi_ctrlr_setup(const struct spi_slave *dev)
-{
- if ((dev->bus != 0) && (dev->cs != 0)) {
- printk(BIOS_ERR, "%s: Unsupported device "
- "bus=0x%x,cs=0x%x!\n", __func__, dev->bus, dev->cs);
- return -1;
- }
-
- printk(BIOS_INFO, "%s: Found controller for device "
- "(bus=0x%x,cs=0x%x)!!\n", __func__, dev->bus, dev->cs);
- return 0;
-}
-
-static const struct spi_ctrlr fast_spi_ctrlr = {
- .setup = fast_spi_ctrlr_setup,
-};
-
const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = {
- { .ctrlr = &fast_spi_ctrlr, .bus_start = 0, .bus_end = 0 },
+ { .ctrlr = &fast_spi_flash_ctrlr, .bus_start = 0, .bus_end = 0 },
};
const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map);
diff --git a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c b/src/soc/intel/common/block/fast_spi/fast_spi_flash.c
index 3babf91..27a4bb7 100644
--- a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c
+++ b/src/soc/intel/common/block/fast_spi/fast_spi_flash.c
@@ -350,3 +350,18 @@
return 0;
}
+
+static int fast_spi_flash_ctrlr_setup(const struct spi_slave *dev)
+{
+ if (dev->cs != 0) {
+ printk(BIOS_ERR, "%s: Invalid CS for fast SPI bus=0x%x,cs=0x%x!\n",
+ __func__, dev->bus, dev->cs);
+ return -1;
+ }
+
+ return 0;
+}
+
+const struct spi_ctrlr fast_spi_flash_ctrlr = {
+ .setup = fast_spi_flash_ctrlr_setup,
+};
diff --git a/src/soc/intel/common/block/include/intelblocks/fast_spi.h b/src/soc/intel/common/block/include/intelblocks/fast_spi.h
index 2b80c49..e4bddc4 100644
--- a/src/soc/intel/common/block/include/intelblocks/fast_spi.h
+++ b/src/soc/intel/common/block/include/intelblocks/fast_spi.h
@@ -64,4 +64,10 @@
*/
void fast_spi_early_init(uintptr_t spi_base_address);
+/*
+ * Fast SPI flash controller structure to allow SoCs to define bus-controller
+ * mapping.
+ */
+extern const struct spi_ctrlr fast_spi_flash_ctrlr;
+
#endif /* SOC_INTEL_COMMON_BLOCK_FAST_SPI_H */
diff --git a/src/soc/intel/skylake/spi.c b/src/soc/intel/skylake/spi.c
index e11e13f..e575e6e 100644
--- a/src/soc/intel/skylake/spi.c
+++ b/src/soc/intel/skylake/spi.c
@@ -20,28 +20,13 @@
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <device/spi.h>
+#include <intelblocks/fast_spi.h>
#include <intelblocks/gspi.h>
#include <soc/ramstage.h>
#include <spi-generic.h>
-/* SPI controller managing the flash-device SPI. */
-static int flash_spi_ctrlr_setup(const struct spi_slave *dev)
-{
- if ((dev->bus != 0) || (dev->cs != 0)) {
- printk(BIOS_ERR, "%s: Unsupported device bus=0x%x,cs=0x%x!\n",
- __func__, dev->bus, dev->cs);
- return -1;
- }
-
- return 0;
-}
-
-static const struct spi_ctrlr flash_spi_ctrlr = {
- .setup = flash_spi_ctrlr_setup,
-};
-
const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = {
- { .ctrlr = &flash_spi_ctrlr, .bus_start = 0, .bus_end = 0 },
+ { .ctrlr = &fast_spi_flash_ctrlr, .bus_start = 0, .bus_end = 0 },
#if !ENV_SMM
{ .ctrlr = &gspi_ctrlr, .bus_start = 1,
.bus_end = 1 + (CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX - 1)},
--
To view, visit https://review.coreboot.org/19575
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7228ae885018d1e23e6e80dd8ce227b0d99d84a6
Gerrit-PatchSet: 6
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Furquan Shaikh <furquan at google.com>
Gerrit-Reviewer: Aaron Durbin <adurbin at chromium.org>
Gerrit-Reviewer: Duncan Laurie <dlaurie at chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan at google.com>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Subrata Banik <subrata.banik at intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
More information about the coreboot-gerrit
mailing list