mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
6cd41b419c
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Fixes for CVEs: CVE-2018-1108 CVE-2018-1092 CVE-2018-1094 CVE-2018-1095 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Tested-by: Stijn Segers <foss@volatilesystems.org>
52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
--- a/drivers/spi/Kconfig
|
|
+++ b/drivers/spi/Kconfig
|
|
@@ -206,6 +206,13 @@ config SPI_CLPS711X
|
|
This enables dedicated general purpose SPI/Microwire1-compatible
|
|
master mode interface (SSI1) for CLPS711X-based CPUs.
|
|
|
|
+config SPI_CNS3XXX
|
|
+ tristate "CNS3XXX SPI controller"
|
|
+ depends on ARCH_CNS3XXX && SPI_MASTER
|
|
+ select SPI_BITBANG
|
|
+ help
|
|
+ This enables using the CNS3XXX SPI controller in master mode.
|
|
+
|
|
config SPI_COLDFIRE_QSPI
|
|
tristate "Freescale Coldfire QSPI controller"
|
|
depends on (M520x || M523x || M5249 || M525x || M527x || M528x || M532x)
|
|
--- a/drivers/spi/Makefile
|
|
+++ b/drivers/spi/Makefile
|
|
@@ -31,6 +31,7 @@ obj-$(CONFIG_SPI_BITBANG) += spi-bitban
|
|
obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o
|
|
obj-$(CONFIG_SPI_CADENCE) += spi-cadence.o
|
|
obj-$(CONFIG_SPI_CLPS711X) += spi-clps711x.o
|
|
+obj-$(CONFIG_SPI_CNS3XXX) += spi-cns3xxx.o
|
|
obj-$(CONFIG_SPI_COLDFIRE_QSPI) += spi-coldfire-qspi.o
|
|
obj-$(CONFIG_SPI_DAVINCI) += spi-davinci.o
|
|
obj-$(CONFIG_SPI_DLN2) += spi-dln2.o
|
|
--- a/include/linux/spi/spi.h
|
|
+++ b/include/linux/spi/spi.h
|
|
@@ -799,6 +799,10 @@ struct spi_transfer {
|
|
u32 speed_hz;
|
|
|
|
struct list_head transfer_list;
|
|
+
|
|
+#ifdef CONFIG_ARCH_CNS3XXX
|
|
+ unsigned last_in_message_list;
|
|
+#endif
|
|
};
|
|
|
|
/**
|
|
--- a/drivers/spi/spi.c
|
|
+++ b/drivers/spi/spi.c
|
|
@@ -1027,6 +1027,9 @@ static int spi_transfer_one_message(stru
|
|
list_for_each_entry(xfer, &msg->transfers, transfer_list) {
|
|
trace_spi_transfer_start(msg, xfer);
|
|
|
|
+ xfer->last_in_message_list =
|
|
+ list_is_last(&xfer->transfer_list, &msg->transfers);
|
|
+
|
|
spi_statistics_add_transfer_stats(statm, xfer, ctlr);
|
|
spi_statistics_add_transfer_stats(stats, xfer, ctlr);
|
|
|