linaro-kernel

linaro-kernel@lists.linaro.org

10094 discussions

[PATCH 1/2] serial: s3c: Fix build of header without serial_core.h preinclusion

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> serial_s3c.h uses upf_t which is defined in serial_core.h but does not include that itself meaning that users which include serial_s3c.h by itself don't build. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- This is needed together with patch 2 to fix build failures in -next, I didn't have the time/enthusiasm to isolate the issue. include/linux/serial_s3c.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h index 907d9d1d56cf..44e4a6b92ddb 100644 --- a/include/linux/serial_s3c.h +++ b/include/linux/serial_s3c.h @@ -29,6 +29,8 @@ #ifndef __ASM_ARM_REGS_SERIAL_H #define __ASM_ARM_REGS_SERIAL_H +#include <linux/serial_core.h> + #define S3C2410_URXH (0x24) #define S3C2410_UTXH (0x20) #define S3C2410_ULCON (0x00) -- 1.9.0

11 years, 2 months

State of OMAP4 in the linaro kernel

by Ramakrishnan Muthukrishnan (ramakrmu)

Hello, We have been using the linaro's OMAP4 kernels (tilt-3.4 tree). When I checked a few months ago for updates to tilt trees, I see that not much of development is happening here. Can someone point to a tree I can use with OMAP4? I tried rebasing tilt-3.4 with linux-linaro-tracking but there were *lots* of conflicts. Any help/advice/pointers will be appreciated. Thanks Ramakrishnan

11 years, 2 months

[RFC V2] cpufreq: make sure frequency transitions are serialized

by Viresh Kumar

Whenever we are changing frequency of a cpu, we are calling PRECHANGE and POSTCHANGE notifiers. They must be serialized. i.e. PRECHANGE or POSTCHANGE shouldn't be called twice continuously. Following examples show why this is important: Scenario 1: ----------- One thread reading value of cpuinfo_cur_freq, which will call __cpufreq_cpu_get()->cpufreq_out_of_sync()->cpufreq_notify_transition().. And ondemand governor trying to change freq of cpu at the same time and so sending notification via ->target().. Notifiers are not serialized and suppose this is what happened - PRECHANGE Notification for freq A (from cpuinfo_cur_freq) - PRECHANGE Notification for freq B (from target()) - Freq changed by target() to B - POSTCHANGE Notification for freq B - POSTCHANGE Notification for freq A Now the last POSTCHANGE Notification happened for freq A and hardware is currently running at freq B :) Where would we break then?: adjust_jiffies() in cpufreq.c and cpufreq_callback() in arch/arm/kernel/smp.c (which is also adjusting jiffies).. All loops_per_jiffy based stuff is broken.. Scenario 2: ----------- Governor is changing freq and has called __cpufreq_driver_target(). At the same time we are changing scaling_{min|max}_freq from sysfs, which would eventually end up calling governor's: CPUFREQ_GOV_LIMITS notification, that will also call: __cpufreq_driver_target().. And hence concurrent calls to ->target() And Platform have something like this in their ->target() (Like: cpufreq-cpu0, omap, exynos, etc) A. If new freq is more than old: Increase voltage B. Change freq C. If new freq is less than old: decrease voltage Now, two concurrent calls to target are X and Y, where X is trying to increase freq and Y is trying to decrease it.. And this is the sequence that followed due to races.. X.A: voltage increased for larger freq Y.A: nothing happened here Y.B: freq decreased Y.C: voltage decreased X.B: freq increased X.C: nothing happened.. We ended up setting a freq which is not supported by the voltage we have set.. That will probably make clock to CPU unstable and system might not be workable anymore... This patch adds protection in cpufreq_notify_transition() to make transitions serialized. It runs WARN() if POSTCHANGE notification is sent when we are not in middle of a transition. And PRECHANGE notification is forced to wait while the current transition is in progress. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- This was discussed earlier here: https://lkml.org/lkml/2013/9/25/402 Where Rafael asked for better fix, as he called the V1 fixes: "quick and dirty". This is another approach, much simpler than previous one. Please see if this looks fine. There is a TODO note in there as I wanted some suggestions on how exactly should we wait for a transition to get over. drivers/cpufreq/cpufreq.c | 39 +++++++++++++++++++++++++++++++++++++-- include/linux/cpufreq.h | 2 ++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 2677ff1..66bdfff 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -324,6 +324,13 @@ static void __cpufreq_notify_transition(struct cpufreq_policy *policy, } } +static void notify_transition_for_each_cpu(struct cpufreq_policy *policy, + struct cpufreq_freqs *freqs, unsigned int state) +{ + for_each_cpu(freqs->cpu, policy->cpus) + __cpufreq_notify_transition(policy, freqs, state); +} + /** * cpufreq_notify_transition - call notifier chain and adjust_jiffies * on frequency transition. @@ -335,8 +342,35 @@ static void __cpufreq_notify_transition(struct cpufreq_policy *policy, void cpufreq_notify_transition(struct cpufreq_policy *policy, struct cpufreq_freqs *freqs, unsigned int state) { - for_each_cpu(freqs->cpu, policy->cpus) - __cpufreq_notify_transition(policy, freqs, state); + if ((state != CPUFREQ_PRECHANGE) && (state != CPUFREQ_POSTCHANGE)) + return notify_transition_for_each_cpu(policy, freqs, state); + + /* Serialize pre-post notifications */ + mutex_lock(&policy->transition_lock); + if (unlikely(WARN_ON(!policy->transition_ongoing && + (state == CPUFREQ_POSTCHANGE)))) { + mutex_unlock(&policy->transition_lock); + return; + } + + if (state == CPUFREQ_PRECHANGE) { + while (policy->transition_ongoing) { + mutex_unlock(&policy->transition_lock); + /* TODO: Can we do something better here? */ + cpu_relax(); + mutex_lock(&policy->transition_lock); + } + + policy->transition_ongoing = true; + mutex_unlock(&policy->transition_lock); + } + + notify_transition_for_each_cpu(policy, freqs, state); + + if (state == CPUFREQ_POSTCHANGE) { + policy->transition_ongoing = false; + mutex_unlock(&policy->transition_lock); + } } EXPORT_SYMBOL_GPL(cpufreq_notify_transition); @@ -983,6 +1017,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(void) INIT_LIST_HEAD(&policy->policy_list); init_rwsem(&policy->rwsem); + mutex_init(&policy->transition_lock); return policy; diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 31c431e..e5cebce 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -104,6 +104,8 @@ struct cpufreq_policy { * __cpufreq_governor(data, CPUFREQ_GOV_POLICY_EXIT); */ struct rw_semaphore rwsem; + bool transition_ongoing; /* Tracks transition status */ + struct mutex transition_lock; }; /* Only for ACPI */ -- 1.7.12.rc2.18.g61b472e

