Versatile Express config update for 3.13
Subsystems (3)
cover Versatile Express config update for 3.13
Greetings,
This micro-series updates the Versatile Express defconfig in two stages:
1. Makes the defconfig-ed kernels actually work on real boards and QEMU.
2. Enables all platform-specific drivers and features.
The first patch definitely should go in, as it is a de-facto bug fix. The second has been suggested to increase build coverage.
I've tried to keep the changes to minimum. The patches can be also pulled as described below.
Cheers!
Pawel
The following changes since commit 61e6cfa80de5760bbe406f4e815b7739205754d2:
Linux 3.12-rc5 (2013-10-13 15:41:28 -0700)
are available in the git repository at:
git://git.linaro.org/people/pawelmoll/linux.git tags/vexpress/defconfig-for-v3.13
for you to fetch changes up to 04650cf989f418b7c28f94d63c0c174d34e0a9ad:
ARM: vexpress: Enable platform-specific options in defconfig (2013-10-16 14:23:25 +0100)
----------------------------------------------------------------
Fathi Boudra (1):
ARM: vexpress: Make defconfig work again
Pawel Moll (1):
ARM: vexpress: Enable platform-specific options in defconfig
arch/arm/configs/vexpress_defconfig | 72 +++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 26 deletions(-)
Signature · 1 line
1.8.1.2
PATCH 1/2 ARM: vexpress: Make defconfig work again
From: Fathi Boudra <[email protected]>
This patch updates the Versatile Express defconfig to a level which makes it possible to run a defconfig-ed kernel work on the board and in QEMU with modern userspace. It does:
- update cmdline to contain "console=ttyAMA0" only
- enable devtmpfs filesystem
- enable voltage regulator support
- enable ext4 filesystem
- disable low level debug and early printk
--- arch/arm/configs/vexpress_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm/configs/vexpress_defconfig +4 -3
@@ -30,7 +30,7 @@ CONFIG_HOTPLUG_CPU=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" +CONFIG_CMDLINE="console=ttyAMA0" CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -45,6 +45,7 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y CONFIG_MTD=y CONFIG_MTD_CONCAT=y CONFIG_MTD_PARTITIONS=y
@@ -75,6 +76,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set +CONFIG_REGULATOR=y CONFIG_FB=y CONFIG_FB_ARMCLCD=y CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -115,6 +117,7 @@ CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set # CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y
@@ -134,7 +137,5 @@ CONFIG_DEBUG_INFO=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set CONFIG_DEBUG_USER=y CONFIG_DEBUG_ERRORS=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set
Signature · 1 line
1.8.1.2
PATCH 1/2 ARM: vexpress: Make defconfig work again
Hi Pawel, Fathi,
Quoted 6 lines · Pawel Moll
From: Fathi Boudra <[email protected]>
This patch updates the Versatile Express defconfig to a level which makes it possible to run a defconfig-ed kernel work on the board and in QEMU with modern userspace. It does:
Quoted 8 lines
- update cmdline to contain "console=ttyAMA0" only
- enable devtmpfs filesystem
- enable voltage regulator support
- enable ext4 filesystem
- disable low level debug and early printkSigned-off-by Fathi Boudra <[email protected]>[PM: removed DEBUG_LL - it doesn't work on qemu]
Does DEBUG_LL/EARLY_PRINTK break boot on QEMU? If not, why not leave it in for folks using other emulators, hardware, and maybe future versions of QEMU?
Thanks,
Christopher
Signature · 3 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation.
PATCH 1/2 ARM: vexpress: Make defconfig work again
Quoted 7 lines · Christopher Covington
Quoted 4 lines
- disable low level debug and early printk
Signed-off-by Fathi Boudra <[email protected]>[PM: removed DEBUG_LL - it doesn't work on qemu]Does DEBUG_LL/EARLY_PRINTK break boot on QEMU? If not, why not leave it in for folks using other emulators, hardware, and maybe future versions of QEMU?
Yep, unfortunately it does break qemu boot. And generally DEBUG_LL is considered to be a development-only option and in it was pointed out in many discussion that people using it must exactly know what are they doing. Definitely not a candidate for a defconfig.
As to the details of the problem, the memory map detection heuristics has been crafted do match the V2P-CA9 board processor revision, and qemu returns a different one. Just a nuisance, but very hard to debug if things go wrong. And before you ask, I'd rather remove the detection code completely than change it yet another time, which will have the same result - no DEBUG_LL enabled in defconfig because one will have to explicitly select one of two options. Pick the wrong one and you're back in the same place - nothing work and you don't know where.
Thanks for looking at the patch!
Pawel
PATCH 2/2 ARM: vexpress: Enable platform-specific options in defconfig
In reply to Pawel MollThis patch enables all drivers and alike to make defconfig-ed kernels use Versatile Express specific features, like power management services (PSCI, MCPM and cpuidle with drivers for DCCSB on Fast Models and SPC on TC2), CMA for frame buffer allocation, all virtio device drivers (for QEMU, KVM tools and Fast Models), MTD physmap drivers with squashfs and UBIFS for flash, I2C master, regulator and hwmon drivers and LEDs support with most useful triggers. The maximum amount of CPUs has been increased to 8 to facilitate big.Little systems.
--- arch/arm/configs/vexpress_defconfig | 65 ++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 23 deletions(-)
arch/arm/configs/vexpress_defconfig +42 -23
@@ -1,4 +1,3 @@ -CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_IKCONFIG=y
@@ -8,11 +7,9 @@ CONFIG_CGROUPS=y CONFIG_CPUSETS=y # CONFIG_UTS_NS is not set # CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set # CONFIG_PID_NS is not set # CONFIG_NET_NS is not set CONFIG_BLK_DEV_INITRD=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_PROFILING=y CONFIG_OPROFILE=y CONFIG_MODULES=y
@@ -23,14 +20,22 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_VEXPRESS_CA9X4=y +CONFIG_ARCH_VEXPRESS_DCSCB=y +CONFIG_ARCH_VEXPRESS_TC2_PM=y # CONFIG_SWP_EMULATE is not set CONFIG_SMP=y +CONFIG_HAVE_ARM_ARCH_TIMER=y +CONFIG_MCPM=y CONFIG_VMSPLIT_2G=y -CONFIG_HOTPLUG_CPU=y +CONFIG_NR_CPUS=8 +CONFIG_ARM_PSCI=y CONFIG_AEABI=y +CONFIG_CMA=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyAMA0" +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_BIG_LITTLE=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -44,39 +49,46 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_ARM_INTEGRATOR=y -CONFIG_MISC_DEVICES=y +CONFIG_MTD_RAM=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_UBI=y +CONFIG_PROC_DEVICETREE=y +CONFIG_VIRTIO_BLK=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y -# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_SCSI_VIRTIO=y CONFIG_ATA=y # CONFIG_SATA_PMP is not set CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y +CONFIG_VIRTIO_NET=y +CONFIG_SMC91X=y CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set # CONFIG_WLAN is not set CONFIG_INPUT_EVDEV=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_AMBAKMI=y +CONFIG_LEGACY_PTY_COUNT=16 CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=16 -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_I2C=y +CONFIG_I2C_VERSATILE=y +CONFIG_SENSORS_VEXPRESS=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_VEXPRESS=y CONFIG_FB=y CONFIG_FB_ARMCLCD=y CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -105,14 +117,22 @@ CONFIG_HID_THRUSTMASTER=y CONFIG_HID_ZEROPLUS=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -# CONFIG_USB_DEVICE_CLASS is not set CONFIG_USB_MON=y CONFIG_USB_ISP1760_HCD=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_ARMMMCI=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_CPU=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PL031=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -121,21 +141,20 @@ CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y CONFIG_CRAMFS=y +CONFIG_SQUASHFS=y +CONFIG_SQUASHFS_LZO=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_ROOT_NFS=y -# CONFIG_RPCSEC_GSS_KRB5 is not set CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y -CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y +CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set -CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set
Signature · 1 line
1.8.1.2
PATCH 2/2 ARM: vexpress: Enable platform-specific options in defconfig
Hi Pawel,
Quoted 17 lines · Pawel Moll
This patch enables all drivers and alike to make defconfig-ed kernels use Versatile Express specific features, like power management services (PSCI, MCPM and cpuidle with drivers for DCCSB on Fast Models and SPC on TC2), CMA for frame buffer allocation, all virtio device drivers (for QEMU, KVM tools and Fast Models), MTD physmap drivers with squashfs and UBIFS for flash, I2C master, regulator and hwmon drivers and LEDs support with most useful triggers. The maximum amount of CPUs has been increased to 8 to facilitate big.Little systems.
Signed-off-by Pawel Moll <[email protected]>--- arch/arm/configs/vexpress_defconfig | 65 ++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 23 deletions(-)arch/arm/configs/vexpress_defconfig +0
-0
[...]
arch/arm/configs/vexpress_defconfig CONFIG_EXT4_FS=y · line 149
Quoted 11 lines
arch/arm/configs/vexpress_defconfig +3
-1@@ -121,21 +141,20 @@ CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y CONFIG_CRAMFS=y +CONFIG_SQUASHFS=y +CONFIG_SQUASHFS_LZO=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_ROOT_NFS=y
Isn't CONFIG_9P_FS=y needed for VirtIO passthrough filesystem support?
[...]
Thanks,
Christopher
Signature · 3 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation.
PATCH 2/2 ARM: vexpress: Enable platform-specific options in defconfig
Quoted 5 lines · Christopher Covington
Quoted 5 lines
arch/arm/configs/vexpress_defconfig +1
-0@@ -121,21 +141,20 @@ CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y
Quoted 8 lines
arch/arm/configs/vexpress_defconfig CONFIG_EXT4_FS=y · line 149
Quoted 6 lines
arch/arm/configs/vexpress_defconfig +2
-1CONFIG_CRAMFS=y +CONFIG_SQUASHFS=y +CONFIG_SQUASHFS_LZO=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_ROOT_NFS=yIsn't
CONFIG_9P_FS=yneeded for VirtIO passthrough filesystem support?
Yes, I think you're right. I've expected 9P_VFS and NET_9P select or depend on each other.
Thanks for pointing this out!
Pawe?
PATCH 2/2 ARM: vexpress: Enable platform-specific options in defconfig
In reply to Pawel MollHi Pawel,
Quoted 20 lines · Pawel Moll
This patch enables all drivers and alike to make defconfig-ed kernels use Versatile Express specific features, like power management services (PSCI, MCPM and cpuidle with drivers for DCCSB on Fast Models and SPC on TC2), CMA for frame buffer allocation, all virtio device drivers (for QEMU, KVM tools and Fast Models), MTD physmap drivers with squashfs and UBIFS for flash, I2C master, regulator and hwmon drivers and LEDs support with most useful triggers. The maximum amount of CPUs has been increased to 8 to facilitate big.Little systems.
Signed-off-by Pawel Moll <[email protected]>--- arch/arm/configs/vexpress_defconfig | 65 ++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 23 deletions(-)arch/arm/configs/vexpress_defconfig +0
-0
[snip]
Quoted 14 lines
arch/arm/configs/vexpress_defconfig +2
-3@@ -44,39 +49,46 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_MTD=y -CONFIG_MTD_CONCAT=y -CONFIG_MTD_PARTITIONS=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y
arch/arm/configs/vexpress_defconfig CONFIG_IP_PNP_BOOTP=y · line 66
Quoted 10 lines
arch/arm/configs/vexpress_defconfig +3
-2CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_ARM_INTEGRATOR=y -CONFIG_MISC_DEVICES=y +CONFIG_MTD_RAM=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y
This could cause issues with CPUIdle on TC2. Since TC2 reset vector is in NOR flash, NOR flash has to be in Read mode when CPU resets and enter reset vector. But what I have seen is that NOR flash is left in Read Identifier Mode after the driver is initialised. So we need to make sure NOR device is in Read mode whenever CPU enters deeper C-states and also may have to register notifiers which seems overkill IMO. Most of the platform have separate(or secure) flash for this reason.
Is it possible to disable flash on TC2 only in it's DT something like
flash at 0,00000000 {
status = "disabled";
}; Regards,
Sudeep
PATCH 2/2 ARM: vexpress: Enable platform-specific options in defconfig
Quoted 10 lines · Sudeep KarkadaNagesha
arch/arm/configs/vexpress_defconfig CONFIG_IP_PNP_BOOTP=y · line 64
Quoted 2 lines
arch/arm/configs/vexpress_defconfig +2
-0+CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=yThis could cause issues with CPUIdle on TC2. Since TC2 reset vector is in NOR flash, NOR flash has to be in Read mode when CPU resets and enter reset vector. But what I have seen is that NOR flash is left in Read Identifier Mode after the driver is initialised. So we need to make sure NOR device is in Read mode whenever CPU enters deeper C-states and also may have to register notifiers which seems overkill IMO. Most of the platform have separate(or secure) flash for this reason.
Oh boy, yes, I remember this now.
Quoted 4 lines
Is it possible to disable flash on TC2 only in it's DT something like
flash at 0,00000000 { status = "disabled"; };
But flash is innocent, really... I may just remove CPU_IDLE for the time being.
Pawe?
PATCH 2/2 ARM: vexpress: Enable platform-specific options in defconfig
Hi Pawel,
Quoted 14 lines · Pawel Moll
Quoted 10 lines · Sudeep KarkadaNagesha
Review
Quoted 2 lines
(quoted diff) +2
-0+CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=yThis could cause issues with CPUIdle on TC2. Since TC2 reset vector is in NOR flash, NOR flash has to be in Read mode when CPU resets and enter reset vector. But what I have seen is that NOR flash is left in Read Identifier Mode after the driver is initialised. So we need to make sure NOR device is in Read mode whenever CPU enters deeper C-states and also may have to register notifiers which seems overkill IMO. Most of the platform have separate(or secure) flash for this reason.
Oh boy, yes, I remember this now.
Quoted 8 lines
Quoted 4 lines
Is it possible to disable flash on TC2 only in it's DT something like
flash at 0,00000000 { status = "disabled"; };But flash is innocent, really... I may just remove
CPU_IDLEfor the time being.
I tried disabling flash device only on TC2 in DT which seem to work for me.
Regards,
Sudeep
-->8
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +9 -0
@@ -418,3 +418,12 @@ /include/ "vexpress-v2m-rs1.dtsi" }; }; +/ { + smb { + motherboard { + flash at 0,00000000 { + status = "disabled"; + }; + }; + }; +};
cover Versatile Express config update for 3.13
In reply to Pawel MollQuoted 18 lines · Pawel Moll
Greetings,
This micro-series updates the Versatile Express defconfig in two stages:
1. Makes the defconfig-ed kernels actually work on real boards and QEMU.
2. Enables all platform-specific drivers and features.The first patch definitely should go in, as it is a de-facto bug fix. The second has been suggested to increase build coverage.
I've tried to keep the changes to minimum. The patches can be also pulled as described below.
Cheers!
Pawel
Quoted 7 lines
The following changes since commit
61e6cfa80de5760bbe406f4e815b7739205754d2:Linux 3.12-rc5 (2013-10-13 15:41:28 -0700)
are available in the git repository at:
git://git.linaro.org/people/pawelmoll/linux.gittags/vexpress/defconfig-for-v3.13
Based on the comments on at least the first patch I'm guessing you'll want to respin, so I'll wait for a new pull request.
-Olof