diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-07-19 12:21:48 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-07-19 12:21:48 -0500 |
| commit | 50f4874960651a699409d365e0d9e80e8e2110db (patch) | |
| tree | 2579d357503848ac8b056526a2b6bbcd875f8c45 | |
| parent | df37aba8e2edf1e5a9774342b2e23bb5d6a4f996 (diff) | |
| download | kernel-50f4874960651a699409d365e0d9e80e8e2110db.tar.gz kernel-50f4874960651a699409d365e0d9e80e8e2110db.tar.xz kernel-50f4874960651a699409d365e0d9e80e8e2110db.zip | |
kernel-5.19.0-0.rc7.20220719gitca85855bdcae.54
* Tue Jul 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc7.ca85855bdcae.53]
- arm64: config: Enable DRM_V3D (Nicolas Saenz Julienne)
- ARM: configs: Enable DRM_V3D (Peter Robinson)
- ARM: dts: bcm2711: Enable V3D (Peter Robinson)
- drm/v3d: Add support for bcm2711 (Peter Robinson)
- drm/v3d: Get rid of pm code (Peter Robinson)
- dt-bindings: gpu: v3d: Add BCM2711's compatible (Peter Robinson)
- soc: bcm: bcm2835-power: Bypass power_on/off() calls (Nicolas Saenz Julienne)
- soc: bcm: bcm2835-power: Add support for BCM2711's RPiVid ASB (Stefan Wahren)
- soc: bcm: bcm2835-power: Resolve ASB register macros (Stefan Wahren)
- soc: bcm: bcm2835-power: Refactor ASB control (Stefan Wahren)
- mfd: bcm2835-pm: Add support for BCM2711 (Stefan Wahren)
- mfd: bcm2835-pm: Use 'reg-names' to get resources (Nicolas Saenz Julienne)
- ARM: dts: bcm2711: Use proper compatible in PM/Watchdog node (Nicolas Saenz Julienne)
- ARM: dts: bcm2835/bcm2711: Introduce reg-names in watchdog node (Nicolas Saenz Julienne)
- dt-bindings: soc: bcm: bcm2835-pm: Add support for bcm2711 (Stefan Wahren)
- dt-bindings: soc: bcm: bcm2835-pm: Introduce reg-names (Nicolas Saenz Julienne)
- dt-bindings: soc: bcm: bcm2835-pm: Convert bindings to DT schema (Nicolas Saenz Julienne)
- drm: Prevent drm_copy_field() to attempt copying a NULL pointer (Javier Martinez Canillas)
- drm: Use size_t type for len variable in drm_copy_field() (Javier Martinez Canillas)
- fedora: enable BCM_NET_PHYPTP (Peter Robinson)
- net: phy: Add support for 1PPS out and external timestamps (Jonathan Lemon)
- net: phy: broadcom: Add PTP support for some Broadcom PHYs. (Jonathan Lemon)
- net: phy: broadcom: Add Broadcom PTP hooks to bcm-phy-lib (Jonathan Lemon)
- Fedora 5.19 configs update part 2 (Justin M. Forbes)
- redhat/Makefile: Change fedora BUILD_TARGET (Prarit Bhargava)
- New configs in security/keys (Fedora Kernel Team)
- Fedora: arm: enable a pair of drivers (Peter Robinson)
Resolves:
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
26 files changed, 2193 insertions, 309 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 1a9805313..16c18b9f9 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 53 +RHEL_RELEASE = 54 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index 88c081118..774a35292 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,69 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/3e6c59f7d9411700000a39a6b1f311cf14ae04bf + 3e6c59f7d9411700000a39a6b1f311cf14ae04bf arm64: config: Enable DRM_V3D + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/93e17fe07050f95258db7c2f39931d55a1adbf4b + 93e17fe07050f95258db7c2f39931d55a1adbf4b ARM: configs: Enable DRM_V3D + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/e8fb9825476734a15705f739c6eed3af4bd098c5 + e8fb9825476734a15705f739c6eed3af4bd098c5 ARM: dts: bcm2711: Enable V3D + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/7b65af00a0e7fda6215c0623f664e22ae22be21c + 7b65af00a0e7fda6215c0623f664e22ae22be21c drm/v3d: Add support for bcm2711 + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/c5b6180d2d190dbdb8b6d052c9accceda1d3a1a3 + c5b6180d2d190dbdb8b6d052c9accceda1d3a1a3 drm/v3d: Get rid of pm code + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/c3d4c51216d6d9b2417982a8f43ca55a43ff9ba2 + c3d4c51216d6d9b2417982a8f43ca55a43ff9ba2 dt-bindings: gpu: v3d: Add BCM2711's compatible + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/8fa0fdac99f4a6c1827532fad9b5599287d885fa + 8fa0fdac99f4a6c1827532fad9b5599287d885fa soc: bcm: bcm2835-power: Bypass power_on/off() calls + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/b50a2975996190d0ad2723384a5dfb88748f1589 + b50a2975996190d0ad2723384a5dfb88748f1589 soc: bcm: bcm2835-power: Add support for BCM2711's RPiVid ASB + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/96636502e3bef2595960815009a8cdf7568229d9 + 96636502e3bef2595960815009a8cdf7568229d9 soc: bcm: bcm2835-power: Resolve ASB register macros + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/11edf851683453246117d1f1f6fb31230c499984 + 11edf851683453246117d1f1f6fb31230c499984 soc: bcm: bcm2835-power: Refactor ASB control + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/a8fbc6cac714a0317be56669e040e82a899280ab + a8fbc6cac714a0317be56669e040e82a899280ab mfd: bcm2835-pm: Add support for BCM2711 + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d99e924104bc6261496cb953b99b3e06ac52a066 + d99e924104bc6261496cb953b99b3e06ac52a066 mfd: bcm2835-pm: Use 'reg-names' to get resources + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/88edafa693c70d9f9204b162728903a45d423673 + 88edafa693c70d9f9204b162728903a45d423673 ARM: dts: bcm2711: Use proper compatible in PM/Watchdog node + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d28b28c7f46f7d807064035ff76e16eae69b6c3d + d28b28c7f46f7d807064035ff76e16eae69b6c3d ARM: dts: bcm2835/bcm2711: Introduce reg-names in watchdog node + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/c5312b3c454d18ea785808e674ce7270f28c2750 + c5312b3c454d18ea785808e674ce7270f28c2750 dt-bindings: soc: bcm: bcm2835-pm: Add support for bcm2711 + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/0ee92ce60b956a95ab7aede64885bd0a1c87b721 + 0ee92ce60b956a95ab7aede64885bd0a1c87b721 dt-bindings: soc: bcm: bcm2835-pm: Introduce reg-names + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/d954bc5e74c968bf777b55cf0c00815aeb565654 + d954bc5e74c968bf777b55cf0c00815aeb565654 dt-bindings: soc: bcm: bcm2835-pm: Convert bindings to DT schema + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/361febf10d1873927d099d5e5248a3789aa730eb + 361febf10d1873927d099d5e5248a3789aa730eb drm: Prevent drm_copy_field() to attempt copying a NULL pointer + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/f49d3c9bf89d838d27dc6e392f02c1d2caa41729 + f49d3c9bf89d838d27dc6e392f02c1d2caa41729 drm: Use size_t type for len variable in drm_copy_field() + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/bb1b8f3e8564633453ce3c081364acd9c798fc48 + bb1b8f3e8564633453ce3c081364acd9c798fc48 net: phy: Add support for 1PPS out and external timestamps + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/cfa3c1f3176c53c99a8a7933a5d981c333b9e4a9 + cfa3c1f3176c53c99a8a7933a5d981c333b9e4a9 net: phy: broadcom: Add PTP support for some Broadcom PHYs. + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/834e2da38cfd87ff8c7e25b540d3dc87cb49e36a + 834e2da38cfd87ff8c7e25b540d3dc87cb49e36a net: phy: broadcom: Add Broadcom PTP hooks to bcm-phy-lib + "https://gitlab.com/cki-project/kernel-ark/-/commit"/297bcb88233101e8d5062729ff3a5f989bad1c3b 297bcb88233101e8d5062729ff3a5f989bad1c3b Revert "crypto: rng - Override drivers/char/random in FIPS mode" diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 75683a5f0..a0d8c539f 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -679,6 +679,7 @@ CONFIG_BCMA=m CONFIG_BCMA_POSSIBLE=y CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_SBA_RAID=m CONFIG_BCM_VIDEOCORE=m CONFIG_BCM_VK=m @@ -914,8 +915,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -1245,8 +1246,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set # CONFIG_CPU_IDLE_GOV_LADDER is not set # CONFIG_CPU_IDLE_GOV_TEO is not set @@ -1256,7 +1255,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -2477,7 +2475,7 @@ CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y CONFIG_GPIO_THUNDERX=m -# CONFIG_GPIO_TPIC2810 is not set +CONFIG_GPIO_TPIC2810=m CONFIG_GPIO_TPS65086=m CONFIG_GPIO_TPS6586X=y # CONFIG_GPIO_TS4900 is not set @@ -3052,7 +3050,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3637,7 +3635,7 @@ CONFIG_LEDS_SGM3140=m CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set -# CONFIG_LEDS_TLC591XX is not set +CONFIG_LEDS_TLC591XX=m CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m @@ -4370,7 +4368,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m # CONFIG_MUSB_PIO_ONLY is not set CONFIG_MUX_ADG792A=m @@ -5859,7 +5857,7 @@ CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -5913,7 +5911,6 @@ CONFIG_RESET_SIMPLE=y CONFIG_RESET_TI_SCI=m CONFIG_RESET_TI_SYSCON=m # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -6527,7 +6524,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -6601,7 +6598,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m CONFIG_SENSORS_XGENE=m CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -6699,7 +6696,6 @@ CONFIG_SETEND_EMULATION=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -6930,7 +6926,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -6983,8 +6979,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m CONFIG_SND_SOC_CS4265=m # CONFIG_SND_SOC_CS4270 is not set @@ -7103,7 +7099,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -7300,9 +7296,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set +CONFIG_SND_SOC_WM8731_I2C=m CONFIG_SND_SOC_WM8731=m -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set CONFIG_SND_SOC_WM8741=m # CONFIG_SND_SOC_WM8750 is not set @@ -7315,7 +7311,7 @@ CONFIG_SND_SOC_WM8804=m CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SOC_WM8903=m # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m CONFIG_SND_SOC_WM8960=m CONFIG_SND_SOC_WM8962=m # CONFIG_SND_SOC_WM8974 is not set @@ -7398,7 +7394,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -7942,6 +7937,8 @@ CONFIG_TRACER_SNAPSHOT=y CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRUSTED_FOUNDATIONS=y +CONFIG_TRUSTED_KEYS_CAAM=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -8780,7 +8777,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 3541b2514..c4805257c 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -6336,6 +6336,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index b47d123c6..170a81015 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -679,6 +679,7 @@ CONFIG_BCMA=m CONFIG_BCMA_POSSIBLE=y CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_SBA_RAID=m CONFIG_BCM_VIDEOCORE=m CONFIG_BCM_VK=m @@ -914,8 +915,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -1245,8 +1246,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set # CONFIG_CPU_IDLE_GOV_LADDER is not set # CONFIG_CPU_IDLE_GOV_TEO is not set @@ -1256,7 +1255,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -2461,7 +2459,7 @@ CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y CONFIG_GPIO_THUNDERX=m -# CONFIG_GPIO_TPIC2810 is not set +CONFIG_GPIO_TPIC2810=m CONFIG_GPIO_TPS65086=m CONFIG_GPIO_TPS6586X=y # CONFIG_GPIO_TS4900 is not set @@ -3036,7 +3034,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3618,7 +3616,7 @@ CONFIG_LEDS_SGM3140=m CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set -# CONFIG_LEDS_TLC591XX is not set +CONFIG_LEDS_TLC591XX=m CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m @@ -4350,7 +4348,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m # CONFIG_MUSB_PIO_ONLY is not set CONFIG_MUX_ADG792A=m @@ -5838,7 +5836,7 @@ CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -5892,7 +5890,6 @@ CONFIG_RESET_SIMPLE=y CONFIG_RESET_TI_SCI=m CONFIG_RESET_TI_SYSCON=m # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -6506,7 +6503,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -6580,7 +6577,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m CONFIG_SENSORS_XGENE=m CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -6678,7 +6675,6 @@ CONFIG_SETEND_EMULATION=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -6908,7 +6904,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -6961,8 +6957,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m CONFIG_SND_SOC_CS4265=m # CONFIG_SND_SOC_CS4270 is not set @@ -7081,7 +7077,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -7277,9 +7273,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set +CONFIG_SND_SOC_WM8731_I2C=m CONFIG_SND_SOC_WM8731=m -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set CONFIG_SND_SOC_WM8741=m # CONFIG_SND_SOC_WM8750 is not set @@ -7292,7 +7288,7 @@ CONFIG_SND_SOC_WM8804=m CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SOC_WM8903=m # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m CONFIG_SND_SOC_WM8960=m CONFIG_SND_SOC_WM8962=m # CONFIG_SND_SOC_WM8974 is not set @@ -7375,7 +7371,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -7919,6 +7914,8 @@ CONFIG_TRACER_SNAPSHOT=y CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRUSTED_FOUNDATIONS=y +CONFIG_TRUSTED_KEYS_CAAM=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -8757,7 +8754,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 425410356..ccbb364ad 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -6311,6 +6311,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 9a0d429cc..026ff2be6 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -699,6 +699,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_SBA_RAID=m CONFIG_BCM_VIDEOCORE=m CONFIG_BCM_VK=m @@ -935,8 +936,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -1237,8 +1238,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set @@ -1251,7 +1250,6 @@ CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y CONFIG_CPU_SW_DOMAIN_PAN=y CONFIG_CPU_THERMAL=y -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -2487,7 +2485,7 @@ CONFIG_GPIO_ROCKCHIP=y CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA=y -# CONFIG_GPIO_TPIC2810 is not set +CONFIG_GPIO_TPIC2810=m CONFIG_GPIO_TPS65218=m CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y @@ -3060,7 +3058,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3642,7 +3640,7 @@ CONFIG_LEDS_SGM3140=m CONFIG_LEDS_SYSCON=y CONFIG_LEDS_TCA6507=m # CONFIG_LEDS_TI_LMU_COMMON is not set -# CONFIG_LEDS_TLC591XX is not set +CONFIG_LEDS_TLC591XX=m CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m @@ -4411,7 +4409,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m # CONFIG_MUSB_PIO_ONLY is not set CONFIG_MUX_ADG792A=m @@ -5905,7 +5903,7 @@ CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -5969,7 +5967,6 @@ CONFIG_RESET_SCMI=y CONFIG_RESET_SIMPLE=y CONFIG_RESET_TI_SYSCON=m # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -6598,7 +6595,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -6672,7 +6669,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -6776,7 +6773,6 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -7010,7 +7006,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -7063,8 +7059,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m CONFIG_SND_SOC_CS4265=m # CONFIG_SND_SOC_CS4270 is not set @@ -7188,7 +7184,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -7390,9 +7386,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set +CONFIG_SND_SOC_WM8731_I2C=m CONFIG_SND_SOC_WM8731=m -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set CONFIG_SND_SOC_WM8741=m # CONFIG_SND_SOC_WM8750 is not set @@ -7405,7 +7401,7 @@ CONFIG_SND_SOC_WM8804=m CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SOC_WM8903=m # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m CONFIG_SND_SOC_WM8960=m CONFIG_SND_SOC_WM8962=m # CONFIG_SND_SOC_WM8974 is not set @@ -7515,7 +7511,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -8063,6 +8058,8 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y +CONFIG_TRUSTED_KEYS_CAAM=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -8939,7 +8936,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 5c472b52e..c9b391b7c 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -699,6 +699,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_SBA_RAID=m CONFIG_BCM_VIDEOCORE=m CONFIG_BCM_VK=m @@ -935,8 +936,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -1237,8 +1238,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set @@ -1251,7 +1250,6 @@ CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y CONFIG_CPU_SW_DOMAIN_PAN=y CONFIG_CPU_THERMAL=y -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -2472,7 +2470,7 @@ CONFIG_GPIO_ROCKCHIP=y CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA=y -# CONFIG_GPIO_TPIC2810 is not set +CONFIG_GPIO_TPIC2810=m CONFIG_GPIO_TPS65218=m CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y @@ -3045,7 +3043,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3625,7 +3623,7 @@ CONFIG_LEDS_SGM3140=m CONFIG_LEDS_SYSCON=y CONFIG_LEDS_TCA6507=m # CONFIG_LEDS_TI_LMU_COMMON is not set -# CONFIG_LEDS_TLC591XX is not set +CONFIG_LEDS_TLC591XX=m CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m @@ -4393,7 +4391,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m # CONFIG_MUSB_PIO_ONLY is not set CONFIG_MUX_ADG792A=m @@ -5886,7 +5884,7 @@ CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -5950,7 +5948,6 @@ CONFIG_RESET_SCMI=y CONFIG_RESET_SIMPLE=y CONFIG_RESET_TI_SYSCON=m # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -6579,7 +6576,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -6653,7 +6650,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -6757,7 +6754,6 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -6990,7 +6986,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -7043,8 +7039,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m CONFIG_SND_SOC_CS4265=m # CONFIG_SND_SOC_CS4270 is not set @@ -7168,7 +7164,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -7369,9 +7365,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set +CONFIG_SND_SOC_WM8731_I2C=m CONFIG_SND_SOC_WM8731=m -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set CONFIG_SND_SOC_WM8741=m # CONFIG_SND_SOC_WM8750 is not set @@ -7384,7 +7380,7 @@ CONFIG_SND_SOC_WM8804=m CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SOC_WM8903=m # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m CONFIG_SND_SOC_WM8960=m CONFIG_SND_SOC_WM8962=m # CONFIG_SND_SOC_WM8974 is not set @@ -7494,7 +7490,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -8042,6 +8037,8 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y +CONFIG_TRUSTED_KEYS_CAAM=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -8918,7 +8915,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 477778e22..d5d844ed9 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -678,6 +678,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_SBA_RAID=m CONFIG_BCM_VIDEOCORE=m CONFIG_BCM_VK=m @@ -913,8 +914,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -1209,8 +1210,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set @@ -1223,7 +1222,6 @@ CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y # CONFIG_CPU_SW_DOMAIN_PAN is not set CONFIG_CPU_THERMAL=y -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -2439,7 +2437,7 @@ CONFIG_GPIO_ROCKCHIP=y CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA=y -# CONFIG_GPIO_TPIC2810 is not set +CONFIG_GPIO_TPIC2810=m CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m @@ -3001,7 +2999,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3571,7 +3569,7 @@ CONFIG_LEDS_SGM3140=m CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set -# CONFIG_LEDS_TLC591XX is not set +CONFIG_LEDS_TLC591XX=m CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m @@ -4314,7 +4312,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m # CONFIG_MUSB_PIO_ONLY is not set CONFIG_MUX_ADG792A=m @@ -5739,7 +5737,7 @@ CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -5801,7 +5799,6 @@ CONFIG_RESET_SIMPLE=y CONFIG_RESET_TI_SCI=m CONFIG_RESET_TI_SYSCON=m # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -6418,7 +6415,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -6492,7 +6489,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -6588,7 +6585,6 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -6820,7 +6816,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -6873,8 +6869,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m CONFIG_SND_SOC_CS4265=m # CONFIG_SND_SOC_CS4270 is not set @@ -6992,7 +6988,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -7186,9 +7182,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set +CONFIG_SND_SOC_WM8731_I2C=m CONFIG_SND_SOC_WM8731=m -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set CONFIG_SND_SOC_WM8741=m # CONFIG_SND_SOC_WM8750 is not set @@ -7201,7 +7197,7 @@ CONFIG_SND_SOC_WM8804=m CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SOC_WM8903=m # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m CONFIG_SND_SOC_WM8960=m CONFIG_SND_SOC_WM8962=m # CONFIG_SND_SOC_WM8974 is not set @@ -7294,7 +7290,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -7835,6 +7830,8 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y +CONFIG_TRUSTED_KEYS_CAAM=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -8686,7 +8683,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 95c2ee3c7..fd031106b 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -678,6 +678,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_SBA_RAID=m CONFIG_BCM_VIDEOCORE=m CONFIG_BCM_VK=m @@ -913,8 +914,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -1209,8 +1210,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set @@ -1223,7 +1222,6 @@ CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y # CONFIG_CPU_SW_DOMAIN_PAN is not set CONFIG_CPU_THERMAL=y -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -2424,7 +2422,7 @@ CONFIG_GPIO_ROCKCHIP=y CONFIG_GPIO_STMPE=y CONFIG_GPIO_SYSCON=m CONFIG_GPIO_TEGRA=y -# CONFIG_GPIO_TPIC2810 is not set +CONFIG_GPIO_TPIC2810=m CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m @@ -2986,7 +2984,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3554,7 +3552,7 @@ CONFIG_LEDS_SGM3140=m CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set -# CONFIG_LEDS_TLC591XX is not set +CONFIG_LEDS_TLC591XX=m CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m @@ -4296,7 +4294,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m # CONFIG_MUSB_PIO_ONLY is not set CONFIG_MUX_ADG792A=m @@ -5720,7 +5718,7 @@ CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -5782,7 +5780,6 @@ CONFIG_RESET_SIMPLE=y CONFIG_RESET_TI_SCI=m CONFIG_RESET_TI_SYSCON=m # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -6399,7 +6396,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -6473,7 +6470,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -6569,7 +6566,6 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -6800,7 +6796,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -6853,8 +6849,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m CONFIG_SND_SOC_CS4265=m # CONFIG_SND_SOC_CS4270 is not set @@ -6972,7 +6968,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -7165,9 +7161,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set +CONFIG_SND_SOC_WM8731_I2C=m CONFIG_SND_SOC_WM8731=m -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set CONFIG_SND_SOC_WM8741=m # CONFIG_SND_SOC_WM8750 is not set @@ -7180,7 +7176,7 @@ CONFIG_SND_SOC_WM8804=m CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SOC_WM8903=m # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m CONFIG_SND_SOC_WM8960=m CONFIG_SND_SOC_WM8962=m # CONFIG_SND_SOC_WM8974 is not set @@ -7273,7 +7269,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -7814,6 +7809,8 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y +CONFIG_TRUSTED_KEYS_CAAM=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -8665,7 +8662,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index a978544a4..5ac5d04cb 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -473,6 +473,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_VK=m CONFIG_BCM_VK_TTY=y CONFIG_BE2ISCSI=m @@ -698,8 +699,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -944,8 +945,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set # CONFIG_CPU_IDLE_GOV_LADDER is not set # CONFIG_CPU_IDLE_GOV_TEO is not set @@ -955,7 +954,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -1367,7 +1365,7 @@ CONFIG_DRM_DP_CEC=y # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_FSL_LDB=m +# CONFIG_DRM_FSL_LDB is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_GUD=m # CONFIG_DRM_HISI_HIBMC is not set @@ -2491,7 +2489,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3671,7 +3669,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m CONFIG_MUX_ADG792A=m # CONFIG_MUX_ADGS1408 is not set @@ -4891,7 +4889,7 @@ CONFIG_REGULATOR_MP886X=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -4931,7 +4929,6 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_INTEL_GW is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -5193,7 +5190,6 @@ CONFIG_SCHEDSTATS=y CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCHED_TRACER=y CONFIG_SC_LPASS_CORECC_7180=m -# CONFIG_SC_LPASS_CORECC_7280 is not set CONFIG_SCOM_DEBUGFS=y # CONFIG_SCR24X is not set CONFIG_SCSI_3W_9XXX=m @@ -5484,7 +5480,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -5556,7 +5552,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -5630,7 +5626,6 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -5845,7 +5840,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -5898,8 +5893,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -6017,7 +6012,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -6152,7 +6147,6 @@ CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS5805M=m CONFIG_SND_SOC_TAS6424=m CONFIG_SND_SOC_TDA7419=m -CONFIG_SND_SOC_TEGRA186_ASRC=m # CONFIG_SND_SOC_TEGRA186_DSPK is not set # CONFIG_SND_SOC_TEGRA20_AC97 is not set # CONFIG_SND_SOC_TEGRA20_DAS is not set @@ -6204,9 +6198,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_I2C=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set # CONFIG_SND_SOC_WM8741 is not set # CONFIG_SND_SOC_WM8750 is not set @@ -6219,7 +6213,7 @@ CONFIG_SND_SOC_WM8804_I2C=m # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m # CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_WM8974 is not set @@ -6298,7 +6292,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -6511,7 +6504,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set CONFIG_TEE=m -CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6722,6 +6714,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -7448,7 +7441,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y @@ -7529,7 +7521,7 @@ CONFIG_XFS_WARN=y # CONFIG_XILINX_DMA is not set # CONFIG_XILINX_EMACLITE is not set CONFIG_XILINX_GMII2RGMII=m -CONFIG_XILINX_INTC=y +# CONFIG_XILINX_INTC is not set CONFIG_XILINX_LL_TEMAC=m CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index b35cfe68c..79651f087 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -6091,6 +6091,7 @@ CONFIG_TRACER_SNAPSHOT=y CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 7b8d48249..d8a193456 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -472,6 +472,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_VK=m CONFIG_BCM_VK_TTY=y CONFIG_BE2ISCSI=m @@ -697,8 +698,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -943,8 +944,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set # CONFIG_CPU_IDLE_GOV_LADDER is not set # CONFIG_CPU_IDLE_GOV_TEO is not set @@ -954,7 +953,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -1358,7 +1356,7 @@ CONFIG_DRM_DP_CEC=y # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_FSL_LDB=m +# CONFIG_DRM_FSL_LDB is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_GUD=m # CONFIG_DRM_HISI_HIBMC is not set @@ -2474,7 +2472,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3651,7 +3649,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m CONFIG_MUX_ADG792A=m # CONFIG_MUX_ADGS1408 is not set @@ -4870,7 +4868,7 @@ CONFIG_REGULATOR_MP886X=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -4910,7 +4908,6 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_INTEL_GW is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -5172,7 +5169,6 @@ CONFIG_SCHEDSTATS=y CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCHED_TRACER=y CONFIG_SC_LPASS_CORECC_7180=m -# CONFIG_SC_LPASS_CORECC_7280 is not set CONFIG_SCOM_DEBUGFS=y # CONFIG_SCR24X is not set CONFIG_SCSI_3W_9XXX=m @@ -5463,7 +5459,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -5535,7 +5531,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -5609,7 +5605,6 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y @@ -5823,7 +5818,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -5876,8 +5871,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -5995,7 +5990,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -6129,7 +6124,6 @@ CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS5805M=m CONFIG_SND_SOC_TAS6424=m CONFIG_SND_SOC_TDA7419=m -CONFIG_SND_SOC_TEGRA186_ASRC=m # CONFIG_SND_SOC_TEGRA186_DSPK is not set # CONFIG_SND_SOC_TEGRA20_AC97 is not set # CONFIG_SND_SOC_TEGRA20_DAS is not set @@ -6181,9 +6175,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_I2C=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set # CONFIG_SND_SOC_WM8741 is not set # CONFIG_SND_SOC_WM8750 is not set @@ -6196,7 +6190,7 @@ CONFIG_SND_SOC_WM8804_I2C=m # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m # CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_WM8974 is not set @@ -6275,7 +6269,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -6488,7 +6481,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set CONFIG_TEE=m -CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6699,6 +6691,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -7425,7 +7418,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y @@ -7506,7 +7498,7 @@ CONFIG_XFS_SUPPORT_V4=y # CONFIG_XILINX_DMA is not set # CONFIG_XILINX_EMACLITE is not set CONFIG_XILINX_GMII2RGMII=m -CONFIG_XILINX_INTC=y +# CONFIG_XILINX_INTC is not set CONFIG_XILINX_LL_TEMAC=m CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 25ada74a0..f0c735885 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -6068,6 +6068,7 @@ CONFIG_TRACER_SNAPSHOT=y CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 8bdc688e6..a3da65810 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -477,6 +477,7 @@ CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_VK=m CONFIG_BCM_VK_TTY=y # CONFIG_BE2ISCSI is not set @@ -625,7 +626,7 @@ CONFIG_BRIDGE_MRP=y CONFIG_BRIDGE_NETFILTER=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_BROADCOM_PHY=m +# CONFIG_BROADCOM_PHY is not set CONFIG_BSD_DISKLABEL=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_BSD_PROCESS_ACCT=y @@ -701,8 +702,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -950,8 +951,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set # CONFIG_CPU_IDLE_GOV_LADDER is not set # CONFIG_CPU_IDLE_GOV_TEO is not set @@ -961,7 +960,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -1375,7 +1373,7 @@ CONFIG_DRM_DP_CEC=y # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_FSL_LDB=m +# CONFIG_DRM_FSL_LDB is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_GUD=m # CONFIG_DRM_HISI_HIBMC is not set @@ -2469,7 +2467,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -3652,7 +3650,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m CONFIG_MUX_ADG792A=m # CONFIG_MUX_ADGS1408 is not set @@ -4832,7 +4830,7 @@ CONFIG_REGULATOR_MP886X=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -4873,7 +4871,6 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_INTEL_GW is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -5143,7 +5140,6 @@ CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCHED_TOPOLOGY=y CONFIG_SCHED_TRACER=y CONFIG_SC_LPASS_CORECC_7180=m -# CONFIG_SC_LPASS_CORECC_7280 is not set CONFIG_SCLP_CONSOLE=y CONFIG_SCLP_OFB=y CONFIG_SCLP_TTY=y @@ -5435,7 +5431,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -5507,7 +5503,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -5578,7 +5574,6 @@ CONFIG_SERIO_SERPORT=m CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_PARTITION is not set @@ -5796,7 +5791,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m # CONFIG_SND_SERIAL_U16550 is not set CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -5849,8 +5844,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -5968,7 +5963,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -6103,7 +6098,6 @@ CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS5805M=m CONFIG_SND_SOC_TAS6424=m CONFIG_SND_SOC_TDA7419=m -CONFIG_SND_SOC_TEGRA186_ASRC=m # CONFIG_SND_SOC_TEGRA186_DSPK is not set # CONFIG_SND_SOC_TEGRA20_AC97 is not set # CONFIG_SND_SOC_TEGRA20_DAS is not set @@ -6155,9 +6149,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_I2C=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set # CONFIG_SND_SOC_WM8741 is not set # CONFIG_SND_SOC_WM8750 is not set @@ -6170,7 +6164,7 @@ CONFIG_SND_SOC_WM8804_I2C=m # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m # CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_WM8974 is not set @@ -6246,7 +6240,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -6457,7 +6450,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set CONFIG_TEE=m -CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6673,6 +6665,7 @@ CONFIG_TRACE_EVAL_MAP_FILE=y CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -7408,7 +7401,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m # CONFIG_WIRELESS_EXT is not set @@ -7489,7 +7481,7 @@ CONFIG_XFS_WARN=y # CONFIG_XILINX_DMA is not set CONFIG_XILINX_EMACLITE=m CONFIG_XILINX_GMII2RGMII=m -CONFIG_XILINX_INTC=y +# CONFIG_XILINX_INTC is not set CONFIG_XILINX_LL_TEMAC=m CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 1a7e4a758..e07c1e7c0 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -6070,6 +6070,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 34499aeae..7d3b78a50 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -476,6 +476,7 @@ CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_VK=m CONFIG_BCM_VK_TTY=y # CONFIG_BE2ISCSI is not set @@ -624,7 +625,7 @@ CONFIG_BRIDGE_MRP=y CONFIG_BRIDGE_NETFILTER=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_BROADCOM_PHY=m +# CONFIG_BROADCOM_PHY is not set CONFIG_BSD_DISKLABEL=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_BSD_PROCESS_ACCT=y @@ -700,8 +701,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -949,8 +950,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set # CONFIG_CPU_IDLE_GOV_LADDER is not set # CONFIG_CPU_IDLE_GOV_TEO is not set @@ -960,7 +959,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set -CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -1366,7 +1364,7 @@ CONFIG_DRM_DP_CEC=y # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_FSL_LDB=m +# CONFIG_DRM_FSL_LDB is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_GUD=m # CONFIG_DRM_HISI_HIBMC is not set @@ -2452,7 +2450,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -3632,7 +3630,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MULTIPLEXER=m CONFIG_MUX_ADG792A=m # CONFIG_MUX_ADGS1408 is not set @@ -4811,7 +4809,7 @@ CONFIG_REGULATOR_MP886X=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -4852,7 +4850,6 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_INTEL_GW is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESOURCE_KUNIT_TEST is not set -CONFIG_RETHUNK=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set CONFIG_RFKILL_GPIO=m @@ -5122,7 +5119,6 @@ CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCHED_TOPOLOGY=y CONFIG_SCHED_TRACER=y CONFIG_SC_LPASS_CORECC_7180=m -# CONFIG_SC_LPASS_CORECC_7280 is not set CONFIG_SCLP_CONSOLE=y CONFIG_SCLP_OFB=y CONFIG_SCLP_TTY=y @@ -5414,7 +5410,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -5486,7 +5482,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -5557,7 +5553,6 @@ CONFIG_SERIO_SERPORT=m CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set -# CONFIG_SFC_SIENA is not set # CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_PARTITION is not set @@ -5774,7 +5769,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m # CONFIG_SND_SERIAL_U16550 is not set CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -5827,8 +5822,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m # CONFIG_SND_SOC_CS35L41_I2C is not set # CONFIG_SND_SOC_CS35L41_SPI is not set -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -5946,7 +5941,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -6080,7 +6075,6 @@ CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS5805M=m CONFIG_SND_SOC_TAS6424=m CONFIG_SND_SOC_TDA7419=m -CONFIG_SND_SOC_TEGRA186_ASRC=m # CONFIG_SND_SOC_TEGRA186_DSPK is not set # CONFIG_SND_SOC_TEGRA20_AC97 is not set # CONFIG_SND_SOC_TEGRA20_DAS is not set @@ -6132,9 +6126,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_I2C=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set # CONFIG_SND_SOC_WM8741 is not set # CONFIG_SND_SOC_WM8750 is not set @@ -6147,7 +6141,7 @@ CONFIG_SND_SOC_WM8804_I2C=m # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m # CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_WM8974 is not set @@ -6223,7 +6217,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set @@ -6434,7 +6427,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set CONFIG_TEE=m -CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6650,6 +6642,7 @@ CONFIG_TRACE_EVAL_MAP_FILE=y CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -7385,7 +7378,6 @@ CONFIG_WIL6210=m # CONFIG_WILC1000_SPI is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m # CONFIG_WIRELESS_EXT is not set @@ -7466,7 +7458,7 @@ CONFIG_XFS_SUPPORT_V4=y # CONFIG_XILINX_DMA is not set CONFIG_XILINX_EMACLITE=m CONFIG_XILINX_GMII2RGMII=m -CONFIG_XILINX_INTC=y +# CONFIG_XILINX_INTC is not set CONFIG_XILINX_LL_TEMAC=m CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index a2319dd66..ff8c60a4b 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -6047,6 +6047,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 5cc73ed5c..dad056049 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6073,6 +6073,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TREE_RCU=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 80e8751e8..6d161af76 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -524,6 +524,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_VK=m CONFIG_BCM_VK_TTY=y CONFIG_BE2ISCSI=m @@ -752,8 +753,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -1480,7 +1481,7 @@ CONFIG_DRM_DP_CEC=y # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_FSL_LDB=m +# CONFIG_DRM_FSL_LDB is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_GMA500=m CONFIG_DRM_GUD=m @@ -2689,7 +2690,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3968,7 +3969,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_MTRR_SANITIZER=y @@ -5236,7 +5237,7 @@ CONFIG_REGULATOR_MP886X=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -5540,7 +5541,6 @@ CONFIG_SCHEDSTATS=y CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCHED_TRACER=y CONFIG_SC_LPASS_CORECC_7180=m -# CONFIG_SC_LPASS_CORECC_7280 is not set # CONFIG_SCR24X is not set CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_3W_SAS=m @@ -5842,7 +5842,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -5915,7 +5915,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -5992,7 +5992,11 @@ CONFIG_SFC=m # CONFIG_SFC_MCDI_LOGGING is not set CONFIG_SFC_MCDI_MON=y CONFIG_SFC_MTD=y -# CONFIG_SFC_SIENA is not set +CONFIG_SFC_SIENA=m +CONFIG_SFC_SIENA_MCDI_LOGGING=y +CONFIG_SFC_SIENA_MCDI_MON=y +CONFIG_SFC_SIENA_MTD=y +CONFIG_SFC_SIENA_SRIOV=y CONFIG_SFC_SRIOV=y # CONFIG_SF_PDMA is not set CONFIG_SFP=m @@ -6213,7 +6217,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -6266,8 +6270,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m CONFIG_SND_SOC_CS35L41_I2C=m CONFIG_SND_SOC_CS35L41_SPI=m -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -6386,7 +6390,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -6522,7 +6526,6 @@ CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS5805M=m CONFIG_SND_SOC_TAS6424=m CONFIG_SND_SOC_TDA7419=m -CONFIG_SND_SOC_TEGRA186_ASRC=m # CONFIG_SND_SOC_TEGRA186_DSPK is not set # CONFIG_SND_SOC_TEGRA20_AC97 is not set # CONFIG_SND_SOC_TEGRA20_DAS is not set @@ -6574,9 +6577,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_I2C=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set # CONFIG_SND_SOC_WM8741 is not set # CONFIG_SND_SOC_WM8750 is not set @@ -6589,7 +6592,7 @@ CONFIG_SND_SOC_WM8804=m # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m # CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_WM8974 is not set @@ -6896,7 +6899,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set CONFIG_TEE=m -CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7119,6 +7121,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -7860,7 +7863,7 @@ CONFIG_WIL6210=m # CONFIG_WILCO_EC is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set +CONFIG_WINMATE_FM07_KEYS=m # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y @@ -8027,7 +8030,7 @@ CONFIG_XFS_WARN=y # CONFIG_XILINX_DMA is not set CONFIG_XILINX_EMACLITE=m CONFIG_XILINX_GMII2RGMII=m -CONFIG_XILINX_INTC=y +# CONFIG_XILINX_INTC is not set CONFIG_XILINX_LL_TEMAC=m CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 9045f3764..cba95a85e 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -6315,6 +6315,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 79880502e..517763fc9 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -523,6 +523,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_BCM_NET_PHYPTP=m CONFIG_BCM_VK=m CONFIG_BCM_VK_TTY=y CONFIG_BE2ISCSI=m @@ -751,8 +752,8 @@ CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_CC770 is not set # CONFIG_CAN_C_CAN is not set -# CONFIG_CAN_CTUCANFD_PCI is not set -# CONFIG_CAN_CTUCANFD_PLATFORM is not set +CONFIG_CAN_CTUCANFD_PCI=m +CONFIG_CAN_CTUCANFD_PLATFORM=m # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_DEV=m CONFIG_CAN_EMS_USB=m @@ -1471,7 +1472,7 @@ CONFIG_DRM_DP_CEC=y # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_FSL_LDB=m +# CONFIG_DRM_FSL_LDB is not set CONFIG_DRM_GM12U320=m CONFIG_DRM_GMA500=m CONFIG_DRM_GUD=m @@ -2672,7 +2673,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m CONFIG_INPUT_IQS626A=m -# CONFIG_INPUT_IQS7222 is not set +CONFIG_INPUT_IQS7222=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3949,7 +3950,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_T7XX is not set +CONFIG_MTK_T7XX=m CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_MTRR_SANITIZER=y @@ -5216,7 +5217,7 @@ CONFIG_REGULATOR_MP886X=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5190A=m -# CONFIG_REGULATOR_RT5759 is not set +CONFIG_REGULATOR_RT5759=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTMV20=m @@ -5520,7 +5521,6 @@ CONFIG_SCHEDSTATS=y CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCHED_TRACER=y CONFIG_SC_LPASS_CORECC_7180=m -# CONFIG_SC_LPASS_CORECC_7280 is not set # CONFIG_SCR24X is not set CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_3W_SAS=m @@ -5822,7 +5822,7 @@ CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MR75203=m CONFIG_SENSORS_NCT6683=m -# CONFIG_SENSORS_NCT6775_I2C is not set +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -5895,7 +5895,7 @@ CONFIG_SENSORS_W83795=m CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m # CONFIG_SENSORS_XDPE122 is not set -# CONFIG_SENSORS_XDPE152 is not set +CONFIG_SENSORS_XDPE152=m # CONFIG_SENSORS_XGENE is not set CONFIG_SENSORS_ZL6100=m # CONFIG_SERIAL_8250_16550A_VARIANTS is not set @@ -5972,7 +5972,11 @@ CONFIG_SFC=m # CONFIG_SFC_MCDI_LOGGING is not set CONFIG_SFC_MCDI_MON=y CONFIG_SFC_MTD=y -# CONFIG_SFC_SIENA is not set +CONFIG_SFC_SIENA=m +CONFIG_SFC_SIENA_MCDI_LOGGING=y +CONFIG_SFC_SIENA_MCDI_MON=y +CONFIG_SFC_SIENA_MTD=y +CONFIG_SFC_SIENA_SRIOV=y CONFIG_SFC_SRIOV=y # CONFIG_SF_PDMA is not set CONFIG_SFP=m @@ -6192,7 +6196,7 @@ CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=m -# CONFIG_SND_SERIAL_GENERIC is not set +CONFIG_SND_SERIAL_GENERIC=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -6245,8 +6249,8 @@ CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m CONFIG_SND_SOC_CS35L41_I2C=m CONFIG_SND_SOC_CS35L41_SPI=m -# CONFIG_SND_SOC_CS35L45_I2C is not set -# CONFIG_SND_SOC_CS35L45_SPI is not set +CONFIG_SND_SOC_CS35L45_I2C=m +CONFIG_SND_SOC_CS35L45_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -6365,7 +6369,7 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -# CONFIG_SND_SOC_MAX98396 is not set +CONFIG_SND_SOC_MAX98396=m # CONFIG_SND_SOC_MAX98504 is not set CONFIG_SND_SOC_MAX98520=m # CONFIG_SND_SOC_MAX9860 is not set @@ -6500,7 +6504,6 @@ CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS5805M=m CONFIG_SND_SOC_TAS6424=m CONFIG_SND_SOC_TDA7419=m -CONFIG_SND_SOC_TEGRA186_ASRC=m # CONFIG_SND_SOC_TEGRA186_DSPK is not set # CONFIG_SND_SOC_TEGRA20_AC97 is not set # CONFIG_SND_SOC_TEGRA20_DAS is not set @@ -6552,9 +6555,9 @@ CONFIG_SND_SOC_WM8524=m # CONFIG_SND_SOC_WM8580 is not set # CONFIG_SND_SOC_WM8711 is not set # CONFIG_SND_SOC_WM8728 is not set -# CONFIG_SND_SOC_WM8731_I2C is not set -# CONFIG_SND_SOC_WM8731 is not set -# CONFIG_SND_SOC_WM8731_SPI is not set +CONFIG_SND_SOC_WM8731_I2C=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8731_SPI=m # CONFIG_SND_SOC_WM8737 is not set # CONFIG_SND_SOC_WM8741 is not set # CONFIG_SND_SOC_WM8750 is not set @@ -6567,7 +6570,7 @@ CONFIG_SND_SOC_WM8804=m # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8940 is not set +CONFIG_SND_SOC_WM8940=m # CONFIG_SND_SOC_WM8960 is not set # CONFIG_SND_SOC_WM8962 is not set # CONFIG_SND_SOC_WM8974 is not set @@ -6874,7 +6877,6 @@ CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set CONFIG_TEE=m -CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -7097,6 +7099,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set @@ -7838,7 +7841,7 @@ CONFIG_WIL6210=m # CONFIG_WILCO_EC is not set CONFIG_WILINK_PLATFORM_DATA=y CONFIG_WINBOND_840=m -# CONFIG_WINMATE_FM07_KEYS is not set +CONFIG_WINMATE_FM07_KEYS=m # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m CONFIG_WIRELESS_EXT=y @@ -8005,7 +8008,7 @@ CONFIG_XFS_SUPPORT_V4=y # CONFIG_XILINX_DMA is not set CONFIG_XILINX_EMACLITE=m CONFIG_XILINX_GMII2RGMII=m -CONFIG_XILINX_INTC=y +# CONFIG_XILINX_INTC is not set CONFIG_XILINX_LL_TEMAC=m CONFIG_XILINX_PR_DECOUPLER=m # CONFIG_XILINX_SDFEC is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 8264fa880..79924025b 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -6291,6 +6291,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y +CONFIG_TRUSTED_KEYS_TEE=y CONFIG_TRUSTED_KEYS_TPM=y CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set diff --git a/kernel.spec b/kernel.spec index 4d0958f35..b6e28d955 100755 --- a/kernel.spec +++ b/kernel.spec @@ -120,17 +120,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # define buildid .local %define specversion 5.19.0 %define patchversion 5.19 -%define pkgrelease 0.rc7.53 +%define pkgrelease 0.rc7.20220719gitca85855bdcae.54 %define kversion 5 -%define tarfile_release 5.19-rc7 +%define tarfile_release 5.19-rc7-5-gca85855bdcae # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.53%{?buildid}%{?dist} +%define specrelease 0.rc7.20220719gitca85855bdcae.54%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 5.19.0 @@ -3139,6 +3139,35 @@ fi # # %changelog +* Tue Jul 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc7.ca85855bdcae.53] +- arm64: config: Enable DRM_V3D (Nicolas Saenz Julienne) +- ARM: configs: Enable DRM_V3D (Peter Robinson) +- ARM: dts: bcm2711: Enable V3D (Peter Robinson) +- drm/v3d: Add support for bcm2711 (Peter Robinson) +- drm/v3d: Get rid of pm code (Peter Robinson) +- dt-bindings: gpu: v3d: Add BCM2711's compatible (Peter Robinson) +- soc: bcm: bcm2835-power: Bypass power_on/off() calls (Nicolas Saenz Julienne) +- soc: bcm: bcm2835-power: Add support for BCM2711's RPiVid ASB (Stefan Wahren) +- soc: bcm: bcm2835-power: Resolve ASB register macros (Stefan Wahren) +- soc: bcm: bcm2835-power: Refactor ASB control (Stefan Wahren) +- mfd: bcm2835-pm: Add support for BCM2711 (Stefan Wahren) +- mfd: bcm2835-pm: Use 'reg-names' to get resources (Nicolas Saenz Julienne) +- ARM: dts: bcm2711: Use proper compatible in PM/Watchdog node (Nicolas Saenz Julienne) +- ARM: dts: bcm2835/bcm2711: Introduce reg-names in watchdog node (Nicolas Saenz Julienne) +- dt-bindings: soc: bcm: bcm2835-pm: Add support for bcm2711 (Stefan Wahren) +- dt-bindings: soc: bcm: bcm2835-pm: Introduce reg-names (Nicolas Saenz Julienne) +- dt-bindings: soc: bcm: bcm2835-pm: Convert bindings to DT schema (Nicolas Saenz Julienne) +- drm: Prevent drm_copy_field() to attempt copying a NULL pointer (Javier Martinez Canillas) +- drm: Use size_t type for len variable in drm_copy_field() (Javier Martinez Canillas) +- fedora: enable BCM_NET_PHYPTP (Peter Robinson) +- net: phy: Add support for 1PPS out and external timestamps (Jonathan Lemon) +- net: phy: broadcom: Add PTP support for some Broadcom PHYs. (Jonathan Lemon) +- net: phy: broadcom: Add Broadcom PTP hooks to bcm-phy-lib (Jonathan Lemon) +- Fedora 5.19 configs update part 2 (Justin M. Forbes) +- redhat/Makefile: Change fedora BUILD_TARGET (Prarit Bhargava) +- New configs in security/keys (Fedora Kernel Team) +- Fedora: arm: enable a pair of drivers (Peter Robinson) + * Mon Jul 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc7.52] - redhat: make kernel-zfcpdump-core to not provide kernel-core/kernel (Herton R. Krzesinski) diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index 414913c08..db6a113ac 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -1,15 +1,24 @@ Documentation/admin-guide/kernel-parameters.txt | 9 + + .../devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 + + .../bindings/soc/bcm/brcm,bcm2835-pm.txt | 46 - + .../bindings/soc/bcm/brcm,bcm2835-pm.yaml | 86 ++ Kconfig | 2 + Kconfig.redhat | 17 + Makefile | 12 +- arch/arm/Kconfig | 4 +- + arch/arm/boot/dts/bcm2711-rpi.dtsi | 4 + + arch/arm/boot/dts/bcm2711.dtsi | 14 +- + arch/arm/boot/dts/bcm2835-common.dtsi | 1 + + arch/arm/configs/bcm2835_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + arch/arm64/Kconfig | 3 +- + arch/arm64/configs/defconfig | 1 + arch/arm64/kernel/acpi.c | 4 + arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + arch/x86/kernel/cpu/common.c | 1 + - arch/x86/kernel/setup.c | 68 ++- + arch/x86/kernel/setup.c | 68 +- drivers/acpi/apei/hest.c | 8 + drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + @@ -17,19 +26,30 @@ drivers/char/ipmi/ipmi_dmi.c | 15 + drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/firmware/efi/Makefile | 1 + - drivers/firmware/efi/efi.c | 124 +++-- - drivers/firmware/efi/secureboot.c | 38 ++ - drivers/hid/hid-rmi.c | 64 --- + drivers/firmware/efi/efi.c | 124 ++- + drivers/firmware/efi/secureboot.c | 38 + + drivers/gpu/drm/drm_ioctl.c | 8 +- + drivers/gpu/drm/v3d/Kconfig | 5 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +- + drivers/gpu/drm/v3d/v3d_drv.c | 12 +- + drivers/gpu/drm/v3d/v3d_gem.c | 12 +- + drivers/hid/hid-rmi.c | 64 -- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 + - drivers/input/rmi4/rmi_driver.c | 124 +++-- + drivers/input/rmi4/rmi_driver.c | 124 +-- drivers/iommu/iommu.c | 22 + drivers/message/fusion/mptsas.c | 10 + drivers/message/fusion/mptspi.c | 11 + + drivers/mfd/bcm2835-pm.c | 74 +- + drivers/net/phy/Kconfig | 5 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/bcm-phy-lib.h | 19 + + drivers/net/phy/bcm-phy-ptp.c | 944 +++++++++++++++++++++ + drivers/net/phy/broadcom.c | 33 +- drivers/net/wireguard/main.c | 6 + drivers/nvme/host/core.c | 22 +- drivers/nvme/host/multipath.c | 19 +- drivers/nvme/host/nvme.h | 4 + - drivers/pci/pci-driver.c | 78 ++++ + drivers/pci/pci-driver.c | 78 ++ drivers/pci/quirks.c | 24 + drivers/scsi/aacraid/linit.c | 2 + drivers/scsi/be2iscsi/be_main.c | 2 + @@ -39,16 +59,18 @@ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 + drivers/scsi/qla2xxx/qla_os.c | 6 + drivers/scsi/qla4xxx/ql4_os.c | 2 + + drivers/soc/bcm/bcm2835-power.c | 72 +- drivers/usb/core/hub.c | 7 + fs/afs/main.c | 3 + include/linux/efi.h | 22 +- include/linux/kernel.h | 21 + include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + + include/linux/mfd/bcm2835-pm.h | 1 + include/linux/module.h | 1 + include/linux/panic.h | 19 +- include/linux/pci.h | 16 + - include/linux/rh_kabi.h | 515 +++++++++++++++++++++ + include/linux/rh_kabi.h | 515 +++++++++++ include/linux/rmi.h | 1 + include/linux/security.h | 5 + init/Kconfig | 2 +- @@ -57,14 +79,14 @@ kernel/module/main.c | 2 + kernel/module/signing.c | 9 +- kernel/panic.c | 14 + - kernel/rh_messages.c | 209 +++++++++ + kernel/rh_messages.c | 209 +++++ scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 66 files changed, 1544 insertions(+), 187 deletions(-) + 88 files changed, 2766 insertions(+), 324 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index f2d26cb7e853..c8c658e66f69 100644 @@ -86,6 +108,162 @@ index f2d26cb7e853..c8c658e66f69 100644 usbcore.authorized_default= [USB] Default USB device authorization: (default -1 = authorized except for wireless USB, +diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml +index e6485f7b046f..217c42874f41 100644 +--- a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml ++++ b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml +@@ -16,6 +16,7 @@ properties: + + compatible: + enum: ++ - brcm,2711-v3d + - brcm,7268-v3d + - brcm,7278-v3d + +diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt +deleted file mode 100644 +index 72ff033565e5..000000000000 +--- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt ++++ /dev/null +@@ -1,46 +0,0 @@ +-BCM2835 PM (Power domains, watchdog) +- +-The PM block controls power domains and some reset lines, and includes +-a watchdog timer. This binding supersedes the brcm,bcm2835-pm-wdt +-binding which covered some of PM's register range and functionality. +- +-Required properties: +- +-- compatible: Should be "brcm,bcm2835-pm" +-- reg: Specifies base physical address and size of the two +- register ranges ("PM" and "ASYNC_BRIDGE" in that +- order) +-- clocks: a) v3d: The V3D clock from CPRMAN +- b) peri_image: The PERI_IMAGE clock from CPRMAN +- c) h264: The H264 clock from CPRMAN +- d) isp: The ISP clock from CPRMAN +-- #reset-cells: Should be 1. This property follows the reset controller +- bindings[1]. +-- #power-domain-cells: Should be 1. This property follows the power domain +- bindings[2]. +- +-Optional properties: +- +-- timeout-sec: Contains the watchdog timeout in seconds +-- system-power-controller: Whether the watchdog is controlling the +- system power. This node follows the power controller bindings[3]. +- +-[1] Documentation/devicetree/bindings/reset/reset.txt +-[2] Documentation/devicetree/bindings/power/power-domain.yaml +-[3] Documentation/devicetree/bindings/power/power-controller.txt +- +-Example: +- +-pm { +- compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; +- #power-domain-cells = <1>; +- #reset-cells = <1>; +- reg = <0x7e100000 0x114>, +- <0x7e00a000 0x24>; +- clocks = <&clocks BCM2835_CLOCK_V3D>, +- <&clocks BCM2835_CLOCK_PERI_IMAGE>, +- <&clocks BCM2835_CLOCK_H264>, +- <&clocks BCM2835_CLOCK_ISP>; +- clock-names = "v3d", "peri_image", "h264", "isp"; +- system-power-controller; +-}; +diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml +new file mode 100644 +index 000000000000..894786640938 +--- /dev/null ++++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml +@@ -0,0 +1,86 @@ ++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause ++%YAML 1.2 ++--- ++$id: "http://devicetree.org/schemas/soc/bcm/brcm,bcm2835-pm.yaml#" ++$schema: "http://devicetree.org/meta-schemas/core.yaml#" ++ ++title: BCM2835 PM (Power domains, watchdog) ++ ++description: | ++ The PM block controls power domains and some reset lines, and includes a ++ watchdog timer. ++ ++maintainers: ++ - Nicolas Saenz Julienne <nsaenz@kernel.org> ++ ++allOf: ++ - $ref: ../../watchdog/watchdog.yaml# ++ ++properties: ++ compatible: ++ items: ++ - enum: ++ - brcm,bcm2835-pm ++ - brcm,bcm2711-pm ++ - const: brcm,bcm2835-pm-wdt ++ ++ reg: ++ minItems: 2 ++ maxItems: 3 ++ ++ reg-names: ++ minItems: 2 ++ items: ++ - const: pm ++ - const: asb ++ - const: rpivid_asb ++ ++ "#power-domain-cells": ++ const: 1 ++ ++ "#reset-cells": ++ const: 1 ++ ++ clocks: ++ minItems: 4 ++ maxItems: 4 ++ ++ clock-names: ++ items: ++ - const: v3d ++ - const: peri_image ++ - const: h264 ++ - const: isp ++ ++ system-power-controller: ++ type: boolean ++ ++ timeout-sec: true ++ ++required: ++ - compatible ++ - reg ++ - "#power-domain-cells" ++ - "#reset-cells" ++ - clocks ++ ++additionalProperties: false ++ ++examples: ++ - | ++ #include <dt-bindings/clock/bcm2835.h> ++ ++ watchdog@7e100000 { ++ compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; ++ #power-domain-cells = <1>; ++ #reset-cells = <1>; ++ reg = <0x7e100000 0x114>, ++ <0x7e00a000 0x24>; ++ reg-names = "pm", "asb"; ++ clocks = <&clocks BCM2835_CLOCK_V3D>, ++ <&clocks BCM2835_CLOCK_PERI_IMAGE>, ++ <&clocks BCM2835_CLOCK_H264>, ++ <&clocks BCM2835_CLOCK_ISP>; ++ clock-names = "v3d", "peri_image", "h264", "isp"; ++ system-power-controller; ++ }; diff --git a/Kconfig b/Kconfig index 745bc773f567..f57ff40109d7 100644 --- a/Kconfig @@ -165,6 +343,94 @@ index 7630ba9cb6cc..c2e2991edd11 100644 help The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of +diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi +index ca266c5d9f9b..98817a6675b9 100644 +--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi +@@ -69,6 +69,10 @@ blconfig: nvram@0 { + }; + }; + ++&v3d { ++ clocks = <&firmware_clocks 5>; ++}; ++ + &vchiq { + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + }; +diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi +index 89af57482bc8..941c4d16791b 100644 +--- a/arch/arm/boot/dts/bcm2711.dtsi ++++ b/arch/arm/boot/dts/bcm2711.dtsi +@@ -107,12 +107,13 @@ dma: dma@7e007000 { + }; + + pm: watchdog@7e100000 { +- compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; ++ compatible = "brcm,bcm2711-pm", "brcm,bcm2835-pm-wdt"; + #power-domain-cells = <1>; + #reset-cells = <1>; + reg = <0x7e100000 0x114>, + <0x7e00a000 0x24>, + <0x7ec11000 0x20>; ++ reg-names = "pm", "asb", "rpivid_asb"; + clocks = <&clocks BCM2835_CLOCK_V3D>, + <&clocks BCM2835_CLOCK_PERI_IMAGE>, + <&clocks BCM2835_CLOCK_H264>, +@@ -601,6 +602,17 @@ genet_mdio: mdio@e14 { + #size-cells = <0x0>; + }; + }; ++ ++ v3d: gpu@7ec00000 { ++ compatible = "brcm,2711-v3d"; ++ reg = <0x0 0x7ec00000 0x4000>, ++ <0x0 0x7ec04000 0x4000>; ++ reg-names = "hub", "core0"; ++ ++ power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; ++ resets = <&pm BCM2835_RESET_V3D>; ++ interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ++ }; + }; + }; + +diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi +index c25e797b9060..a037d2bc5b11 100644 +--- a/arch/arm/boot/dts/bcm2835-common.dtsi ++++ b/arch/arm/boot/dts/bcm2835-common.dtsi +@@ -62,6 +62,7 @@ pm: watchdog@7e100000 { + #reset-cells = <1>; + reg = <0x7e100000 0x114>, + <0x7e00a000 0x24>; ++ reg-names = "pm", "asb"; + clocks = <&clocks BCM2835_CLOCK_V3D>, + <&clocks BCM2835_CLOCK_PERI_IMAGE>, + <&clocks BCM2835_CLOCK_H264>, +diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig +index a9ed79b7f871..9270512c14ea 100644 +--- a/arch/arm/configs/bcm2835_defconfig ++++ b/arch/arm/configs/bcm2835_defconfig +@@ -106,6 +106,7 @@ CONFIG_REGULATOR_GPIO=y + CONFIG_MEDIA_SUPPORT=y + CONFIG_MEDIA_CAMERA_SUPPORT=y + CONFIG_DRM=y ++CONFIG_DRM_V3D=y + CONFIG_DRM_VC4=y + CONFIG_FB_SIMPLE=y + CONFIG_FRAMEBUFFER_CONSOLE=y +diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig +index ce9826bce29b..948d18e59cf5 100644 +--- a/arch/arm/configs/multi_v7_defconfig ++++ b/arch/arm/configs/multi_v7_defconfig +@@ -747,6 +747,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m + CONFIG_DRM_IMX_TVE=m + CONFIG_DRM_IMX_LDB=m + CONFIG_DRM_IMX_HDMI=m ++CONFIG_DRM_V3D=m + CONFIG_DRM_VC4=m + CONFIG_DRM_ETNAVIV=m + CONFIG_DRM_MXSFB=m diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1652a9800ebe..834d178f6c70 100644 --- a/arch/arm64/Kconfig @@ -186,6 +452,18 @@ index 1652a9800ebe..834d178f6c70 100644 default "12" if ARM64_16K_PAGES default "11" help +diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig +index 7d1105343bc2..36aace2b5b28 100644 +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -754,6 +754,7 @@ CONFIG_DRM_CDNS_MHDP8546=m + CONFIG_DRM_DW_HDMI_AHB_AUDIO=m + CONFIG_DRM_DW_HDMI_CEC=m + CONFIG_DRM_IMX_DCSS=m ++CONFIG_DRM_V3D=m + CONFIG_DRM_VC4=m + CONFIG_DRM_ETNAVIV=m + CONFIG_DRM_HISI_HIBMC=m diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index e4dea8db6924..3f17c7b5bd78 100644 --- a/arch/arm64/kernel/acpi.c @@ -748,6 +1026,206 @@ index 000000000000..de0a3714a5d4 + } + } +} +diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c +index 51fcf1298023..7f1097947731 100644 +--- a/drivers/gpu/drm/drm_ioctl.c ++++ b/drivers/gpu/drm/drm_ioctl.c +@@ -472,7 +472,13 @@ EXPORT_SYMBOL(drm_invalid_op); + */ + static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value) + { +- int len; ++ size_t len; ++ ++ /* don't attempt to copy a NULL pointer */ ++ if (WARN_ONCE(!value, "BUG: the value to copy was not set!")) { ++ *buf_len = 0; ++ return 0; ++ } + + /* don't overflow userbuf */ + len = strlen(value); +diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig +index e973ec487484..ce62c5908e1d 100644 +--- a/drivers/gpu/drm/v3d/Kconfig ++++ b/drivers/gpu/drm/v3d/Kconfig +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0-only + config DRM_V3D + tristate "Broadcom V3D 3.x and newer" +- depends on ARCH_BCM || ARCH_BRCMSTB || COMPILE_TEST ++ depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST + depends on DRM + depends on COMMON_CLK + depends on MMU +@@ -9,4 +9,5 @@ config DRM_V3D + select DRM_GEM_SHMEM_HELPER + help + Choose this option if you have a system that has a Broadcom +- V3D 3.x or newer GPU, such as BCM7268. ++ V3D 3.x or newer GPUs. SoCs supported include the BCM2711, ++ BCM7268 and BCM7278. +diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c +index 29fd13109e43..efbde124c296 100644 +--- a/drivers/gpu/drm/v3d/v3d_debugfs.c ++++ b/drivers/gpu/drm/v3d/v3d_debugfs.c +@@ -4,7 +4,6 @@ + #include <linux/circ_buf.h> + #include <linux/ctype.h> + #include <linux/debugfs.h> +-#include <linux/pm_runtime.h> + #include <linux/seq_file.h> + #include <linux/string_helpers.h> + +@@ -131,11 +130,7 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) + struct drm_device *dev = node->minor->dev; + struct v3d_dev *v3d = to_v3d_dev(dev); + u32 ident0, ident1, ident2, ident3, cores; +- int ret, core; +- +- ret = pm_runtime_get_sync(v3d->drm.dev); +- if (ret < 0) +- return ret; ++ int core; + + ident0 = V3D_READ(V3D_HUB_IDENT0); + ident1 = V3D_READ(V3D_HUB_IDENT1); +@@ -188,9 +183,6 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) + (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0); + } + +- pm_runtime_mark_last_busy(v3d->drm.dev); +- pm_runtime_put_autosuspend(v3d->drm.dev); +- + return 0; + } + +@@ -218,11 +210,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused) + uint32_t cycles; + int core = 0; + int measure_ms = 1000; +- int ret; +- +- ret = pm_runtime_get_sync(v3d->drm.dev); +- if (ret < 0) +- return ret; + + if (v3d->ver >= 40) { + V3D_CORE_WRITE(core, V3D_V4_PCTR_0_SRC_0_3, +@@ -246,9 +233,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused) + cycles / (measure_ms * 1000), + (cycles / (measure_ms * 100)) % 10); + +- pm_runtime_mark_last_busy(v3d->drm.dev); +- pm_runtime_put_autosuspend(v3d->drm.dev); +- + return 0; + } + +diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c +index 1afcd54fbbd5..8c7f910daa28 100644 +--- a/drivers/gpu/drm/v3d/v3d_drv.c ++++ b/drivers/gpu/drm/v3d/v3d_drv.c +@@ -19,7 +19,6 @@ + #include <linux/module.h> + #include <linux/of_platform.h> + #include <linux/platform_device.h> +-#include <linux/pm_runtime.h> + #include <linux/reset.h> + + #include <drm/drm_drv.h> +@@ -43,7 +42,6 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, + { + struct v3d_dev *v3d = to_v3d_dev(dev); + struct drm_v3d_get_param *args = data; +- int ret; + static const u32 reg_map[] = { + [DRM_V3D_PARAM_V3D_UIFCFG] = V3D_HUB_UIFCFG, + [DRM_V3D_PARAM_V3D_HUB_IDENT1] = V3D_HUB_IDENT1, +@@ -69,17 +67,12 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, + if (args->value != 0) + return -EINVAL; + +- ret = pm_runtime_get_sync(v3d->drm.dev); +- if (ret < 0) +- return ret; + if (args->param >= DRM_V3D_PARAM_V3D_CORE0_IDENT0 && + args->param <= DRM_V3D_PARAM_V3D_CORE0_IDENT2) { + args->value = V3D_CORE_READ(0, offset); + } else { + args->value = V3D_READ(offset); + } +- pm_runtime_mark_last_busy(v3d->drm.dev); +- pm_runtime_put_autosuspend(v3d->drm.dev); + return 0; + } + +@@ -198,6 +191,7 @@ static const struct drm_driver v3d_drm_driver = { + }; + + static const struct of_device_id v3d_of_match[] = { ++ { .compatible = "brcm,2711-v3d" }, + { .compatible = "brcm,7268-v3d" }, + { .compatible = "brcm,7278-v3d" }, + {}, +@@ -280,10 +274,6 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) + return -ENOMEM; + } + +- pm_runtime_use_autosuspend(dev); +- pm_runtime_set_autosuspend_delay(dev, 50); +- pm_runtime_enable(dev); +- + ret = v3d_gem_init(drm); + if (ret) + goto dma_free; +diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c +index 2352e9640922..725a252e837b 100644 +--- a/drivers/gpu/drm/v3d/v3d_gem.c ++++ b/drivers/gpu/drm/v3d/v3d_gem.c +@@ -6,7 +6,6 @@ + #include <linux/io.h> + #include <linux/module.h> + #include <linux/platform_device.h> +-#include <linux/pm_runtime.h> + #include <linux/reset.h> + #include <linux/sched/signal.h> + #include <linux/uaccess.h> +@@ -372,9 +371,6 @@ v3d_job_free(struct kref *ref) + dma_fence_put(job->irq_fence); + dma_fence_put(job->done_fence); + +- pm_runtime_mark_last_busy(job->v3d->drm.dev); +- pm_runtime_put_autosuspend(job->v3d->drm.dev); +- + if (job->perfmon) + v3d_perfmon_put(job->perfmon); + +@@ -476,14 +472,10 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, + job->v3d = v3d; + job->free = free; + +- ret = pm_runtime_get_sync(v3d->drm.dev); +- if (ret < 0) +- goto fail; +- + ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue], + v3d_priv); + if (ret) +- goto fail_job; ++ goto fail; + + if (has_multisync) { + if (se->in_sync_count && se->wait_stage == queue) { +@@ -514,8 +506,6 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, + + fail_deps: + drm_sched_job_cleanup(&job->base); +-fail_job: +- pm_runtime_put_autosuspend(v3d->drm.dev); + fail: + kfree(*container); + *container = NULL; diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 311eee599ce9..2460c6bd46f8 100644 --- a/drivers/hid/hid-rmi.c @@ -1201,6 +1679,1208 @@ index 388675cc1765..8c7d0740efb6 100644 return 0; out_mptspi_probe: +diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c +index 42fe67f1538e..49cd1f03884a 100644 +--- a/drivers/mfd/bcm2835-pm.c ++++ b/drivers/mfd/bcm2835-pm.c +@@ -25,9 +25,52 @@ static const struct mfd_cell bcm2835_power_devs[] = { + { .name = "bcm2835-power" }, + }; + ++static int bcm2835_pm_get_pdata(struct platform_device *pdev, ++ struct bcm2835_pm *pm) ++{ ++ if (of_find_property(pm->dev->of_node, "reg-names", NULL)) { ++ struct resource *res; ++ ++ pm->base = devm_platform_ioremap_resource_byname(pdev, "pm"); ++ if (IS_ERR(pm->base)) ++ return PTR_ERR(pm->base); ++ ++ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "asb"); ++ if (res) { ++ pm->asb = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(pm->asb)) ++ pm->asb = NULL; ++ } ++ ++ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, ++ "rpivid_asb"); ++ if (res) { ++ pm->rpivid_asb = devm_ioremap_resource(&pdev->dev, res); ++ if (IS_ERR(pm->rpivid_asb)) ++ pm->rpivid_asb = NULL; ++ } ++ ++ return 0; ++ } ++ ++ /* If no 'reg-names' property is found we can assume we're using old DTB. */ ++ pm->base = devm_platform_ioremap_resource(pdev, 0); ++ if (IS_ERR(pm->base)) ++ return PTR_ERR(pm->base); ++ ++ pm->asb = devm_platform_ioremap_resource(pdev, 1); ++ if (IS_ERR(pm->asb)) ++ pm->asb = NULL; ++ ++ pm->rpivid_asb = devm_platform_ioremap_resource(pdev, 2); ++ if (IS_ERR(pm->rpivid_asb)) ++ pm->rpivid_asb = NULL; ++ ++ return 0; ++} ++ + static int bcm2835_pm_probe(struct platform_device *pdev) + { +- struct resource *res; + struct device *dev = &pdev->dev; + struct bcm2835_pm *pm; + int ret; +@@ -39,10 +82,9 @@ static int bcm2835_pm_probe(struct platform_device *pdev) + + pm->dev = dev; + +- res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +- pm->base = devm_ioremap_resource(dev, res); +- if (IS_ERR(pm->base)) +- return PTR_ERR(pm->base); ++ ret = bcm2835_pm_get_pdata(pdev, pm); ++ if (ret) ++ return ret; + + ret = devm_mfd_add_devices(dev, -1, + bcm2835_pm_devs, ARRAY_SIZE(bcm2835_pm_devs), +@@ -50,30 +92,22 @@ static int bcm2835_pm_probe(struct platform_device *pdev) + if (ret) + return ret; + +- /* We'll use the presence of the AXI ASB regs in the ++ /* ++ * We'll use the presence of the AXI ASB regs in the + * bcm2835-pm binding as the key for whether we can reference + * the full PM register range and support power domains. + */ +- res = platform_get_resource(pdev, IORESOURCE_MEM, 1); +- if (res) { +- pm->asb = devm_ioremap_resource(dev, res); +- if (IS_ERR(pm->asb)) +- return PTR_ERR(pm->asb); +- +- ret = devm_mfd_add_devices(dev, -1, +- bcm2835_power_devs, +- ARRAY_SIZE(bcm2835_power_devs), +- NULL, 0, NULL); +- if (ret) +- return ret; +- } +- ++ if (pm->asb) ++ return devm_mfd_add_devices(dev, -1, bcm2835_power_devs, ++ ARRAY_SIZE(bcm2835_power_devs), ++ NULL, 0, NULL); + return 0; + } + + static const struct of_device_id bcm2835_pm_of_match[] = { + { .compatible = "brcm,bcm2835-pm-wdt", }, + { .compatible = "brcm,bcm2835-pm", }, ++ { .compatible = "brcm,bcm2711-pm", }, + {}, + }; + MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match); +diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig +index 9fee639ee5c8..4bb231013009 100644 +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -104,6 +104,8 @@ config AX88796B_PHY + config BROADCOM_PHY + tristate "Broadcom 54XX PHYs" + select BCM_NET_PHYLIB ++ select BCM_NET_PHYPTP if NETWORK_PHY_TIMESTAMPING ++ depends on PTP_1588_CLOCK_OPTIONAL + help + Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464, + BCM5481, BCM54810 and BCM5482 PHYs. +@@ -160,6 +162,9 @@ config BCM_CYGNUS_PHY + config BCM_NET_PHYLIB + tristate + ++config BCM_NET_PHYPTP ++ tristate ++ + config CICADA_PHY + tristate "Cicada PHYs" + help +diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile +index b12b1d86fc99..f7138d3c896b 100644 +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile +@@ -47,6 +47,7 @@ obj-$(CONFIG_BCM84881_PHY) += bcm84881.o + obj-$(CONFIG_BCM87XX_PHY) += bcm87xx.o + obj-$(CONFIG_BCM_CYGNUS_PHY) += bcm-cygnus.o + obj-$(CONFIG_BCM_NET_PHYLIB) += bcm-phy-lib.o ++obj-$(CONFIG_BCM_NET_PHYPTP) += bcm-phy-ptp.o + obj-$(CONFIG_BROADCOM_PHY) += broadcom.o + obj-$(CONFIG_CICADA_PHY) += cicada.o + obj-$(CONFIG_CORTINA_PHY) += cortina.o +diff --git a/drivers/net/phy/bcm-phy-lib.h b/drivers/net/phy/bcm-phy-lib.h +index c3842f87c33b..9902fb182099 100644 +--- a/drivers/net/phy/bcm-phy-lib.h ++++ b/drivers/net/phy/bcm-phy-lib.h +@@ -87,4 +87,23 @@ int bcm_phy_cable_test_start_rdb(struct phy_device *phydev); + int bcm_phy_cable_test_start(struct phy_device *phydev); + int bcm_phy_cable_test_get_status(struct phy_device *phydev, bool *finished); + ++#if IS_ENABLED(CONFIG_BCM_NET_PHYPTP) ++struct bcm_ptp_private *bcm_ptp_probe(struct phy_device *phydev); ++void bcm_ptp_config_init(struct phy_device *phydev); ++void bcm_ptp_stop(struct bcm_ptp_private *priv); ++#else ++static inline struct bcm_ptp_private *bcm_ptp_probe(struct phy_device *phydev) ++{ ++ return NULL; ++} ++ ++static inline void bcm_ptp_config_init(struct phy_device *phydev) ++{ ++} ++ ++static inline void bcm_ptp_stop(struct bcm_ptp_private *priv) ++{ ++} ++#endif ++ + #endif /* _LINUX_BCM_PHY_LIB_H */ +diff --git a/drivers/net/phy/bcm-phy-ptp.c b/drivers/net/phy/bcm-phy-ptp.c +new file mode 100644 +index 000000000000..ef00d6163061 +--- /dev/null ++++ b/drivers/net/phy/bcm-phy-ptp.c +@@ -0,0 +1,944 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2022 Meta Platforms Inc. ++ * Copyright (C) 2022 Jonathan Lemon <jonathan.lemon@gmail.com> ++ */ ++ ++#include <asm/unaligned.h> ++#include <linux/mii.h> ++#include <linux/phy.h> ++#include <linux/ptp_classify.h> ++#include <linux/ptp_clock_kernel.h> ++#include <linux/net_tstamp.h> ++#include <linux/netdevice.h> ++#include <linux/workqueue.h> ++ ++#include "bcm-phy-lib.h" ++ ++/* IEEE 1588 Expansion registers */ ++#define SLICE_CTRL 0x0810 ++#define SLICE_TX_EN BIT(0) ++#define SLICE_RX_EN BIT(8) ++#define TX_EVENT_MODE 0x0811 ++#define MODE_TX_UPDATE_CF BIT(0) ++#define MODE_TX_REPLACE_TS_CF BIT(1) ++#define MODE_TX_REPLACE_TS GENMASK(1, 0) ++#define RX_EVENT_MODE 0x0819 ++#define MODE_RX_UPDATE_CF BIT(0) ++#define MODE_RX_INSERT_TS_48 BIT(1) ++#define MODE_RX_INSERT_TS_64 GENMASK(1, 0) ++ ++#define MODE_EVT_SHIFT_SYNC 0 ++#define MODE_EVT_SHIFT_DELAY_REQ 2 ++#define MODE_EVT_SHIFT_PDELAY_REQ 4 ++#define MODE_EVT_SHIFT_PDELAY_RESP 6 ++ ++#define MODE_SEL_SHIFT_PORT 0 ++#define MODE_SEL_SHIFT_CPU 8 ++ ++#define RX_MODE_SEL(sel, evt, act) \ ++ (((MODE_RX_##act) << (MODE_EVT_SHIFT_##evt)) << (MODE_SEL_SHIFT_##sel)) ++ ++#define TX_MODE_SEL(sel, evt, act) \ ++ (((MODE_TX_##act) << (MODE_EVT_SHIFT_##evt)) << (MODE_SEL_SHIFT_##sel)) ++ ++/* needs global TS capture first */ ++#define TX_TS_CAPTURE 0x0821 ++#define TX_TS_CAP_EN BIT(0) ++#define RX_TS_CAPTURE 0x0822 ++#define RX_TS_CAP_EN BIT(0) ++ ++#define TIME_CODE_0 0x0854 ++#define TIME_CODE_1 0x0855 ++#define TIME_CODE_2 0x0856 ++#define TIME_CODE_3 0x0857 ++#define TIME_CODE_4 0x0858 ++ ++#define DPLL_SELECT 0x085b ++#define DPLL_HB_MODE2 BIT(6) ++ ++#define SHADOW_CTRL 0x085c ++#define SHADOW_LOAD 0x085d ++#define TIME_CODE_LOAD BIT(10) ++#define SYNC_OUT_LOAD BIT(9) ++#define NCO_TIME_LOAD BIT(7) ++#define FREQ_LOAD BIT(6) ++#define INTR_MASK 0x085e ++#define INTR_STATUS 0x085f ++#define INTC_FSYNC BIT(0) ++#define INTC_SOP BIT(1) ++ ++#define NCO_FREQ_LSB 0x0873 ++#define NCO_FREQ_MSB 0x0874 ++ ++#define NCO_TIME_0 0x0875 ++#define NCO_TIME_1 0x0876 ++#define NCO_TIME_2_CTRL 0x0877 ++#define FREQ_MDIO_SEL BIT(14) ++ ++#define SYNC_OUT_0 0x0878 ++#define SYNC_OUT_1 0x0879 ++#define SYNC_OUT_2 0x087a ++ ++#define SYNC_IN_DIVIDER 0x087b ++ ++#define SYNOUT_TS_0 0x087c ++#define SYNOUT_TS_1 0x087d ++#define SYNOUT_TS_2 0x087e ++ ++#define NSE_CTRL 0x087f ++#define NSE_GMODE_EN GENMASK(15, 14) ++#define NSE_CAPTURE_EN BIT(13) ++#define NSE_INIT BIT(12) ++#define NSE_CPU_FRAMESYNC BIT(5) ++#define NSE_SYNC1_FRAMESYNC BIT(3) ++#define NSE_FRAMESYNC_MASK GENMASK(5, 2) ++#define NSE_PEROUT_EN BIT(1) ++#define NSE_ONESHOT_EN BIT(0) ++#define NSE_SYNC_OUT_MASK GENMASK(1, 0) ++ ++#define TS_READ_CTRL 0x0885 ++#define TS_READ_START BIT(0) ++#define TS_READ_END BIT(1) ++ ++#define HB_REG_0 0x0886 ++#define HB_REG_1 0x0887 ++#define HB_REG_2 0x0888 ++#define HB_REG_3 0x08ec ++#define HB_REG_4 0x08ed ++#define HB_STAT_CTRL 0x088e ++#define HB_READ_START BIT(10) ++#define HB_READ_END BIT(11) ++#define HB_READ_MASK GENMASK(11, 10) ++ ++#define TS_REG_0 0x0889 ++#define TS_REG_1 0x088a ++#define TS_REG_2 0x088b ++#define TS_REG_3 0x08c4 ++ ++#define TS_INFO_0 0x088c ++#define TS_INFO_1 0x088d ++ ++#define TIMECODE_CTRL 0x08c3 ++#define TX_TIMECODE_SEL GENMASK(7, 0) ++#define RX_TIMECODE_SEL GENMASK(15, 8) ++ ++#define TIME_SYNC 0x0ff5 ++#define TIME_SYNC_EN BIT(0) ++ ++struct bcm_ptp_private { ++ struct phy_device *phydev; ++ struct mii_timestamper mii_ts; ++ struct ptp_clock *ptp_clock; ++ struct ptp_clock_info ptp_info; ++ struct ptp_pin_desc pin; ++ struct mutex mutex; ++ struct sk_buff_head tx_queue; ++ int tx_type; ++ bool hwts_rx; ++ u16 nse_ctrl; ++ bool pin_active; ++ struct delayed_work pin_work; ++}; ++ ++struct bcm_ptp_skb_cb { ++ unsigned long timeout; ++ u16 seq_id; ++ u8 msgtype; ++ bool discard; ++}; ++ ++struct bcm_ptp_capture { ++ ktime_t hwtstamp; ++ u16 seq_id; ++ u8 msgtype; ++ bool tx_dir; ++}; ++ ++#define BCM_SKB_CB(skb) ((struct bcm_ptp_skb_cb *)(skb)->cb) ++#define SKB_TS_TIMEOUT 10 /* jiffies */ ++ ++#define BCM_MAX_PULSE_8NS ((1U << 9) - 1) ++#define BCM_MAX_PERIOD_8NS ((1U << 30) - 1) ++ ++#define BRCM_PHY_MODEL(phydev) \ ++ ((phydev)->drv->phy_id & (phydev)->drv->phy_id_mask) ++ ++static struct bcm_ptp_private *mii2priv(struct mii_timestamper *mii_ts) ++{ ++ return container_of(mii_ts, struct bcm_ptp_private, mii_ts); ++} ++ ++static struct bcm_ptp_private *ptp2priv(struct ptp_clock_info *info) ++{ ++ return container_of(info, struct bcm_ptp_private, ptp_info); ++} ++ ++static void bcm_ptp_get_framesync_ts(struct phy_device *phydev, ++ struct timespec64 *ts) ++{ ++ u16 hb[4]; ++ ++ bcm_phy_write_exp(phydev, HB_STAT_CTRL, HB_READ_START); ++ ++ hb[0] = bcm_phy_read_exp(phydev, HB_REG_0); ++ hb[1] = bcm_phy_read_exp(phydev, HB_REG_1); ++ hb[2] = bcm_phy_read_exp(phydev, HB_REG_2); ++ hb[3] = bcm_phy_read_exp(phydev, HB_REG_3); ++ ++ bcm_phy_write_exp(phydev, HB_STAT_CTRL, HB_READ_END); ++ bcm_phy_write_exp(phydev, HB_STAT_CTRL, 0); ++ ++ ts->tv_sec = (hb[3] << 16) | hb[2]; ++ ts->tv_nsec = (hb[1] << 16) | hb[0]; ++} ++ ++static u16 bcm_ptp_framesync_disable(struct phy_device *phydev, u16 orig_ctrl) ++{ ++ u16 ctrl = orig_ctrl & ~(NSE_FRAMESYNC_MASK | NSE_CAPTURE_EN); ++ ++ bcm_phy_write_exp(phydev, NSE_CTRL, ctrl); ++ ++ return ctrl; ++} ++ ++static void bcm_ptp_framesync_restore(struct phy_device *phydev, u16 orig_ctrl) ++{ ++ if (orig_ctrl & NSE_FRAMESYNC_MASK) ++ bcm_phy_write_exp(phydev, NSE_CTRL, orig_ctrl); ++} ++ ++static void bcm_ptp_framesync(struct phy_device *phydev, u16 ctrl) ++{ ++ /* trigger framesync - must have 0->1 transition. */ ++ bcm_phy_write_exp(phydev, NSE_CTRL, ctrl | NSE_CPU_FRAMESYNC); ++} ++ ++static int bcm_ptp_framesync_ts(struct phy_device *phydev, ++ struct ptp_system_timestamp *sts, ++ struct timespec64 *ts, ++ u16 orig_ctrl) ++{ ++ u16 ctrl, reg; ++ int i; ++ ++ ctrl = bcm_ptp_framesync_disable(phydev, orig_ctrl); ++ ++ ptp_read_system_prets(sts); ++ ++ /* trigger framesync + capture */ ++ bcm_ptp_framesync(phydev, ctrl | NSE_CAPTURE_EN); ++ ++ ptp_read_system_postts(sts); ++ ++ /* poll for FSYNC interrupt from TS capture */ ++ for (i = 0; i < 10; i++) { ++ reg = bcm_phy_read_exp(phydev, INTR_STATUS); ++ if (reg & INTC_FSYNC) { ++ bcm_ptp_get_framesync_ts(phydev, ts); ++ break; ++ } ++ } ++ ++ bcm_ptp_framesync_restore(phydev, orig_ctrl); ++ ++ return reg & INTC_FSYNC ? 0 : -ETIMEDOUT; ++} ++ ++static int bcm_ptp_gettimex(struct ptp_clock_info *info, ++ struct timespec64 *ts, ++ struct ptp_system_timestamp *sts) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int err; ++ ++ mutex_lock(&priv->mutex); ++ err = bcm_ptp_framesync_ts(priv->phydev, sts, ts, priv->nse_ctrl); ++ mutex_unlock(&priv->mutex); ++ ++ return err; ++} ++ ++static int bcm_ptp_settime_locked(struct bcm_ptp_private *priv, ++ const struct timespec64 *ts) ++{ ++ struct phy_device *phydev = priv->phydev; ++ u16 ctrl; ++ u64 ns; ++ ++ ctrl = bcm_ptp_framesync_disable(phydev, priv->nse_ctrl); ++ ++ /* set up time code */ ++ bcm_phy_write_exp(phydev, TIME_CODE_0, ts->tv_nsec); ++ bcm_phy_write_exp(phydev, TIME_CODE_1, ts->tv_nsec >> 16); ++ bcm_phy_write_exp(phydev, TIME_CODE_2, ts->tv_sec); ++ bcm_phy_write_exp(phydev, TIME_CODE_3, ts->tv_sec >> 16); ++ bcm_phy_write_exp(phydev, TIME_CODE_4, ts->tv_sec >> 32); ++ ++ /* set NCO counter to match */ ++ ns = timespec64_to_ns(ts); ++ bcm_phy_write_exp(phydev, NCO_TIME_0, ns >> 4); ++ bcm_phy_write_exp(phydev, NCO_TIME_1, ns >> 20); ++ bcm_phy_write_exp(phydev, NCO_TIME_2_CTRL, (ns >> 36) & 0xfff); ++ ++ /* set up load on next frame sync (auto-clears due to NSE_INIT) */ ++ bcm_phy_write_exp(phydev, SHADOW_LOAD, TIME_CODE_LOAD | NCO_TIME_LOAD); ++ ++ /* must have NSE_INIT in order to write time code */ ++ bcm_ptp_framesync(phydev, ctrl | NSE_INIT); ++ ++ bcm_ptp_framesync_restore(phydev, priv->nse_ctrl); ++ ++ return 0; ++} ++ ++static int bcm_ptp_settime(struct ptp_clock_info *info, ++ const struct timespec64 *ts) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int err; ++ ++ mutex_lock(&priv->mutex); ++ err = bcm_ptp_settime_locked(priv, ts); ++ mutex_unlock(&priv->mutex); ++ ++ return err; ++} ++ ++static int bcm_ptp_adjtime_locked(struct bcm_ptp_private *priv, ++ s64 delta_ns) ++{ ++ struct timespec64 ts; ++ int err; ++ s64 ns; ++ ++ err = bcm_ptp_framesync_ts(priv->phydev, NULL, &ts, priv->nse_ctrl); ++ if (!err) { ++ ns = timespec64_to_ns(&ts) + delta_ns; ++ ts = ns_to_timespec64(ns); ++ err = bcm_ptp_settime_locked(priv, &ts); ++ } ++ return err; ++} ++ ++static int bcm_ptp_adjtime(struct ptp_clock_info *info, s64 delta_ns) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int err; ++ ++ mutex_lock(&priv->mutex); ++ err = bcm_ptp_adjtime_locked(priv, delta_ns); ++ mutex_unlock(&priv->mutex); ++ ++ return err; ++} ++ ++/* A 125Mhz clock should adjust 8ns per pulse. ++ * The frequency adjustment base is 0x8000 0000, or 8*2^28. ++ * ++ * Frequency adjustment is ++ * adj = scaled_ppm * 8*2^28 / (10^6 * 2^16) ++ * which simplifies to: ++ * adj = scaled_ppm * 2^9 / 5^6 ++ */ ++static int bcm_ptp_adjfine(struct ptp_clock_info *info, long scaled_ppm) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int neg_adj = 0; ++ u32 diff, freq; ++ u16 ctrl; ++ u64 adj; ++ ++ if (scaled_ppm < 0) { ++ neg_adj = 1; ++ scaled_ppm = -scaled_ppm; ++ } ++ ++ adj = scaled_ppm << 9; ++ diff = div_u64(adj, 15625); ++ freq = (8 << 28) + (neg_adj ? -diff : diff); ++ ++ mutex_lock(&priv->mutex); ++ ++ ctrl = bcm_ptp_framesync_disable(priv->phydev, priv->nse_ctrl); ++ ++ bcm_phy_write_exp(priv->phydev, NCO_FREQ_LSB, freq); ++ bcm_phy_write_exp(priv->phydev, NCO_FREQ_MSB, freq >> 16); ++ ++ bcm_phy_write_exp(priv->phydev, NCO_TIME_2_CTRL, FREQ_MDIO_SEL); ++ ++ /* load on next framesync */ ++ bcm_phy_write_exp(priv->phydev, SHADOW_LOAD, FREQ_LOAD); ++ ++ bcm_ptp_framesync(priv->phydev, ctrl); ++ ++ /* clear load */ ++ bcm_phy_write_exp(priv->phydev, SHADOW_LOAD, 0); ++ ++ bcm_ptp_framesync_restore(priv->phydev, priv->nse_ctrl); ++ ++ mutex_unlock(&priv->mutex); ++ ++ return 0; ++} ++ ++static bool bcm_ptp_rxtstamp(struct mii_timestamper *mii_ts, ++ struct sk_buff *skb, int type) ++{ ++ struct bcm_ptp_private *priv = mii2priv(mii_ts); ++ struct skb_shared_hwtstamps *hwts; ++ struct ptp_header *header; ++ u32 sec, nsec; ++ u8 *data; ++ int off; ++ ++ if (!priv->hwts_rx) ++ return false; ++ ++ header = ptp_parse_header(skb, type); ++ if (!header) ++ return false; ++ ++ data = (u8 *)(header + 1); ++ sec = get_unaligned_be32(data); ++ nsec = get_unaligned_be32(data + 4); ++ ++ hwts = skb_hwtstamps(skb); ++ hwts->hwtstamp = ktime_set(sec, nsec); ++ ++ off = data - skb->data + 8; ++ if (off < skb->len) { ++ memmove(data, data + 8, skb->len - off); ++ __pskb_trim(skb, skb->len - 8); ++ } ++ ++ return false; ++} ++ ++static bool bcm_ptp_get_tstamp(struct bcm_ptp_private *priv, ++ struct bcm_ptp_capture *capts) ++{ ++ struct phy_device *phydev = priv->phydev; ++ u16 ts[4], reg; ++ u32 sec, nsec; ++ ++ mutex_lock(&priv->mutex); ++ ++ reg = bcm_phy_read_exp(phydev, INTR_STATUS); ++ if ((reg & INTC_SOP) == 0) { ++ mutex_unlock(&priv->mutex); ++ return false; ++ } ++ ++ bcm_phy_write_exp(phydev, TS_READ_CTRL, TS_READ_START); ++ ++ ts[0] = bcm_phy_read_exp(phydev, TS_REG_0); ++ ts[1] = bcm_phy_read_exp(phydev, TS_REG_1); ++ ts[2] = bcm_phy_read_exp(phydev, TS_REG_2); ++ ts[3] = bcm_phy_read_exp(phydev, TS_REG_3); ++ ++ /* not in be32 format for some reason */ ++ capts->seq_id = bcm_phy_read_exp(priv->phydev, TS_INFO_0); ++ ++ reg = bcm_phy_read_exp(phydev, TS_INFO_1); ++ capts->msgtype = reg >> 12; ++ capts->tx_dir = !!(reg & BIT(11)); ++ ++ bcm_phy_write_exp(phydev, TS_READ_CTRL, TS_READ_END); ++ bcm_phy_write_exp(phydev, TS_READ_CTRL, 0); ++ ++ mutex_unlock(&priv->mutex); ++ ++ sec = (ts[3] << 16) | ts[2]; ++ nsec = (ts[1] << 16) | ts[0]; ++ capts->hwtstamp = ktime_set(sec, nsec); ++ ++ return true; ++} ++ ++static void bcm_ptp_match_tstamp(struct bcm_ptp_private *priv, ++ struct bcm_ptp_capture *capts) ++{ ++ struct skb_shared_hwtstamps hwts; ++ struct sk_buff *skb, *ts_skb; ++ unsigned long flags; ++ bool first = false; ++ ++ ts_skb = NULL; ++ spin_lock_irqsave(&priv->tx_queue.lock, flags); ++ skb_queue_walk(&priv->tx_queue, skb) { ++ if (BCM_SKB_CB(skb)->seq_id == capts->seq_id && ++ BCM_SKB_CB(skb)->msgtype == capts->msgtype) { ++ first = skb_queue_is_first(&priv->tx_queue, skb); ++ __skb_unlink(skb, &priv->tx_queue); ++ ts_skb = skb; ++ break; ++ } ++ } ++ spin_unlock_irqrestore(&priv->tx_queue.lock, flags); ++ ++ /* TX captures one-step packets, discard them if needed. */ ++ if (ts_skb) { ++ if (BCM_SKB_CB(ts_skb)->discard) { ++ kfree_skb(ts_skb); ++ } else { ++ memset(&hwts, 0, sizeof(hwts)); ++ hwts.hwtstamp = capts->hwtstamp; ++ skb_complete_tx_timestamp(ts_skb, &hwts); ++ } ++ } ++ ++ /* not first match, try and expire entries */ ++ if (!first) { ++ while ((skb = skb_dequeue(&priv->tx_queue))) { ++ if (!time_after(jiffies, BCM_SKB_CB(skb)->timeout)) { ++ skb_queue_head(&priv->tx_queue, skb); ++ break; ++ } ++ kfree_skb(skb); ++ } ++ } ++} ++ ++static long bcm_ptp_do_aux_work(struct ptp_clock_info *info) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ struct bcm_ptp_capture capts; ++ bool reschedule = false; ++ ++ while (!skb_queue_empty_lockless(&priv->tx_queue)) { ++ if (!bcm_ptp_get_tstamp(priv, &capts)) { ++ reschedule = true; ++ break; ++ } ++ bcm_ptp_match_tstamp(priv, &capts); ++ } ++ ++ return reschedule ? 1 : -1; ++} ++ ++static int bcm_ptp_cancel_func(struct bcm_ptp_private *priv) ++{ ++ if (!priv->pin_active) ++ return 0; ++ ++ priv->pin_active = false; ++ ++ priv->nse_ctrl &= ~(NSE_SYNC_OUT_MASK | NSE_SYNC1_FRAMESYNC | ++ NSE_CAPTURE_EN); ++ bcm_phy_write_exp(priv->phydev, NSE_CTRL, priv->nse_ctrl); ++ ++ cancel_delayed_work_sync(&priv->pin_work); ++ ++ return 0; ++} ++ ++static void bcm_ptp_perout_work(struct work_struct *pin_work) ++{ ++ struct bcm_ptp_private *priv = ++ container_of(pin_work, struct bcm_ptp_private, pin_work.work); ++ struct phy_device *phydev = priv->phydev; ++ struct timespec64 ts; ++ u64 ns, next; ++ u16 ctrl; ++ ++ mutex_lock(&priv->mutex); ++ ++ /* no longer running */ ++ if (!priv->pin_active) { ++ mutex_unlock(&priv->mutex); ++ return; ++ } ++ ++ bcm_ptp_framesync_ts(phydev, NULL, &ts, priv->nse_ctrl); ++ ++ /* this is 1PPS only */ ++ next = NSEC_PER_SEC - ts.tv_nsec; ++ ts.tv_sec += next < NSEC_PER_MSEC ? 2 : 1; ++ ts.tv_nsec = 0; ++ ++ ns = timespec64_to_ns(&ts); ++ ++ /* force 0->1 transition for ONESHOT */ ++ ctrl = bcm_ptp_framesync_disable(phydev, ++ priv->nse_ctrl & ~NSE_ONESHOT_EN); ++ ++ bcm_phy_write_exp(phydev, SYNOUT_TS_0, ns & 0xfff0); ++ bcm_phy_write_exp(phydev, SYNOUT_TS_1, ns >> 16); ++ bcm_phy_write_exp(phydev, SYNOUT_TS_2, ns >> 32); ++ ++ /* load values on next framesync */ ++ bcm_phy_write_exp(phydev, SHADOW_LOAD, SYNC_OUT_LOAD); ++ ++ bcm_ptp_framesync(phydev, ctrl | NSE_ONESHOT_EN | NSE_INIT); ++ ++ priv->nse_ctrl |= NSE_ONESHOT_EN; ++ bcm_ptp_framesync_restore(phydev, priv->nse_ctrl); ++ ++ mutex_unlock(&priv->mutex); ++ ++ next = next + NSEC_PER_MSEC; ++ schedule_delayed_work(&priv->pin_work, nsecs_to_jiffies(next)); ++} ++ ++static int bcm_ptp_perout_locked(struct bcm_ptp_private *priv, ++ struct ptp_perout_request *req, int on) ++{ ++ struct phy_device *phydev = priv->phydev; ++ u64 period, pulse; ++ u16 val; ++ ++ if (!on) ++ return bcm_ptp_cancel_func(priv); ++ ++ /* 1PPS */ ++ if (req->period.sec != 1 || req->period.nsec != 0) ++ return -EINVAL; ++ ++ period = BCM_MAX_PERIOD_8NS; /* write nonzero value */ ++ ++ if (req->flags & PTP_PEROUT_PHASE) ++ return -EOPNOTSUPP; ++ ++ if (req->flags & PTP_PEROUT_DUTY_CYCLE) ++ pulse = ktime_to_ns(ktime_set(req->on.sec, req->on.nsec)); ++ else ++ pulse = (u64)BCM_MAX_PULSE_8NS << 3; ++ ++ /* convert to 8ns units */ ++ pulse >>= 3; ++ ++ if (!pulse || pulse > period || pulse > BCM_MAX_PULSE_8NS) ++ return -EINVAL; ++ ++ bcm_phy_write_exp(phydev, SYNC_OUT_0, period); ++ ++ val = ((pulse & 0x3) << 14) | ((period >> 16) & 0x3fff); ++ bcm_phy_write_exp(phydev, SYNC_OUT_1, val); ++ ++ val = ((pulse >> 2) & 0x7f) | (pulse << 7); ++ bcm_phy_write_exp(phydev, SYNC_OUT_2, val); ++ ++ if (priv->pin_active) ++ cancel_delayed_work_sync(&priv->pin_work); ++ ++ priv->pin_active = true; ++ INIT_DELAYED_WORK(&priv->pin_work, bcm_ptp_perout_work); ++ schedule_delayed_work(&priv->pin_work, 0); ++ ++ return 0; ++} ++ ++static void bcm_ptp_extts_work(struct work_struct *pin_work) ++{ ++ struct bcm_ptp_private *priv = ++ container_of(pin_work, struct bcm_ptp_private, pin_work.work); ++ struct phy_device *phydev = priv->phydev; ++ struct ptp_clock_event event; ++ struct timespec64 ts; ++ u16 reg; ++ ++ mutex_lock(&priv->mutex); ++ ++ /* no longer running */ ++ if (!priv->pin_active) { ++ mutex_unlock(&priv->mutex); ++ return; ++ } ++ ++ reg = bcm_phy_read_exp(phydev, INTR_STATUS); ++ if ((reg & INTC_FSYNC) == 0) ++ goto out; ++ ++ bcm_ptp_get_framesync_ts(phydev, &ts); ++ ++ event.index = 0; ++ event.type = PTP_CLOCK_EXTTS; ++ event.timestamp = timespec64_to_ns(&ts); ++ ptp_clock_event(priv->ptp_clock, &event); ++ ++out: ++ mutex_unlock(&priv->mutex); ++ schedule_delayed_work(&priv->pin_work, HZ / 4); ++} ++ ++static int bcm_ptp_extts_locked(struct bcm_ptp_private *priv, int on) ++{ ++ struct phy_device *phydev = priv->phydev; ++ ++ if (!on) ++ return bcm_ptp_cancel_func(priv); ++ ++ if (priv->pin_active) ++ cancel_delayed_work_sync(&priv->pin_work); ++ ++ bcm_ptp_framesync_disable(phydev, priv->nse_ctrl); ++ ++ priv->nse_ctrl |= NSE_SYNC1_FRAMESYNC | NSE_CAPTURE_EN; ++ ++ bcm_ptp_framesync_restore(phydev, priv->nse_ctrl); ++ ++ priv->pin_active = true; ++ INIT_DELAYED_WORK(&priv->pin_work, bcm_ptp_extts_work); ++ schedule_delayed_work(&priv->pin_work, 0); ++ ++ return 0; ++} ++ ++static int bcm_ptp_enable(struct ptp_clock_info *info, ++ struct ptp_clock_request *rq, int on) ++{ ++ struct bcm_ptp_private *priv = ptp2priv(info); ++ int err = -EBUSY; ++ ++ mutex_lock(&priv->mutex); ++ ++ switch (rq->type) { ++ case PTP_CLK_REQ_PEROUT: ++ if (priv->pin.func == PTP_PF_PEROUT) ++ err = bcm_ptp_perout_locked(priv, &rq->perout, on); ++ break; ++ case PTP_CLK_REQ_EXTTS: ++ if (priv->pin.func == PTP_PF_EXTTS) ++ err = bcm_ptp_extts_locked(priv, on); ++ break; ++ default: ++ err = -EOPNOTSUPP; ++ break; ++ } ++ ++ mutex_unlock(&priv->mutex); ++ ++ return err; ++} ++ ++static int bcm_ptp_verify(struct ptp_clock_info *info, unsigned int pin, ++ enum ptp_pin_function func, unsigned int chan) ++{ ++ switch (func) { ++ case PTP_PF_NONE: ++ case PTP_PF_EXTTS: ++ case PTP_PF_PEROUT: ++ break; ++ default: ++ return -EOPNOTSUPP; ++ } ++ return 0; ++} ++ ++static const struct ptp_clock_info bcm_ptp_clock_info = { ++ .owner = THIS_MODULE, ++ .name = KBUILD_MODNAME, ++ .max_adj = 100000000, ++ .gettimex64 = bcm_ptp_gettimex, ++ .settime64 = bcm_ptp_settime, ++ .adjtime = bcm_ptp_adjtime, ++ .adjfine = bcm_ptp_adjfine, ++ .enable = bcm_ptp_enable, ++ .verify = bcm_ptp_verify, ++ .do_aux_work = bcm_ptp_do_aux_work, ++ .n_pins = 1, ++ .n_per_out = 1, ++ .n_ext_ts = 1, ++}; ++ ++static void bcm_ptp_txtstamp(struct mii_timestamper *mii_ts, ++ struct sk_buff *skb, int type) ++{ ++ struct bcm_ptp_private *priv = mii2priv(mii_ts); ++ struct ptp_header *hdr; ++ bool discard = false; ++ int msgtype; ++ ++ hdr = ptp_parse_header(skb, type); ++ if (!hdr) ++ goto out; ++ msgtype = ptp_get_msgtype(hdr, type); ++ ++ switch (priv->tx_type) { ++ case HWTSTAMP_TX_ONESTEP_P2P: ++ if (msgtype == PTP_MSGTYPE_PDELAY_RESP) ++ discard = true; ++ fallthrough; ++ case HWTSTAMP_TX_ONESTEP_SYNC: ++ if (msgtype == PTP_MSGTYPE_SYNC) ++ discard = true; ++ fallthrough; ++ case HWTSTAMP_TX_ON: ++ BCM_SKB_CB(skb)->timeout = jiffies + SKB_TS_TIMEOUT; ++ BCM_SKB_CB(skb)->seq_id = be16_to_cpu(hdr->sequence_id); ++ BCM_SKB_CB(skb)->msgtype = msgtype; ++ BCM_SKB_CB(skb)->discard = discard; ++ skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; ++ skb_queue_tail(&priv->tx_queue, skb); ++ ptp_schedule_worker(priv->ptp_clock, 0); ++ return; ++ default: ++ break; ++ } ++ ++out: ++ kfree_skb(skb); ++} ++ ++static int bcm_ptp_hwtstamp(struct mii_timestamper *mii_ts, ++ struct ifreq *ifr) ++{ ++ struct bcm_ptp_private *priv = mii2priv(mii_ts); ++ struct hwtstamp_config cfg; ++ u16 mode, ctrl; ++ ++ if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg))) ++ return -EFAULT; ++ ++ switch (cfg.rx_filter) { ++ case HWTSTAMP_FILTER_NONE: ++ priv->hwts_rx = false; ++ break; ++ case HWTSTAMP_FILTER_PTP_V2_L4_EVENT: ++ case HWTSTAMP_FILTER_PTP_V2_L4_SYNC: ++ case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ: ++ case HWTSTAMP_FILTER_PTP_V2_L2_EVENT: ++ case HWTSTAMP_FILTER_PTP_V2_L2_SYNC: ++ case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ: ++ case HWTSTAMP_FILTER_PTP_V2_EVENT: ++ case HWTSTAMP_FILTER_PTP_V2_SYNC: ++ case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ: ++ cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT; ++ priv->hwts_rx = true; ++ break; ++ default: ++ return -ERANGE; ++ } ++ ++ priv->tx_type = cfg.tx_type; ++ ++ ctrl = priv->hwts_rx ? SLICE_RX_EN : 0; ++ ctrl |= priv->tx_type != HWTSTAMP_TX_OFF ? SLICE_TX_EN : 0; ++ ++ mode = TX_MODE_SEL(PORT, SYNC, REPLACE_TS) | ++ TX_MODE_SEL(PORT, DELAY_REQ, REPLACE_TS) | ++ TX_MODE_SEL(PORT, PDELAY_REQ, REPLACE_TS) | ++ TX_MODE_SEL(PORT, PDELAY_RESP, REPLACE_TS); ++ ++ bcm_phy_write_exp(priv->phydev, TX_EVENT_MODE, mode); ++ ++ mode = RX_MODE_SEL(PORT, SYNC, INSERT_TS_64) | ++ RX_MODE_SEL(PORT, DELAY_REQ, INSERT_TS_64) | ++ RX_MODE_SEL(PORT, PDELAY_REQ, INSERT_TS_64) | ++ RX_MODE_SEL(PORT, PDELAY_RESP, INSERT_TS_64); ++ ++ bcm_phy_write_exp(priv->phydev, RX_EVENT_MODE, mode); ++ ++ bcm_phy_write_exp(priv->phydev, SLICE_CTRL, ctrl); ++ ++ if (ctrl & SLICE_TX_EN) ++ bcm_phy_write_exp(priv->phydev, TX_TS_CAPTURE, TX_TS_CAP_EN); ++ else ++ ptp_cancel_worker_sync(priv->ptp_clock); ++ ++ /* purge existing data */ ++ skb_queue_purge(&priv->tx_queue); ++ ++ return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0; ++} ++ ++static int bcm_ptp_ts_info(struct mii_timestamper *mii_ts, ++ struct ethtool_ts_info *ts_info) ++{ ++ struct bcm_ptp_private *priv = mii2priv(mii_ts); ++ ++ ts_info->phc_index = ptp_clock_index(priv->ptp_clock); ++ ts_info->so_timestamping = ++ SOF_TIMESTAMPING_TX_HARDWARE | ++ SOF_TIMESTAMPING_RX_HARDWARE | ++ SOF_TIMESTAMPING_RAW_HARDWARE; ++ ts_info->tx_types = ++ BIT(HWTSTAMP_TX_ON) | ++ BIT(HWTSTAMP_TX_OFF) | ++ BIT(HWTSTAMP_TX_ONESTEP_SYNC) | ++ BIT(HWTSTAMP_TX_ONESTEP_P2P); ++ ts_info->rx_filters = ++ BIT(HWTSTAMP_FILTER_NONE) | ++ BIT(HWTSTAMP_FILTER_PTP_V2_EVENT); ++ ++ return 0; ++} ++ ++void bcm_ptp_stop(struct bcm_ptp_private *priv) ++{ ++ ptp_cancel_worker_sync(priv->ptp_clock); ++ bcm_ptp_cancel_func(priv); ++} ++EXPORT_SYMBOL_GPL(bcm_ptp_stop); ++ ++void bcm_ptp_config_init(struct phy_device *phydev) ++{ ++ /* init network sync engine */ ++ bcm_phy_write_exp(phydev, NSE_CTRL, NSE_GMODE_EN | NSE_INIT); ++ ++ /* enable time sync (TX/RX SOP capture) */ ++ bcm_phy_write_exp(phydev, TIME_SYNC, TIME_SYNC_EN); ++ ++ /* use sec.nsec heartbeat capture */ ++ bcm_phy_write_exp(phydev, DPLL_SELECT, DPLL_HB_MODE2); ++ ++ /* use 64 bit timecode for TX */ ++ bcm_phy_write_exp(phydev, TIMECODE_CTRL, TX_TIMECODE_SEL); ++ ++ /* always allow FREQ_LOAD on framesync */ ++ bcm_phy_write_exp(phydev, SHADOW_CTRL, FREQ_LOAD); ++ ++ bcm_phy_write_exp(phydev, SYNC_IN_DIVIDER, 1); ++} ++EXPORT_SYMBOL_GPL(bcm_ptp_config_init); ++ ++static void bcm_ptp_init(struct bcm_ptp_private *priv) ++{ ++ priv->nse_ctrl = NSE_GMODE_EN; ++ ++ mutex_init(&priv->mutex); ++ skb_queue_head_init(&priv->tx_queue); ++ ++ priv->mii_ts.rxtstamp = bcm_ptp_rxtstamp; ++ priv->mii_ts.txtstamp = bcm_ptp_txtstamp; ++ priv->mii_ts.hwtstamp = bcm_ptp_hwtstamp; ++ priv->mii_ts.ts_info = bcm_ptp_ts_info; ++ ++ priv->phydev->mii_ts = &priv->mii_ts; ++} ++ ++struct bcm_ptp_private *bcm_ptp_probe(struct phy_device *phydev) ++{ ++ struct bcm_ptp_private *priv; ++ struct ptp_clock *clock; ++ ++ switch (BRCM_PHY_MODEL(phydev)) { ++ case PHY_ID_BCM54210E: ++ break; ++ default: ++ return NULL; ++ } ++ ++ priv = devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL); ++ if (!priv) ++ return ERR_PTR(-ENOMEM); ++ ++ priv->ptp_info = bcm_ptp_clock_info; ++ ++ snprintf(priv->pin.name, sizeof(priv->pin.name), "SYNC_OUT"); ++ priv->ptp_info.pin_config = &priv->pin; ++ ++ clock = ptp_clock_register(&priv->ptp_info, &phydev->mdio.dev); ++ if (IS_ERR(clock)) ++ return ERR_CAST(clock); ++ priv->ptp_clock = clock; ++ ++ priv->phydev = phydev; ++ bcm_ptp_init(priv); ++ ++ return priv; ++} ++EXPORT_SYMBOL_GPL(bcm_ptp_probe); ++ ++MODULE_LICENSE("GPL"); +diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c +index e36809aa6d30..876bc45ede60 100644 +--- a/drivers/net/phy/broadcom.c ++++ b/drivers/net/phy/broadcom.c +@@ -27,6 +27,11 @@ MODULE_DESCRIPTION("Broadcom PHY driver"); + MODULE_AUTHOR("Maciej W. Rozycki"); + MODULE_LICENSE("GPL"); + ++struct bcm54xx_phy_priv { ++ u64 *stats; ++ struct bcm_ptp_private *ptp; ++}; ++ + static int bcm54xx_config_clock_delay(struct phy_device *phydev) + { + int rc, val; +@@ -313,6 +318,22 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) + bcm_phy_write_shadow(phydev, BCM54XX_SHD_APD, val); + } + ++static void bcm54xx_ptp_stop(struct phy_device *phydev) ++{ ++ struct bcm54xx_phy_priv *priv = phydev->priv; ++ ++ if (priv->ptp) ++ bcm_ptp_stop(priv->ptp); ++} ++ ++static void bcm54xx_ptp_config_init(struct phy_device *phydev) ++{ ++ struct bcm54xx_phy_priv *priv = phydev->priv; ++ ++ if (priv->ptp) ++ bcm_ptp_config_init(phydev); ++} ++ + static int bcm54xx_config_init(struct phy_device *phydev) + { + int reg, err, val; +@@ -390,6 +411,8 @@ static int bcm54xx_config_init(struct phy_device *phydev) + bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val); + } + ++ bcm54xx_ptp_config_init(phydev); ++ + return 0; + } + +@@ -418,6 +441,8 @@ static int bcm54xx_suspend(struct phy_device *phydev) + { + int ret; + ++ bcm54xx_ptp_stop(phydev); ++ + /* We cannot use a read/modify/write here otherwise the PHY gets into + * a bad state where its LEDs keep flashing, thus defeating the purpose + * of low power mode. +@@ -741,10 +766,6 @@ static irqreturn_t brcm_fet_handle_interrupt(struct phy_device *phydev) + return IRQ_HANDLED; + } + +-struct bcm54xx_phy_priv { +- u64 *stats; +-}; +- + static int bcm54xx_phy_probe(struct phy_device *phydev) + { + struct bcm54xx_phy_priv *priv; +@@ -761,6 +782,10 @@ static int bcm54xx_phy_probe(struct phy_device *phydev) + if (!priv->stats) + return -ENOMEM; + ++ priv->ptp = bcm_ptp_probe(phydev); ++ if (IS_ERR(priv->ptp)) ++ return PTR_ERR(priv->ptp); ++ + return 0; + } + diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c index ee4da9ab8013..d395d11eadc4 100644 --- a/drivers/net/wireguard/main.c @@ -1752,6 +3432,144 @@ index 9e849f6b0d0f..00f9a1303b93 100644 {0, 0}, }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); +diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c +index 1e0041ec8132..5bcd047768b6 100644 +--- a/drivers/soc/bcm/bcm2835-power.c ++++ b/drivers/soc/bcm/bcm2835-power.c +@@ -126,8 +126,7 @@ + + #define ASB_AXI_BRDG_ID 0x20 + +-#define ASB_READ(reg) readl(power->asb + (reg)) +-#define ASB_WRITE(reg, val) writel(PM_PASSWORD | (val), power->asb + (reg)) ++#define BCM2835_BRDG_ID 0x62726467 + + struct bcm2835_power_domain { + struct generic_pm_domain base; +@@ -142,24 +141,41 @@ struct bcm2835_power { + void __iomem *base; + /* AXI Async bridge registers. */ + void __iomem *asb; ++ /* RPiVid bridge registers. */ ++ void __iomem *rpivid_asb; + + struct genpd_onecell_data pd_xlate; + struct bcm2835_power_domain domains[BCM2835_POWER_DOMAIN_COUNT]; + struct reset_controller_dev reset; + }; + +-static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) ++static int bcm2835_asb_control(struct bcm2835_power *power, u32 reg, bool enable) + { ++ void __iomem *base = power->asb; + u64 start; ++ u32 val; + +- if (!reg) ++ switch (reg) { ++ case 0: + return 0; ++ case ASB_V3D_S_CTRL: ++ case ASB_V3D_M_CTRL: ++ if (power->rpivid_asb) ++ base = power->rpivid_asb; ++ break; ++ } + + start = ktime_get_ns(); + + /* Enable the module's async AXI bridges. */ +- ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP); +- while (ASB_READ(reg) & ASB_ACK) { ++ if (enable) { ++ val = readl(base + reg) & ~ASB_REQ_STOP; ++ } else { ++ val = readl(base + reg) | ASB_REQ_STOP; ++ } ++ writel(PM_PASSWORD | val, base + reg); ++ ++ while (readl(base + reg) & ASB_ACK) { + cpu_relax(); + if (ktime_get_ns() - start >= 1000) + return -ETIMEDOUT; +@@ -168,30 +184,24 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) + return 0; + } + +-static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) ++static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) + { +- u64 start; +- +- if (!reg) +- return 0; +- +- start = ktime_get_ns(); +- +- /* Enable the module's async AXI bridges. */ +- ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP); +- while (!(ASB_READ(reg) & ASB_ACK)) { +- cpu_relax(); +- if (ktime_get_ns() - start >= 1000) +- return -ETIMEDOUT; +- } ++ return bcm2835_asb_control(power, reg, true); ++} + +- return 0; ++static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) ++{ ++ return bcm2835_asb_control(power, reg, false); + } + + static int bcm2835_power_power_off(struct bcm2835_power_domain *pd, u32 pm_reg) + { + struct bcm2835_power *power = pd->power; + ++ /* We don't run this on BCM2711 */ ++ if (power->rpivid_asb) ++ return 0; ++ + /* Enable functional isolation */ + PM_WRITE(pm_reg, PM_READ(pm_reg) & ~PM_ISFUNC); + +@@ -213,6 +223,10 @@ static int bcm2835_power_power_on(struct bcm2835_power_domain *pd, u32 pm_reg) + int inrush; + bool powok; + ++ /* We don't run this on BCM2711 */ ++ if (power->rpivid_asb) ++ return 0; ++ + /* If it was already powered on by the fw, leave it that way. */ + if (PM_READ(pm_reg) & PM_POWUP) + return 0; +@@ -626,13 +640,23 @@ static int bcm2835_power_probe(struct platform_device *pdev) + power->dev = dev; + power->base = pm->base; + power->asb = pm->asb; ++ power->rpivid_asb = pm->rpivid_asb; + +- id = ASB_READ(ASB_AXI_BRDG_ID); +- if (id != 0x62726467 /* "BRDG" */) { ++ id = readl(power->asb + ASB_AXI_BRDG_ID); ++ if (id != BCM2835_BRDG_ID /* "BRDG" */) { + dev_err(dev, "ASB register ID returned 0x%08x\n", id); + return -ENODEV; + } + ++ if (power->rpivid_asb) { ++ id = readl(power->rpivid_asb + ASB_AXI_BRDG_ID); ++ if (id != BCM2835_BRDG_ID /* "BRDG" */) { ++ dev_err(dev, "RPiVid ASB register ID returned 0x%08x\n", ++ id); ++ return -ENODEV; ++ } ++ } ++ + power->pd_xlate.domains = devm_kcalloc(dev, + ARRAY_SIZE(power_domain_names), + sizeof(*power->pd_xlate.domains), diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 68e9121c1878..ccd7566adb4b 100644 --- a/drivers/usb/core/hub.c @@ -1912,6 +3730,18 @@ index 91c8146649f5..42a73934404e 100644 * Security hooks for perf events * * @perf_event_open: +diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h +index ed37dc40e82a..f70a810c55f7 100644 +--- a/include/linux/mfd/bcm2835-pm.h ++++ b/include/linux/mfd/bcm2835-pm.h +@@ -9,6 +9,7 @@ struct bcm2835_pm { + struct device *dev; + void __iomem *base; + void __iomem *asb; ++ void __iomem *rpivid_asb; + }; + + #endif /* BCM2835_MFD_PM_H */ diff --git a/include/linux/module.h b/include/linux/module.h index abd9fa916b7d..f32ae6380ffd 100644 --- a/include/linux/module.h @@ -1,3 +1,3 @@ -SHA512 (linux-5.19-rc7.tar.xz) = 128d3f3342465c26b83381099706bf0d8dc6eff3dcc386240fae3c9c333d041bbf9b82fefa3dc1048cd6c1c302a8e228eae49390110cff3830324a65b7d7374e -SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = d2fd7c91f9a7233e955b7c9899a78c4d35a43a0fe9dbda267e7a889bf886cb7300cba713acf375afcfe20e684322f95b94e9eb56e9dcbebbf86e543bfc0434cf -SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = e48091c7569df7558744fe07eb2e1982f0deef471f313ac385d24485f1d59c982efc6fdb610606baa94e6d3a7f8a8753955f3357b89f684886becd4da26fdc27 +SHA512 (linux-5.19-rc7-5-gca85855bdcae.tar.xz) = 9de0374c656a32256e678e650ed164166a18ac8d8e647001c6823bfe72b28e06aad120585cc531b7918fd3129e173384b8b0c0e89d0de5765f58df9ba201cca2 +SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = 6b776eb4e7c9adabf11c544333089031687b0a2dead152f7aecfbc1f2b135f977b73eb6681fafde724be137854651572a3898f7274112f3457b425181e0de436 +SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = 9a46369a86fb709bc2d2a708f0961b1b1e80d64f611c056f1a7ac2e7410aff0f76f83cf19b715ecd2982c8d44f53aedf685679c69786b408b40e175ec8751265 |