11 years, 2 months

next boot: 37 pass, 7 fail (next-20140320)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: next Git describe: next-20140320 Failed boot tests (console logs at the end) =========================================== sun7i-a20-cubieboard2: FAIL: multi_lpae_defconfig sun7i-a20-cubieboard2: FAIL: sunxi_defconfig sun4i-a10-cubieboard: FAIL: sunxi_defconfig ste-snowball: FAIL: multi_v7_defconfig sun7i-a20-cubieboard2: FAIL: multi_v7_defconfig sun4i-a10-cubieboard: FAIL: multi_v7_defconfig bcm28155-ap: FAIL: multi_v7_defconfig Full Report =========== omap2plus_defconfig ------------------- legacy,3730xm PASS: 0 min 51.5 sec am335x-boneblack PASS: 0 min 26.0 sec omap3-beagle-xm PASS: 1 min 1.0 sec legacy,3530beagle PASS: 1 min 6.5 sec omap4-panda PASS: 1 min 4.8 sec omap3-overo-tobi PASS: 0 min 24.0 sec am335x-bone PASS: 0 min 27.9 sec omap3-overo-storm-tobi PASS: 0 min 22.4 sec omap5-uevm PASS: 1 min 4.5 sec omap4-panda-es PASS: 1 min 4.5 sec legacy,3730storm PASS: 0 min 23.6 sec legacy,3530overo PASS: 0 min 21.9 sec multi_lpae_defconfig -------------------- omap5-uevm PASS: 1 min 37.5 sec sun7i-a20-cubieboard2 FAIL: 0 min 23.1 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 18.9 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 20.6 sec imx6dl-wandboard,wand-solo PASS: 0 min 20.9 sec imx6q-wandboard PASS: 0 min 20.2 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 FAIL: 0 min 18.2 sec sun4i-a10-cubieboard FAIL: 0 min 22.1 sec bcm_defconfig ------------- bcm28155-ap PASS: 1 min 5.1 sec exynos_defconfig ---------------- exynos5250-arndale PASS: 0 min 29.8 sec multi_v7_defconfig ------------------ qcom-apq8074-dragonboard PASS: 1 min 9.4 sec ste-snowball FAIL: 0 min 33.6 sec tegra30-beaver PASS: 0 min 21.6 sec am335x-boneblack PASS: 0 min 24.0 sec omap3-beagle-xm PASS: 0 min 51.5 sec sun7i-a20-cubieboard2 FAIL: 0 min 31.4 sec armada-370-mirabox PASS: 0 min 22.2 sec omap4-panda PASS: 0 min 56.1 sec armada-xp-openblocks-ax3-4 PASS: 0 min 25.3 sec sun4i-a10-cubieboard FAIL: 0 min 20.0 sec bcm28155-ap FAIL: 16 min 17.8 sec omap3-overo-tobi PASS: 0 min 22.3 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.4 sec am335x-bone PASS: 0 min 26.9 sec omap3-overo-storm-tobi PASS: 0 min 21.3 sec omap5-uevm PASS: 1 min 42.6 sec imx6q-wandboard PASS: 0 min 17.6 sec omap4-panda-es PASS: 0 min 51.4 sec imx6dl-wandboard,wand-dual PASS: 0 min 18.5 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 33.8 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.2 sec davinci_all_defconfig --------------------- legacy,dm365evm PASS: 0 min 17.7 sec Console logs for failures ========================= multi_lpae_defconfig -------------------- sun7i-a20-cubieboard2: FAIL: last 80 lines of boot log: ------------------------------------------------------- sun7i# setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 sun7i# setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' sun7i# setenv initrd_high 0xffffffff setenv initrd_high 0xffffffff sun7i# if test -n ${initenv}; then run initenv; fi if test -n ${initenv}; then run initenv; fi sun7i# if test -n ${preboot}; then run preboot; fi if test -n ${preboot}; then run preboot; fi sun7i# setenv autoload no; setenv autoboot no setenv autoload no; setenv autoboot no sun7i# dhcp dhcp ENET Speed is 100 Mbps - FULL duplex connection BOOTP broadcast 1 BOOTP broadcast 2 DHCP client bound to address 192.168.1.153 sun7i# setenv serverip 192.168.1.2 setenv serverip 192.168.1.2 sun7i# if test -n ${netargs}; then run netargs; fi if test -n ${netargs}; then run netargs; fi sun7i# tftp 0x40008000 192.168.1.2:tmp/cubie2-8tL_r8/zImage tftp 0x40008000 192.168.1.2:tmp/cubie2-8tL_r8/zImage Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.153 Filename 'tmp/cubie2-8tL_r8/zImage'. Load address: 0x40008000 Loading: *################################################################# ################################################################# ################################################################# ################################################################# ###################################################### 2.7 MiB/s done Bytes transferred = 4609160 (465488 hex) sun7i#tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.153 Filename 'buildroot.cpio.gz.uboot'. Load address: 0x42000000 Loading: *############################################ 2.7 MiB/s done Bytes transferred = 642602 (9ce2a hex) sun7i# tftp 0x41000000 192.168.1.2:tmp/cubie2-8tL_r8/sun7i-a20-cubieboard2.dtb tftp 0x41000000 192.168.1.2:tmp/cubie2-8tL_r8/sun7i-a20-cubieboard2.dtb Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.153 Filename 'tmp/cubie2-8tL_r8/sun7i-a20-cubieboard2.dtb'. Load address: 0x41000000 Loading: *## 2.2 MiB/s done Bytes transferred = 18209 (4721 hex) sun7i# printenv bootargs printenv bootargs bootargs=console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 ip=192.168.1.153:192.168.1.2:192.168.1.254:255.255.255.0::::192.168.1.254:none sun7i# bootz 0x40008000 0x42000000 0x41000000 bootz 0x40008000 0x42000000 0x41000000 Kernel image @ 0x40008000 [ 0x000000 - 0x465488 ] ## Loading init Ramdisk from Legacy Image at 42000000 ... Image Name: Created: 2014-02-07 19:37:29 UTC Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 642538 Bytes = 627.5 KiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 41000000 Booting using the fdt blob at 0x41000000 Loading Device Tree to 40ff8000, end 40fff720 ... OK Starting kernel ... ~$off # PYBOOT: Exception: kernel: ERROR: did not start booting. # PYBOOT: Time: 23.10 seconds. # PYBOOT: Result: FAIL sunxi_defconfig --------------- sun7i-a20-cubieboard2: FAIL: last 80 lines of boot log: ------------------------------------------------------- arm-linux-gnueabi-gcc (Ubuntu/Linaro 4.7.2-1ubuntu1) 4.7.2 GNU ld (GNU Binutils for Ubuntu) 2.22.90.20120919 sun7i# setenv ethaddr 22:71:81:DA:53:EA setenv ethaddr 22:71:81:DA:53:EA sun7i# setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 sun7i# setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' sun7i# setenv initrd_high 0xffffffff setenv initrd_high 0xffffffff sun7i# if test -n ${initenv}; then run initenv; fi if test -n ${initenv}; then run initenv; fi sun7i# if test -n ${preboot}; then run preboot; fi if test -n ${preboot}; then run preboot; fi sun7i# setenv autoload no; setenv autoboot no setenv autoload no; setenv autoboot no sun7i# dhcp dhcp ENET Speed is 100 Mbps - FULL duplex connection BOOTP broadcast 1 DHCP client bound to address 192.168.1.153 sun7i# setenv serverip 192.168.1.2 setenv serverip 192.168.1.2 sun7i# if test -n ${netargs}; then run netargs; fi if test -n ${netargs}; then run netargs; fi sun7i# tftp 0x40008000 192.168.1.2:tmp/cubie2-vsD4Ae/zImage tftp 0x40008000 192.168.1.2:tmp/cubie2-vsD4Ae/zImage Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.153 Filename 'tmp/cubie2-vsD4Ae/zImage'. Load address: 0x40008000 Loading: *################################################################# ########################################################## 2.7 MiB/s done Bytes transferred = 1802016 (1b7f20 hex) sun7i# tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.153 Filename 'buildroot.cpio.gz.uboot'. Load address: 0x42000000 Loading: *############################################ 2.7 MiB/s done Bytes transferred = 642602 (9ce2a hex) sun7i# tftp 0x41000000 192.168.1.2:tmp/cubie2-vsD4Ae/sun7i-a20-cubieboard2.dtb tftp 0x41000000 192.168.1.2:tmp/cubie2-vsD4Ae/sun7i-a20-cubieboard2.dtb Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.153 Filename 'tmp/cubie2-vsD4Ae/sun7i-a20-cubieboard2.dtb'. Load address: 0x41000000 Loading: *## 2.2 MiB/s done Bytes transferred = 18209 (4721 hex) sun7i#printenv bootargs printenv bootargs bootargs=console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 ip=192.168.1.153:192.168.1.2:192.168.1.254:255.255.255.0::::192.168.1.254:none sun7i# bootz 0x40008000 0x42000000 0x41000000 bootz 0x40008000 0x42000000 0x41000000 Kernel image @ 0x40008000 [ 0x000000 - 0x1b7f20 ] ## Loading init Ramdisk from Legacy Image at 42000000 ... Image Name: Created: 2014-02-07 19:37:29 UTC Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 642538 Bytes = 627.5 KiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 41000000 Booting using the fdt blob at 0x41000000 Loading Device Tree to 40ff8000, end 40fff720 ... OK Starting kernel ... ~$off # PYBOOT: Exception: kernel: ERROR: did not start booting. # PYBOOT: Time: 18.21 seconds. # PYBOOT: Result: FAIL sun4i-a10-cubieboard: FAIL: last 80 lines of boot log: ------------------------------------------------------ GNU ld (GNU Binutils for Ubuntu) 2.22.90.20120919 sun4i# setenv ethaddr 2e:40:70:f0:12:08 setenv ethaddr 2e:40:70:f0:12:08 sun4i#setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 sun4i# setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' sun4i# setenv initrd_high 0xffffffff setenv initrd_high 0xffffffff sun4i# if test -n ${initenv}; then run initenv; fi if test -n ${initenv}; then run initenv; fi sun4i# if test -n ${preboot}; then run preboot; fi if test -n ${preboot}; then run preboot; fi sun4i# setenv autoload no; setenv autoboot no setenv autoload no; setenv autoboot no sun4i# dhcp dhcp ENET Speed is 100 Mbps - FULL duplex connection BOOTP broadcast 1 BOOTP broadcast 2 DHCP client bound to address 192.168.1.193 sun4i# setenv serverip 192.168.1.2 setenv serverip 192.168.1.2 sun4i# if test -n ${netargs}; then run netargs; fi if test -n ${netargs}; then run netargs; fi sun4i# tftp 0x40008000 192.168.1.2:tmp/cubie-0Y4qfR/zImage tftp 0x40008000 192.168.1.2:tmp/cubie-0Y4qfR/zImage Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.193 Filename 'tmp/cubie-0Y4qfR/zImage'. Load address: 0x40008000 Loading: *################################################################# ########################################################## 2.8 MiB/s done Bytes transferred = 1802016 (1b7f20 hex) sun4i# tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.193 Filename 'buildroot.cpio.gz.uboot'. Load address: 0x42000000 Loading: *############################################ 2.7 MiB/s done Bytes transferred = 642602 (9ce2a hex) sun4i# tftp 0x41000000 192.168.1.2:tmp/cubie-0Y4qfR/sun4i-a10-cubieboard.dtb tftp 0x41000000 192.168.1.2:tmp/cubie-0Y4qfR/sun4i-a10-cubieboard.dtb Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.193 Filename 'tmp/cubie-0Y4qfR/sun4i-a10-cubieboard.dtb'. Load address: 0x41000000 Loading: *## 2.4 MiB/s done Bytes transferred = 15184 (3b50 hex) sun4i#printenv bootargs printenv bootargs bootargs=console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 ip=192.168.1.193:192.168.1.2:192.168.1.254:255.255.255.0::::192.168.1.254:none sun4i# bootz 0x40008000 0x42000000 0x41000000 bootz 0x40008000 0x42000000 0x41000000 Kernel image @ 0x40008000 [ 0x000000 - 0x1b7f20 ] ## Loading init Ramdisk from Legacy Image at 42000000 ... Image Name: Created: 2014-02-07 19:37:29 UTC Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 642538 Bytes = 627.5 KiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 41000000 Booting using the fdt blob at 0x41000000 Loading Device Tree to 40ff9000, end 40fffb4f ... OK Starting kernel ... ~$off # PYBOOT: Exception: kernel: ERROR: did not start booting. # PYBOOT: Time: 22.05 seconds. # PYBOOT: Result: FAIL multi_v7_defconfig ------------------ ste-snowball: FAIL: last 80 lines of boot log: ---------------------------------------------- CPU: ST-Ericsson db8500 v2 (Dual ARM Cortex A9) 998.400 Mhz I2C: ready DRAM: 1 GB MMC: MCDE: startup failed sec_bridge: ISSWAPI_FLUSH_BOOT_CODE: 2 EMMC: 0, MMC: 1 In: serial Out: serial Err: serial Net: smc911x-0 Hit any key to stop autoboot: 1 0 U8500 $ U8500 $ version version U-Boot 2009.11 (sept. 19 2011 - 17:03:11) U8500 $ setenv ethaddr 6e:e6:84:36:8e:9e setenv ethaddr 6e:e6:84:36:8e:9e Can't overwrite "ethaddr" U8500 $ setenv bootargs console=ttyAMA2,115200n8 debug earlyprintk rw root=/dev/mmcblk0p3 rootwait rootfstype=ext4 setenv bootargs console=ttyAMA2,115200n8 debug earlyprintk rw root=/dev/mmcblk0p3 rootwait rootfstype=ext4 U8500 $ setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' U8500 $ if test -n ${initenv}; then run initenv; fi if test -n ${initenv}; then run initenv; fi U8500 $ if test -n ${preboot}; then run preboot; fi if test -n ${preboot}; then run preboot; fi U8500 $ setenv autoload no; setenv autoboot no setenv autoload no; setenv autoboot no U8500 $ dhcp dhcp smc911x: detected LAN9221 controller smc911x: phy initialized smc911x: MAC 6e:e6:84:36:8e:9e BOOTP broadcast 1 BOOTP broadcast 2 DHCP client bound to address 192.168.1.159 U8500 $ setenv serverip 192.168.1.2 setenv serverip 192.168.1.2 U8500 $ if test -n ${netargs}; then run netargs; fi if test -n ${netargs}; then run netargs; fi U8500 $ tftp 0x00800000 192.168.1.2:tmp/snowball-nTiae6/tmp6GIczF-uImage tftp 0x00800000 192.168.1.2:tmp/snowball-nTiae6/tmp6GIczF-uImage smc911x: detected LAN9221 controller smc911x: phy initialized smc911x: MAC 6e:e6:84:36:8e:9e Using smc911x-0 device TFTP from server 192.168.1.2; our IP address is 192.168.1.159 Filename 'tmp/snowball-nTiae6/tmp6GIczF-uImage'. Load address: 0x800000 Loading: *################################################################# ################################################################# ################################################################# ################################################################# ######################################################## done Bytes transferred = 4626033 (469671 hex) U8500 $ printenv bootargs printenv bootargs bootargs=console=ttyAMA2,115200n8 debug earlyprintk rw root=/dev/mmcblk0p3 rootwait rootfstype=ext4 ip=192.168.1.159:192.168.1.2:192.168.1.254:255.255.255.0::::192.168.1.254:none U8500 $ bootm 0x00800000 bootm 0x00800000 ## Booting kernel from Legacy Image at 00800000 ... Image Name: Linux Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 4625969 Bytes = 4.4 MB Load Address: 00008000 Entry Point: 00008000 Loading Kernel Image ... OK OK Starting kernel ... ~$off # PYBOOT: Exception: kernel: ERROR: did not start booting. # PYBOOT: Time: 33.58 seconds. # PYBOOT: Result: FAIL sun7i-a20-cubieboard2: FAIL: last 80 lines of boot log: ------------------------------------------------------- Connected to cubie2 console [channel connected] (~$quit to exit) (user:khilman) is already connected ~$hardreset Command(cubie2 console)> hardreset (user:khilman) Reboot cubie2 Reboot: cubie2 ; phidget 3 0 : off, sleep, on 0 sun7i# ~$off # PYBOOT: Exception: ERROR: Could not break into autoboot. # PYBOOT: Time: 31.38 seconds. # PYBOOT: Result: FAIL sun4i-a10-cubieboard: FAIL: last 80 lines of boot log: ------------------------------------------------------ setenv ethaddr 2e:40:70:f0:12:08 sun4i# setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 setenv bootargs console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 sun4i# setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' setenv netargs 'setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}::::192.168.1.254:none' sun4i# setenv initrd_high 0xffffffff setenv initrd_high 0xffffffff sun4i# if test -n ${initenv}; then run initenv; fi if test -n ${initenv}; then run initenv; fi sun4i# if test -n ${preboot}; then run preboot; fi if test -n ${preboot}; then run preboot; fi sun4i# setenv autoload no; setenv autoboot no setenv autoload no; setenv autoboot no sun4i# dhcp dhcp ENET Speed is 100 Mbps - FULL duplex connection BOOTP broadcast 1 DHCP client bound to address 192.168.1.193 sun4i# setenv serverip 192.168.1.2 setenv serverip 192.168.1.2 sun4i# if test -n ${netargs}; then run netargs; fi if test -n ${netargs}; then run netargs; fi sun4i# tftp 0x40008000 192.168.1.2:tmp/cubie-9mvSpC/zImage tftp 0x40008000 192.168.1.2:tmp/cubie-9mvSpC/zImage Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.193 Filename 'tmp/cubie-9mvSpC/zImage'. Load address: 0x40008000 Loading: *################################################################# ################################################################# ################################################################# ################################################################# ##################################################### 2.7 MiB/s done Bytes transferred = 4584720 (45f510 hex) sun4i# tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot tftp 0x42000000 192.168.1.2:buildroot.cpio.gz.uboot Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.193 Filename 'buildroot.cpio.gz.uboot'. Load address: 0x42000000 Loading: *############################################ 2.7 MiB/s done Bytes transferred = 642602 (9ce2a hex) sun4i# tftp 0x41000000 192.168.1.2:tmp/cubie-9mvSpC/sun4i-a10-cubieboard.dtb tftp 0x41000000 192.168.1.2:tmp/cubie-9mvSpC/sun4i-a10-cubieboard.dtb Using emac device TFTP from server 192.168.1.2; our IP address is 192.168.1.193 Filename 'tmp/cubie-9mvSpC/sun4i-a10-cubieboard.dtb'. Load address: 0x41000000 Loading: *## 2.1 MiB/s done Bytes transferred = 15184 (3b50 hex) sun4i# printenv bootargs printenv bootargs bootargs=console=ttyS0,115200 debug earlyprintk rw root=/dev/mmcblk0p2 rootwait rootfstype=ext4 ip=192.168.1.193:192.168.1.2:192.168.1.254:255.255.255.0::::192.168.1.254:none sun4i# bootz 0x40008000 0x42000000 0x41000000 bootz 0x40008000 0x42000000 0x41000000 Kernel image @ 0x40008000 [ 0x000000 - 0x45f510 ] ## Loading init Ramdisk from Legacy Image at 42000000 ... Image Name: Created: 2014-02-07 19:37:29 UTC Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 642538 Bytes = 627.5 KiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 41000000 Booting using the fdt blob at 0x41000000 Loading Device Tree to 40ff9000, end 40fffb4f ... OK Starting kernel ... ~$off # PYBOOT: Exception: kernel: ERROR: did not start booting. # PYBOOT: Time: 19.97 seconds. # PYBOOT: Result: FAIL bcm28155-ap: FAIL: last 80 lines of boot log: --------------------------------------------- [ 1.060000] ---[ end trace d5a8b1884f236a4c ]--- [ 1.060000] Alignment trap: not handling instruction e1923f9f at [<c07bb9fc>] [ 1.060000] Unhandled fault: alignment exception (0x001) at 0x20736eae <LAVA_DISPATCHER>2014-03-20 08:17:56 AM WARNING: Sending newline in case of corruption. <LAVA_DISPATCHER>2014-03-20 08:18:26 AM WARNING: Sending newline in case of corruption. <LAVA_DISPATCHER>2014-03-20 08:18:56 AM WARNING: Sending newline in case of corruption. <LAVA_DISPATCHER>2014-03-20 08:19:26 AM WARNING: Sending newline in case of corruption. <LAVA_DISPATCHER>2014-03-20 08:19:56 AM WARNING: Sending newline in case of corruption. <LAVA_DISPATCHER>2014-03-20 08:20:26 AM WARNING: Sending newline in case of corruption. <LAVA_DISPATCHER>2014-03-20 08:20:56 AM INFO: Boot linaro image failed: Timeout exceeded in read_nonblocking(). <lava_dispatcher.utils.logging_spawn object at 0xa60d02c> version: 2.4 ($Revision: 516 $) command: /usr/bin/conmux-console args: [u'/usr/bin/conmux-console', u'vence/capri'] searcher: searcher_re: 0: re.compile("root@bcm-capri-board:~#") buffer (last 100 chars): 23f9f at [<c07bb9fc>] [ 1.060000] Unhandled fault: alignment exception (0x001) at 0x20736eae before (last 100 chars): 23f9f at [<c07bb9fc>] [ 1.060000] Unhandled fault: alignment exception (0x001) at 0x20736eae after: <class 'pexpect.TIMEOUT'> match: None match_index: None exitstatus: None flag_eof: False pid: 9628 child_fd: 3 closed: False timeout: 1200 delimiter: <class 'pexpect.EOF'> logfile: None logfile_read: <lava_dispatcher.context.Flusher object at 0x9f3a60c> logfile_send: None maxread: 2000 ignorecase: False searchwindowsize: None delaybeforesend: 0.05 delayafterclose: 0.1 delayafterterminate: 0.1 <LAVA_DISPATCHER>2014-03-20 08:20:56 AM INFO: Booting the test image. Attempt: 2 < waiting for device > <LAVA_DISPATCHER>2014-03-20 08:20:58 AM INFO: Perform hard reset on the system Reboot: capri ; ip9258 1 3 : off, sleep, on < waiting for device > <LAVA_DISPATCHER>2014-03-20 08:31:01 AM ERROR: boot_linaro_image failed Traceback (most recent call last): File "/home/khilman/work.local/lava/lava-dispatcher/lava_dispatcher/actions/boot_control.py", line 105, in run client.boot_linaro_image() File "/home/khilman/work.local/lava/lava-dispatcher/lava_dispatcher/client/base.py", line 508, in boot_linaro_image self._boot_linaro_image() File "/home/khilman/work.local/lava/lava-dispatcher/lava_dispatcher/client/base.py", line 481, in _boot_linaro_image self.proc = self.target_device.power_on() File "/home/khilman/work.local/lava/lava-dispatcher/lava_dispatcher/device/capri.py", line 114, in power_on self.fastboot('reboot') File "/home/khilman/work.local/lava/lava-dispatcher/lava_dispatcher/device/fastboot.py", line 57, in __call__ _call(self.context, command, ignore_failure, timeout) File "/home/khilman/work.local/lava/lava-dispatcher/lava_dispatcher/device/fastboot.py", line 45, in _call context.run_command(cmd, failok=ignore_failure) File "/home/khilman/work.local/lava/lava-dispatcher/lava_dispatcher/context.py", line 153, in run_command rc = subprocess.check_call(command, **output_args) File "/usr/lib/python2.7/subprocess.py", line 511, in check_call raise CalledProcessError(retcode, cmd) CalledProcessError: Command '['nice', 'sh', '-c', u'timeout 600s flock /var/lock/lava-fastboot.lck fastboot -s 1234567890 reboot']' returned non-zero exit status 124 <LAVA_DISPATCHER>2014-03-20 08:31:01 AM INFO: CriticalError <LAVA_DISPATCHER>2014-03-20 08:31:01 AM WARNING: [ACTION-E] boot_linaro_image is finished with error (Failed to boot test image.). ErrorMessage: Failed to boot test image. Lava failed at action boot_linaro_image with error:Failed to boot test image. Traceback (most recent call last): File "/home/khilman/work.local/lava/lava-dispatcher/lava_dispatcher/job.py", line 270, in run action.run(**params) File "/home/khilman/work.local/lava/lava-dispatcher/lava_dispatcher/actions/boot_control.py", line 109, in run raise CriticalError("Failed to boot test image.") CriticalError: Failed to boot test image. Reboot: capri ; ip9258 1 3 : ['off'] <LAVA_DISPATCHER>2014-03-20 08:31:02 AM INFO: Submitting the test result with parameters = {u'token': '<HIDDEN>', u'stream': u'/anonymous/lboot/', u'server': u'http://khilman@lava.lan/RPC2/'} <LAVA_DISPATCHER>2014-03-20 08:31:02 AM INFO: Dashboard : http://lava.lan/dashboard/permalink/bundle/02488d2b582a090a3f040f0daa7c8f24… LBOOT: Result: FAIL LBOOT: Time: 977.77 seconds.

