linaro-kernel

linaro-kernel@lists.linaro.org

10095 discussions

[PATCH V4 1/2] cpuidle: simplify multiple driver support

by Daniel Lezcano

Commit bf4d1b5ddb78f86078ac6ae0415802d5f0c68f92 brought the multiple driver support. The code added a couple of new API to register the driver per cpu. That led to some code complexity to handle the kernel config options when the multiple driver support is enabled or not, which is not really necessary. The code has to be compatible when the multiple driver support is not enabled, and the multiple driver support has to be compatible with the old api. This patch removes this API, which is not yet used by any driver but needed for the HMP cpuidle drivers which will come soon, and replaces its usage by a cpumask pointer in the cpuidle driver structure telling what cpus are handled by the driver. That let the API cpuidle_[un]register_driver to be used for the multiple driver support and also the cpuidle_[un]register functions, added recently in the cpuidle framework. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> --- [V4] - uninitialize per cpu driver variable on error - rollback indentation in cpuidle.h [V3] - moved the kerneldoc and comments to a separate patch [V2]: - fixed bad refcount check - inverted clockevent notify off order at unregister time drivers/cpuidle/cpuidle.c | 4 +- drivers/cpuidle/driver.c | 192 +++++++++++++++++++-------------------------- include/linux/cpuidle.h | 6 +- 3 files changed, 84 insertions(+), 118 deletions(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index c3a93fe..fdc432f 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -466,7 +466,7 @@ void cpuidle_unregister(struct cpuidle_driver *drv) int cpu; struct cpuidle_device *device; - for_each_possible_cpu(cpu) { + for_each_cpu(cpu, drv->cpumask) { device = &per_cpu(cpuidle_dev, cpu); cpuidle_unregister_device(device); } @@ -498,7 +498,7 @@ int cpuidle_register(struct cpuidle_driver *drv, return ret; } - for_each_possible_cpu(cpu) { + for_each_cpu(cpu, drv->cpumask) { device = &per_cpu(cpuidle_dev, cpu); device->cpu = cpu; diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 8dfaaae..e75fa54 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -18,167 +18,140 @@ DEFINE_SPINLOCK(cpuidle_driver_lock); -static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu); -static struct cpuidle_driver * __cpuidle_get_cpu_driver(int cpu); +#ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS -static void cpuidle_setup_broadcast_timer(void *arg) +static DEFINE_PER_CPU(struct cpuidle_driver *, cpuidle_drivers); + +static struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) { - int cpu = smp_processor_id(); - clockevents_notify((long)(arg), &cpu); + return per_cpu(cpuidle_drivers, cpu); } -static void __cpuidle_driver_init(struct cpuidle_driver *drv, int cpu) +static inline void __cpuidle_unset_driver(struct cpuidle_driver *drv) { - int i; - - drv->refcnt = 0; + int cpu; - for (i = drv->state_count - 1; i >= 0 ; i--) { + for_each_cpu(cpu, drv->cpumask) { - if (!(drv->states[i].flags & CPUIDLE_FLAG_TIMER_STOP)) + if (drv != __cpuidle_get_cpu_driver(cpu)) continue; - drv->bctimer = 1; - on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer, - (void *)CLOCK_EVT_NOTIFY_BROADCAST_ON, 1); - break; + per_cpu(cpuidle_drivers, cpu) = NULL; } } -static int __cpuidle_register_driver(struct cpuidle_driver *drv, int cpu) +static inline int __cpuidle_set_driver(struct cpuidle_driver *drv) { - if (!drv || !drv->state_count) - return -EINVAL; - - if (cpuidle_disabled()) - return -ENODEV; + int cpu; - if (__cpuidle_get_cpu_driver(cpu)) - return -EBUSY; + for_each_cpu(cpu, drv->cpumask) { - __cpuidle_driver_init(drv, cpu); + if (__cpuidle_get_cpu_driver(cpu)) { + __cpuidle_unset_driver(drv); + return -EBUSY; + } - __cpuidle_set_cpu_driver(drv, cpu); + per_cpu(cpuidle_drivers, cpu) = drv; + } return 0; } -static void __cpuidle_unregister_driver(struct cpuidle_driver *drv, int cpu) -{ - if (drv != __cpuidle_get_cpu_driver(cpu)) - return; +#else - if (!WARN_ON(drv->refcnt > 0)) - __cpuidle_set_cpu_driver(NULL, cpu); +static struct cpuidle_driver *cpuidle_curr_driver; - if (drv->bctimer) { - drv->bctimer = 0; - on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer, - (void *)CLOCK_EVT_NOTIFY_BROADCAST_OFF, 1); - } +static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) +{ + return cpuidle_curr_driver; } -#ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS +static inline int __cpuidle_set_driver(struct cpuidle_driver *drv) +{ + if (cpuidle_curr_driver) + return -EBUSY; -static DEFINE_PER_CPU(struct cpuidle_driver *, cpuidle_drivers); + cpuidle_curr_driver = drv; -static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu) -{ - per_cpu(cpuidle_drivers, cpu) = drv; + return 0; } -static struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) +static inline void __cpuidle_unset_driver(struct cpuidle_driver *drv) { - return per_cpu(cpuidle_drivers, cpu); + if (drv == cpuidle_curr_driver) + cpuidle_curr_driver = NULL; } -static void __cpuidle_unregister_all_cpu_driver(struct cpuidle_driver *drv) +#endif + +static void cpuidle_setup_broadcast_timer(void *arg) { - int cpu; - for_each_present_cpu(cpu) - __cpuidle_unregister_driver(drv, cpu); + int cpu = smp_processor_id(); + clockevents_notify((long)(arg), &cpu); } -static int __cpuidle_register_all_cpu_driver(struct cpuidle_driver *drv) +static int __cpuidle_driver_init(struct cpuidle_driver *drv) { - int ret = 0; - int i, cpu; + int i; - for_each_present_cpu(cpu) { - ret = __cpuidle_register_driver(drv, cpu); - if (ret) - break; - } + drv->refcnt = 0; - if (ret) - for_each_present_cpu(i) { - if (i == cpu) - break; - __cpuidle_unregister_driver(drv, i); - } + if (!drv->cpumask) + drv->cpumask = (struct cpumask *)cpu_possible_mask; + for (i = drv->state_count - 1; i >= 0 ; i--) { - return ret; + if (!(drv->states[i].flags & CPUIDLE_FLAG_TIMER_STOP)) + continue; + + drv->bctimer = 1; + break; + } + + return 0; } -int cpuidle_register_cpu_driver(struct cpuidle_driver *drv, int cpu) +static int __cpuidle_register_driver(struct cpuidle_driver *drv) { int ret; - spin_lock(&cpuidle_driver_lock); - ret = __cpuidle_register_driver(drv, cpu); - spin_unlock(&cpuidle_driver_lock); + if (!drv || !drv->state_count) + return -EINVAL; - return ret; -} + if (cpuidle_disabled()) + return -ENODEV; -void cpuidle_unregister_cpu_driver(struct cpuidle_driver *drv, int cpu) -{ - spin_lock(&cpuidle_driver_lock); - __cpuidle_unregister_driver(drv, cpu); - spin_unlock(&cpuidle_driver_lock); -} + ret = __cpuidle_driver_init(drv); + if (ret) + return ret; -/** - * cpuidle_register_driver - registers a driver - * @drv: the driver - */ -int cpuidle_register_driver(struct cpuidle_driver *drv) -{ - int ret; + ret = __cpuidle_set_driver(drv); + if (ret) + return ret; - spin_lock(&cpuidle_driver_lock); - ret = __cpuidle_register_all_cpu_driver(drv); - spin_unlock(&cpuidle_driver_lock); + if (drv->bctimer) + on_each_cpu_mask(drv->cpumask, cpuidle_setup_broadcast_timer, + (void *)CLOCK_EVT_NOTIFY_BROADCAST_ON, 1); - return ret; + return 0; } -EXPORT_SYMBOL_GPL(cpuidle_register_driver); /** * cpuidle_unregister_driver - unregisters a driver * @drv: the driver */ -void cpuidle_unregister_driver(struct cpuidle_driver *drv) +static void __cpuidle_unregister_driver(struct cpuidle_driver *drv) { - spin_lock(&cpuidle_driver_lock); - __cpuidle_unregister_all_cpu_driver(drv); - spin_unlock(&cpuidle_driver_lock); -} -EXPORT_SYMBOL_GPL(cpuidle_unregister_driver); - -#else - -static struct cpuidle_driver *cpuidle_curr_driver; + if (WARN_ON(drv->refcnt > 0)) + return; -static inline void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu) -{ - cpuidle_curr_driver = drv; -} + if (drv->bctimer) { + drv->bctimer = 0; + on_each_cpu_mask(drv->cpumask, cpuidle_setup_broadcast_timer, + (void *)CLOCK_EVT_NOTIFY_BROADCAST_OFF, 1); + } -static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) -{ - return cpuidle_curr_driver; + __cpuidle_unset_driver(drv); } /** @@ -187,13 +160,11 @@ static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) */ int cpuidle_register_driver(struct cpuidle_driver *drv) { - int ret, cpu; + int ret; - cpu = get_cpu(); spin_lock(&cpuidle_driver_lock); - ret = __cpuidle_register_driver(drv, cpu); + ret = __cpuidle_register_driver(drv); spin_unlock(&cpuidle_driver_lock); - put_cpu(); return ret; } @@ -205,16 +176,11 @@ EXPORT_SYMBOL_GPL(cpuidle_register_driver); */ void cpuidle_unregister_driver(struct cpuidle_driver *drv) { - int cpu; - - cpu = get_cpu(); spin_lock(&cpuidle_driver_lock); - __cpuidle_unregister_driver(drv, cpu); + __cpuidle_unregister_driver(drv); spin_unlock(&cpuidle_driver_lock); - put_cpu(); } EXPORT_SYMBOL_GPL(cpuidle_unregister_driver); -#endif /** * cpuidle_get_driver - return the current driver diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 8f04062..0bc4b74 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -111,6 +111,9 @@ struct cpuidle_driver { struct cpuidle_state states[CPUIDLE_STATE_MAX]; int state_count; int safe_state_index; + + /* the driver handles the cpus in cpumask */ + struct cpumask *cpumask; }; #ifdef CONFIG_CPU_IDLE @@ -135,9 +138,6 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev); extern int cpuidle_play_dead(void); extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev); -extern int cpuidle_register_cpu_driver(struct cpuidle_driver *drv, int cpu); -extern void cpuidle_unregister_cpu_driver(struct cpuidle_driver *drv, int cpu); - #else static inline void disable_cpuidle(void) { } static inline int cpuidle_idle_call(void) { return -ENODEV; } -- 1.7.9.5

12 years, 1 month

linus/master boot: 24 pass, 1 fail (v3.12-rc2-83-g4b97280)

by Kevin Hilman build bot

Automated DT boot report for various ARM defconfigs. Boot test simply checks if kernel can boot to initramfs with busybox and run some basic commands (e.g. 'cat /proc/cpuinfo'). Tree/Branch: linus/master Git describe: v3.12-rc2-83-g4b97280 Commit: 4b97280675 Merge tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip Failed boot tests (console logs at the end) =========================================== omap3-beagle: FAIL: arm-omap2plus_defconfig Full Report =========== arm-imx_v6_v7_defconfig ----------------------- imx6dl-wandboard,wand-dual PASS: 0 min 16.4 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.3 sec imx6q-wandboard PASS: 0 min 15.0 sec arm-omap2plus_defconfig ----------------------- am335x-boneblack PASS: 0 min 27.3 sec omap3-beagle-xm PASS: 0 min 49.9 sec am335x-bone PASS: 0 min 26.2 sec omap3-tobi,3530overo PASS: 0 min 42.5 sec omap4-panda PASS: 1 min 6.5 sec omap4-panda-es PASS: 1 min 13.8 sec omap3-tobi,3730storm PASS: 0 min 41.4 sec omap3-beagle FAIL: 0 min 47.6 sec arm-multi_v7_defconfig ---------------------- am335x-boneblack PASS: 0 min 31.8 sec omap3-beagle-xm PASS: 0 min 52.5 sec omap4-panda-es PASS: 1 min 15.8 sec omap4-panda PASS: 1 min 0.7 sec sun4i-a10-cubieboard PASS: 0 min 11.6 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.4 sec omap3-tobi,3530overo PASS: 0 min 40.8 sec am335x-bone PASS: 0 min 33.4 sec imx6q-wandboard PASS: 0 min 15.7 sec omap3-tobi,3730storm PASS: 0 min 40.4 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.6 sec omap3-beagle PASS: 0 min 48.7 sec arm-exynos_defconfig -------------------- exynos5250-arndale PASS: 0 min 35.3 sec arm-sama5_defconfig ------------------- sama5d35ek PASS: 0 min 20.4 sec Console logs for failures ========================= arm-omap2plus_defconfig ----------------------- omap3-beagle: FAIL: last 24 lines of boot log: ---------------------------------------------- dhcp ERROR: Need valid 'usbnet_devaddr' to be set at ether.c:2369/usb_eth_init() Waiting for Ethernet connection... done. BOOTP broadcast 1 BOOTP broadcast 2 DHCP client bound to address 192.168.1.164 OMAP3 beagleboard.org # setenv serverip 192.168.1.2 setenv serverip 192.168.1.2 OMAP3 beagleboard.org # if test -n ${netargs}; then run netargs; fi if test -n ${netargs}; then run netargs; fi OMAP3 beagleboard.org # tftp 0x80200000 tmp/3530beagle-lMvinl/zImage tftp 0x80200000 tmp/3530beagle-lMvinl/zImage Waiting for Ethernet connection... done. Using asx0 device TFTP from server 192.168.1.2; our IP address is 192.168.1.164 Filename 'tmp/3530beagle-lMvinl/zImage'. Load address: 0x80200000 Loading: *T ######T ############################################################ ##################################T T ############################### ####~$off # PYBOOT: Exception: ERROR: Timeout loading tmp/3530beagle-lMvinl/zImage. Giving up. # PYBOOT: Time: 47.58 seconds. # PYBOOT: Result: FAIL

12 years, 1 month

linus/master boot: 24 pass, 1 fail (v3.12-rc2-58-g654fdd0)

by Kevin Hilman build bot

Automated DT boot report for various ARM defconfigs. Boot test simply checks if kernel can boot to initramfs with busybox and run some basic commands (e.g. 'cat /proc/cpuinfo'). Tree/Branch: linus/master Git describe: v3.12-rc2-58-g654fdd0 Commit: 654fdd0412 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Failed boot tests (console logs at the end) =========================================== omap4-panda: FAIL: arm-multi_v7_defconfig Full Report =========== arm-imx_v6_v7_defconfig ----------------------- imx6dl-wandboard,wand-dual PASS: 0 min 16.4 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.4 sec imx6q-wandboard PASS: 0 min 15.0 sec arm-omap2plus_defconfig ----------------------- am335x-boneblack PASS: 0 min 27.8 sec omap3-beagle-xm PASS: 0 min 48.2 sec am335x-bone PASS: 0 min 26.3 sec omap3-tobi,3530overo PASS: 0 min 42.4 sec omap4-panda PASS: 1 min 3.6 sec omap4-panda-es PASS: 1 min 14.5 sec omap3-tobi,3730storm PASS: 0 min 41.3 sec omap3-beagle PASS: 0 min 50.6 sec arm-multi_v7_defconfig ---------------------- am335x-boneblack PASS: 0 min 31.8 sec omap3-beagle-xm PASS: 0 min 49.1 sec omap4-panda-es PASS: 1 min 10.0 sec omap4-panda FAIL: 2 min 23.8 sec sun4i-a10-cubieboard PASS: 0 min 11.6 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.4 sec omap3-tobi,3530overo PASS: 0 min 40.9 sec am335x-bone PASS: 0 min 33.4 sec imx6q-wandboard PASS: 0 min 15.7 sec omap3-tobi,3730storm PASS: 0 min 40.7 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.7 sec omap3-beagle PASS: 0 min 48.8 sec arm-exynos_defconfig -------------------- exynos5250-arndale PASS: 0 min 36.8 sec arm-sama5_defconfig ------------------- sama5d35ek PASS: 0 min 19.1 sec Console logs for failures ========================= arm-multi_v7_defconfig ---------------------- omap4-panda: FAIL: last 24 lines of boot log: --------------------------------------------- [ 1.611602] omap_hsmmc 4809c000.mmc: pins are not configured from the driver [ 1.736694] usb 1-1: new high-speed USB device number 2 using ehci-omap [ 1.744110] pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38) [ 1.751953] pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x [ 1.761169] omap-dma-engine 4a056000.dma-controller: allocating channel for 60 [ 1.768890] omap-dma-engine 4a056000.dma-controller: allocating channel for 59 [ 1.891937] twl_rtc rtc.11: setting system clock to 2013-09-25 23:59:14 UTC (1380153554) [ 1.901885] hub 1-1:1.0: USB hub found [ 1.906280] hub 1-1:1.0: 5 ports detected [ 1.998138] mmc0: host does not support reading read-only switch. assuming write-enable. [ 2.008789] mmc0: new high speed SD card at address aaaa [ 2.014892] mmcblk0: mmc0:aaaa SD02G 1.84 GiB [ 2.021362] mmcblk0: p1 p2 [ 2.307922] usb 1-1.1: new high-speed USB device number 3 using ehci-omap [ 17.010223] EXT4-fs (mmcblk0p2): recovery complete [ 17.023162] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null) [ 17.023162] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 17.039245] devtmpfs: mounted [ 17.039398] Freeing unused kernel memory: 464K (c0627000 - c069b000) [ 17.464294] init: ureadahead main process (56) terminated with status 5 ~$off # PYBOOT: Exception: userspace: ERROR: Never found root shell # PYBOOT: Time: 143.77 seconds. # PYBOOT: Result: FAIL

