linaro-kernel

linaro-kernel@lists.linaro.org

10094 discussions

[PATCH/CDF RFC v3 0/3] Migrate CDFv3 into pl111 drm/kms driver

by Show Liu

Hi all, This series patches base on Tom's "Initial drm/kms driver for pl111"[1] with linaro release 13.07 and migrate the CDFv3 for evaluation. please notes that I set VGA as default output and tested on RTSM only. [1] http://lwn.net/Articles/561344/ Cheers, Show Liu Show Liu (3): Add display entities and pipe link for pl111 Add display entity and set VGA output(site MB) as default add pipe link for display entity arch/arm/boot/dts/rtsm_ve-motherboard.dtsi | 46 +++ arch/arm/boot/dts/rtsm_ve-v2p-ca15x1-ca7x1.dts | 4 + drivers/gpu/drm/pl111/pl111_drm.h | 23 +- drivers/gpu/drm/pl111/pl111_drm_device.c | 374 ++++++++++++++++++++++-- drivers/video/vexpress-dvi.c | 94 +++++- 5 files changed, 503 insertions(+), 38 deletions(-) -- 1.7.9.5

11 years, 7 months

[PATCH V5 0/9] USB: OHCI: more bus glues as separate modules

by Manjunath Goudar

These patches are for separating the SOC On-Chip ohci host controller from ohci-hcd host code and making per SOC driver module similar to EHCI module available in the kernel. This work is part of enabling multi-platform kernel on ARM. Before I was sending three different ohci patch set as below. 1. Six series patch set is having exynos, omap, omap3, spear, at91 and s3c2410. 2. ohci-nxp a separate driver patch. 3. Two series patch set is having ep93xx and pxa27x. In this patch set all three previous ohci series have been combined into single series as all these patches are related to OHCI. This patch series is rebased on greghk/usb-next 3.12 rc1. Manjunath Goudar (9): USB: OHCI: make ohci-exynos a separate driver USB: OHCI: make ohci-omap a separate driver USB: OHCI: make ohci-omap3 a separate driver USB: OHCI: make ohci-spear a separate driver USB: OHCI: make ohci-at91 a separate driver USB: OHCI: make ohci-s3c2410 a separate driver USB: OHCI: make ohci-nxp a separate driver USB: OHCI: make ohci-ep93xx a separate driver USB: OHCI: make ohci-pxa27x a separate driver drivers/usb/host/Kconfig | 56 ++++++++- drivers/usb/host/Makefile | 9 ++ drivers/usb/host/ohci-at91.c | 156 ++++++++++++------------- drivers/usb/host/ohci-ep93xx.c | 72 +++++------- drivers/usb/host/ohci-exynos.c | 167 +++++++++++---------------- drivers/usb/host/ohci-hcd.c | 149 ------------------------ drivers/usb/host/ohci-nxp.c | 123 ++++++++------------ drivers/usb/host/ohci-omap.c | 156 +++++++++---------------- drivers/usb/host/ohci-omap3.c | 118 +++++++------------ drivers/usb/host/ohci-pxa27x.c | 240 +++++++++++++++++---------------------- drivers/usb/host/ohci-s3c2410.c | 128 ++++++++++----------- drivers/usb/host/ohci-spear.c | 140 +++++++++-------------- 12 files changed, 587 insertions(+), 927 deletions(-) -- 1.7.9.5

11 years, 7 months

Re: [PATCH] spi/s3c64x: Ensure runtime PM is enabled prior to registration

by Sylwester Nawrocki

On 27/09/13 12:53, Mark Brown wrote: > From: Mark Brown <broonie(a)linaro.org> > > Otherwise we may try to start transfers immediately and then fail to > runtime resume the device causing us not to have clocks enabled. > > Signed-off-by: Mark Brown <broonie(a)linaro.org> Reviewed-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> There is only a small typo in the subject line, thanks.

11 years, 7 months

[PATCH v2 0/8] Support VGIC save/restore using device control API

by Christoffer Dall

Implement save/restore of the VGIC state using the newer KVM Device Control API. This requries some number of changes to existing code in addition to actually supporting save/restore of the necessary state. The first patches (01-03) support creating the VGIC using the Device Control API. This change is necessary because there are no other suitable KVM APIs that we can leverage to access the VGIC state from user space and the device control API was crafted exactly for this purpose. Subsequent patches add the missing infrastructure and user space API pieces necessary to actually save and restore the VGIC state. The GIC v2.0 architecture specification already specifies registers that can be used to save and restore the complete VGIC state for suspend/resume purposes on real hardware, and we can resuse this interface for the VGIC. The API is therefore based on the memory-mapped register accesses defined in the specs. See the individual patches for details. The patches are based on kvm-arm-next: git://git.linaro.org/people/cdall/linux-kvm-arm.git kvm-arm-next This patch series based on the above can be cloned from: git://git.linaro.org/people/cdall/linux-kvm-arm.git vgic-migrate-v2 User space patches for QEMU also posted on the list. Tested on Versatile Express TC2. Changelogs in the individual patches. Christoffer Dall (8): ARM: KVM: Allow creating the VGIC after VCPUs KVM: arm-vgic: Support KVM_CREATE_DEVICE for VGIC KVM: arm-vgic: Set base addr through device API irqchip: arm-gic: Define additional MMIO offsets and masks KVM: arm-vgic: Make vgic mmio functions more generic KVM: arm-vgic: Add vgic reg access from dev attr KVM: arm-vgic: Add GICD_SPENDSGIR and GICD_CPENDSGIR handlers KVM: arm-vgic: Support CPU interface reg access Documentation/virtual/kvm/api.txt | 6 +- Documentation/virtual/kvm/devices/arm-vgic.txt | 71 ++++ arch/arm/include/uapi/asm/kvm.h | 8 + arch/arm/kvm/arm.c | 10 +- include/kvm/arm_vgic.h | 2 +- include/linux/irqchip/arm-gic.h | 14 + include/linux/kvm_host.h | 1 + include/uapi/linux/kvm.h | 1 + virt/kvm/arm/vgic.c | 494 ++++++++++++++++++++++-- virt/kvm/kvm_main.c | 5 + 10 files changed, 580 insertions(+), 32 deletions(-) create mode 100644 Documentation/virtual/kvm/devices/arm-vgic.txt -- 1.7.10.4

11 years, 7 months

dead lock issue on upstream perf.

by Alex Shi

When I run perf command on my pandaboard es with upstream kernel 3.12-rc2 kernel. my kernel dump some ops once. but hard to reproduce this issue. Anyone has interesting on this? $sudo ~/bin/perf record -e cpu-clock -e task-clock -e page-faults -e cs -g -a dd if=/dev/mmcblk0p1 of=/dev/null 147424+0 records in 147424+0 records out 75481088 bytes (75 MB) copied, 3.70752 s, 20.4 MB/s [ perf record: Woken up 26 times to write data ] [ perf record: Captured and wrote 6.715 MB perf.data (~293383 samples) ] and dmesg show: [25429.818237] hrtimer: interrupt took 183106 ns [25430.221008] [25430.221405] ============================================= [25430.228149] [ INFO: possible recursive locking detected ] [25430.234100] 3.12.0-rc2 #2 Not tainted [25430.237945] --------------------------------------------- [25430.243743] perf/7789 is trying to acquire lock: [25430.246154] (&mm->mmap_sem){++++++}, at: [<c053578c>] do_page_fault.part.9+0x8c/0x3bc [25430.246154] [25430.246154] but task is already holding lock: [25430.263305] (&mm->mmap_sem){++++++}, at: [<c0535770>] do_page_fault.part.9+0x70/0x3bc [25430.271759] [25430.271759] other info that might help us debug this: [25430.278594] Possible unsafe locking scenario: [25430.278594] [25430.284820] CPU0 [25430.287567] ---- [25430.290008] lock(&mm->mmap_sem); [25430.293762] lock(&mm->mmap_sem); [25430.297424] [25430.297424] *** DEADLOCK *** [25430.297424] [25430.303588] May be due to missing lock nesting notation [25430.303588] [25430.310943] 5 locks held by perf/7789: [25430.314788] #0: (sb_writers#7){.+.+.+}, at: [<c0114400>] vfs_write+0x174/0x188 [25430.322753] #1: (&sb->s_type->i_mutex_key#9){+.+.+.}, at: [<c00d91e4>] generic_file_aio_write+0x44/0xa0 [25430.333038] #2: (&mm->mmap_sem){++++++}, at: [<c0535770>] do_page_fault.part.9+0x70/0x3bc [25430.341888] #3: (rcu_read_lock){.+.+.+}, at: [<c00d3904>] __perf_sw_event+0x24/0x204 [25430.350402] #4: (rcu_read_lock){.+.+.+}, at: [<c00d2b14>] __perf_event_overflow+0x128/0x2b4 [25430.359344] [25430.359344] stack backtrace: [25430.364135] CPU: 1 PID: 7789 Comm: perf Not tainted 3.12.0-rc2 #2 [25430.370513] [<c001c7b0>] (unwind_backtrace+0x0/0x130) from [<c00187f8>] (show_stack+0x10/0x14) [25430.377624] [<c00187f8>] (show_stack+0x10/0x14) from [<c052dcd0>] (dump_stack+0x78/0x94) [25430.388336] [<c052dcd0>] (dump_stack+0x78/0x94) from [<c009fa8c>] (__lock_acquire+0x14d0/0x1b8c) [25430.397125] [<c009fa8c>] (__lock_acquire+0x14d0/0x1b8c) from [<c00a0694>] (lock_acquire+0x9c/0x104) [25430.407348] [<c00a0694>] (lock_acquire+0x9c/0x104) from [<c05314c8>] (down_read+0x30/0x40) [25430.415344] [<c05314c8>] (down_read+0x30/0x40) from [<c053578c>] (do_page_fault.part.9+0x8c/0x3bc) [25430.425567] [<c053578c>] (do_page_fault.part.9+0x8c/0x3bc) from [<c0535b30>] (do_page_fault+0x74/0x84) [25430.435607] [<c0535b30>] (do_page_fault+0x74/0x84) from [<c000839c>] (do_DataAbort+0x34/0x98) [25430.444335] [<c000839c>] (do_DataAbort+0x34/0x98) from [<c0533ea4>] (__dabt_svc+0x44/0x80) [25430.453460] Exception stack(0xedf0b9a0 to 0xedf0b9e8) [25430.458831] b9a0: edf0ba14 0007ca5c ffffffec 00000000 0000007e 00000000 ede0d000 0007ca5c -- Thanks Alex

11 years, 7 months

[PATCH 0/8] Support VGIC save/restore using device control API

by Christoffer Dall

Implement save/restore of the VGIC state using the newer KVM Device Control API. This requries some number of changes to existing code in addition to actually supporting save/restore of the necessary state. The first patches (01-03) support creating the VGIC using the Device Control API. This change is necessary because there are no other suitable KVM APIs that we can leverage to access the VGIC state from user space and the device control API was crafted exactly for this purpose. Subsequent patches add the missing infrastructure and user space API pieces necessary to actually save and restore the VGIC state. The GIC v2.0 architecture specification already specifies registers that can be used to save and restore the complete VGIC state for suspend/resume purposes on real hardware, and we can resuse this interface for the VGIC. The API is therefore based on the memory-mapped register accesses defined in the specs. See the individual patches for details. The patches rely on a number of small fixes sent separately to actually work: git://git.linaro.org/people/cdall/linux-kvm-arm.git vgic-migrate-prereq This patch series based on the above can be cloned from: git://git.linaro.org/people/cdall/linux-kvm-arm.git vgic-migrate User space patches for QEMU will follow shortly. Tested on Versatile Express TC2. Christoffer Dall (8): ARM: KVM: Allow creating the VGIC after VCPUs KVM: arm-vgic: Support KVM_CREATE_DEVICE for VGIC KVM: arm-vgic: Set base addr through device API irqchip: arm-gic: Define additional MMIO offsets and masks KVM: arm-vgic: Make vgic mmio functions more generic KVM: arm-vgic: Add vgic reg access from dev attr KVM: arm-vgic: Add GICD_SPENDSGIR and GICD_CPENDSGIR handlers KVM: arm-vgic: Support CPU interface reg access Documentation/virtual/kvm/api.txt | 6 +- Documentation/virtual/kvm/devices/arm-vgic.txt | 56 +++ arch/arm/include/uapi/asm/kvm.h | 8 + arch/arm/kvm/arm.c | 10 +- include/kvm/arm_vgic.h | 2 +- include/linux/irqchip/arm-gic.h | 14 + include/linux/kvm_host.h | 1 + include/uapi/linux/kvm.h | 1 + virt/kvm/arm/vgic.c | 479 ++++++++++++++++++++++-- virt/kvm/kvm_main.c | 5 + 10 files changed, 554 insertions(+), 28 deletions(-) create mode 100644 Documentation/virtual/kvm/devices/arm-vgic.txt -- 1.7.10.4

11 years, 7 months

[PATCH] OMAPDSS: Add missing dependency on backlight for DSI-CM panel drier

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> The DSI-CM driver uses the backlight class so needs to build depend on it. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- drivers/video/omap2/displays-new/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/omap2/displays-new/Kconfig b/drivers/video/omap2/displays-new/Kconfig index 6c90885..10b25e7 100644 --- a/drivers/video/omap2/displays-new/Kconfig +++ b/drivers/video/omap2/displays-new/Kconfig @@ -35,6 +35,7 @@ config DISPLAY_PANEL_DPI config DISPLAY_PANEL_DSI_CM tristate "Generic DSI Command Mode Panel" + depends on BACKLIGHT_CLASS_DEVICE help Driver for generic DSI command mode panels. -- 1.8.4.rc3

11 years, 7 months

arm-soc/for-next boot: 23 pass, 2 fail (fixes-for-linus-408-ge4f7a53)

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: arm-soc/for-next Git describe: fixes-for-linus-408-ge4f7a53 Commit: e4f7a53270 NEXT: ARM: add arm-soc-for-next-contents.txt Failed boot tests (console logs at the end) =========================================== omap4-panda: FAIL: arm-omap2plus_defconfig omap4-panda-es: 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.2 sec imx6q-wandboard PASS: 0 min 15.0 sec arm-omap2plus_defconfig ----------------------- am335x-boneblack PASS: 0 min 27.2 sec omap3-beagle-xm PASS: 0 min 51.4 sec am335x-bone PASS: 0 min 26.3 sec omap3-tobi,3530overo PASS: 0 min 42.3 sec omap4-panda FAIL: 2 min 23.0 sec omap4-panda-es FAIL: 2 min 28.7 sec omap3-tobi,3730storm PASS: 0 min 41.6 sec omap3-beagle PASS: 1 min 4.7 sec arm-multi_v7_defconfig ---------------------- am335x-boneblack PASS: 0 min 31.8 sec omap3-beagle-xm PASS: 0 min 51.8 sec omap4-panda-es PASS: 1 min 5.6 sec omap4-panda PASS: 0 min 58.7 sec sun4i-a10-cubieboard PASS: 0 min 11.6 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.5 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.5 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.7 sec omap3-beagle PASS: 1 min 14.3 sec arm-exynos_defconfig -------------------- exynos5250-arndale PASS: 0 min 29.9 sec arm-sama5_defconfig ------------------- sama5d35ek PASS: 0 min 18.3 sec Console logs for failures ========================= arm-omap2plus_defconfig ----------------------- omap4-panda: FAIL: last 24 lines of boot log: --------------------------------------------- [ 2.455352] omap-dma-engine 4a056000.dma-controller: allocating channel for 59 [ 2.586639] twl_rtc rtc.11: setting system clock to 2013-09-26 09:57:48 UTC (1380189468) [ 2.732757] mmc0: host does not support reading read-only switch. assuming write-enable. [ 2.743560] mmc0: new high speed SD card at address aaaa [ 2.751403] mmcblk0: mmc0:aaaa SD02G 1.84 GiB [ 2.761383] mmcblk0: p1 p2 [ 16.758087] EXT4-fs (mmcblk0p2): recovery complete [ 16.771209] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null) [ 16.779937] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 16.788787] devtmpfs: mounted [ 16.788787] Freeing unused kernel memory: 392K (c074f000 - c07b1000) [ 17.290466] init: ureadahead main process (793) terminated with status 5 * Setting sensors limits [80G [74G[ OK ] * Loading cpufreq kernel modules... [80G Last login: Tue Sep 24 15:36:00 UTC 2013 on tty1 Welcome to Linaro 13.08 (GNU/Linux 3.12.0-rc2-00408-ge4f7a53 armv7l) * Documentation: https://wiki.linaro.org/ [74G[ OK ] * CPUFreq Utilities: Setting ondemand CPUFreq governor... [80G * disabled, governor not available... [80Groot@linaro-developer:~# [74G[ OK ] ~$off # PYBOOT: Exception: userspace: ERROR: Never found root shell # PYBOOT: Time: 143.04 seconds. # PYBOOT: Result: FAIL omap4-panda-es: FAIL: last 24 lines of boot log: ------------------------------------------------ [ 20.711547] EXT4-fs (mmcblk0p2): recovery complete [ 21.590209] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null) [ 21.599365] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 21.607971] devtmpfs: mounted [ 21.611602] Freeing unused kernel memory: 392K (c074f000 - c07b1000) [ 22.135894] init: ureadahead main process (794) terminated with status 5 [ 25.708343] init: Caught segmentation fault, core dumped [ 25.721282] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000b00 [ 25.721282] [ 25.721405] CPU0: stopping [ 25.734008] CPU: 0 PID: 866 Comm: loadkeys Not tainted 3.12.0-rc2-00408-ge4f7a53 #1 [ 25.734008] [<c001bc28>] (unwind_backtrace+0x0/0xf0) from [<c0017e50>] (show_stack+0x10/0x14) [ 25.734008] [<c0017e50>] (show_stack+0x10/0x14) from [<c05076d8>] (dump_stack+0x78/0x94) [ 25.734008] [<c05076d8>] (dump_stack+0x78/0x94) from [<c00198f0>] (handle_IPI+0x10c/0x134) [ 25.734008] [<c00198f0>] (handle_IPI+0x10c/0x134) from [<c00085d4>] (gic_handle_irq+0x54/0x5c) [ 25.777740] [<c00085d4>] (gic_handle_irq+0x54/0x5c) from [<c050dd3c>] (__irq_usr+0x3c/0x60) [ 25.777740] Exception stack(0xed9b9fb0 to 0xed9b9ff8) [ 25.777740] 9fa0: ffffffe5 00011599 00000066 0000004b [ 25.777740] 9fc0: 00028cee 00000080 00000000 00000000 0001e260 00000001 0001e3ac 00000036 [ 25.777740] 9fe0: 0001e00c be82b1a0 0000cba5 0000cb98 80000130 ffffffff ~$off # PYBOOT: Exception: userspace: ERROR: Never found root shell # PYBOOT: Time: 148.65 seconds. # PYBOOT: Result: FAIL

11 years, 7 months

next/master boot: 24 pass, 1 fail (next-20130926)

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/master Git describe: next-20130926 Commit: 9acc1f56ec Add linux-next specific files for 20130926 Failed boot tests (console logs at the end) =========================================== omap4-panda-es: 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.2 sec imx6q-wandboard PASS: 0 min 15.0 sec arm-omap2plus_defconfig ----------------------- am335x-boneblack PASS: 0 min 27.1 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.5 sec omap4-panda PASS: 1 min 4.2 sec omap4-panda-es FAIL: 2 min 30.9 sec omap3-tobi,3730storm PASS: 0 min 44.4 sec omap3-beagle PASS: 0 min 57.3 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 11.8 sec omap4-panda PASS: 1 min 2.0 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.5 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.6 sec omap3-beagle PASS: 1 min 7.4 sec arm-exynos_defconfig -------------------- exynos5250-arndale PASS: 0 min 29.7 sec arm-sama5_defconfig ------------------- sama5d35ek PASS: 0 min 18.2 sec Console logs for failures ========================= arm-omap2plus_defconfig ----------------------- omap4-panda-es: FAIL: last 24 lines of boot log: ------------------------------------------------ [ 2.222198] omap_i2c 48350000.i2c: bus 3 rev0.11 at 400 kHz [ 2.228668] omap-dma-engine 4a056000.dma-controller: allocating channel for 62 [ 2.236419] omap-dma-engine 4a056000.dma-controller: allocating channel for 61 [ 2.246978] omap_hsmmc 4809c000.mmc: pins are not configured from the driver [ 2.303131] pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38) [ 2.311401] pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x [ 2.320800] omap-dma-engine 4a056000.dma-controller: allocating channel for 60 [ 2.328674] omap-dma-engine 4a056000.dma-controller: allocating channel for 59 [ 2.461975] mmc0: host does not support reading read-only switch. assuming write-enable. [ 2.472717] mmc0: new high speed SDHC card at address 1234 [ 2.480468] mmcblk0: mmc0:1234 SA04G 3.63 GiB [ 2.490264] mmcblk0: p1 p2 [ 2.538482] twl_rtc rtc.12: setting system clock to 2000-01-29 12:18:56 UTC (949148336) [ 23.117950] EXT4-fs (mmcblk0p2): recovery complete [ 23.126922] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null) [ 23.135803] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 23.144287] devtmpfs: mounted [ 23.148468] Freeing unused kernel memory: 392K (c0753000 - c07b5000) [ 23.668945] init: ureadahead main process (795) terminated with status 5 * Setting sensors limits [80G [74G[ OK ] ~$off # PYBOOT: Exception: userspace: ERROR: Never found root shell # PYBOOT: Time: 150.91 seconds. # PYBOOT: Result: FAIL

11 years, 7 months

[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

11 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel