Hello ARM maintainers,
v3: Keep CRYPTO_DEV_FSL_DPAA2_CAAM in patch 7/9
v2: Improve commit message for a few patches
The set of Kconfig options slowly changes with every kernel version.
This patch series regenerates the arm64 defconfig for v4.20
No functional change intended, except adding PINCTRL_MTK_MOORE to
keep PINCTRL_MT7622, and adding FSL_MC_BUS and FSL_MC_DPIO to
keep CRYPTO_DEV_FSL_DPAA2_CAAM.
Marc Gonzalez (9):
arm64: defconfig: Regenerate for v4.20
arm64: defconfig: Drop ARM_BIG_LITTLE_CPUFREQ
arm64: defconfig: Drop NF_CONNTRACK_IPV{4,6}
arm64: defconfig: Drop USB_ULPI_BUS and USB_CHIPIDEA_ULPI
arm64: defconfig: Replace PINCTRL_MT7622 with PINCTRL_MTK_MOORE
arm64: defconfig: Drop redundant SND_SOC_ROCKCHIP_I2S
arm64: defconfig: Enable FSL_MC_BUS and FSL_MC_DPIO
arm64: defconfig: Change SCSI_UFS_HISI=m
arm64: defconfig: Drop redundant sound codec options
arch/arm64/configs/defconfig | 108 ++++++++++++++++++++-----------------------
1 file changed, 49 insertions(+), 59 deletions(-)
--
2.8.2
Run the platform defconfig through kbuild, and handle the trivial case
where options merely move around.
Signed-off-by: Marc Gonzalez <[email protected]>
---
arch/arm64/configs/defconfig | 90 ++++++++++++++++++++++----------------------
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index c9a57d11330b..f786c95504d3 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -3,6 +3,7 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_AUDIT=y
CONFIG_NO_HZ_IDLE=y
CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -28,9 +29,6 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_KALLSYMS_ALL=y
# CONFIG_COMPAT_BRK is not set
CONFIG_PROFILING=y
-CONFIG_JUMP_LABEL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
CONFIG_ARCH_SUNXI=y
CONFIG_ARCH_ALPINE=y
CONFIG_ARCH_BCM2835=y
@@ -46,9 +44,6 @@ CONFIG_ARCH_MEDIATEK=y
CONFIG_ARCH_MESON=y
CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_ROCKCHIP=y
-CONFIG_ARCH_SEATTLE=y
-CONFIG_ARCH_SYNQUACER=y
CONFIG_ARCH_RENESAS=y
CONFIG_ARCH_R8A774A1=y
CONFIG_ARCH_R8A774C0=y
@@ -59,7 +54,10 @@ CONFIG_ARCH_R8A77970=y
CONFIG_ARCH_R8A77980=y
CONFIG_ARCH_R8A77990=y
CONFIG_ARCH_R8A77995=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_SEATTLE=y
CONFIG_ARCH_STRATIX10=y
+CONFIG_ARCH_SYNQUACER=y
CONFIG_ARCH_TEGRA=y
CONFIG_ARCH_SPRD=y
CONFIG_ARCH_THUNDER=y
@@ -91,16 +89,10 @@ CONFIG_PCIE_HISI_STB=y
CONFIG_ARM64_VA_BITS_48=y
CONFIG_SCHED_MC=y
CONFIG_NUMA=y
-CONFIG_PREEMPT=y
-CONFIG_KSM=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_CMA=y
CONFIG_SECCOMP=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_XEN=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_COMPAT=y
CONFIG_HIBERNATION=y
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
@@ -118,7 +110,37 @@ CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
CONFIG_ARM_SCPI_CPUFREQ=y
CONFIG_ARM_TEGRA186_CPUFREQ=y
+CONFIG_ARM_SCPI_PROTOCOL=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
CONFIG_TI_SCI_PROTOCOL=y
+CONFIG_EFI_CAPSULE_LOADER=y
+CONFIG_ACPI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_CHACHA20_NEON=m
+CONFIG_CRYPTO_AES_ARM64_BS=m
+CONFIG_JUMP_LABEL=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_KSM=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CMA=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -202,8 +224,8 @@ CONFIG_SCSI_HISI_SAS=y
CONFIG_SCSI_HISI_SAS_PCI=y
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_UFS_HISI=y
CONFIG_SCSI_UFS_QCOM=m
+CONFIG_SCSI_UFS_HISI=y
CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=y
@@ -371,8 +393,8 @@ CONFIG_BATTERY_SBS=m
CONFIG_BATTERY_BQ27XXX=y
CONFIG_SENSORS_ARM_SCPI=y
CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
+CONFIG_SENSORS_INA2XX=m
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_CPU_THERMAL=y
CONFIG_THERMAL_EMULATION=y
@@ -395,8 +417,6 @@ CONFIG_BCM2835_WDT=y
CONFIG_MFD_BD9571MWV=y
CONFIG_MFD_AXP20X_RSB=y
CONFIG_MFD_CROS_EC=y
-CONFIG_CROS_EC_I2C=y
-CONFIG_CROS_EC_SPI=y
CONFIG_MFD_CROS_EC_CHARDEV=m
CONFIG_MFD_EXYNOS_LPASS=m
CONFIG_MFD_HI6421_PMIC=y
@@ -430,9 +450,9 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_DVB_NET is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
@@ -448,7 +468,6 @@ CONFIG_DRM_EXYNOS_DSI=y
CONFIG_DRM_EXYNOS_HDMI=y
CONFIG_DRM_EXYNOS_MIC=y
CONFIG_DRM_ROCKCHIP=m
-CONFIG_DRM_SUN4I=m
CONFIG_ROCKCHIP_ANALOGIX_DP=y
CONFIG_ROCKCHIP_CDN_DP=y
CONFIG_ROCKCHIP_DW_HDMI=y
@@ -456,6 +475,7 @@ CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_INNO_HDMI=y
CONFIG_DRM_RCAR_DU=m
CONFIG_DRM_RCAR_LVDS=m
+CONFIG_DRM_SUN4I=m
CONFIG_DRM_TEGRA=m
CONFIG_DRM_PANEL_SIMPLE=m
CONFIG_DRM_I2C_ADV7511=m
@@ -587,6 +607,8 @@ CONFIG_VIRTIO_BALLOON=y
CONFIG_VIRTIO_MMIO=y
CONFIG_XEN_GNTDEV=y
CONFIG_XEN_GRANT_DEV_ALLOC=y
+CONFIG_CROS_EC_I2C=y
+CONFIG_CROS_EC_SPI=y
CONFIG_COMMON_CLK_RK808=y
CONFIG_COMMON_CLK_SCPI=y
CONFIG_COMMON_CLK_CS2000_CP=y
@@ -662,9 +684,9 @@ CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
CONFIG_PHY_ROCKCHIP_PCIE=m
CONFIG_PHY_ROCKCHIP_TYPEC=y
-CONFIG_PHY_TEGRA_XUSB=y
-CONFIG_PHY_UNIPHIER_USB3=y
CONFIG_PHY_UNIPHIER_USB2=y
+CONFIG_PHY_UNIPHIER_USB3=y
+CONFIG_PHY_TEGRA_XUSB=y
CONFIG_HISI_PMU=y
CONFIG_QCOM_L2_PMU=y
CONFIG_QCOM_L3_PMU=y
@@ -674,14 +696,6 @@ CONFIG_UNIPHIER_EFUSE=y
CONFIG_MESON_EFUSE=m
CONFIG_TEE=y
CONFIG_OPTEE=y
-CONFIG_ARM_SCPI_PROTOCOL=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_EFI_CAPSULE_LOADER=y
-CONFIG_ACPI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
@@ -707,8 +721,9 @@ CONFIG_ROOT_NFS=y
CONFIG_9P_FS=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
+CONFIG_SECURITY=y
+CONFIG_CRYPTO_ECHAINIV=y
+CONFIG_CRYPTO_ANSI_CPRNG=y
CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FS=y
@@ -718,19 +733,4 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_FTRACE is not set
CONFIG_MEMTEST=y
-CONFIG_SECURITY=y
-CONFIG_CRYPTO_ECHAINIV=y
-CONFIG_CRYPTO_ANSI_CPRNG=y
CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-CONFIG_CRYPTO_SHA3_ARM64=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_AES_ARM64_BS=m
--
2.8.2
Commit a7314405d83c ("drop ARM_BIG_LITTLE_CPUFREQ support for ARM64")
dropped ARM_BIG_LITTLE_CPUFREQ support for ARM64, so remove it from
the defconfig.
Acked-by: Viresh Kumar <[email protected]>
Acked-by: Sudeep Holla <[email protected]>
Acked-by: Mark Rutland <[email protected]>
Signed-off-by: Marc Gonzalez <[email protected]>
---
arch/arm64/configs/defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index f786c95504d3..8d6878c1e794 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -107,7 +107,6 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
CONFIG_CPUFREQ_DT=y
CONFIG_ACPI_CPPC_CPUFREQ=m
CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
-CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
CONFIG_ARM_SCPI_CPUFREQ=y
CONFIG_ARM_TEGRA186_CPUFREQ=y
CONFIG_ARM_SCPI_PROTOCOL=y
--
2.8.2
Commit a0ae2562c6c4 ("netfilter: conntrack: remove l3proto abstraction")
folded NF_CONNTRACK_IPV4 and NF_CONNTRACK_IPV6 into NF_CONNTRACK.
Signed-off-by: Marc Gonzalez <[email protected]>
---
arch/arm64/configs/defconfig | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 8d6878c1e794..58741c07a6ef 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -156,14 +156,12 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_MANGLE=m
-CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
--
2.8.2
Commit a930d8bd94d8 ("usb: chipidea: Always build ULPI code") made
USB_CHIPIDEA select USB_ULPI_BUS, and removed USB_CHIPIDEA_ULPI.
Reviewed-by: Fabio Estevam <[email protected]>
Signed-off-by: Marc Gonzalez <[email protected]>
---
arch/arm64/configs/defconfig | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 58741c07a6ef..6fe418d72337 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -528,7 +528,6 @@ CONFIG_USB_DWC2=y
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_ULPI=y
CONFIG_USB_ISP1760=y
CONFIG_USB_HSIC_USB3503=y
CONFIG_NOP_USB_XCEIV=y
@@ -536,7 +535,6 @@ CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_RENESAS_USBHS_UDC=m
CONFIG_USB_RENESAS_USB3=m
-CONFIG_USB_ULPI_BUS=y
CONFIG_MMC=y
CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_ARMMMCI=y
--
2.8.2
Commit e78d57b2f87c ("pinctrl: mediatek: add pinctrl-moore that
implements the generic pinctrl dt-bindings") made PINCTRL_MT7622
depend on PINCTRL_MTK_MOORE.
Signed-off-by: Marc Gonzalez <[email protected]>
---
arch/arm64/configs/defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 6fe418d72337..725b9471b21c 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -369,7 +369,7 @@ CONFIG_PINCTRL_MSM8994=y
CONFIG_PINCTRL_MSM8996=y
CONFIG_PINCTRL_QDF2XXX=y
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
-CONFIG_PINCTRL_MT7622=y
+CONFIG_PINCTRL_MTK_MOORE=y
CONFIG_GPIO_DWAPB=y
CONFIG_GPIO_MB86S7X=y
CONFIG_GPIO_PL061=y
--
2.8.2
Commit e8342cc7954e ("enable CAAM crypto engine on QorIQ DPAA2 SoCs")
enabled CRYPTO_DEV_FSL_DPAA2_CAAM, which depends on FSL_MC_DPIO,
which is not set. Enable FSL_MC_BUS, and build FSL_MC_DPIO and
CRYPTO_DEV_FSL_DPAA2_CAAM as modules.
Signed-off-by: Marc Gonzalez <[email protected]>
---
arch/arm64/configs/defconfig | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 8e181cca0a05..2662f83c481c 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -200,6 +200,7 @@ CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=32
CONFIG_HISILICON_LPC=y
CONFIG_SIMPLE_PM_BUS=y
+CONFIG_FSL_MC_BUS=y
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_M25P80=y
@@ -631,6 +632,7 @@ CONFIG_QCOM_IOMMU=y
CONFIG_RPMSG_QCOM_GLINK_RPM=y
CONFIG_RPMSG_QCOM_SMD=y
CONFIG_RASPBERRYPI_POWER=y
+CONFIG_FSL_MC_DPIO=m
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMD_RPM=y
CONFIG_QCOM_SMP2P=y
@@ -718,6 +720,7 @@ CONFIG_NLS_ISO8859_1=y
CONFIG_SECURITY=y
CONFIG_CRYPTO_ECHAINIV=y
CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FS=y
@@ -727,4 +730,3 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_FTRACE is not set
CONFIG_MEMTEST=y
-CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y
--
2.8.2
SND_SOC_RK3399_GRU_SOUND selects SND_SOC_DA7219, SND_SOC_MAX98357A,
SND_SOC_RT5514, SND_SOC_RT5514_SPI.
SND_SOC_ROCKCHIP_RT5645 selects SND_SOC_RT5645.
SND_SOC_RL6231 is pulled in for SND_SOC_RT5514 and SND_SOC_RT5645.
Signed-off-by: Marc Gonzalez <[email protected]>
---
arch/arm64/configs/defconfig | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 2e173978eef8..0385a438ccff 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -500,12 +500,6 @@ CONFIG_SND_SOC_RK3399_GRU_SOUND=m
CONFIG_SND_SOC_SAMSUNG=y
CONFIG_SND_SOC_RCAR=m
CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SOC_DA7219=m
-CONFIG_SND_SOC_MAX98357A=m
-CONFIG_SND_SOC_RL6231=m
-CONFIG_SND_SOC_RT5514=m
-CONFIG_SND_SOC_RT5514_SPI=m
-CONFIG_SND_SOC_RT5645=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
CONFIG_I2C_HID=m
--
2.8.2
SND_SOC_ROCKCHIP_RT5645 selects SND_SOC_ROCKCHIP_I2S
Signed-off-by: Marc Gonzalez <[email protected]>
---
arch/arm64/configs/defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 725b9471b21c..8e181cca0a05 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -493,7 +493,6 @@ CONFIG_SND=y
CONFIG_SND_SOC=y
CONFIG_SND_BCM2835_SOC_I2S=m
CONFIG_SND_SOC_ROCKCHIP=m
-CONFIG_SND_SOC_ROCKCHIP_I2S=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
--
2.8.2
SCSI_UFS_HISI depends on SCSI_UFSHCD_PLATFORM=m
Signed-off-by: Marc Gonzalez <[email protected]>
---
arch/arm64/configs/defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 2662f83c481c..2e173978eef8 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -223,7 +223,7 @@ CONFIG_SCSI_HISI_SAS_PCI=y
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PLATFORM=m
CONFIG_SCSI_UFS_QCOM=m
-CONFIG_SCSI_UFS_HISI=y
+CONFIG_SCSI_UFS_HISI=m
CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=y
--
2.8.2
On 11/9/2018 3:11 AM, Marc Gonzalez wrote:
> Commit e8342cc7954e ("enable CAAM crypto engine on QorIQ DPAA2 SoCs")
> enabled CRYPTO_DEV_FSL_DPAA2_CAAM, which depends on FSL_MC_DPIO,
> which is not set. Enable FSL_MC_BUS, and build FSL_MC_DPIO and
> CRYPTO_DEV_FSL_DPAA2_CAAM as modules.
>
> Signed-off-by: Marc Gonzalez <[email protected]>
Reviewed-by: Horia Geant? <[email protected]>
Thanks,
Horia
On 09/11/2018 02:03, Marc Gonzalez wrote:
> Commit e78d57b2f87c ("pinctrl: mediatek: add pinctrl-moore that
> implements the generic pinctrl dt-bindings") made PINCTRL_MT7622
> depend on PINCTRL_MTK_MOORE.
>
> Signed-off-by: Marc Gonzalez <[email protected]>
> ---
> arch/arm64/configs/defconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index 6fe418d72337..725b9471b21c 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -369,7 +369,7 @@ CONFIG_PINCTRL_MSM8994=y
> CONFIG_PINCTRL_MSM8996=y
> CONFIG_PINCTRL_QDF2XXX=y
> CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
> -CONFIG_PINCTRL_MT7622=y
> +CONFIG_PINCTRL_MTK_MOORE=y
This would disable pinctrl for mt7622, I don't think that is what we want.
Regards,
Matthias
> CONFIG_GPIO_DWAPB=y
> CONFIG_GPIO_MB86S7X=y
> CONFIG_GPIO_PL061=y
>
On 09/11/2018 14:03, Matthias Brugger wrote:
> On 09/11/2018 02:03, Marc Gonzalez wrote:
>
>> Commit e78d57b2f87c ("pinctrl: mediatek: add pinctrl-moore that
>> implements the generic pinctrl dt-bindings") made PINCTRL_MT7622
>> depend on PINCTRL_MTK_MOORE.
>>
>> Signed-off-by: Marc Gonzalez <[email protected]>
>> ---
>> arch/arm64/configs/defconfig | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
>> index 6fe418d72337..725b9471b21c 100644
>> --- a/arch/arm64/configs/defconfig
>> +++ b/arch/arm64/configs/defconfig
>> @@ -369,7 +369,7 @@ CONFIG_PINCTRL_MSM8994=y
>> CONFIG_PINCTRL_MSM8996=y
>> CONFIG_PINCTRL_QDF2XXX=y
>> CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
>> -CONFIG_PINCTRL_MT7622=y
>> +CONFIG_PINCTRL_MTK_MOORE=y
>
> This would disable pinctrl for mt7622, I don't think that is what we want.
I don't think so, because PINCTRL_MT7622 is "default y"
I compared the .config files before and after the patch series
to make sure no option changed unexpectedly.
Regards.
On 09/11/2018 20:59, Marc Gonzalez wrote:
> On 09/11/2018 14:03, Matthias Brugger wrote:
>
>> On 09/11/2018 02:03, Marc Gonzalez wrote:
>>
>>> Commit e78d57b2f87c ("pinctrl: mediatek: add pinctrl-moore that
>>> implements the generic pinctrl dt-bindings") made PINCTRL_MT7622
>>> depend on PINCTRL_MTK_MOORE.
>>>
>>> Signed-off-by: Marc Gonzalez <[email protected]>
>>> ---
>>> arch/arm64/configs/defconfig | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
>>> index 6fe418d72337..725b9471b21c 100644
>>> --- a/arch/arm64/configs/defconfig
>>> +++ b/arch/arm64/configs/defconfig
>>> @@ -369,7 +369,7 @@ CONFIG_PINCTRL_MSM8994=y
>>> CONFIG_PINCTRL_MSM8996=y
>>> CONFIG_PINCTRL_QDF2XXX=y
>>> CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
>>> -CONFIG_PINCTRL_MT7622=y
>>> +CONFIG_PINCTRL_MTK_MOORE=y
>>
>> This would disable pinctrl for mt7622, I don't think that is what we want.
>
> I don't think so, because PINCTRL_MT7622 is "default y"
>
> I compared the .config files before and after the patch series
> to make sure no option changed unexpectedly.
>
Fair enough.
Reviewed-by: Matthias Brugger <[email protected]>
On 09/11/2018 01:54, Marc Gonzalez wrote:
> Hello ARM maintainers,
>
> v3: Keep CRYPTO_DEV_FSL_DPAA2_CAAM in patch 7/9
>
> v2: Improve commit message for a few patches
>
> The set of Kconfig options slowly changes with every kernel version.
> This patch series regenerates the arm64 defconfig for v4.20
> No functional change intended, except adding PINCTRL_MTK_MOORE to
> keep PINCTRL_MT7622, and adding FSL_MC_BUS and FSL_MC_DPIO to
> keep CRYPTO_DEV_FSL_DPAA2_CAAM.
>
> Marc Gonzalez (9):
> arm64: defconfig: Regenerate for v4.20
> arm64: defconfig: Drop ARM_BIG_LITTLE_CPUFREQ
> arm64: defconfig: Drop NF_CONNTRACK_IPV{4,6}
> arm64: defconfig: Drop USB_ULPI_BUS and USB_CHIPIDEA_ULPI
> arm64: defconfig: Replace PINCTRL_MT7622 with PINCTRL_MTK_MOORE
> arm64: defconfig: Drop redundant SND_SOC_ROCKCHIP_I2S
> arm64: defconfig: Enable FSL_MC_BUS and FSL_MC_DPIO
> arm64: defconfig: Change SCSI_UFS_HISI=m
> arm64: defconfig: Drop redundant sound codec options
>
> arch/arm64/configs/defconfig | 108 ++++++++++++++++++++-----------------------
> 1 file changed, 49 insertions(+), 59 deletions(-)
Arnd, Olof,
Would you take this series for 4.21-rc1?
Regards.
On Wed, Dec 05, 2018 at 04:33:37PM +0100, Marc Gonzalez wrote:
> On 09/11/2018 01:54, Marc Gonzalez wrote:
>
> > Hello ARM maintainers,
> >
> > v3: Keep CRYPTO_DEV_FSL_DPAA2_CAAM in patch 7/9
> >
> > v2: Improve commit message for a few patches
> >
> > The set of Kconfig options slowly changes with every kernel version.
> > This patch series regenerates the arm64 defconfig for v4.20
> > No functional change intended, except adding PINCTRL_MTK_MOORE to
> > keep PINCTRL_MT7622, and adding FSL_MC_BUS and FSL_MC_DPIO to
> > keep CRYPTO_DEV_FSL_DPAA2_CAAM.
> >
> > Marc Gonzalez (9):
> > arm64: defconfig: Regenerate for v4.20
> > arm64: defconfig: Drop ARM_BIG_LITTLE_CPUFREQ
> > arm64: defconfig: Drop NF_CONNTRACK_IPV{4,6}
> > arm64: defconfig: Drop USB_ULPI_BUS and USB_CHIPIDEA_ULPI
> > arm64: defconfig: Replace PINCTRL_MT7622 with PINCTRL_MTK_MOORE
> > arm64: defconfig: Drop redundant SND_SOC_ROCKCHIP_I2S
> > arm64: defconfig: Enable FSL_MC_BUS and FSL_MC_DPIO
> > arm64: defconfig: Change SCSI_UFS_HISI=m
> > arm64: defconfig: Drop redundant sound codec options
> >
> > arch/arm64/configs/defconfig | 108 ++++++++++++++++++++-----------------------
> > 1 file changed, 49 insertions(+), 59 deletions(-)
>
> Arnd, Olof,
>
> Would you take this series for 4.21-rc1?
Hi,
Yeah, I'm happy to look at applying it but will do it towards the end of the
staging of new contents so we don't get too much conflicts with pull requests
that come in.
-Olof
On Fri, Nov 09, 2018 at 01:56:44AM +0100, Marc Gonzalez wrote:
> Run the platform defconfig through kbuild, and handle the trivial case
> where options merely move around.
>
> Signed-off-by: Marc Gonzalez <[email protected]>
Applied, which in reality meant that I had to redo what you did and commit
that, but that's fine. :)
-Olof
On Fri, Nov 09, 2018 at 02:03:20AM +0100, Marc Gonzalez wrote:
> Commit e78d57b2f87c ("pinctrl: mediatek: add pinctrl-moore that
> implements the generic pinctrl dt-bindings") made PINCTRL_MT7622
> depend on PINCTRL_MTK_MOORE.
>
> Signed-off-by: Marc Gonzalez <[email protected]>
Applied, needed touchups.
-Olof
On Fri, Nov 09, 2018 at 06:05:24AM +0000, Horia Geanta wrote:
> On 11/9/2018 3:11 AM, Marc Gonzalez wrote:
> > Commit e8342cc7954e ("enable CAAM crypto engine on QorIQ DPAA2 SoCs")
> > enabled CRYPTO_DEV_FSL_DPAA2_CAAM, which depends on FSL_MC_DPIO,
> > which is not set. Enable FSL_MC_BUS, and build FSL_MC_DPIO and
> > CRYPTO_DEV_FSL_DPAA2_CAAM as modules.
> >
> > Signed-off-by: Marc Gonzalez <[email protected]>
> Reviewed-by: Horia Geantă <[email protected]>
I had to redo this one, and when I did I noticed that there's also an ethernet
driver. Should that be enabled as well?
-Olof
On Fri, Nov 09, 2018 at 02:08:41AM +0100, Marc Gonzalez wrote:
> SND_SOC_RK3399_GRU_SOUND selects SND_SOC_DA7219, SND_SOC_MAX98357A,
> SND_SOC_RT5514, SND_SOC_RT5514_SPI.
>
> SND_SOC_ROCKCHIP_RT5645 selects SND_SOC_RT5645.
>
> SND_SOC_RL6231 is pulled in for SND_SOC_RT5514 and SND_SOC_RT5645.
>
> Signed-off-by: Marc Gonzalez <[email protected]>
> ---
> arch/arm64/configs/defconfig | 6 ------
> 1 file changed, 6 deletions(-)
Also covered by patch 1.
-Olof
On Tue, Dec 11, 2018 at 07:41:59AM -0800, Olof Johansson wrote:
> On Wed, Dec 05, 2018 at 04:33:37PM +0100, Marc Gonzalez wrote:
> > On 09/11/2018 01:54, Marc Gonzalez wrote:
> >
> > > Hello ARM maintainers,
> > >
> > > v3: Keep CRYPTO_DEV_FSL_DPAA2_CAAM in patch 7/9
> > >
> > > v2: Improve commit message for a few patches
> > >
> > > The set of Kconfig options slowly changes with every kernel version.
> > > This patch series regenerates the arm64 defconfig for v4.20
> > > No functional change intended, except adding PINCTRL_MTK_MOORE to
> > > keep PINCTRL_MT7622, and adding FSL_MC_BUS and FSL_MC_DPIO to
> > > keep CRYPTO_DEV_FSL_DPAA2_CAAM.
> > >
> > > Marc Gonzalez (9):
> > > arm64: defconfig: Regenerate for v4.20
> > > arm64: defconfig: Drop ARM_BIG_LITTLE_CPUFREQ
> > > arm64: defconfig: Drop NF_CONNTRACK_IPV{4,6}
> > > arm64: defconfig: Drop USB_ULPI_BUS and USB_CHIPIDEA_ULPI
> > > arm64: defconfig: Replace PINCTRL_MT7622 with PINCTRL_MTK_MOORE
> > > arm64: defconfig: Drop redundant SND_SOC_ROCKCHIP_I2S
> > > arm64: defconfig: Enable FSL_MC_BUS and FSL_MC_DPIO
> > > arm64: defconfig: Change SCSI_UFS_HISI=m
> > > arm64: defconfig: Drop redundant sound codec options
> > >
> > > arch/arm64/configs/defconfig | 108 ++++++++++++++++++++-----------------------
> > > 1 file changed, 49 insertions(+), 59 deletions(-)
> >
> > Arnd, Olof,
> >
> > Would you take this series for 4.21-rc1?
>
> Hi,
>
> Yeah, I'm happy to look at applying it but will do it towards the end of the
> staging of new contents so we don't get too much conflicts with pull requests
> that come in.
I've applied the patches from the series that were still needed. When
re-running savedefconfig as part of patch 1, several of them were no longer
applicable.
-Olof
On Fri, Nov 09, 2018 at 02:08:07AM +0100, Marc Gonzalez wrote:
> SCSI_UFS_HISI depends on SCSI_UFSHCD_PLATFORM=m
>
> Signed-off-by: Marc Gonzalez <[email protected]>
> ---
> arch/arm64/configs/defconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Another one that got covered by patch 1.
-Olof
On Fri, Nov 09, 2018 at 02:01:13AM +0100, Marc Gonzalez wrote:
> Commit a0ae2562c6c4 ("netfilter: conntrack: remove l3proto abstraction")
> folded NF_CONNTRACK_IPV4 and NF_CONNTRACK_IPV6 into NF_CONNTRACK.
>
> Signed-off-by: Marc Gonzalez <[email protected]>
Same here, this one is no longer needed either.
-Olof
On Fri, Nov 09, 2018 at 02:02:18AM +0100, Marc Gonzalez wrote:
> Commit a930d8bd94d8 ("usb: chipidea: Always build ULPI code") made
> USB_CHIPIDEA select USB_ULPI_BUS, and removed USB_CHIPIDEA_ULPI.
>
> Reviewed-by: Fabio Estevam <[email protected]>
> Signed-off-by: Marc Gonzalez <[email protected]>
This one is the same as some of the others; it had already dropped off with the
refresh.
-Olof
On Fri, Nov 09, 2018 at 02:03:55AM +0100, Marc Gonzalez wrote:
> SND_SOC_ROCKCHIP_RT5645 selects SND_SOC_ROCKCHIP_I2S
>
> Signed-off-by: Marc Gonzalez <[email protected]>
> ---
> arch/arm64/configs/defconfig | 1 -
> 1 file changed, 1 deletion(-)
This one got covered by patch 1 too.
-Olof
On Fri, Nov 09, 2018 at 02:00:28AM +0100, Marc Gonzalez wrote:
> Commit a7314405d83c ("drop ARM_BIG_LITTLE_CPUFREQ support for ARM64")
> dropped ARM_BIG_LITTLE_CPUFREQ support for ARM64, so remove it from
> the defconfig.
>
> Acked-by: Viresh Kumar <[email protected]>
> Acked-by: Sudeep Holla <[email protected]>
> Acked-by: Mark Rutland <[email protected]>
> Signed-off-by: Marc Gonzalez <[email protected]>
No longer needed since patch 1 dropped it.
-Olof
> -----Original Message-----
> From: [email protected] <linux-kernel-
> [email protected]> On Behalf Of Olof Johansson
> Sent: Thursday, December 13, 2018 8:48 AM
> To: Horia Geanta <[email protected]>
> Cc: Marc Gonzalez <[email protected]>; arm-soc <[email protected]>;
> Linux ARM <[email protected]>; LKML <linux-
> [email protected]>
> Subject: Re: [PATCH v3 7/9] arm64: defconfig: Enable FSL_MC_BUS and
> FSL_MC_DPIO
>
> On Fri, Nov 09, 2018 at 06:05:24AM +0000, Horia Geanta wrote:
> > On 11/9/2018 3:11 AM, Marc Gonzalez wrote:
> > > Commit e8342cc7954e ("enable CAAM crypto engine on QorIQ DPAA2
> SoCs")
> > > enabled CRYPTO_DEV_FSL_DPAA2_CAAM, which depends on
> FSL_MC_DPIO,
> > > which is not set. Enable FSL_MC_BUS, and build FSL_MC_DPIO and
> > > CRYPTO_DEV_FSL_DPAA2_CAAM as modules.
> > >
> > > Signed-off-by: Marc Gonzalez <[email protected]>
> > Reviewed-by: Horia Geantă <[email protected]>
>
> I had to redo this one, and when I did I noticed that there's also an ethernet
> driver. Should that be enabled as well?
Yes, it would be best to have the ethernet driver enabled too.
Thanks,
Ioana
On 13/12/2018 07:51, Olof Johansson wrote:
> I've applied the patches from the series that were still needed. When
> re-running savedefconfig as part of patch 1, several of them were no longer
> applicable.
FWIW, Arnd had suggested that the first patch should only deal with the
trivial case (moving options around), and subsequent patches should deal
with removed options, and corner cases.
IIUC, you folded "trivial + removed" into a single patch. I suppose it
does make the commit log less bloated ;-)
Thanks for merging the series.
Regards.
Hi,
> Olof Johansson <[email protected]> hat am 13. Dezember 2018 um 07:48 geschrieben:
>
>
> On Fri, Nov 09, 2018 at 06:05:24AM +0000, Horia Geanta wrote:
> > On 11/9/2018 3:11 AM, Marc Gonzalez wrote:
> > > Commit e8342cc7954e ("enable CAAM crypto engine on QorIQ DPAA2 SoCs")
> > > enabled CRYPTO_DEV_FSL_DPAA2_CAAM, which depends on FSL_MC_DPIO,
> > > which is not set. Enable FSL_MC_BUS, and build FSL_MC_DPIO and
> > > CRYPTO_DEV_FSL_DPAA2_CAAM as modules.
> > >
> > > Signed-off-by: Marc Gonzalez <[email protected]>
> > Reviewed-by: Horia Geantă <[email protected]>
>
> I had to redo this one, and when I did I noticed that there's also an ethernet
> driver. Should that be enabled as well?
>
this patch in next-20181214 breaks "make modules_install" for arm64/defconfig on my Ubuntu machine:
DEPMOD 4.20.0-rc6-next-20181214
depmod: ERROR: Found 6 modules in dependency cycles!
depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> authenc
depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> fsl_mc_dpio
depmod: ERROR: Cycle detected: dpaa2_caam -> caamhash_desc -> dpaa2_caam
depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> error
depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> caamalg_desc
After reverting of this patch the issue disappeared.
Stefan
On 12/15/2018 11:44 PM, Stefan Wahren wrote:
> Hi,
>
>> Olof Johansson <[email protected]> hat am 13. Dezember 2018 um 07:48 geschrieben:
>>
>>
>> On Fri, Nov 09, 2018 at 06:05:24AM +0000, Horia Geanta wrote:
>>> On 11/9/2018 3:11 AM, Marc Gonzalez wrote:
>>>> Commit e8342cc7954e ("enable CAAM crypto engine on QorIQ DPAA2 SoCs")
>>>> enabled CRYPTO_DEV_FSL_DPAA2_CAAM, which depends on FSL_MC_DPIO,
>>>> which is not set. Enable FSL_MC_BUS, and build FSL_MC_DPIO and
>>>> CRYPTO_DEV_FSL_DPAA2_CAAM as modules.
>>>>
>>>> Signed-off-by: Marc Gonzalez <[email protected]>
>>> Reviewed-by: Horia Geant? <[email protected]>
>>
>> I had to redo this one, and when I did I noticed that there's also an ethernet
>> driver. Should that be enabled as well?
>>
>
> this patch in next-20181214 breaks "make modules_install" for arm64/defconfig on my Ubuntu machine:
>
> DEPMOD 4.20.0-rc6-next-20181214
> depmod: ERROR: Found 6 modules in dependency cycles!
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> authenc
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> fsl_mc_dpio
> depmod: ERROR: Cycle detected: dpaa2_caam -> caamhash_desc -> dpaa2_caam
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> error
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> caamalg_desc
>
> After reverting of this patch the issue disappeared.
>
Seems there's a dependency cycle b/w dpaa2_caam and caam{alg,hash}_desc, as follows:
A->B
---
dpaa2_caam needs cnstr_* exported by caam{alg,hash}_desc
B->A
---
caam{alg,hash}_desc need caam_imx, caam_little_end:
caam{hash,alg}_desc.c
--> desc_constr.h (included for descriptors generation functions)
--> regs.h (included for endianness helpers)
--> extern bool caam_imx, caam_little_end
caam_imx, caam_little_end are exported by dpaa2_caam - caamalg_qi2.c (when
CONFIG_CRYPTO_DEV_FSL_CAAM=n)
Could we drop this patch, until CAAM driver gets a proper fix (which is not
straightforward)?
Thanks,
Horia
On Fri, Dec 14, 2018 at 4:44 PM Marc Gonzalez <[email protected]> wrote:
>
> On 13/12/2018 07:51, Olof Johansson wrote:
>
> > I've applied the patches from the series that were still needed. When
> > re-running savedefconfig as part of patch 1, several of them were no longer
> > applicable.
>
> FWIW, Arnd had suggested that the first patch should only deal with the
> trivial case (moving options around), and subsequent patches should deal
> with removed options, and corner cases.
>
> IIUC, you folded "trivial + removed" into a single patch. I suppose it
> does make the commit log less bloated ;-)
>
> Thanks for merging the series.
I suppose I should have asked for the patch to reorder the series to be
the /last/ one in the series instead, to keep the useful changelog texts.
Arnd
On Tue, Dec 18, 2018 at 7:28 AM Arnd Bergmann <[email protected]> wrote:
>
> On Fri, Dec 14, 2018 at 4:44 PM Marc Gonzalez <[email protected]> wrote:
> >
> > On 13/12/2018 07:51, Olof Johansson wrote:
> >
> > > I've applied the patches from the series that were still needed. When
> > > re-running savedefconfig as part of patch 1, several of them were no longer
> > > applicable.
> >
> > FWIW, Arnd had suggested that the first patch should only deal with the
> > trivial case (moving options around), and subsequent patches should deal
> > with removed options, and corner cases.
> >
> > IIUC, you folded "trivial + removed" into a single patch. I suppose it
> > does make the commit log less bloated ;-)
> >
> > Thanks for merging the series.
>
> I suppose I should have asked for the patch to reorder the series to be
> the /last/ one in the series instead, to keep the useful changelog texts.
In my case I was a bit confused about what the series did when it was
first posted; I thought it actually enabled and disabled new
functionality, not that it "just" reflected changes that happened
implicit due to Kconfig changes. I.e. the patches that "fell out" of
the series were not actually making a difference to the generated
config, since they were setting what was now the default (or what
dependencies were no longer fulfilled).
So, I think there was a bit of miscommunication all around. Either way
-- thanks Marc for doing this work and following up on it, and
apologies for the confusion.
-Olof
Hi Horia,
> Horia Geanta <[email protected]> hat am 17. Dezember 2018 um 16:33 geschrieben:
>
>
> On 12/15/2018 11:44 PM, Stefan Wahren wrote:
> > Hi,
> >
> >> Olof Johansson <[email protected]> hat am 13. Dezember 2018 um 07:48 geschrieben:
> >>
> >>
> >> On Fri, Nov 09, 2018 at 06:05:24AM +0000, Horia Geanta wrote:
> >>> On 11/9/2018 3:11 AM, Marc Gonzalez wrote:
> >>>> Commit e8342cc7954e ("enable CAAM crypto engine on QorIQ DPAA2 SoCs")
> >>>> enabled CRYPTO_DEV_FSL_DPAA2_CAAM, which depends on FSL_MC_DPIO,
> >>>> which is not set. Enable FSL_MC_BUS, and build FSL_MC_DPIO and
> >>>> CRYPTO_DEV_FSL_DPAA2_CAAM as modules.
> >>>>
> >>>> Signed-off-by: Marc Gonzalez <[email protected]>
> >>> Reviewed-by: Horia Geantă <[email protected]>
> >>
> >> I had to redo this one, and when I did I noticed that there's also an ethernet
> >> driver. Should that be enabled as well?
> >>
> >
> > this patch in next-20181214 breaks "make modules_install" for arm64/defconfig on my Ubuntu machine:
> >
> > DEPMOD 4.20.0-rc6-next-20181214
> > depmod: ERROR: Found 6 modules in dependency cycles!
> > depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> authenc
> > depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> fsl_mc_dpio
> > depmod: ERROR: Cycle detected: dpaa2_caam -> caamhash_desc -> dpaa2_caam
> > depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> error
> > depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> caamalg_desc
> >
> > After reverting of this patch the issue disappeared.
> >
> Seems there's a dependency cycle b/w dpaa2_caam and caam{alg,hash}_desc, as follows:
>
> A->B
> ---
> dpaa2_caam needs cnstr_* exported by caam{alg,hash}_desc
>
> B->A
> ---
> caam{alg,hash}_desc need caam_imx, caam_little_end:
> caam{hash,alg}_desc.c
> --> desc_constr.h (included for descriptors generation functions)
> --> regs.h (included for endianness helpers)
> --> extern bool caam_imx, caam_little_end
> caam_imx, caam_little_end are exported by dpaa2_caam - caamalg_qi2.c (when
> CONFIG_CRYPTO_DEV_FSL_CAAM=n)
>
> Could we drop this patch, until CAAM driver gets a proper fix (which is not
> straightforward)?
this issue still persists in 4.20.0-rc7-next-20181218. Could you please send a patch to revert this change?
Thanks Stefan
>
> Thanks,
> Horia
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
This reverts commit d9678adbe733a770428a98651beaa2817d503ed3.
Received below report from Stefan.
Revert the commit until CAAM driver dependency cycles are fixed.
this patch in next-20181214 breaks "make modules_install" for
arm64/defconfig on my Ubuntu machine:
DEPMOD 4.20.0-rc6-next-20181214
depmod: ERROR: Found 6 modules in dependency cycles!
depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> authenc
depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> fsl_mc_dpio
depmod: ERROR: Cycle detected: dpaa2_caam -> caamhash_desc -> dpaa2_caam
depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> error
depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> caamalg_desc
Reported-by: Stefan Wahren <[email protected]>
Signed-off-by: Horia Geantă <[email protected]>
---
arch/arm64/configs/defconfig | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 989f51bb1bd4..d0724d4e0546 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -200,7 +200,6 @@ CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=32
CONFIG_HISILICON_LPC=y
CONFIG_SIMPLE_PM_BUS=y
-CONFIG_FSL_MC_BUS=y
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_M25P80=y
@@ -644,7 +643,6 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y
CONFIG_RPMSG_QCOM_GLINK_SMEM=m
CONFIG_RPMSG_QCOM_SMD=y
CONFIG_RASPBERRYPI_POWER=y
-CONFIG_FSL_MC_DPIO=m
CONFIG_QCOM_COMMAND_DB=y
CONFIG_QCOM_GENI_SE=y
CONFIG_QCOM_GLINK_SSR=m
@@ -737,7 +735,6 @@ CONFIG_NLS_ISO8859_1=y
CONFIG_SECURITY=y
CONFIG_CRYPTO_ECHAINIV=y
CONFIG_CRYPTO_ANSI_CPRNG=y
-CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FS=y
--
2.16.2
On Wed, Dec 19, 2018 at 11:18 AM Horia Geantă <[email protected]> wrote:
>
> This reverts commit d9678adbe733a770428a98651beaa2817d503ed3.
>
> Received below report from Stefan.
> Revert the commit until CAAM driver dependency cycles are fixed.
>
> this patch in next-20181214 breaks "make modules_install" for
> arm64/defconfig on my Ubuntu machine:
>
> DEPMOD 4.20.0-rc6-next-20181214
> depmod: ERROR: Found 6 modules in dependency cycles!
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> authenc
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> fsl_mc_dpio
> depmod: ERROR: Cycle detected: dpaa2_caam -> caamhash_desc -> dpaa2_caam
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> error
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> caamalg_desc
>
> Reported-by: Stefan Wahren <[email protected]>
> Signed-off-by: Horia Geantă <[email protected]>
I've applied the revert, but I think there is still a problem, since
anyone could manually enable those options and should not
see those cycles in the module dependencies.
Horia, can you have a look at what caused that and how to fix it?
It's probably a commit in the caam drivers. I have also created
a patch to address a problem with that driver but forgot
to send that out, it might fix this one as well, see my follow-up
patch "crypto: caam/qi2 - add a CRYPTO_DEV_FSL_CAAM
dependency".
Arnd
On 12/20/2018 5:28 PM, Arnd Bergmann wrote:
> On Wed, Dec 19, 2018 at 11:18 AM Horia Geant? <[email protected]> wrote:
>>
>> This reverts commit d9678adbe733a770428a98651beaa2817d503ed3.
>>
>> Received below report from Stefan.
>> Revert the commit until CAAM driver dependency cycles are fixed.
>>
>> this patch in next-20181214 breaks "make modules_install" for
>> arm64/defconfig on my Ubuntu machine:
>>
>> DEPMOD 4.20.0-rc6-next-20181214
>> depmod: ERROR: Found 6 modules in dependency cycles!
>> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> authenc
>> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> fsl_mc_dpio
>> depmod: ERROR: Cycle detected: dpaa2_caam -> caamhash_desc -> dpaa2_caam
>> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> error
>> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> caamalg_desc
>>
>> Reported-by: Stefan Wahren <[email protected]>
>> Signed-off-by: Horia Geant? <[email protected]>
>
> I've applied the revert, but I think there is still a problem, since
> anyone could manually enable those options and should not
> see those cycles in the module dependencies.
>
Agree, root cause has to be fixed.
> Horia, can you have a look at what caused that and how to fix it?
> It's probably a commit in the caam drivers. I have also created
> a patch to address a problem with that driver but forgot
> to send that out, it might fix this one as well, see my follow-up
> patch "crypto: caam/qi2 - add a CRYPTO_DEV_FSL_CAAM
> dependency".
>
Yes, will continue discussion there.
Thanks,
Horia