@@ -448,7 +448,7 @@ config SPI_INTEL
tristate
config SPI_INTEL_PCI
- tristate "Intel PCH/PCU SPI flash PCI driver (DANGEROUS)"
+ tristate "Intel PCH/PCU SPI flash PCI driver"
depends on PCI
depends on X86 || COMPILE_TEST
depends on SPI_MEM
@@ -458,6 +458,8 @@ config SPI_INTEL_PCI
master mode. This controller is present in modern Intel hardware
and is used to hold BIOS and other persistent settings. Using
this driver it is possible to upgrade BIOS directly from Linux.
+ The driver will use hardware sequencing capabilities from the chip
+ by default.
Say N here unless you know what you are doing. Overwriting the
SPI flash may render the system unbootable.
@@ -466,7 +468,7 @@ config SPI_INTEL_PCI
will be called spi-intel-pci.
config SPI_INTEL_PLATFORM
- tristate "Intel PCH/PCU SPI flash platform driver (DANGEROUS)"
+ tristate "Intel PCH/PCU SPI flash platform driver"
depends on X86 || COMPILE_TEST
depends on SPI_MEM
select SPI_INTEL
@@ -476,6 +478,8 @@ config SPI_INTEL_PLATFORM
Intel hardware and is used to hold BIOS and other persistent
settings. Using this driver it is possible to upgrade BIOS
directly from Linux.
+ The driver will use hardware sequencing capabilities from the chip
+ by default.
Say N here unless you know what you are doing. Overwriting the
SPI flash may render the system unbootable.
@@ -483,6 +487,13 @@ config SPI_INTEL_PLATFORM
To compile this driver as a module, choose M here: the module
will be called spi-intel-platform.
+config SPI_INTEL_SWSEQ
+ tristate "Intel SPI controller software sequencing support (DANGEROUS)"
+ depends on X86 || COMPILE_TEST
+ depends on SPI_MEM
+ help
+ This enables software sequencing functionality to the SPI controller
+
config SPI_JCORE
tristate "J-Core SPI Master"
depends on OF && (SUPERH || COMPILE_TEST)
@@ -12,6 +12,7 @@
#include "spi-intel-common.h"
#include "spi-intel-swseq.h"
+#if defined(CONFIG_SPI_INTEL_SWSEQ)
bool mem_op_supported_on_spi_locked(const struct intel_spi *ispi,
const struct spi_mem_op *op)
{
@@ -178,4 +179,53 @@ void populate_opmenus(struct intel_spi *ispi, u32 *opmenu0, u32 *opmenu1)
}
EXPORT_SYMBOL(populate_opmenus);
+#else
+static inline void log_error_swseq_not_supported(const struct intel_spi *ispi)
+{
+ dev_err(ispi->dev, "SW sequencing is not enabled");
+}
+
+int handle_swseq_wren(struct intel_spi *ispi)
+{
+ log_error_swseq_not_supported(ispi);
+ return -EINVAL;
+}
+EXPORT_SYMBOL(handle_swseq_wren);
+
+bool mem_op_supported_on_spi_locked(const struct intel_spi *ispi,
+ const struct spi_mem_op *op)
+{
+ log_error_swseq_not_supported(ispi);
+ return false;
+}
+EXPORT_SYMBOL(mem_op_supported_on_spi_locked);
+
+int intel_spi_sw_cycle(struct intel_spi *ispi, u8 opcode, size_t len,
+ int optype)
+{
+ log_error_swseq_not_supported(ispi);
+ return -ENOTSUPP;
+}
+EXPORT_SYMBOL(intel_spi_sw_cycle);
+
+inline bool is_swseq_enabled(void)
+{
+ return false;
+}
+EXPORT_SYMBOL(is_swseq_enabled);
+
+void disable_smi_generation(const struct intel_spi *ispi)
+{
+ log_error_swseq_not_supported(ispi);
+}
+EXPORT_SYMBOL(disable_smi_generation);
+
+void populate_opmenus(struct intel_spi *ispi, u32 *opmenu0, u32 *opmenu1)
+{
+ log_error_swseq_not_supported(ispi);
+}
+EXPORT_SYMBOL(populate_opmenus);
+
+#endif
+
MODULE_LICENSE("GPL v2");
Add menuconfig option to build the driver with hardware sequencing by default and another to specify software sequencing support if needed. For the software sequencing functionality preserve the *DANGEROUS* tag. Signed-off-by: Mauro Lima <mauro.lima@eclypsium.com> --- drivers/spi/Kconfig | 15 +++++++++-- drivers/spi/spi-intel-swseq.c | 50 +++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-)