From 390328875f43a0c8048e77b722f272287b2b2ae9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 10 Feb 2018 14:11:08 +0000 Subject: remove old mv cesa driver --- configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MV_CESA | 1 - kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - 7 files changed, 7 deletions(-) delete mode 100644 configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MV_CESA diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MV_CESA b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MV_CESA deleted file mode 100644 index 25ac0e90d..000000000 --- a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MV_CESA +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_DEV_MV_CESA=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index d015fcbfe..f78bf85bd 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1027,7 +1027,6 @@ CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m -CONFIG_CRYPTO_DEV_MV_CESA=m CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_ROCKCHIP=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 1a690bdd4..93f8f6ac9 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1025,7 +1025,6 @@ CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m -CONFIG_CRYPTO_DEV_MV_CESA=m CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_ROCKCHIP=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a8247abac..1619d4898 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1066,7 +1066,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m -CONFIG_CRYPTO_DEV_MV_CESA=m # CONFIG_CRYPTO_DEV_MXC_SCC is not set # CONFIG_CRYPTO_DEV_MXS_DCP is not set CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 525cb8b06..26a99da0a 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1022,7 +1022,6 @@ CONFIG_CRYPTO_DEV_EXYNOS_RNG=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m -CONFIG_CRYPTO_DEV_MV_CESA=m CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_S5P=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index d08e940c8..7ca17eb5a 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1019,7 +1019,6 @@ CONFIG_CRYPTO_DEV_EXYNOS_RNG=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m -CONFIG_CRYPTO_DEV_MV_CESA=m CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_S5P=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index b74e3c9b4..f70708cc7 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1063,7 +1063,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_CRYPTO_DEV_MARVELL_CESA=m -CONFIG_CRYPTO_DEV_MV_CESA=m # CONFIG_CRYPTO_DEV_MXC_SCC is not set # CONFIG_CRYPTO_DEV_MXS_DCP is not set CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m -- cgit From 4b5db15c5b71b67f75b8d84dccb9dd334fac44a8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 10 Feb 2018 14:53:34 +0000 Subject: of pci config options dropped --- configs/fedora/generic/arm/CONFIG_OF_PCI | 1 - configs/fedora/generic/arm/CONFIG_OF_PCI_IRQ | 1 - kernel-aarch64-debug.config | 2 -- kernel-aarch64.config | 2 -- kernel-armv7hl-debug.config | 2 -- kernel-armv7hl-lpae-debug.config | 2 -- kernel-armv7hl-lpae.config | 2 -- kernel-armv7hl.config | 2 -- 8 files changed, 14 deletions(-) delete mode 100644 configs/fedora/generic/arm/CONFIG_OF_PCI delete mode 100644 configs/fedora/generic/arm/CONFIG_OF_PCI_IRQ diff --git a/configs/fedora/generic/arm/CONFIG_OF_PCI b/configs/fedora/generic/arm/CONFIG_OF_PCI deleted file mode 100644 index ed845e881..000000000 --- a/configs/fedora/generic/arm/CONFIG_OF_PCI +++ /dev/null @@ -1 +0,0 @@ -CONFIG_OF_PCI=y diff --git a/configs/fedora/generic/arm/CONFIG_OF_PCI_IRQ b/configs/fedora/generic/arm/CONFIG_OF_PCI_IRQ deleted file mode 100644 index d0054d853..000000000 --- a/configs/fedora/generic/arm/CONFIG_OF_PCI_IRQ +++ /dev/null @@ -1 +0,0 @@ -CONFIG_OF_PCI_IRQ=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index f78bf85bd..e76de4945 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3937,8 +3937,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PCI_IRQ=y -CONFIG_OF_PCI=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 93f8f6ac9..3223e2379 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3914,8 +3914,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PCI_IRQ=y -CONFIG_OF_PCI=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 1619d4898..4fc2232ce 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4173,8 +4173,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PCI_IRQ=y -CONFIG_OF_PCI=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 26a99da0a..9ab9620a9 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3991,8 +3991,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PCI_IRQ=y -CONFIG_OF_PCI=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 7ca17eb5a..ef552df47 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3968,8 +3968,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PCI_IRQ=y -CONFIG_OF_PCI=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index f70708cc7..c2bdb7bb4 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4150,8 +4150,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_PCI_IRQ=y -CONFIG_OF_PCI=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y # CONFIG_OF_UNITTEST is not set -- cgit From b63450507742dd67cf77504608599349a512c9ed Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 10 Feb 2018 15:12:35 +0000 Subject: minor cleanup (NFC) --- configs/fedora/generic/CONFIG_USB_CHIPIDEA_ULPI | 1 - kernel-i686-PAE.config | 1 - kernel-i686-PAEdebug.config | 1 - kernel-i686-debug.config | 1 - kernel-i686.config | 1 - kernel-ppc64-debug.config | 1 - kernel-ppc64.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 1 - kernel-x86_64.config | 1 - 13 files changed, 13 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_USB_CHIPIDEA_ULPI diff --git a/configs/fedora/generic/CONFIG_USB_CHIPIDEA_ULPI b/configs/fedora/generic/CONFIG_USB_CHIPIDEA_ULPI deleted file mode 100644 index c97b84c79..000000000 --- a/configs/fedora/generic/CONFIG_USB_CHIPIDEA_ULPI +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_USB_CHIPIDEA_ULPI is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 4a5e77f30..095cc2de6 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -5615,7 +5615,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 99fba307a..b8e69f1a5 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -5639,7 +5639,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 7a682e434..2d40c9ae2 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5639,7 +5639,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-i686.config b/kernel-i686.config index 888c324d6..1ed6d2fcb 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5615,7 +5615,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 9141d5291..7d42f2e3d 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -5399,7 +5399,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index dc47eef5b..8ab54919d 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -5373,7 +5373,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index c405c955f..d0a91845a 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5327,7 +5327,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 1fe78d28f..c0c9ffa94 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5301,7 +5301,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 1edbc05a8..ddf536504 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5224,7 +5224,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 1bde46e6f..5f06608be 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5198,7 +5198,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 8e290528e..5deb90d6c 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5727,7 +5727,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 2b674a156..5dc680429 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -5703,7 +5703,6 @@ CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m # CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CXACRU=m # CONFIG_USB_CYPRESS_CY7C63 is not set -- cgit From 65da22b9d77b6af7240675509215f185e038be3f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 10 Feb 2018 15:26:17 +0000 Subject: ARM doesn't support the Gemini SoCs --- configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET | 1 - configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA | 1 - kernel-aarch64-debug.config | 3 +-- kernel-aarch64.config | 3 +-- kernel-armv7hl-debug.config | 3 +-- kernel-armv7hl-lpae-debug.config | 3 +-- kernel-armv7hl-lpae.config | 3 +-- kernel-armv7hl.config | 3 +-- 8 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET delete mode 100644 configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA diff --git a/configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET b/configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET deleted file mode 100644 index 2af33e19f..000000000 --- a/configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET +++ /dev/null @@ -1 +0,0 @@ -CONFIG_GEMINI_ETHERNET=m diff --git a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA b/configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA deleted file mode 100644 index 4dbaa1244..000000000 --- a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NET_VENDOR_CORTINA=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index e76de4945..3ec616937 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1752,7 +1752,6 @@ CONFIG_GAMEPORT_NS558=m # CONFIG_GCC_PLUGINS is not set # CONFIG_GCOV_KERNEL is not set # CONFIG_GDB_SCRIPTS is not set -CONFIG_GEMINI_ETHERNET=m # CONFIG_GENERIC_ADC_BATTERY is not set # CONFIG_GENERIC_ADC_THERMAL is not set # CONFIG_GENERIC_IRQ_DEBUGFS is not set @@ -3624,7 +3623,7 @@ CONFIG_NET_VENDOR_BROADCOM=y CONFIG_NET_VENDOR_CAVIUM=y CONFIG_NET_VENDOR_CHELSIO=y # CONFIG_NET_VENDOR_CISCO is not set -CONFIG_NET_VENDOR_CORTINA=y +# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_DEC is not set CONFIG_NET_VENDOR_DLINK=y CONFIG_NET_VENDOR_EMULEX=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 3223e2379..cdafb3629 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1733,7 +1733,6 @@ CONFIG_GAMEPORT_NS558=m # CONFIG_GCC_PLUGINS is not set # CONFIG_GCOV_KERNEL is not set # CONFIG_GDB_SCRIPTS is not set -CONFIG_GEMINI_ETHERNET=m # CONFIG_GENERIC_ADC_BATTERY is not set # CONFIG_GENERIC_ADC_THERMAL is not set # CONFIG_GENERIC_IRQ_DEBUGFS is not set @@ -3601,7 +3600,7 @@ CONFIG_NET_VENDOR_BROADCOM=y CONFIG_NET_VENDOR_CAVIUM=y CONFIG_NET_VENDOR_CHELSIO=y # CONFIG_NET_VENDOR_CISCO is not set -CONFIG_NET_VENDOR_CORTINA=y +# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_DEC is not set CONFIG_NET_VENDOR_DLINK=y CONFIG_NET_VENDOR_EMULEX=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 4fc2232ce..fb12c21ca 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1865,7 +1865,6 @@ CONFIG_GAMEPORT_NS558=m # CONFIG_GCC_PLUGINS is not set # CONFIG_GCOV_KERNEL is not set # CONFIG_GDB_SCRIPTS is not set -CONFIG_GEMINI_ETHERNET=m CONFIG_GENERIC_ADC_BATTERY=m # CONFIG_GENERIC_ADC_THERMAL is not set # CONFIG_GENERIC_IRQ_DEBUGFS is not set @@ -3858,7 +3857,7 @@ CONFIG_NET_VENDOR_BROADCOM=y CONFIG_NET_VENDOR_CHELSIO=y # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CISCO is not set -CONFIG_NET_VENDOR_CORTINA=y +# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_DEC is not set CONFIG_NET_VENDOR_DLINK=y CONFIG_NET_VENDOR_EMULEX=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 9ab9620a9..467c46ae5 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1770,7 +1770,6 @@ CONFIG_GAMEPORT_NS558=m # CONFIG_GCC_PLUGINS is not set # CONFIG_GCOV_KERNEL is not set # CONFIG_GDB_SCRIPTS is not set -CONFIG_GEMINI_ETHERNET=m CONFIG_GENERIC_ADC_BATTERY=m # CONFIG_GENERIC_ADC_THERMAL is not set # CONFIG_GENERIC_IRQ_DEBUGFS is not set @@ -3682,7 +3681,7 @@ CONFIG_NET_VENDOR_BROADCOM=y CONFIG_NET_VENDOR_CHELSIO=y # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CISCO is not set -CONFIG_NET_VENDOR_CORTINA=y +# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_DEC is not set CONFIG_NET_VENDOR_DLINK=y CONFIG_NET_VENDOR_EMULEX=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index ef552df47..a1adeb5d8 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1751,7 +1751,6 @@ CONFIG_GAMEPORT_NS558=m # CONFIG_GCC_PLUGINS is not set # CONFIG_GCOV_KERNEL is not set # CONFIG_GDB_SCRIPTS is not set -CONFIG_GEMINI_ETHERNET=m CONFIG_GENERIC_ADC_BATTERY=m # CONFIG_GENERIC_ADC_THERMAL is not set # CONFIG_GENERIC_IRQ_DEBUGFS is not set @@ -3659,7 +3658,7 @@ CONFIG_NET_VENDOR_BROADCOM=y CONFIG_NET_VENDOR_CHELSIO=y # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CISCO is not set -CONFIG_NET_VENDOR_CORTINA=y +# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_DEC is not set CONFIG_NET_VENDOR_DLINK=y CONFIG_NET_VENDOR_EMULEX=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index c2bdb7bb4..640f0472e 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1846,7 +1846,6 @@ CONFIG_GAMEPORT_NS558=m # CONFIG_GCC_PLUGINS is not set # CONFIG_GCOV_KERNEL is not set # CONFIG_GDB_SCRIPTS is not set -CONFIG_GEMINI_ETHERNET=m CONFIG_GENERIC_ADC_BATTERY=m # CONFIG_GENERIC_ADC_THERMAL is not set # CONFIG_GENERIC_IRQ_DEBUGFS is not set @@ -3835,7 +3834,7 @@ CONFIG_NET_VENDOR_BROADCOM=y CONFIG_NET_VENDOR_CHELSIO=y # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CISCO is not set -CONFIG_NET_VENDOR_CORTINA=y +# CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_DEC is not set CONFIG_NET_VENDOR_DLINK=y CONFIG_NET_VENDOR_EMULEX=y -- cgit From b1638c0f320cbc7b5d5e7a9c7477cbc6909d5d6c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 10 Feb 2018 16:01:19 +0000 Subject: we don't enable pci endpoint support, unlikely to run Fedora on a SoC on a PCI card plugged into a host atm --- configs/fedora/generic/CONFIG_PCIE_CADENCE_EP | 1 - kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-i686-PAE.config | 1 - kernel-i686-PAEdebug.config | 1 - kernel-i686-debug.config | 1 - kernel-i686.config | 1 - kernel-ppc64-debug.config | 1 - kernel-ppc64.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 1 - kernel-x86_64.config | 1 - 19 files changed, 19 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_PCIE_CADENCE_EP diff --git a/configs/fedora/generic/CONFIG_PCIE_CADENCE_EP b/configs/fedora/generic/CONFIG_PCIE_CADENCE_EP deleted file mode 100644 index 21cd9ee80..000000000 --- a/configs/fedora/generic/CONFIG_PCIE_CADENCE_EP +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PCIE_CADENCE_EP=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 3ec616937..5d4e6449f 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4041,7 +4041,6 @@ CONFIG_PCIEAER=y CONFIG_PCIE_ARMADA_8K=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y CONFIG_PCIE_DW_HOST_ECAM=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index cdafb3629..eb86f9189 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4018,7 +4018,6 @@ CONFIG_PCIEAER=y CONFIG_PCIE_ARMADA_8K=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y CONFIG_PCIE_DW_HOST_ECAM=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index fb12c21ca..3f7d04472 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4320,7 +4320,6 @@ CONFIG_PCIEAER=y # CONFIG_PCIE_ARMADA_8K is not set # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 467c46ae5..8d2451ee6 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4101,7 +4101,6 @@ CONFIG_PCIEAER=y # CONFIG_PCIE_ARMADA_8K is not set # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index a1adeb5d8..80607ee45 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4078,7 +4078,6 @@ CONFIG_PCIEAER=y # CONFIG_PCIE_ARMADA_8K is not set # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 640f0472e..9c6775b1c 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4297,7 +4297,6 @@ CONFIG_PCIEAER=y # CONFIG_PCIE_ARMADA_8K is not set # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 095cc2de6..ac71c34c4 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -3888,7 +3888,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index b8e69f1a5..610b87ec2 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -3910,7 +3910,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 2d40c9ae2..d26600cfc 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -3910,7 +3910,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-i686.config b/kernel-i686.config index 1ed6d2fcb..d60630efe 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3888,7 +3888,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 7d42f2e3d..eb76a44fc 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -3703,7 +3703,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 8ab54919d..f7b3771f6 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3679,7 +3679,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index d0a91845a..47d622825 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3645,7 +3645,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index c0c9ffa94..b8b841f13 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3621,7 +3621,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index ddf536504..6837405b2 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3579,7 +3579,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 5f06608be..fd3326eed 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3555,7 +3555,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 5deb90d6c..9a581c982 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3961,7 +3961,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 5dc680429..ffb2bbe02 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3939,7 +3939,6 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y -CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set -- cgit From 6749144071b6b3cb14f0fed8a17bcc380d29f31c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 10 Feb 2018 18:19:41 +0000 Subject: don't filter platform drivers (currently only chromeos devices) from core --- filter-aarch64.sh | 2 +- filter-armv7hl.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filter-aarch64.sh b/filter-aarch64.sh index 4ca60946f..0bc756108 100644 --- a/filter-aarch64.sh +++ b/filter-aarch64.sh @@ -9,7 +9,7 @@ # modifications to the overrides below. If something should be removed across # all arches, remove it in the default instead of per-arch. -driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1" +driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia power ssb staging tty uio uwb w1" ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom" diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh index c08e03d12..f021c0609 100644 --- a/filter-armv7hl.sh +++ b/filter-armv7hl.sh @@ -9,7 +9,7 @@ # modifications to the overrides below. If something should be removed across # all arches, remove it in the default instead of per-arch. -driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn media memstick message mwave nfc ntb pcmcia platform ssb staging tty uio uwb w1" +driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn media memstick message mwave nfc ntb pcmcia ssb staging tty uio uwb w1" ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom" -- cgit From 682fa4513e2fb2750ededd523ec79c256ff0d0aa Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 12 Feb 2018 01:16:42 +0000 Subject: minor AllWinner config tweeak --- configs/fedora/generic/arm/CONFIG_SUN8I_DE2_CCU | 2 +- configs/fedora/generic/arm/armv7/CONFIG_SUN8I_DE2_CCU | 1 - kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 configs/fedora/generic/arm/armv7/CONFIG_SUN8I_DE2_CCU diff --git a/configs/fedora/generic/arm/CONFIG_SUN8I_DE2_CCU b/configs/fedora/generic/arm/CONFIG_SUN8I_DE2_CCU index 41a3847ad..1729d1f68 100644 --- a/configs/fedora/generic/arm/CONFIG_SUN8I_DE2_CCU +++ b/configs/fedora/generic/arm/CONFIG_SUN8I_DE2_CCU @@ -1 +1 @@ -# CONFIG_SUN8I_DE2_CCU is not set +CONFIG_SUN8I_DE2_CCU=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SUN8I_DE2_CCU b/configs/fedora/generic/arm/armv7/CONFIG_SUN8I_DE2_CCU deleted file mode 100644 index 1729d1f68..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_SUN8I_DE2_CCU +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SUN8I_DE2_CCU=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 5d4e6449f..79bfb0fc6 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -5615,7 +5615,7 @@ CONFIG_ST_UVIS25_SPI=m CONFIG_SUN4I_GPADC=m CONFIG_SUN50I_A64_CCU=y # CONFIG_SUN8I_A83T_CCU is not set -# CONFIG_SUN8I_DE2_CCU is not set +CONFIG_SUN8I_DE2_CCU=y CONFIG_SUN8I_H3_CCU=y CONFIG_SUN8I_R_CCU=y # CONFIG_SUN8I_V3S_CCU is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index eb86f9189..682ed217a 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -5590,7 +5590,7 @@ CONFIG_ST_UVIS25_SPI=m CONFIG_SUN4I_GPADC=m CONFIG_SUN50I_A64_CCU=y # CONFIG_SUN8I_A83T_CCU is not set -# CONFIG_SUN8I_DE2_CCU is not set +CONFIG_SUN8I_DE2_CCU=y CONFIG_SUN8I_H3_CCU=y CONFIG_SUN8I_R_CCU=y # CONFIG_SUN8I_V3S_CCU is not set -- cgit From dd10af6de0e6c31646b83945c7261ae22fe43426 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 12 Feb 2018 01:21:20 +0000 Subject: Some fixes to help RPi HDMI monitor detection, fixes for AllWinner --- arm-clk-bcm2835-hdmi-fixes.patch | 175 +++++++++++++++++++++ ...pto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch | 28 ++++ arm-sun4i_ss_prng-fixes.patch | 80 ++++++++++ kernel.spec | 11 ++ 4 files changed, 294 insertions(+) create mode 100644 arm-clk-bcm2835-hdmi-fixes.patch create mode 100644 arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch create mode 100644 arm-sun4i_ss_prng-fixes.patch diff --git a/arm-clk-bcm2835-hdmi-fixes.patch b/arm-clk-bcm2835-hdmi-fixes.patch new file mode 100644 index 000000000..0fc2405e5 --- /dev/null +++ b/arm-clk-bcm2835-hdmi-fixes.patch @@ -0,0 +1,175 @@ +From patchwork Thu Feb 8 13:43:35 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [1/4] clk: bcm2835: Fix ana->maskX definitions +From: Boris Brezillon +X-Patchwork-Id: 10207161 +Message-Id: <20180208134338.24590-1-boris.brezillon@bootlin.com> +To: Florian Fainelli , Ray Jui , + Scott Branden , + bcm-kernel-feedback-list@broadcom.com, + Stephen Warren , + Lee Jones , Eric Anholt , + linux-rpi-kernel@lists.infradead.org, + Mike Turquette , + Stephen Boyd , linux-clk@vger.kernel.org +Cc: Boris Brezillon , stable@vger.kernel.org +Date: Thu, 8 Feb 2018 14:43:35 +0100 + +ana->maskX values are already '~'-ed in bcm2835_pll_set_rate(). Remove +the '~' in the definition to fix ANA setup. + +Note that this commit fixes a long standing bug preventing one from +using an HDMI display if it's plugged after the FW has booted Linux. +This is because PLLH is used by the HDMI encoder to generate the pixel +clock. + +Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks") +Cc: +Signed-off-by: Boris Brezillon +Reviewed-by: Eric Anholt +--- + drivers/clk/bcm/clk-bcm2835.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c +index 44301a3d9963..2108a274185a 100644 +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -449,17 +449,17 @@ struct bcm2835_pll_ana_bits { + static const struct bcm2835_pll_ana_bits bcm2835_ana_default = { + .mask0 = 0, + .set0 = 0, +- .mask1 = (u32)~(A2W_PLL_KI_MASK | A2W_PLL_KP_MASK), ++ .mask1 = A2W_PLL_KI_MASK | A2W_PLL_KP_MASK, + .set1 = (2 << A2W_PLL_KI_SHIFT) | (8 << A2W_PLL_KP_SHIFT), +- .mask3 = (u32)~A2W_PLL_KA_MASK, ++ .mask3 = A2W_PLL_KA_MASK, + .set3 = (2 << A2W_PLL_KA_SHIFT), + .fb_prediv_mask = BIT(14), + }; + + static const struct bcm2835_pll_ana_bits bcm2835_ana_pllh = { +- .mask0 = (u32)~(A2W_PLLH_KA_MASK | A2W_PLLH_KI_LOW_MASK), ++ .mask0 = A2W_PLLH_KA_MASK | A2W_PLLH_KI_LOW_MASK, + .set0 = (2 << A2W_PLLH_KA_SHIFT) | (2 << A2W_PLLH_KI_LOW_SHIFT), +- .mask1 = (u32)~(A2W_PLLH_KI_HIGH_MASK | A2W_PLLH_KP_MASK), ++ .mask1 = A2W_PLLH_KI_HIGH_MASK | A2W_PLLH_KP_MASK, + .set1 = (6 << A2W_PLLH_KP_SHIFT), + .mask3 = 0, + .set3 = 0, +From patchwork Thu Feb 8 13:43:36 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [2/4] clk: bcm2835: Protect sections updating shared registers +From: Boris Brezillon +X-Patchwork-Id: 10207155 +Message-Id: <20180208134338.24590-2-boris.brezillon@bootlin.com> +To: Florian Fainelli , Ray Jui , + Scott Branden , + bcm-kernel-feedback-list@broadcom.com, + Stephen Warren , + Lee Jones , Eric Anholt , + linux-rpi-kernel@lists.infradead.org, + Mike Turquette , + Stephen Boyd , linux-clk@vger.kernel.org +Cc: Boris Brezillon , stable@vger.kernel.org +Date: Thu, 8 Feb 2018 14:43:36 +0100 + +CM_PLLx and A2W_XOSC_CTRL registers are accessed by different clock +handlers and must be accessed with ->regs_lock held. +Update the sections where this protection is missing. + +Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks") +Cc: +Signed-off-by: Boris Brezillon +Reviewed-by: Eric Anholt +--- + drivers/clk/bcm/clk-bcm2835.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c +index 2108a274185a..a07f6451694a 100644 +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -623,8 +623,10 @@ static int bcm2835_pll_on(struct clk_hw *hw) + ~A2W_PLL_CTRL_PWRDN); + + /* Take the PLL out of reset. */ ++ spin_lock(&cprman->regs_lock); + cprman_write(cprman, data->cm_ctrl_reg, + cprman_read(cprman, data->cm_ctrl_reg) & ~CM_PLL_ANARST); ++ spin_unlock(&cprman->regs_lock); + + /* Wait for the PLL to lock. */ + timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS); +@@ -701,9 +703,11 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw, + } + + /* Unmask the reference clock from the oscillator. */ ++ spin_lock(&cprman->regs_lock); + cprman_write(cprman, A2W_XOSC_CTRL, + cprman_read(cprman, A2W_XOSC_CTRL) | + data->reference_enable_mask); ++ spin_unlock(&cprman->regs_lock); + + if (do_ana_setup_first) + bcm2835_pll_write_ana(cprman, data->ana_reg_base, ana); +From patchwork Thu Feb 8 13:43:37 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [3/4] clk: bcm2835: De-assert/assert PLL reset signal when appropriate +From: Boris Brezillon +X-Patchwork-Id: 10207157 +Message-Id: <20180208134338.24590-3-boris.brezillon@bootlin.com> +To: Florian Fainelli , Ray Jui , + Scott Branden , + bcm-kernel-feedback-list@broadcom.com, + Stephen Warren , + Lee Jones , Eric Anholt , + linux-rpi-kernel@lists.infradead.org, + Mike Turquette , + Stephen Boyd , linux-clk@vger.kernel.org +Cc: Boris Brezillon , stable@vger.kernel.org +Date: Thu, 8 Feb 2018 14:43:37 +0100 + +In order to enable a PLL, not only the PLL has to be powered up and +locked, but you also have to de-assert the reset signal. The last part +was missing. Add it so PLLs that were not enabled by the FW/bootloader +can be enabled from Linux. + +Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks") +Cc: +Signed-off-by: Boris Brezillon +--- + drivers/clk/bcm/clk-bcm2835.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c +index a07f6451694a..6c5d4a8e426c 100644 +--- a/drivers/clk/bcm/clk-bcm2835.c ++++ b/drivers/clk/bcm/clk-bcm2835.c +@@ -602,6 +602,9 @@ static void bcm2835_pll_off(struct clk_hw *hw) + const struct bcm2835_pll_data *data = pll->data; + + spin_lock(&cprman->regs_lock); ++ cprman_write(cprman, data->a2w_ctrl_reg, ++ cprman_read(cprman, data->a2w_ctrl_reg) & ++ ~A2W_PLL_CTRL_PRST_DISABLE); + cprman_write(cprman, data->cm_ctrl_reg, + cprman_read(cprman, data->cm_ctrl_reg) | + CM_PLL_ANARST); +@@ -640,6 +643,10 @@ static int bcm2835_pll_on(struct clk_hw *hw) + cpu_relax(); + } + ++ cprman_write(cprman, data->a2w_ctrl_reg, ++ cprman_read(cprman, data->a2w_ctrl_reg) | ++ A2W_PLL_CTRL_PRST_DISABLE); ++ + return 0; + } + diff --git a/arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch b/arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch new file mode 100644 index 000000000..45941edd0 --- /dev/null +++ b/arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch @@ -0,0 +1,28 @@ +From 7a2e67bfa5316e267e782477ec880e2464fd682a Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sun, 11 Feb 2018 21:28:41 +0000 +Subject: [PATCH] crypto: sunxi-ss: Add MODULE_ALIAS to sun4i-ss + +The MODULE_ALIAS is required to enable the sun4i-ss driver to load +automatically when built at a module. Tested on a Cubietruck. + +Signed-off-by: Peter Robinson +--- + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-core.c b/drivers/crypto/sunxi-ss/sun4i-ss-core.c +index 1547cbe13dc2..a81d89b3b7d8 100644 +--- a/drivers/crypto/sunxi-ss/sun4i-ss-core.c ++++ b/drivers/crypto/sunxi-ss/sun4i-ss-core.c +@@ -451,6 +451,7 @@ static struct platform_driver sun4i_ss_driver = { + + module_platform_driver(sun4i_ss_driver); + ++MODULE_ALIAS("platform:sun4i-ss"); + MODULE_DESCRIPTION("Allwinner Security System cryptographic accelerator"); + MODULE_LICENSE("GPL"); + MODULE_AUTHOR("Corentin LABBE "); +-- +2.14.3 + diff --git a/arm-sun4i_ss_prng-fixes.patch b/arm-sun4i_ss_prng-fixes.patch new file mode 100644 index 000000000..ed4cc0369 --- /dev/null +++ b/arm-sun4i_ss_prng-fixes.patch @@ -0,0 +1,80 @@ +From patchwork Tue Feb 6 21:20:21 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [1/2] sun4i_ss_prng: fix return value of sun4i_ss_prng_generate +From: Artem Savkov +X-Patchwork-Id: 10204151 +Message-Id: <20180206212022.1309-2-artem.savkov@gmail.com> +To: Corentin Labbe +Cc: linux-kernel@vger.kernel.org, Artem Savkov , + Herbert Xu , + linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org +Date: Tue, 6 Feb 2018 22:20:21 +0100 + +According to crypto/rng.h generate function should return 0 on success +and < 0 on error. + +Fixes: b8ae5c7387ad ("crypto: sun4i-ss - support the Security System PRNG") +Signed-off-by: Artem Savkov +Acked-by: Corentin Labbe +--- + drivers/crypto/sunxi-ss/sun4i-ss-prng.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-prng.c b/drivers/crypto/sunxi-ss/sun4i-ss-prng.c +index 0d01d1624252..5754e0b92fb0 100644 +--- a/drivers/crypto/sunxi-ss/sun4i-ss-prng.c ++++ b/drivers/crypto/sunxi-ss/sun4i-ss-prng.c +@@ -52,5 +52,5 @@ int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src, + + writel(0, ss->base + SS_CTL); + spin_unlock(&ss->slock); +- return dlen; ++ return 0; + } +From patchwork Tue Feb 6 21:20:22 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [2/2] sun4i_ss_prng: convert lock to _bh in sun4i_ss_prng_generate +From: Artem Savkov +X-Patchwork-Id: 10204145 +Message-Id: <20180206212022.1309-3-artem.savkov@gmail.com> +To: Corentin Labbe +Cc: linux-kernel@vger.kernel.org, Artem Savkov , + Herbert Xu , + linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org +Date: Tue, 6 Feb 2018 22:20:22 +0100 + +Lockdep detects a possible deadlock in sun4i_ss_prng_generate() and +throws an "inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage" warning. +Disabling softirqs to fix this. + +Fixes: b8ae5c7387ad ("crypto: sun4i-ss - support the Security System PRNG") +Signed-off-by: Artem Savkov +--- + drivers/crypto/sunxi-ss/sun4i-ss-prng.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-prng.c b/drivers/crypto/sunxi-ss/sun4i-ss-prng.c +index 5754e0b92fb0..63d636424161 100644 +--- a/drivers/crypto/sunxi-ss/sun4i-ss-prng.c ++++ b/drivers/crypto/sunxi-ss/sun4i-ss-prng.c +@@ -28,7 +28,7 @@ int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src, + algt = container_of(alg, struct sun4i_ss_alg_template, alg.rng); + ss = algt->ss; + +- spin_lock(&ss->slock); ++ spin_lock_bh(&ss->slock); + + writel(mode, ss->base + SS_CTL); + +@@ -51,6 +51,6 @@ int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src, + } + + writel(0, ss->base + SS_CTL); +- spin_unlock(&ss->slock); ++ spin_unlock_bh(&ss->slock); + return 0; + } diff --git a/kernel.spec b/kernel.spec index 09fe5faa4..7d73dc730 100644 --- a/kernel.spec +++ b/kernel.spec @@ -590,6 +590,13 @@ Patch307: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/ Patch308: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch +# https://www.spinics.net/lists/stable/msg214527.html +Patch311: arm-clk-bcm2835-hdmi-fixes.patch + +# https://www.spinics.net/lists/arm-kernel/msg632925.html +Patch312: arm-sun4i_ss_prng-fixes.patch +Patch313: arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch + # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc @@ -1864,6 +1871,10 @@ fi # # %changelog +* Sun Feb 11 2018 Peter Robinson +- Improvements/fixes for Raspberry Pi HDMI monitor detection +- Fix regression with AllWinner (sunxi) crypto PRNG, and module loading + * Fri Feb 09 2018 Justin M. Forbes - 4.16.0-0.rc0.git9.1 - Linux v4.15-12216-gf9f1e414128e -- cgit