11 years, 2 months

[RFC 0/6] rework sched_domain topology description

by Vincent Guittot

This patchset was previously part of the larger tasks packing patchset [1]. I have splitted the latter in 3 different patchsets (at least) to make the thing easier. -configuration of sched_domain topology (this patchset) -update and consolidation of cpu_power -tasks packing algorithm Based on Peter Z's proposal [2][3], this patchset modifies the way to configure the sched_domain level in order to let architectures to add specific level like the current BOOK level or the proposed power gating level for ARM architecture. [1] https://lkml.org/lkml/2013/10/18/121 [2] https://lkml.org/lkml/2013/11/5/239 [3] https://lkml.org/lkml/2013/11/5/449 Vincent Guittot (6): sched: remove unused SCHED_INIT_NODE sched: rework of sched_domain topology definition sched: s390: create a dedicated topology table sched: powerpc: create a dedicated topology table sched: add a new SD_SHARE_POWERDOMAIN for sched_domain sched: ARM: create a dedicated scheduler topology table arch/arm/kernel/topology.c | 26 ++++ arch/ia64/include/asm/topology.h | 24 ---- arch/metag/include/asm/topology.h | 27 ----- arch/powerpc/kernel/smp.c | 35 ++++-- arch/s390/include/asm/topology.h | 13 +- arch/s390/kernel/topology.c | 25 ++++ arch/tile/include/asm/topology.h | 33 ------ include/linux/sched.h | 30 +++++ include/linux/topology.h | 128 ++------------------ kernel/sched/core.c | 235 ++++++++++++++++++------------------- 10 files changed, 237 insertions(+), 339 deletions(-) -- 1.7.9.5