12 years, 1 month

[PATCH] Staging / quickstart: remove reduplicate if(acpi_disabled) check

by Hanjun Guo

In acpi_bus_register_driver(), there is an if (acpi_disabled) check, so the if(acpi_disabled) before it is reduplicate, remove it. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/staging/quickstart/quickstart.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c index 4247d60..9f6ebdb 100644 --- a/drivers/staging/quickstart/quickstart.c +++ b/drivers/staging/quickstart/quickstart.c @@ -390,10 +390,6 @@ static int __init quickstart_init(void) { int ret; - /* ACPI Check */ - if (acpi_disabled) - return -ENODEV; - /* ACPI driver register */ ret = acpi_bus_register_driver(&quickstart_acpi_driver); if (ret) -- 1.7.9.5

12 years, 1 month

[PATCH] ASoC: sn95031: Convert to regmap

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> This moves us towards being able to remove the duplicated register I/O functionality in ASoC. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/sn95031.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c index dba26e63..13045f2 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c @@ -164,30 +164,28 @@ static unsigned int sn95031_get_mic_bias(struct snd_soc_codec *codec) } /*end - adc helper functions */ -static inline unsigned int sn95031_read(struct snd_soc_codec *codec, - unsigned int reg) +static int sn95031_read(void *ctx, unsigned int reg, unsigned int *val) { u8 value = 0; int ret; ret = intel_scu_ipc_ioread8(reg, &value); - if (ret) - pr_err("read of %x failed, err %d\n", reg, ret); - return value; + if (ret == 0) + *val = value; + return ret; } -static inline int sn95031_write(struct snd_soc_codec *codec, - unsigned int reg, unsigned int value) +static int sn95031_write(void *ctx, unsigned int reg, unsigned int value) { - int ret; - - ret = intel_scu_ipc_iowrite8(reg, value); - if (ret) - pr_err("write of %x failed, err %d\n", reg, ret); - return ret; + return intel_scu_ipc_iowrite8(reg, value); } +static const struct regmap_config sn95031_regmap = { + .reg_read = sn95031_read, + .reg_write = sn95031_write, +}; + static int sn95031_set_vaud_bias(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { @@ -827,6 +825,8 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec) { pr_debug("codec_probe called\n"); + snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); + /* PCM interface config * This sets the pcm rx slot conguration to max 6 slots * for max 4 dais (2 stereo and 2 mono) @@ -886,8 +886,6 @@ static int sn95031_codec_remove(struct snd_soc_codec *codec) static struct snd_soc_codec_driver sn95031_codec = { .probe = sn95031_codec_probe, .remove = sn95031_codec_remove, - .read = sn95031_read, - .write = sn95031_write, .set_bias_level = sn95031_set_vaud_bias, .idle_bias_off = true, .dapm_widgets = sn95031_dapm_widgets, @@ -898,7 +896,14 @@ static struct snd_soc_codec_driver sn95031_codec = { static int sn95031_device_probe(struct platform_device *pdev) { + struct regmap *regmap; + pr_debug("codec device probe called for %s\n", dev_name(&pdev->dev)); + + regmap = devm_regmap_init(&pdev->dev, NULL, NULL, &sn95031_regmap); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + return snd_soc_register_codec(&pdev->dev, &sn95031_codec, sn95031_dais, ARRAY_SIZE(sn95031_dais)); } -- 1.8.4.rc3

12 years, 1 month

[PATCH] ACPI / scan: fix typo in comments of acpi_bus_unregister_driver()

by Hanjun Guo

"APIC" should be "ACPI" here. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/acpi/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index fbdb82e..611ce90 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1121,7 +1121,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver) EXPORT_SYMBOL(acpi_bus_register_driver); /** - * acpi_bus_unregister_driver - unregisters a driver with the APIC bus + * acpi_bus_unregister_driver - unregisters a driver with the ACPI bus * @driver: driver to unregister * * Unregisters a driver with the ACPI bus. Searches the namespace for all -- 1.7.9.5

12 years, 1 month

next-20130925 boot: 25 pass, 0 fail (next-20130925)

by Kevin Hilman build bot

Automated DT boot report for various ARM defconfigs. Boot test simply checks if kernel can boot to initramfs with busybox and run some basic commands (e.g. 'cat /proc/cpuinfo'). Tree/Branch: next-20130925 Git describe: next-20130925 Commit: 050f4da86e Add linux-next specific files for 20130925 Full Report =========== arm-imx_v6_v7_defconfig ----------------------- imx6dl-wandboard,wand-dual PASS: 0 min 16.4 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.4 sec imx6q-wandboard PASS: 0 min 15.2 sec arm-omap2plus_defconfig ----------------------- am335x-boneblack PASS: 0 min 27.4 sec omap3-beagle-xm PASS: 0 min 49.8 sec am335x-bone PASS: 0 min 26.3 sec omap3-tobi,3530overo PASS: 0 min 42.4 sec omap4-panda PASS: 1 min 5.7 sec omap4-panda-es PASS: 1 min 12.3 sec omap3-tobi,3730storm PASS: 0 min 41.5 sec omap3-beagle PASS: 0 min 49.8 sec arm-multi_v7_defconfig ---------------------- am335x-boneblack PASS: 0 min 31.8 sec omap3-beagle-xm PASS: 0 min 49.6 sec omap4-panda-es PASS: 1 min 13.5 sec omap4-panda PASS: 0 min 59.3 sec sun4i-a10-cubieboard PASS: 0 min 11.5 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.4 sec omap3-tobi,3530overo PASS: 0 min 40.7 sec am335x-bone PASS: 0 min 33.4 sec imx6q-wandboard PASS: 0 min 15.7 sec omap3-tobi,3730storm PASS: 0 min 40.1 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.6 sec omap3-beagle PASS: 0 min 52.1 sec arm-exynos_defconfig -------------------- exynos5250-arndale PASS: 0 min 35.1 sec arm-sama5_defconfig ------------------- sama5d35ek PASS: 0 min 19.0 sec

12 years, 1 month

linus/HEAD boot: 25 pass, 0 fail (v3.12-rc2-33-g22356f4)

by Kevin Hilman build bot

Automated DT boot report for various ARM defconfigs. Boot test simply checks if kernel can boot to initramfs with busybox and run some basic commands (e.g. 'cat /proc/cpuinfo'). Tree/Branch: linus/HEAD Git describe: v3.12-rc2-33-g22356f4 Commit: 22356f447c mm: Place preemption point in do_mlockall() loop Full Report =========== arm-imx_v6_v7_defconfig ----------------------- imx6dl-wandboard,wand-dual PASS: 0 min 16.4 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.3 sec imx6q-wandboard PASS: 0 min 15.0 sec arm-omap2plus_defconfig ----------------------- am335x-boneblack PASS: 0 min 28.5 sec omap3-beagle-xm PASS: 0 min 52.5 sec am335x-bone PASS: 0 min 26.3 sec omap3-tobi,3530overo PASS: 0 min 42.3 sec omap4-panda PASS: 1 min 8.1 sec omap4-panda-es PASS: 1 min 16.9 sec omap3-tobi,3730storm PASS: 0 min 45.0 sec omap3-beagle PASS: 0 min 53.5 sec arm-multi_v7_defconfig ---------------------- am335x-boneblack PASS: 0 min 31.8 sec omap3-beagle-xm PASS: 0 min 51.9 sec omap4-panda-es PASS: 1 min 9.9 sec omap4-panda PASS: 1 min 6.5 sec sun4i-a10-cubieboard PASS: 0 min 14.6 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.4 sec omap3-tobi,3530overo PASS: 0 min 41.0 sec am335x-bone PASS: 0 min 33.4 sec imx6q-wandboard PASS: 0 min 15.7 sec omap3-tobi,3730storm PASS: 0 min 40.0 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.7 sec omap3-beagle PASS: 1 min 7.7 sec arm-exynos_defconfig -------------------- exynos5250-arndale PASS: 0 min 29.6 sec arm-sama5_defconfig ------------------- sama5d35ek PASS: 0 min 18.2 sec

12 years, 1 month

[PATCH] arm64: avoid multiple evaluation of ptr in get_user/put_user()

by AKASHI Takahiro

get_user() is defined as a function macro in arm64, and trace_get_user() calls it as followed: get_user(ch, ptr++); Since the second parameter occurs twice in the definition, 'ptr++' is unexpectedly evaluated twice and trace_get_user() will generate a bogus string from user-provided one. As a result, some ftrace sysfs operations, like "echo FUNCNAME > set_ftrace_filter," hit this case and eventually fail. This patch fixes the issue both in get_user() and put_user(). Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- arch/arm64/include/asm/uaccess.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index edb3d5c..bbeab83 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -166,9 +166,11 @@ do { \ #define get_user(x, ptr) \ ({ \ + __typeof__(*(ptr)) *optr = (ptr); \ + \ might_fault(); \ - access_ok(VERIFY_READ, (ptr), sizeof(*(ptr))) ? \ - __get_user((x), (ptr)) : \ + access_ok(VERIFY_READ, optr, sizeof(*optr)) ? \ + __get_user((x), optr) : \ ((x) = 0, -EFAULT); \ }) @@ -227,9 +229,11 @@ do { \ #define put_user(x, ptr) \ ({ \ + __typeof__(*(ptr)) *optr = (ptr); \ + \ might_fault(); \ - access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ? \ - __put_user((x), (ptr)) : \ + access_ok(VERIFY_WRITE, optr, sizeof(*optr)) ? \ + __put_user((x), optr) : \ -EFAULT; \ }) -- 1.7.9.5

12 years, 1 month

[PATCH 1/3] mfd: mc13xxx: Don't require lock for simple register I/O

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> Since the conversion to regmap there has been no need for device level locking for I/O as regmap provides locking so remove the locks. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- drivers/mfd/mc13xxx-core.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c index 2a9b100..dbbf8ee 100644 --- a/drivers/mfd/mc13xxx-core.c +++ b/drivers/mfd/mc13xxx-core.c @@ -158,8 +158,6 @@ int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32 *val) { int ret; - BUG_ON(!mutex_is_locked(&mc13xxx->lock)); - if (offset > MC13XXX_NUMREGS) return -EINVAL; @@ -172,8 +170,6 @@ EXPORT_SYMBOL(mc13xxx_reg_read); int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int offset, u32 val) { - BUG_ON(!mutex_is_locked(&mc13xxx->lock)); - dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x\n", offset, val); if (offset > MC13XXX_NUMREGS || val > 0xffffff) @@ -186,7 +182,6 @@ EXPORT_SYMBOL(mc13xxx_reg_write); int mc13xxx_reg_rmw(struct mc13xxx *mc13xxx, unsigned int offset, u32 mask, u32 val) { - BUG_ON(!mutex_is_locked(&mc13xxx->lock)); BUG_ON(val & ~mask); dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x (mask: 0x%06x)\n", offset, val, mask); -- 1.8.4.rc3

12 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel