[{"id":2660529,"web_url":"http://patchwork.ozlabs.org/comment/2660529/","msgid":"<366fd8d3-09c9-8cae-3f10-046c4a643792@csgroup.eu>","date":"2021-04-02T17:34:19","subject":"Re: [PATCH 4/8] CMDLINE: powerpc: convert to generic builtin command\n line","submitter":{"id":79086,"url":"http://patchwork.ozlabs.org/api/people/79086/","name":"Christophe Leroy","email":"christophe.leroy@csgroup.eu"},"content":"Le 30/03/2021 à 19:56, Daniel Walker a écrit :\n> This updates the powerpc code to use the CONFIG_GENERIC_CMDLINE\n> option.\n> \n> This includes a scripted mass convert of the config files to use\n> the new generic cmdline. There is a bit of a trim effect here.\n> It would seems that some of the config haven't been trimmed in\n> a while.\n\nSorry, this patch is not acceptable as is, the default for powerpc is CMDLINE_FROM_BOOTLOADER, ie \nbuiltin-cmdline is taken if and only if none is provided by the bootloader.\n\nAs far as I understand, that disappear with this patch.\n\n> \n> The bash script used to convert is as follows,\n> \n> if [[ -z \"$1\" || -z \"$2\" ]]; then\n> echo \"Two arguments are needed.\"\n> exit 1\n> fi\n> mkdir $1\n> cp $2 $1/.config\n> sed -i 's/CONFIG_CMDLINE=/CONFIG_CMDLINE_BOOL=y\\nCONFIG_CMDLINE_PREPEND=/g' $1/.config\n> make ARCH=$1 O=$1 olddefconfig\n> make ARCH=$1 O=$1 savedefconfig\n> cp $1/defconfig $2\n> rm -Rf $1\n> \n> Cc: xe-linux-external@cisco.com\n> Signed-off-by: Ruslan Ruslichenko \n> Signed-off-by: Ruslan Bilovol \n> Signed-off-by: Daniel Walker \n> ---\n> arch/powerpc/Kconfig | 38 +------------------\n> arch/powerpc/configs/44x/fsp2_defconfig | 32 ++++++++--------\n> arch/powerpc/configs/44x/iss476-smp_defconfig | 24 ++++++------\n> arch/powerpc/configs/44x/warp_defconfig | 17 ++++-----\n> arch/powerpc/configs/holly_defconfig | 13 ++++---\n> arch/powerpc/configs/mvme5100_defconfig | 23 +++++------\n> arch/powerpc/configs/skiroot_defconfig | 12 +++---\n> arch/powerpc/configs/storcenter_defconfig | 18 ++++-----\n> arch/powerpc/kernel/prom_init.c | 10 +++--\n> 9 files changed, 74 insertions(+), 113 deletions(-)\n> \n> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig\n> index 386ae12d8523..3a19e5b74177 100644\n> --- a/arch/powerpc/Kconfig\n> +++ b/arch/powerpc/Kconfig\n> @@ -167,6 +167,8 @@ config PPC\n> \tselect EDAC_SUPPORT\n> \tselect GENERIC_ATOMIC64\t\t\tif PPC32\n> \tselect GENERIC_CLOCKEVENTS_BROADCAST\tif SMP\n> +\tselect GENERIC_CMDLINE\n> +\tselect GENERIC_CMDLINE_OF\n> \tselect GENERIC_CMOS_UPDATE\n> \tselect GENERIC_CPU_AUTOPROBE\n> \tselect GENERIC_CPU_VULNERABILITIES\tif PPC_BARRIER_NOSPEC\n> @@ -886,42 +888,6 @@ config PPC_DENORMALISATION\n> \t Add support for handling denormalisation of single precision\n> \t values. Useful for bare metal only. If unsure say Y here.\n> \n> -config CMDLINE\n> -\tstring \"Initial kernel command string\"\n> -\tdefault \"\"\n> -\thelp\n> -\t On some platforms, there is currently no way for the boot loader to\n> -\t pass arguments to the kernel. For these platforms, you can supply\n> -\t some command-line options at build time by entering them here. In\n> -\t most cases you will need to specify the root device here.\n> -\n> -choice\n> -\tprompt \"Kernel command line type\" if CMDLINE != \"\"\n> -\tdefault CMDLINE_FROM_BOOTLOADER\n> -\n> -config CMDLINE_FROM_BOOTLOADER\n> -\tbool \"Use bootloader kernel arguments if available\"\n> -\thelp\n> -\t Uses the command-line options passed by the boot loader. If\n> -\t the boot loader doesn't provide any, the default kernel command\n> -\t string provided in CMDLINE will be used.\n> -\n> -config CMDLINE_EXTEND\n> -\tbool \"Extend bootloader kernel arguments\"\n> -\thelp\n> -\t The command-line arguments provided by the boot loader will be\n> -\t appended to the default kernel command string.\n> -\n> -config CMDLINE_FORCE\n> -\tbool \"Always use the default kernel command string\"\n> -\thelp\n> -\t Always use the default kernel command string, even if the boot\n> -\t loader passes other arguments to the kernel.\n> -\t This is useful if you cannot or don't want to change the\n> -\t command-line options your boot loader passes to the kernel.\n> -\n> -endchoice\n> -\n> config EXTRA_TARGETS\n> \tstring \"Additional default image types\"\n> \thelp\n> diff --git a/arch/powerpc/configs/44x/fsp2_defconfig b/arch/powerpc/configs/44x/fsp2_defconfig\n> index 8da316e61a08..4993db054589 100644\n> --- a/arch/powerpc/configs/44x/fsp2_defconfig\n> +++ b/arch/powerpc/configs/44x/fsp2_defconfig\n> @@ -1,8 +1,6 @@\n> -CONFIG_44x=y\n> # CONFIG_SWAP is not set\n> CONFIG_SYSVIPC=y\n> # CONFIG_CROSS_MEMORY_ATTACH is not set\n> -# CONFIG_FHANDLE is not set\n> CONFIG_NO_HZ=y\n> CONFIG_HIGH_RES_TIMERS=y\n> CONFIG_IKCONFIG=y\n> @@ -13,23 +11,25 @@ CONFIG_BLK_DEV_INITRD=y\n> # CONFIG_RD_XZ is not set\n> # CONFIG_RD_LZO is not set\n> # CONFIG_RD_LZ4 is not set\n> +# CONFIG_FHANDLE is not set\n> CONFIG_KALLSYMS_ALL=y\n> CONFIG_BPF_SYSCALL=y\n> CONFIG_EMBEDDED=y\n> CONFIG_PROFILING=y\n> -CONFIG_MODULES=y\n> -CONFIG_MODULE_UNLOAD=y\n> -# CONFIG_BLK_DEV_BSG is not set\n> +CONFIG_CMDLINE_BOOL=y\n> +CONFIG_CMDLINE_PREPEND=\"ip=on rw\"\n> +CONFIG_44x=y\n> CONFIG_PPC_47x=y\n> # CONFIG_EBONY is not set\n> CONFIG_FSP2=y\n> CONFIG_476FPE_ERR46=y\n> -CONFIG_SWIOTLB=y\n> CONFIG_KEXEC=y\n> CONFIG_CRASH_DUMP=y\n> -CONFIG_CMDLINE=\"ip=on rw\"\n> # CONFIG_SUSPEND is not set\n> -# CONFIG_PCI is not set\n> +CONFIG_OPROFILE=y\n> +CONFIG_MODULES=y\n> +CONFIG_MODULE_UNLOAD=y\n> +# CONFIG_BLK_DEV_BSG is not set\n> CONFIG_NET=y\n> CONFIG_PACKET=y\n> CONFIG_UNIX=y\n> @@ -46,14 +46,12 @@ CONFIG_MTD=y\n> CONFIG_MTD_BLOCK=y\n> CONFIG_MTD_JEDECPROBE=y\n> CONFIG_MTD_CFI_AMDSTD=y\n> -CONFIG_MTD_PHYSMAP_OF=y\n> CONFIG_BLK_DEV_RAM=y\n> CONFIG_BLK_DEV_RAM_SIZE=35000\n> # CONFIG_SCSI_PROC_FS is not set\n> CONFIG_BLK_DEV_SD=y\n> # CONFIG_SCSI_LOWLEVEL is not set\n> CONFIG_ATA=y\n> -# CONFIG_SATA_PMP is not set\n> # CONFIG_ATA_SFF is not set\n> CONFIG_NETDEVICES=y\n> CONFIG_BONDING=m\n> @@ -62,7 +60,6 @@ CONFIG_IBM_EMAC=m\n> # CONFIG_SERIO is not set\n> # CONFIG_VT is not set\n> # CONFIG_LEGACY_PTYS is not set\n> -# CONFIG_DEVMEM is not set\n> CONFIG_SERIAL_8250=y\n> CONFIG_SERIAL_8250_CONSOLE=y\n> CONFIG_SERIAL_8250_NR_UARTS=32\n> @@ -71,6 +68,7 @@ CONFIG_SERIAL_8250_EXTENDED=y\n> CONFIG_SERIAL_8250_SHARE_IRQ=y\n> CONFIG_SERIAL_OF_PLATFORM=y\n> # CONFIG_HW_RANDOM is not set\n> +# CONFIG_DEVMEM is not set\n> CONFIG_I2C=y\n> CONFIG_I2C_IBM_IIC=y\n> CONFIG_PTP_1588_CLOCK=y\n> @@ -106,6 +104,12 @@ CONFIG_NFS_V3_ACL=y\n> CONFIG_NFS_V4=y\n> CONFIG_ROOT_NFS=y\n> CONFIG_NLS_DEFAULT=\"n\"\n> +CONFIG_CRYPTO_CBC=y\n> +CONFIG_CRYPTO_ECB=y\n> +CONFIG_CRYPTO_PCBC=y\n> +CONFIG_CRYPTO_MD5=y\n> +CONFIG_CRYPTO_DES=y\n> +# CONFIG_CRYPTO_HW is not set\n> CONFIG_XZ_DEC=y\n> CONFIG_PRINTK_TIME=y\n> CONFIG_MESSAGE_LOGLEVEL_DEFAULT=3\n> @@ -113,9 +117,3 @@ CONFIG_DYNAMIC_DEBUG=y\n> CONFIG_DEBUG_INFO=y\n> CONFIG_MAGIC_SYSRQ=y\n> CONFIG_DETECT_HUNG_TASK=y\n> -CONFIG_CRYPTO_CBC=y\n> -CONFIG_CRYPTO_ECB=y\n> -CONFIG_CRYPTO_PCBC=y\n> -CONFIG_CRYPTO_MD5=y\n> -CONFIG_CRYPTO_DES=y\n> -# CONFIG_CRYPTO_HW is not set\n> diff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig\n> index c11e777b2f3d..b8d97061517a 100644\n> --- a/arch/powerpc/configs/44x/iss476-smp_defconfig\n> +++ b/arch/powerpc/configs/44x/iss476-smp_defconfig\n> @@ -1,5 +1,3 @@\n> -CONFIG_44x=y\n> -CONFIG_SMP=y\n> CONFIG_SYSVIPC=y\n> CONFIG_POSIX_MQUEUE=y\n> CONFIG_LOG_BUF_SHIFT=14\n> @@ -7,19 +5,22 @@ CONFIG_BLK_DEV_INITRD=y\n> CONFIG_EXPERT=y\n> CONFIG_KALLSYMS_ALL=y\n> CONFIG_PROFILING=y\n> -CONFIG_MODULES=y\n> -CONFIG_MODULE_UNLOAD=y\n> -# CONFIG_BLK_DEV_BSG is not set\n> +CONFIG_CMDLINE_BOOL=y\n> +CONFIG_CMDLINE_PREPEND=\"root=/dev/issblk0\"\n> +CONFIG_44x=y\n> +CONFIG_SMP=y\n> CONFIG_PPC_47x=y\n> # CONFIG_EBONY is not set\n> CONFIG_ISS4xx=y\n> CONFIG_HZ_100=y\n> CONFIG_MATH_EMULATION=y\n> CONFIG_IRQ_ALL_CPUS=y\n> -CONFIG_CMDLINE=\"root=/dev/issblk0\"\n> -# CONFIG_PCI is not set\n> CONFIG_ADVANCED_OPTIONS=y\n> CONFIG_DYNAMIC_MEMSTART=y\n> +CONFIG_OPROFILE=y\n> +CONFIG_MODULES=y\n> +CONFIG_MODULE_UNLOAD=y\n> +# CONFIG_BLK_DEV_BSG is not set\n> CONFIG_NET=y\n> CONFIG_PACKET=y\n> CONFIG_UNIX=y\n> @@ -33,7 +34,6 @@ CONFIG_MTD=y\n> CONFIG_MTD_BLOCK=y\n> CONFIG_MTD_JEDECPROBE=y\n> CONFIG_MTD_CFI_AMDSTD=y\n> -CONFIG_MTD_PHYSMAP_OF=y\n> CONFIG_BLK_DEV_RAM=y\n> CONFIG_BLK_DEV_RAM_SIZE=35000\n> # CONFIG_INPUT is not set\n> @@ -56,13 +56,13 @@ CONFIG_PROC_KCORE=y\n> CONFIG_TMPFS=y\n> CONFIG_CRAMFS=y\n> # CONFIG_NETWORK_FILESYSTEMS is not set\n> -CONFIG_DEBUG_INFO=y\n> -CONFIG_MAGIC_SYSRQ=y\n> -CONFIG_DETECT_HUNG_TASK=y\n> -CONFIG_PPC_EARLY_DEBUG=y\n> CONFIG_CRYPTO_CBC=y\n> CONFIG_CRYPTO_ECB=y\n> CONFIG_CRYPTO_PCBC=y\n> CONFIG_CRYPTO_MD5=y\n> CONFIG_CRYPTO_DES=y\n> # CONFIG_CRYPTO_HW is not set\n> +CONFIG_DEBUG_INFO=y\n> +CONFIG_MAGIC_SYSRQ=y\n> +CONFIG_DETECT_HUNG_TASK=y\n> +CONFIG_PPC_EARLY_DEBUG=y\n> diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig\n> index 47252c2d7669..d2e4bbe1492c 100644\n> --- a/arch/powerpc/configs/44x/warp_defconfig\n> +++ b/arch/powerpc/configs/44x/warp_defconfig\n> @@ -1,4 +1,3 @@\n> -CONFIG_44x=y\n> CONFIG_LOCALVERSION=\"-pika\"\n> # CONFIG_LOCALVERSION_AUTO is not set\n> CONFIG_SYSVIPC=y\n> @@ -7,15 +6,16 @@ CONFIG_IKCONFIG_PROC=y\n> CONFIG_LOG_BUF_SHIFT=14\n> CONFIG_BLK_DEV_INITRD=y\n> CONFIG_EXPERT=y\n> -CONFIG_MODULES=y\n> -CONFIG_MODULE_UNLOAD=y\n> -# CONFIG_BLK_DEV_BSG is not set\n> +CONFIG_CMDLINE_BOOL=y\n> +CONFIG_CMDLINE_PREPEND=\"ip=on\"\n> +CONFIG_44x=y\n> # CONFIG_EBONY is not set\n> CONFIG_WARP=y\n> CONFIG_PPC4xx_GPIO=y\n> CONFIG_HZ_1000=y\n> -CONFIG_CMDLINE=\"ip=on\"\n> -# CONFIG_PCI is not set\n> +CONFIG_MODULES=y\n> +CONFIG_MODULE_UNLOAD=y\n> +# CONFIG_BLK_DEV_BSG is not set\n> CONFIG_NET=y\n> CONFIG_PACKET=y\n> CONFIG_UNIX=y\n> @@ -31,7 +31,6 @@ CONFIG_MTD_CMDLINE_PARTS=y\n> CONFIG_MTD_BLOCK=y\n> CONFIG_MTD_CFI=y\n> CONFIG_MTD_CFI_AMDSTD=y\n> -CONFIG_MTD_PHYSMAP_OF=y\n> CONFIG_MTD_RAW_NAND=y\n> CONFIG_MTD_NAND_NDFC=y\n> CONFIG_MTD_UBI=y\n> @@ -88,9 +87,9 @@ CONFIG_NLS_UTF8=y\n> CONFIG_CRC_CCITT=y\n> CONFIG_CRC_T10DIF=y\n> CONFIG_PRINTK_TIME=y\n> +# CONFIG_DEBUG_BUGVERBOSE is not set\n> CONFIG_DEBUG_INFO=y\n> -CONFIG_DEBUG_FS=y\n> CONFIG_MAGIC_SYSRQ=y\n> +CONFIG_DEBUG_FS=y\n> CONFIG_DETECT_HUNG_TASK=y\n> # CONFIG_SCHED_DEBUG is not set\n> -# CONFIG_DEBUG_BUGVERBOSE is not set\n> diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig\n> index 271daff47d1d..98c0644e80b4 100644\n> --- a/arch/powerpc/configs/holly_defconfig\n> +++ b/arch/powerpc/configs/holly_defconfig\n> @@ -4,17 +4,18 @@ CONFIG_HIGH_RES_TIMERS=y\n> CONFIG_LOG_BUF_SHIFT=14\n> CONFIG_BLK_DEV_INITRD=y\n> CONFIG_EXPERT=y\n> -CONFIG_MODULES=y\n> -# CONFIG_BLK_DEV_BSG is not set\n> -CONFIG_PARTITION_ADVANCED=y\n> +CONFIG_CMDLINE_BOOL=y\n> +CONFIG_CMDLINE_PREPEND=\"console=ttyS0,115200\"\n> # CONFIG_PPC_CHRP is not set\n> # CONFIG_PPC_PMAC is not set\n> CONFIG_EMBEDDED6xx=y\n> CONFIG_PPC_HOLLY=y\n> CONFIG_GEN_RTC=y\n> -CONFIG_BINFMT_MISC=y\n> -CONFIG_CMDLINE=\"console=ttyS0,115200\"\n> # CONFIG_SECCOMP is not set\n> +CONFIG_MODULES=y\n> +# CONFIG_BLK_DEV_BSG is not set\n> +CONFIG_PARTITION_ADVANCED=y\n> +CONFIG_BINFMT_MISC=y\n> CONFIG_NET=y\n> CONFIG_PACKET=y\n> CONFIG_UNIX=y\n> @@ -53,8 +54,8 @@ CONFIG_PROC_KCORE=y\n> CONFIG_TMPFS=y\n> CONFIG_NFS_FS=y\n> CONFIG_ROOT_NFS=y\n> +# CONFIG_DEBUG_BUGVERBOSE is not set\n> CONFIG_MAGIC_SYSRQ=y\n> # CONFIG_SCHED_DEBUG is not set\n> -# CONFIG_DEBUG_BUGVERBOSE is not set\n> CONFIG_XMON=y\n> CONFIG_XMON_DEFAULT=y\n> diff --git a/arch/powerpc/configs/mvme5100_defconfig b/arch/powerpc/configs/mvme5100_defconfig\n> index 1fed6be95d53..884a3e0defde 100644\n> --- a/arch/powerpc/configs/mvme5100_defconfig\n> +++ b/arch/powerpc/configs/mvme5100_defconfig\n> @@ -11,16 +11,17 @@ CONFIG_LOG_BUF_SHIFT=14\n> # CONFIG_NET_NS is not set\n> CONFIG_CC_OPTIMIZE_FOR_SIZE=y\n> # CONFIG_COMPAT_BRK is not set\n> -CONFIG_MODULES=y\n> -CONFIG_MODULE_UNLOAD=y\n> -# CONFIG_BLK_DEV_BSG is not set\n> +CONFIG_CMDLINE_BOOL=y\n> +CONFIG_CMDLINE_PREPEND=\"console=ttyS0,9600 ip=dhcp root=/dev/nfs\"\n> # CONFIG_PPC_CHRP is not set\n> # CONFIG_PPC_PMAC is not set\n> CONFIG_EMBEDDED6xx=y\n> CONFIG_MVME5100=y\n> CONFIG_KVM_GUEST=y\n> CONFIG_HZ_100=y\n> -CONFIG_CMDLINE=\"console=ttyS0,9600 ip=dhcp root=/dev/nfs\"\n> +CONFIG_MODULES=y\n> +CONFIG_MODULE_UNLOAD=y\n> +# CONFIG_BLK_DEV_BSG is not set\n> # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set\n> # CONFIG_COMPACTION is not set\n> CONFIG_NET=y\n> @@ -108,13 +109,6 @@ CONFIG_NLS_CODEPAGE_437=m\n> CONFIG_NLS_CODEPAGE_932=m\n> CONFIG_NLS_ISO8859_1=m\n> CONFIG_NLS_UTF8=m\n> -CONFIG_CRC_CCITT=m\n> -CONFIG_CRC_T10DIF=y\n> -CONFIG_XZ_DEC=y\n> -CONFIG_MAGIC_SYSRQ=y\n> -CONFIG_DEBUG_KERNEL=y\n> -CONFIG_DETECT_HUNG_TASK=y\n> -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=20\n> CONFIG_CRYPTO_CBC=y\n> CONFIG_CRYPTO_PCBC=m\n> CONFIG_CRYPTO_MD5=y\n> @@ -125,3 +119,10 @@ CONFIG_CRYPTO_DES=y\n> CONFIG_CRYPTO_SERPENT=m\n> CONFIG_CRYPTO_TWOFISH=m\n> CONFIG_CRYPTO_DEFLATE=m\n> +CONFIG_CRC_CCITT=m\n> +CONFIG_CRC_T10DIF=y\n> +CONFIG_XZ_DEC=y\n> +CONFIG_MAGIC_SYSRQ=y\n> +CONFIG_DEBUG_KERNEL=y\n> +CONFIG_DETECT_HUNG_TASK=y\n> +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=20\n> diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig\n> index b806a5d3a695..5e11995508d7 100644\n> --- a/arch/powerpc/configs/skiroot_defconfig\n> +++ b/arch/powerpc/configs/skiroot_defconfig\n> @@ -26,6 +26,8 @@ CONFIG_PERF_EVENTS=y\n> # CONFIG_SLAB_MERGE_DEFAULT is not set\n> CONFIG_SLAB_FREELIST_RANDOM=y\n> CONFIG_SLAB_FREELIST_HARDENED=y\n> +CONFIG_CMDLINE_BOOL=y\n> +CONFIG_CMDLINE_PREPEND=\"console=tty0 console=hvc0 ipr.fast_reboot=1 quiet\"\n> CONFIG_PPC64=y\n> CONFIG_ALTIVEC=y\n> CONFIG_VSX=y\n> @@ -42,14 +44,11 @@ CONFIG_KEXEC=y\n> CONFIG_KEXEC_FILE=y\n> CONFIG_PRESERVE_FA_DUMP=y\n> CONFIG_IRQ_ALL_CPUS=y\n> -CONFIG_NUMA=y\n> CONFIG_PPC_64K_PAGES=y\n> CONFIG_SCHED_SMT=y\n> -CONFIG_CMDLINE=\"console=tty0 console=hvc0 ipr.fast_reboot=1 quiet\"\n> -# CONFIG_SECCOMP is not set\n> # CONFIG_PPC_MEM_KEYS is not set\n> CONFIG_JUMP_LABEL=y\n> -CONFIG_STRICT_KERNEL_RWX=y\n> +# CONFIG_SECCOMP is not set\n> CONFIG_MODULES=y\n> CONFIG_MODULE_UNLOAD=y\n> CONFIG_MODULE_SIG_FORCE=y\n> @@ -80,7 +79,6 @@ CONFIG_BLK_DEV_NVME=m\n> CONFIG_NVME_MULTIPATH=y\n> CONFIG_EEPROM_AT24=m\n> # CONFIG_CXL is not set\n> -# CONFIG_OCXL is not set\n> CONFIG_BLK_DEV_SD=m\n> CONFIG_BLK_DEV_SR=m\n> CONFIG_CHR_DEV_SG=m\n> @@ -199,7 +197,6 @@ CONFIG_PHYLIB=y\n> CONFIG_INPUT_EVDEV=y\n> CONFIG_INPUT_MISC=y\n> # CONFIG_SERIO_SERPORT is not set\n> -# CONFIG_DEVMEM is not set\n> CONFIG_SERIAL_8250=y\n> CONFIG_SERIAL_8250_CONSOLE=y\n> CONFIG_IPMI_HANDLER=y\n> @@ -207,9 +204,10 @@ CONFIG_IPMI_DEVICE_INTERFACE=y\n> CONFIG_IPMI_POWERNV=y\n> CONFIG_IPMI_WATCHDOG=y\n> CONFIG_HW_RANDOM=y\n> +# CONFIG_DEVMEM is not set\n> +# CONFIG_DEVPORT is not set\n> CONFIG_TCG_TPM=y\n> CONFIG_TCG_TIS_I2C_NUVOTON=y\n> -# CONFIG_DEVPORT is not set\n> CONFIG_I2C=y\n> # CONFIG_I2C_COMPAT is not set\n> CONFIG_I2C_CHARDEV=y\n> diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig\n> index 47dcfaddc1ac..17a17b8ae160 100644\n> --- a/arch/powerpc/configs/storcenter_defconfig\n> +++ b/arch/powerpc/configs/storcenter_defconfig\n> @@ -2,18 +2,19 @@ CONFIG_SYSVIPC=y\n> CONFIG_LOG_BUF_SHIFT=14\n> CONFIG_EXPERT=y\n> # CONFIG_KALLSYMS is not set\n> -CONFIG_MODULES=y\n> -CONFIG_MODULE_UNLOAD=y\n> -# CONFIG_BLK_DEV_BSG is not set\n> -CONFIG_PARTITION_ADVANCED=y\n> +CONFIG_CMDLINE_BOOL=y\n> +CONFIG_CMDLINE_PREPEND=\"console=ttyS0,115200\"\n> # CONFIG_PPC_CHRP is not set\n> # CONFIG_PPC_PMAC is not set\n> CONFIG_EMBEDDED6xx=y\n> CONFIG_STORCENTER=y\n> CONFIG_HZ_100=y\n> -CONFIG_BINFMT_MISC=y\n> -CONFIG_CMDLINE=\"console=ttyS0,115200\"\n> # CONFIG_SECCOMP is not set\n> +CONFIG_MODULES=y\n> +CONFIG_MODULE_UNLOAD=y\n> +# CONFIG_BLK_DEV_BSG is not set\n> +CONFIG_PARTITION_ADVANCED=y\n> +CONFIG_BINFMT_MISC=y\n> CONFIG_NET=y\n> CONFIG_PACKET=m\n> CONFIG_UNIX=y\n> @@ -35,7 +36,6 @@ CONFIG_BLK_DEV_SD=y\n> CONFIG_BLK_DEV_SR=y\n> CONFIG_SCSI_SPI_ATTRS=y\n> CONFIG_ATA=y\n> -CONFIG_PATA_VIA=y\n> CONFIG_MD=y\n> CONFIG_BLK_DEV_MD=y\n> CONFIG_MD_LINEAR=y\n> @@ -44,16 +44,13 @@ CONFIG_MD_RAID1=y\n> CONFIG_MD_RAID456=y\n> CONFIG_NETDEVICES=y\n> CONFIG_DUMMY=m\n> -CONFIG_R8169=y\n> # CONFIG_INPUT is not set\n> # CONFIG_SERIO is not set\n> # CONFIG_VT is not set\n> CONFIG_SERIAL_8250=y\n> CONFIG_SERIAL_8250_CONSOLE=y\n> -# CONFIG_SERIAL_8250_PCI is not set\n> CONFIG_SERIAL_8250_NR_UARTS=2\n> CONFIG_SERIAL_8250_RUNTIME_UARTS=2\n> -CONFIG_NVRAM=y\n> CONFIG_I2C=y\n> CONFIG_I2C_CHARDEV=y\n> CONFIG_I2C_MPC=y\n> @@ -76,4 +73,3 @@ CONFIG_NLS_CODEPAGE_437=y\n> CONFIG_NLS_ISO8859_1=y\n> CONFIG_NLS_UTF8=y\n> CONFIG_CRC_T10DIF=y\n> -# CONFIG_ENABLE_MUST_CHECK is not set\n> diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c\n> index 2c2f33155317..27fece82ff93 100644\n> --- a/arch/powerpc/kernel/prom_init.c\n> +++ b/arch/powerpc/kernel/prom_init.c\n> @@ -27,6 +27,7 @@\n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> @@ -309,6 +310,7 @@ static char __init *prom_strstr(const char *s1, const char *s2)\n> \treturn NULL;\n> }\n> \n> +#ifdef GENERIC_CMDLINE_NEED_STRLCAT\n> static size_t __init prom_strlcat(char *dest, const char *src, size_t count)\n> {\n> \tsize_t dsize = prom_strlen(dest);\n> @@ -328,6 +330,7 @@ static size_t __init prom_strlcat(char *dest, const char *src, size_t count)\n> \treturn res;\n> \n> }\n> +#endif\n> \n> #ifdef CONFIG_PPC_PSERIES\n> static int __init prom_strtobool(const char *s, bool *res)\n> @@ -780,12 +783,11 @@ static void __init early_cmdline_parse(void)\n> \tprom_cmd_line[0] = 0;\n> \tp = prom_cmd_line;\n> \n> -\tif (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && (long)prom.chosen > 0)\n> +\tif ((long)prom.chosen > 0)\n> \t\tl = prom_getprop(prom.chosen, \"bootargs\", p, COMMAND_LINE_SIZE-1);\n> \n> -\tif (IS_ENABLED(CONFIG_CMDLINE_EXTEND) || l <= 0 || p[0] == '\\0')\n> -\t\tprom_strlcat(prom_cmd_line, \" \" CONFIG_CMDLINE,\n> -\t\t\t sizeof(prom_cmd_line));\n> +\tcmdline_add_builtin_custom(prom_cmd_line, (l > 0 ? p : NULL), sizeof(prom_cmd_line),\n> +\t\t\t\t\t__prombss, prom_strlcpy, prom_strlcat);\n> \n> \tprom_printf(\"command line: %s\\n\", prom_cmd_line);\n> \n>","headers":{"Return-Path":"\n ","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org;\n receiver=)","lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=csgroup.eu (client-ip=93.17.236.30; helo=pegase1.c-s.fr;\n envelope-from=christophe.leroy@csgroup.eu; receiver=)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4FBnHS28Bqz9sW0\n\tfor ; Sat, 3 Apr 2021 04:34:44 +1100 (AEDT)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FBnHS1DVsz3c8t\n\tfor ; Sat, 3 Apr 2021 04:34:44 +1100 (AEDT)","from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4FBnH74GRqz3bpF\n for ; Sat, 3 Apr 2021 04:34:26 +1100 (AEDT)","from localhost (mailhub1-int [192.168.12.234])\n by localhost (Postfix) with ESMTP id 4FBnH16mjxz9v3qS;\n Fri, 2 Apr 2021 19:34:21 +0200 (CEST)","from pegase1.c-s.fr ([192.168.12.234])\n by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024)\n with ESMTP id YaSiQ0OBnDTQ; Fri, 2 Apr 2021 19:34:21 +0200 (CEST)","from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192])\n by pegase1.c-s.fr (Postfix) with ESMTP id 4FBnH15YNmz9v3qR;\n Fri, 2 Apr 2021 19:34:21 +0200 (CEST)","from localhost (localhost [127.0.0.1])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id D26368BB77;\n Fri, 2 Apr 2021 19:34:23 +0200 (CEST)","from messagerie.si.c-s.fr ([127.0.0.1])\n by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023)\n with ESMTP id 7Ql2iT7YHy-y; Fri, 2 Apr 2021 19:34:23 +0200 (CEST)","from [192.168.4.90] (unknown [192.168.4.90])\n by messagerie.si.c-s.fr (Postfix) with ESMTP id AF2C68BB6F;\n Fri, 2 Apr 2021 19:34:22 +0200 (CEST)"],"X-Virus-Scanned":["Debian amavisd-new at c-s.fr","amavisd-new at c-s.fr"],"Subject":"Re: [PATCH 4/8] CMDLINE: powerpc: convert to generic builtin command\n line","To":"Daniel Walker , Will Deacon ,\n ob Herring ,\n Daniel Gimpelevich ,\n Andrew Morton , x86@kernel.org,\n linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,\n Michael Ellerman ,\n Benjamin Herrenschmidt ,\n Paul Mackerras ","References":"\n <41021d66db2ab427c14255d2a24bb4517c8b58fd.1617126961.git.danielwa@cisco.com>\n ","From":"Christophe Leroy ","Message-ID":"<366fd8d3-09c9-8cae-3f10-046c4a643792@csgroup.eu>","Date":"Fri, 2 Apr 2021 19:34:19 +0200","User-Agent":"Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:78.0) Gecko/20100101\n Thunderbird/78.9.0","MIME-Version":"1.0","In-Reply-To":"\n ","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Language":"fr","Content-Transfer-Encoding":"8bit","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"Ruslan Ruslichenko ,\n Ruslan Bilovol , linux-kernel@vger.kernel.org,\n xe-linux-external@cisco.com","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n "}},{"id":2661836,"web_url":"http://patchwork.ozlabs.org/comment/2661836/","msgid":"<20210406163849.GT2469518@zorba>","date":"2021-04-06T16:38:49","subject":"Re: [PATCH 4/8] CMDLINE: powerpc: convert to generic builtin command\n line","submitter":{"id":67374,"url":"http://patchwork.ozlabs.org/api/people/67374/","name":"Daniel Walker (danielwa)","email":"danielwa@cisco.com"},"content":"On Fri, Apr 02, 2021 at 07:34:19PM +0200, Christophe Leroy wrote:\n> \n> \n> Le 30/03/2021 à 19:56, Daniel Walker a écrit :\n> > This updates the powerpc code to use the CONFIG_GENERIC_CMDLINE\n> > option.\n> > \n> > This includes a scripted mass convert of the config files to use\n> > the new generic cmdline. There is a bit of a trim effect here.\n> > It would seems that some of the config haven't been trimmed in\n> > a while.\n> \n> Sorry, this patch is not acceptable as is, the default for powerpc is\n> CMDLINE_FROM_BOOTLOADER, ie builtin-cmdline is taken if and only if none is\n> provided by the bootloader.\n> \n> As far as I understand, that disappear with this patch.\n\nWe've talked about it previously. Maybe your not understanding the precedent of\nthe command line options. I tried to explain that one before.\n\nWhat problems do you think are caused if this patch is applied ?\n\nDaniel","headers":{"Return-Path":"\n ","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org;\n receiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=exBRtp50;\n\tdkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=exBRtp50;\n\tdkim-atps=neutral","lists.ozlabs.org; spf=pass (sender SPF authorized)\n smtp.mailfrom=cisco.com (client-ip=173.37.142.95;\n helo=alln-iport-8.cisco.com;\n envelope-from=danielwa@cisco.com; receiver=)","lists.ozlabs.org; dkim=pass (1024-bit key;\n unprotected) header.d=cisco.com header.i=@cisco.com header.a=rsa-sha256\n header.s=iport header.b=exBRtp50; dkim-atps=neutral"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4FFCsc1pb0z9sRf\n\tfor ; Wed, 7 Apr 2021 02:39:16 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4FFCsc12mGz30C6\n\tfor ; Wed, 7 Apr 2021 02:39:16 +1000 (AEST)","from alln-iport-8.cisco.com (alln-iport-8.cisco.com [173.37.142.95])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n bits)) (No client certificate requested)\n by lists.ozlabs.org (Postfix) with ESMTPS id 4FFCsD5gqJz2xfv\n for ; Wed, 7 Apr 2021 02:38:56 +1000 (AEST)","from alln-core-7.cisco.com ([173.36.13.140])\n by alln-iport-8.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA;\n 06 Apr 2021 16:38:52 +0000","from zorba ([10.24.14.212])\n by alln-core-7.cisco.com (8.15.2/8.15.2) with ESMTPS id 136GcoPb001265\n (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);\n Tue, 6 Apr 2021 16:38:51 GMT"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n d=cisco.com; i=@cisco.com; l=907; q=dns/txt; s=iport;\n t=1617727137; x=1618936737;\n h=date:from:to:cc:subject:message-id:references:\n mime-version:content-transfer-encoding:in-reply-to;\n bh=Smn0mCx9dbvDRLHtP0dTWqRsaDRXRIB0PRh2q1rD0Lk=;\n b=exBRtp509uZkQhblLqccKzPJTwGNJEYefN+cqIYUIqWbUcqiZpHn1Nt4\n wrnfY+jgdwdgRjTQ0vFejYp+k5GKcyiU8plRBpJUL4Bfk89aFesp64HSv\n 0/YRGeTyRS8P3LDjnk3SEwcpD8NEnryfPyjW45zr7Zh4VlZ4xWsH/qFBv o=;","X-IronPort-AV":"E=Sophos;i=\"5.82,310,1613433600\"; d=\"scan'208\";a=\"690319628\"","Date":"Tue, 6 Apr 2021 09:38:49 -0700","From":"Daniel Walker ","To":"Christophe Leroy ","Subject":"Re: [PATCH 4/8] CMDLINE: powerpc: convert to generic builtin command\n line","Message-ID":"<20210406163849.GT2469518@zorba>","References":"\n <41021d66db2ab427c14255d2a24bb4517c8b58fd.1617126961.git.danielwa@cisco.com>\n \n <366fd8d3-09c9-8cae-3f10-046c4a643792@csgroup.eu>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<366fd8d3-09c9-8cae-3f10-046c4a643792@csgroup.eu>","X-Auto-Response-Suppress":"DR, OOF, AutoReply","X-Outbound-SMTP-Client":"10.24.14.212, [10.24.14.212]","X-Outbound-Node":"alln-core-7.cisco.com","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"ob Herring , Ruslan Ruslichenko ,\n Ruslan Bilovol ,\n Daniel Gimpelevich ,\n xe-linux-external@cisco.com, linuxppc-dev@lists.ozlabs.org, x86@kernel.org,\n linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,\n Paul Mackerras , Andrew Morton ,\n Will Deacon ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n "}}]