11 years, 2 months

[PATCH 0/5] aarch64 BE kvm support

by Victor Kamensky

Hi Guys, Here is series that enable KVM in V8 BE image. It is addition on top of previously posted V7 BE KVM support [1]. It was tested on aarch64 fastmodels and APM mustang board. It was tested only with kvmtool at this point. In case of V8 BE KVM host was tested that V8 BE guest runs fine and V8 LE guest runs too. Also V8 LE KVM regression was tested on both V8 LE guest and V8 BE guest. Note for mixed mode Marc's kvmtool was used and guest image had minor change that treats all virtio in LE form. Note first two patches are similar to V7 BE KVM patches. Last three are new specific for V8 image. Thanks, Victor [1] https://lists.cs.columbia.edu/pipermail/kvmarm/2014-February/009446.html Victor Kamensky (5): ARM64: KVM: MMIO support BE host running LE code ARM64: KVM: set and get of sys registers in BE case ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word ARM64: KVM: vgic_elrsr and vgic_eisr need to by byteswapped in BE case ARM64: KVM: fix vgic_bitmap_get_reg function for BE 64bit case arch/arm64/include/asm/kvm_emulate.h | 22 ++++++++++++++++++++ arch/arm64/kvm/hyp.S | 9 ++++++++- arch/arm64/kvm/sys_regs.c | 39 ++++++++++++++++++++++++++++++------ virt/kvm/arm/vgic.c | 27 +++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 9 deletions(-) -- 1.8.1.4 Thanks, Victor

11 years, 2 months

mainline boot: 48 pass, 0 fail (v3.14-rc7-33-g8878439)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: mainline Git describe: v3.14-rc7-33-g8878439 Full Report =========== da8xx_omapl_defconfig --------------------- da850-evm PASS: 0 min 15.7 sec legacy,da850evm PASS: 0 min 14.7 sec omap2plus_defconfig ------------------- legacy,3730xm PASS: 0 min 57.6 sec am335x-boneblack PASS: 0 min 26.4 sec omap3-beagle-xm PASS: 1 min 5.7 sec legacy,3530beagle PASS: 0 min 46.5 sec omap4-panda PASS: 1 min 5.2 sec omap3-overo-tobi PASS: 0 min 23.3 sec am335x-bone PASS: 0 min 27.8 sec omap3-overo-storm-tobi PASS: 0 min 25.4 sec omap5-uevm PASS: 0 min 59.4 sec omap4-panda-es PASS: 1 min 7.6 sec legacy,3730storm PASS: 0 min 23.9 sec legacy,3530overo PASS: 0 min 24.5 sec multi_lpae_defconfig -------------------- omap5-uevm PASS: 1 min 52.6 sec sun7i-a20-cubieboard2 PASS: 0 min 14.7 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 17.1 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 19.0 sec imx6dl-wandboard,wand-solo PASS: 0 min 19.1 sec imx6q-wandboard PASS: 0 min 17.5 sec msm_defconfig ------------- qcom-apq8074-dragonboard PASS: 1 min 4.2 sec bcm_defconfig ------------- bcm28155-ap PASS: 0 min 58.7 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 16.7 sec sun4i-a10-cubieboard PASS: 0 min 13.3 sec exynos_defconfig ---------------- exynos5250-arndale PASS: 0 min 30.0 sec multi_v7_defconfig ------------------ ste-snowball PASS: 1 min 18.3 sec tegra30-beaver PASS: 0 min 20.0 sec am335x-boneblack PASS: 0 min 23.9 sec omap3-beagle-xm PASS: 0 min 57.8 sec sun7i-a20-cubieboard2 PASS: 0 min 14.7 sec armada-370-mirabox PASS: 0 min 22.1 sec omap4-panda PASS: 0 min 54.1 sec armada-xp-openblocks-ax3-4 PASS: 0 min 24.9 sec sun4i-a10-cubieboard PASS: 0 min 14.5 sec bcm28155-ap PASS: 1 min 9.4 sec omap3-overo-tobi PASS: 0 min 21.7 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.4 sec am335x-bone PASS: 0 min 26.4 sec omap3-overo-storm-tobi PASS: 0 min 21.3 sec omap5-uevm PASS: 1 min 55.5 sec imx6q-wandboard PASS: 0 min 17.6 sec omap4-panda-es PASS: 0 min 54.2 sec imx6dl-wandboard,wand-dual PASS: 0 min 19.0 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 32.4 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.1 sec davinci_all_defconfig --------------------- legacy,dm365evm PASS: 0 min 17.3 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 21.9 sec armada-370-mirabox PASS: 0 min 20.2 sec

11 years, 2 months

[PATCH 1/2] timer: check failure of timer_cpu_notify() before calling init_timer_stats()

by Viresh Kumar

timer_cpu_notify() should return NOTIFY_OK and nothing else. Anything else would trigger a BUG_ON(). Return value of this routine is already checked correctly but is done after issuing a call to init_timer_stats(). The right order would be to check the error case first and then call init_timer_stats(). Lets do it. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- kernel/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/timer.c b/kernel/timer.c index f64a98c..e8e7839 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1674,9 +1674,9 @@ void __init init_timers(void) err = timer_cpu_notify(&timers_nb, (unsigned long)CPU_UP_PREPARE, (void *)(long)smp_processor_id()); - init_timer_stats(); - BUG_ON(err != NOTIFY_OK); + + init_timer_stats(); register_cpu_notifier(&timers_nb); open_softirq(TIMER_SOFTIRQ, run_timer_softirq); } -- 1.7.12.rc2.18.g61b472e

11 years, 2 months

mainline boot: 48 pass, 0 fail (v3.14-rc7-28-gea1cd65)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: mainline Git describe: v3.14-rc7-28-gea1cd65 Full Report =========== da8xx_omapl_defconfig --------------------- da850-evm PASS: 0 min 15.7 sec legacy,da850evm PASS: 0 min 14.7 sec omap2plus_defconfig ------------------- legacy,3730xm PASS: 0 min 48.3 sec am335x-boneblack PASS: 0 min 26.0 sec omap3-beagle-xm PASS: 0 min 57.4 sec legacy,3530beagle PASS: 0 min 36.3 sec omap4-panda PASS: 1 min 10.7 sec omap3-overo-tobi PASS: 0 min 23.8 sec am335x-bone PASS: 0 min 27.9 sec omap3-overo-storm-tobi PASS: 0 min 25.1 sec omap5-uevm PASS: 1 min 4.7 sec omap4-panda-es PASS: 1 min 4.8 sec legacy,3730storm PASS: 0 min 21.2 sec legacy,3530overo PASS: 0 min 21.7 sec multi_lpae_defconfig -------------------- omap5-uevm PASS: 1 min 48.8 sec sun7i-a20-cubieboard2 PASS: 0 min 14.6 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 20.8 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 19.1 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.9 sec imx6q-wandboard PASS: 0 min 17.4 sec msm_defconfig ------------- qcom-apq8074-dragonboard PASS: 1 min 4.1 sec bcm_defconfig ------------- bcm28155-ap PASS: 1 min 14.5 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 13.3 sec sun4i-a10-cubieboard PASS: 0 min 16.2 sec exynos_defconfig ---------------- exynos5250-arndale PASS: 0 min 30.3 sec multi_v7_defconfig ------------------ ste-snowball PASS: 1 min 17.6 sec tegra30-beaver PASS: 0 min 19.7 sec am335x-boneblack PASS: 0 min 23.9 sec omap3-beagle-xm PASS: 0 min 51.5 sec sun7i-a20-cubieboard2 PASS: 0 min 14.4 sec armada-370-mirabox PASS: 0 min 22.0 sec omap4-panda PASS: 0 min 58.1 sec armada-xp-openblocks-ax3-4 PASS: 0 min 24.9 sec sun4i-a10-cubieboard PASS: 0 min 14.3 sec bcm28155-ap PASS: 1 min 9.2 sec omap3-overo-tobi PASS: 0 min 21.9 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.8 sec am335x-bone PASS: 0 min 26.5 sec omap3-overo-storm-tobi PASS: 0 min 24.8 sec omap5-uevm PASS: 1 min 47.8 sec imx6q-wandboard PASS: 0 min 17.6 sec omap4-panda-es PASS: 0 min 57.6 sec imx6dl-wandboard,wand-dual PASS: 0 min 18.7 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 34.6 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.1 sec davinci_all_defconfig --------------------- legacy,dm365evm PASS: 0 min 17.1 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 22.2 sec armada-370-mirabox PASS: 0 min 20.1 sec

11 years, 2 months

[PATCH 1/3] arm64: topology: Add support for topology DT bindings

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> Add support for parsing the explicit topology bindings to discover the topology of the system. Since it is not currently clear how to map multi-level clusters for the scheduler all leaf clusters are presented to the scheduler at the same level. This should be enough to provide good support for current systems. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- This revision of the patch changes the parsing code to error out on any failures it detects and discard any information already obtained, reverting to the default flat topology. arch/arm64/kernel/topology.c | 172 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 167 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 3e06b0b..8e0f29a 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -17,10 +17,161 @@ #include <linux/percpu.h> #include <linux/node.h> #include <linux/nodemask.h> +#include <linux/of.h> #include <linux/sched.h> #include <asm/topology.h> +#ifdef CONFIG_OF +static int __init get_cpu_for_node(struct device_node *node) +{ + struct device_node *cpu_node; + int cpu; + + cpu_node = of_parse_phandle(node, "cpu", 0); + if (!cpu_node) + return -1; + + for_each_possible_cpu(cpu) { + if (of_get_cpu_node(cpu, NULL) == cpu_node) + return cpu; + } + + pr_crit("Unable to find CPU node for %s\n", cpu_node->full_name); + return -1; +} + +static int __init parse_core(struct device_node *core, int cluster_id, + int core_id) +{ + char name[10]; + bool leaf = true; + int i = 0; + int cpu; + struct device_node *t; + + do { + snprintf(name, sizeof(name), "thread%d", i); + t = of_get_child_by_name(core, name); + if (t) { + leaf = false; + cpu = get_cpu_for_node(t); + if (cpu >= 0) { + cpu_topology[cpu].cluster_id = cluster_id; + cpu_topology[cpu].core_id = core_id; + cpu_topology[cpu].thread_id = i; + } else { + pr_err("%s: Can't get CPU for thread\n", + t->full_name); + return -EINVAL; + } + } + i++; + } while (t); + + cpu = get_cpu_for_node(core); + if (cpu >= 0) { + if (!leaf) { + pr_err("%s: Core has both threads and CPU\n", + core->full_name); + return -EINVAL; + } + + cpu_topology[cpu].cluster_id = cluster_id; + cpu_topology[cpu].core_id = core_id; + } else if (leaf) { + pr_err("%s: Can't get CPU for leaf core\n", core->full_name); + return -EINVAL; + } + + return 0; +} + +static int __init parse_cluster(struct device_node *cluster, int depth) +{ + char name[10]; + bool leaf = true; + bool has_cores = false; + struct device_node *c; + static int __initdata cluster_id; + int core_id = 0; + int i, ret; + + /* + * First check for child clusters; we currently ignore any + * information about the nesting of clusters and present the + * scheduler with a flat list of them. + */ + i = 0; + do { + snprintf(name, sizeof(name), "cluster%d", i); + c = of_get_child_by_name(cluster, name); + if (c) { + parse_cluster(c, depth + 1); + leaf = false; + } + i++; + } while (c); + + /* Now check for cores */ + i = 0; + do { + snprintf(name, sizeof(name), "core%d", i); + c = of_get_child_by_name(cluster, name); + if (c) { + has_cores = true; + + if (depth == 0) + pr_err("%s: cpu-map children should be clusters\n", + c->full_name); + + if (leaf) { + ret = parse_core(c, cluster_id, core_id++); + if (ret != 0) { + return ret; + } + } else { + pr_err("%s: Non-leaf cluster with core %s\n", + cluster->full_name, name); + return -EINVAL; + } + } + i++; + } while (c); + + if (leaf && !has_cores) + pr_warn("%s: empty cluster\n", cluster->full_name); + + if (leaf) + cluster_id++; + + return 0; +} + +static int __init parse_dt_topology(void) +{ + struct device_node *cn; + + cn = of_find_node_by_path("/cpus"); + if (!cn) { + pr_err("No CPU information found in DT\n"); + return 0; + } + + /* + * When topology is provided cpu-map is essentially a root + * cluster with restricted subnodes. + */ + cn = of_get_child_by_name(cn, "cpu-map"); + if (!cn) + return 0; + return parse_cluster(cn, 0); +} + +#else +static inline int parse_dt_topology(void) { return 0; } +#endif + /* * cpu topology table */ @@ -74,11 +225,7 @@ void store_cpu_topology(unsigned int cpuid) update_siblings_masks(cpuid); } -/* - * init_cpu_topology is called at boot when only one cpu is running - * which prevent simultaneous write access to cpu_topology array - */ -void __init init_cpu_topology(void) +static void __init reset_cpu_topology(void) { unsigned int cpu; @@ -93,3 +240,18 @@ void __init init_cpu_topology(void) cpumask_clear(&cpu_topo->thread_sibling); } } + +/* + * init_cpu_topology is called at boot when only one cpu is running + * which prevent simultaneous write access to cpu_topology array + */ +void __init init_cpu_topology(void) +{ + int ret; + + reset_cpu_topology(); + + ret = parse_dt_topology(); + if (ret != 0) + reset_cpu_topology(); +} -- 1.9.0

11 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel