linaro-dev

linaro-dev@lists.linaro.org

4332 discussions

[PATCH android/device/linaro/pandaboard] Remove obsolete vold.conf

by Jeremy Chang

Signed-off-by: Jeremy Chang <jeremy.chang(a)linaro.org> --- AndroidBoard.mk | 5 ----- vold.conf | 10 ---------- 2 files changed, 0 insertions(+), 15 deletions(-) delete mode 100644 vold.conf diff --git a/AndroidBoard.mk b/AndroidBoard.mk index 6bb655a..941416a 100644 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -35,11 +35,6 @@ ALL_PREBUILT += $(file) $(file) : $(LOCAL_PATH)/init.omap4.sh | $(ACP) $(transform-prebuilt-to-target) -file := $(TARGET_ROOT_OUT)/system/etc/vold.conf -ALL_PREBUILT += $(file) -$(file) : $(LOCAL_PATH)/vold.conf | $(ACP) - $(transform-prebuilt-to-target) - file := $(TARGET_ROOT_OUT)/initlogo.rle ALL_PREBUILT += $(file) $(file) : $(LOCAL_PATH)/initlogo.rle | $(ACP) diff --git a/vold.conf b/vold.conf deleted file mode 100644 index 6901734..0000000 --- a/vold.conf +++ /dev/null @@ -1,10 +0,0 @@ -## vold configuration file for the 'generic' target - -volume_sdcard { - ## This is the direct uevent device path to the SD slot on the device - media_path /devices/platform/mmci-omap-hs.0/mmc_host/mmc0 - - media_type mmc - mount_point /sdcard - ums_path /devices/platform/musb_hdrc/gadget/lun0 -} -- 1.7.1

14 years

[PATCH android/device/linaro/pandaboard] Move the common package and benchmark definitions into common folder

by Jeremy Chang

Signed-off-by: Jeremy Chang <jeremy.chang(a)linaro.org> --- ZeroXBenchmark.mk | 96 ----------------------------------------------------- pandaboard.mk | 31 +---------------- 2 files changed, 1 insertions(+), 126 deletions(-) delete mode 100644 ZeroXBenchmark.mk diff --git a/ZeroXBenchmark.mk b/ZeroXBenchmark.mk deleted file mode 100644 index e78047d..0000000 --- a/ZeroXBenchmark.mk +++ /dev/null @@ -1,96 +0,0 @@ -UNIXBENCH_BENCH_APPS := \ - bench_ubench_hanoi \ - bench_ubench_syscall \ - bench_ubench_context1 \ - bench_ubench_pipe \ - bench_ubench_spawn \ - bench_ubench_execl \ - bench_ubench_looper \ - bench_ubench_fstime \ - bench_ubench_arithoh \ - bench_ubench_register \ - bench_ubench_short \ - bench_ubench_int \ - bench_ubench_long \ - bench_ubench_float \ - bench_ubench_double \ - bench_ubench_dhry2 \ - bench_ubench_dhry2reg \ - bench_ubench_whetstone-double - -LIBMICRO_BENCH_APPS := \ - bench_getpid \ - bench_bind \ - bench_cascade_mutex \ - bench_cascade_fcntl \ - bench_cascade_flock \ - bench_chdir \ - bench_close \ - bench_close_tcp \ - bench_connection \ - bench_dup \ - bench_exec \ - bench_exit \ - bench_exp \ - bench_fcntl \ - bench_fcntl_ndelay \ - bench_file_lock \ - bench_fork \ - bench_getenv \ - bench_gettimeofday \ - bench_getpeername \ - bench_getrusage \ - bench_getsockname \ - bench_isatty \ - bench_listen \ - bench_localtime_r \ - bench_log \ - bench_longjmp \ - bench_lrand48 \ - bench_lseek \ - bench_malloc \ - bench_memcpy \ - bench_memmove \ - bench_memrand \ - bench_memset \ - bench_mktime \ - bench_mprotect \ - bench_mmap \ - bench_msync \ - bench_munmap \ - bench_mutex \ - bench_nop \ - bench_open \ - bench_pipe \ - bench_poll \ - bench_pread \ - bench_pthread_create \ - bench_pwrite \ - bench_read \ - bench_realpath \ - bench_recurse \ - bench_select \ - bench_setsockopt \ - bench_sigaction \ - bench_siglongjmp \ - bench_signal \ - bench_sigprocmask \ - bench_socket \ - bench_socketpair \ - bench_stat \ - bench_strcasecmp \ - bench_strchr \ - bench_strcmp \ - bench_strcpy \ - bench_strftime \ - bench_strlen \ - bench_strtol \ - bench_system \ - bench_time \ - bench_times \ - bench_write \ - bench_writev - -ZEROXBENCHMARK_NATIVE_APPS := \ - $(UNIXBENCH_BENCH_APPS) \ - $(LIBMICRO_BENCH_APPS) diff --git a/pandaboard.mk b/pandaboard.mk index 7c15efd..43dd4a5 100644 --- a/pandaboard.mk +++ b/pandaboard.mk @@ -1,36 +1,7 @@ # The pandaboard product that is specialized for pandaboard. - -include $(LOCAL_PATH)/ZeroXBenchmark.mk - -PRODUCT_PACKAGES := \ - ZeroXBenchmark \ - libmicro \ - AccountAndSyncSettings \ - AlarmClock \ - AlarmProvider \ - Bluetooth \ - Calculator \ - Calendar \ - Camera \ - CertInstaller \ - DrmProvider \ - Email \ - Gallery3D \ - LatinIME \ - Mms \ - Music \ - Provision \ - Settings \ - Sync \ - Updater \ - CalendarProvider \ - SyncProvider \ - $(ZEROXBENCHMARK_NATIVE_APPS) - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) +$(call inherit-product, device/linaro/common/common.mk) $(call inherit-product, device/linaro/pandaboard/device.mk) -# Overrides PRODUCT_BRAND := pandaboard PRODUCT_DEVICE := pandaboard PRODUCT_NAME := pandaboard -- 1.7.1

14 years

[PATCH android/device/linaro/common] Add common.mk

by Jeremy Chang

Add common.mk and ZeroXBenchmark.mk for the common part Signed-off-by: Jeremy Chang <jeremy.chang(a)linaro.org> --- ZeroXBenchmark.mk | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ common.mk | 29 ++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) create mode 100644 ZeroXBenchmark.mk create mode 100644 common.mk diff --git a/ZeroXBenchmark.mk b/ZeroXBenchmark.mk new file mode 100644 index 0000000..e78047d --- /dev/null +++ b/ZeroXBenchmark.mk @@ -0,0 +1,96 @@ +UNIXBENCH_BENCH_APPS := \ + bench_ubench_hanoi \ + bench_ubench_syscall \ + bench_ubench_context1 \ + bench_ubench_pipe \ + bench_ubench_spawn \ + bench_ubench_execl \ + bench_ubench_looper \ + bench_ubench_fstime \ + bench_ubench_arithoh \ + bench_ubench_register \ + bench_ubench_short \ + bench_ubench_int \ + bench_ubench_long \ + bench_ubench_float \ + bench_ubench_double \ + bench_ubench_dhry2 \ + bench_ubench_dhry2reg \ + bench_ubench_whetstone-double + +LIBMICRO_BENCH_APPS := \ + bench_getpid \ + bench_bind \ + bench_cascade_mutex \ + bench_cascade_fcntl \ + bench_cascade_flock \ + bench_chdir \ + bench_close \ + bench_close_tcp \ + bench_connection \ + bench_dup \ + bench_exec \ + bench_exit \ + bench_exp \ + bench_fcntl \ + bench_fcntl_ndelay \ + bench_file_lock \ + bench_fork \ + bench_getenv \ + bench_gettimeofday \ + bench_getpeername \ + bench_getrusage \ + bench_getsockname \ + bench_isatty \ + bench_listen \ + bench_localtime_r \ + bench_log \ + bench_longjmp \ + bench_lrand48 \ + bench_lseek \ + bench_malloc \ + bench_memcpy \ + bench_memmove \ + bench_memrand \ + bench_memset \ + bench_mktime \ + bench_mprotect \ + bench_mmap \ + bench_msync \ + bench_munmap \ + bench_mutex \ + bench_nop \ + bench_open \ + bench_pipe \ + bench_poll \ + bench_pread \ + bench_pthread_create \ + bench_pwrite \ + bench_read \ + bench_realpath \ + bench_recurse \ + bench_select \ + bench_setsockopt \ + bench_sigaction \ + bench_siglongjmp \ + bench_signal \ + bench_sigprocmask \ + bench_socket \ + bench_socketpair \ + bench_stat \ + bench_strcasecmp \ + bench_strchr \ + bench_strcmp \ + bench_strcpy \ + bench_strftime \ + bench_strlen \ + bench_strtol \ + bench_system \ + bench_time \ + bench_times \ + bench_write \ + bench_writev + +ZEROXBENCHMARK_NATIVE_APPS := \ + $(UNIXBENCH_BENCH_APPS) \ + $(LIBMICRO_BENCH_APPS) diff --git a/common.mk b/common.mk new file mode 100644 index 0000000..8865ef1 --- /dev/null +++ b/common.mk @@ -0,0 +1,29 @@ +# stuff common to all Linaro LEB +include $(LOCAL_PATH)/ZeroXBenchmark.mk + +PRODUCT_PACKAGES := \ + AccountAndSyncSettings \ + AlarmClock \ + AlarmProvider \ + Bluetooth \ + Calculator \ + Calendar \ + Camera \ + CertInstaller \ + DrmProvider \ + Email \ + Gallery3D \ + LatinIME \ + Mms \ + Music \ + Provision \ + Settings \ + Sync \ + Updater \ + CalendarProvider \ + SyncProvider \ + ZeroXBenchmark \ + libmicro \ + $(ZEROXBENCHMARK_NATIVE_APPS) + +$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) -- 1.7.1

14 years

[PATCH android/device/linaro/beagleboard] Remove obsolete vold.conf

by Jeremy Chang

Signed-off-by: Jeremy Chang <jeremy.chang(a)linaro.org> --- AndroidBoard.mk | 5 ----- vold.conf | 10 ---------- 2 files changed, 0 insertions(+), 15 deletions(-) delete mode 100644 vold.conf diff --git a/AndroidBoard.mk b/AndroidBoard.mk index 934d19a..e6c13d0 100644 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -35,11 +35,6 @@ ALL_PREBUILT += $(file) $(file) : $(LOCAL_PATH)/init.omap3.sh | $(ACP) $(transform-prebuilt-to-target) -file := $(TARGET_ROOT_OUT)/system/etc/vold.conf -ALL_PREBUILT += $(file) -$(file) : $(LOCAL_PATH)/vold.conf | $(ACP) - $(transform-prebuilt-to-target) - file := $(TARGET_ROOT_OUT)/initlogo.rle ALL_PREBUILT += $(file) $(file) : $(LOCAL_PATH)/initlogo.rle | $(ACP) diff --git a/vold.conf b/vold.conf deleted file mode 100644 index 6901734..0000000 --- a/vold.conf +++ /dev/null @@ -1,10 +0,0 @@ -## vold configuration file for the 'generic' target - -volume_sdcard { - ## This is the direct uevent device path to the SD slot on the device - media_path /devices/platform/mmci-omap-hs.0/mmc_host/mmc0 - - media_type mmc - mount_point /sdcard - ums_path /devices/platform/musb_hdrc/gadget/lun0 -} -- 1.7.1

14 years

[PATCH android/device/linaro/beagleboard] Move the common package and benchmark definitions into common folder

by Jeremy Chang

Signed-off-by: Jeremy Chang <jeremy.chang(a)linaro.org> --- ZeroXBenchmark.mk | 96 ----------------------------------------------------- beagleboard.mk | 32 +----------------- 2 files changed, 1 insertions(+), 127 deletions(-) delete mode 100644 ZeroXBenchmark.mk diff --git a/ZeroXBenchmark.mk b/ZeroXBenchmark.mk deleted file mode 100644 index e78047d..0000000 --- a/ZeroXBenchmark.mk +++ /dev/null @@ -1,96 +0,0 @@ -UNIXBENCH_BENCH_APPS := \ - bench_ubench_hanoi \ - bench_ubench_syscall \ - bench_ubench_context1 \ - bench_ubench_pipe \ - bench_ubench_spawn \ - bench_ubench_execl \ - bench_ubench_looper \ - bench_ubench_fstime \ - bench_ubench_arithoh \ - bench_ubench_register \ - bench_ubench_short \ - bench_ubench_int \ - bench_ubench_long \ - bench_ubench_float \ - bench_ubench_double \ - bench_ubench_dhry2 \ - bench_ubench_dhry2reg \ - bench_ubench_whetstone-double - -LIBMICRO_BENCH_APPS := \ - bench_getpid \ - bench_bind \ - bench_cascade_mutex \ - bench_cascade_fcntl \ - bench_cascade_flock \ - bench_chdir \ - bench_close \ - bench_close_tcp \ - bench_connection \ - bench_dup \ - bench_exec \ - bench_exit \ - bench_exp \ - bench_fcntl \ - bench_fcntl_ndelay \ - bench_file_lock \ - bench_fork \ - bench_getenv \ - bench_gettimeofday \ - bench_getpeername \ - bench_getrusage \ - bench_getsockname \ - bench_isatty \ - bench_listen \ - bench_localtime_r \ - bench_log \ - bench_longjmp \ - bench_lrand48 \ - bench_lseek \ - bench_malloc \ - bench_memcpy \ - bench_memmove \ - bench_memrand \ - bench_memset \ - bench_mktime \ - bench_mprotect \ - bench_mmap \ - bench_msync \ - bench_munmap \ - bench_mutex \ - bench_nop \ - bench_open \ - bench_pipe \ - bench_poll \ - bench_pread \ - bench_pthread_create \ - bench_pwrite \ - bench_read \ - bench_realpath \ - bench_recurse \ - bench_select \ - bench_setsockopt \ - bench_sigaction \ - bench_siglongjmp \ - bench_signal \ - bench_sigprocmask \ - bench_socket \ - bench_socketpair \ - bench_stat \ - bench_strcasecmp \ - bench_strchr \ - bench_strcmp \ - bench_strcpy \ - bench_strftime \ - bench_strlen \ - bench_strtol \ - bench_system \ - bench_time \ - bench_times \ - bench_write \ - bench_writev - -ZEROXBENCHMARK_NATIVE_APPS := \ - $(UNIXBENCH_BENCH_APPS) \ - $(LIBMICRO_BENCH_APPS) diff --git a/beagleboard.mk b/beagleboard.mk index 015b605..2e40056 100644 --- a/beagleboard.mk +++ b/beagleboard.mk @@ -1,37 +1,7 @@ # The beagleboard product that is specialized for beagleboard. - -include $(LOCAL_PATH)/ZeroXBenchmark.mk - -PRODUCT_PACKAGES := \ - ZeroXBenchmark \ - libmicro \ - AccountAndSyncSettings \ - AlarmClock \ - AlarmProvider \ - Bluetooth \ - Calculator \ - Calendar \ - Camera \ - CertInstaller \ - DrmProvider \ - Email \ - Gallery3D \ - LatinIME \ - Mms \ - Music \ - Provision \ - Settings \ - Sync \ - Updater \ - CalendarProvider \ - SyncProvider \ - $(ZEROXBENCHMARK_NATIVE_APPS) - - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) +$(call inherit-product, device/linaro/common/common.mk) $(call inherit-product, device/linaro/beagleboard/device.mk) -# Overrides PRODUCT_BRAND := beagleboard PRODUCT_DEVICE := beagleboard PRODUCT_NAME := beagleboard -- 1.7.1

14 years

[PATCH 1/1] arm: pmu: support pmu/perf on OMAP4

by Avik Sil

This patch fixes the bug #702999 (oprofile failure on panda (omap4)). It is based on [1] that fixes the issue by enabling pmu events for omap4, which are routed from CTI. The patch attached is a modified version of [1] with removal of some CTI register reads that cause hang in the initial phase of booting. The patch has been verified on Panda board and the profile data could be generated that are shown by opreport. Although, there is a lockdep warning "possible circular locking dependency detected" when "opcontrol --start" is called for the first time. Regards, Avik [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2011-March/045283.html Signed-off-by: Avik Sil <avik.sil(a)linaro.org> --- arch/arm/include/asm/cti.h | 157 ++++++++++++++++++++++++++++ arch/arm/include/asm/pmu.h | 15 ++- arch/arm/kernel/perf_event.c | 15 ++- arch/arm/mach-omap2/devices.c | 82 ++++++++++++++- arch/arm/plat-omap/include/plat/omap44xx.h | 2 + 5 files changed, 262 insertions(+), 9 deletions(-) create mode 100644 arch/arm/include/asm/cti.h diff --git a/arch/arm/include/asm/cti.h b/arch/arm/include/asm/cti.h new file mode 100644 index 0000000..26e7450 --- /dev/null +++ b/arch/arm/include/asm/cti.h @@ -0,0 +1,157 @@ +#ifndef __ASMARM_CTI_H +#define __ASMARM_CTI_H + +#include <asm/io.h> + +/* The registers' definition is from section 3.2 of + * Embedded Cross Trigger Revision: r0p0 + */ +#define CTICONTROL 0x000 +#define CTISTATUS 0x004 +#define CTILOCK 0x008 +#define CTIPROTECTION 0x00C +#define CTIINTACK 0x010 +#define CTIAPPSET 0x014 +#define CTIAPPCLEAR 0x018 +#define CTIAPPPULSE 0x01c +#define CTIINEN 0x020 +#define CTIOUTEN 0x0A0 +#define CTITRIGINSTATUS 0x130 +#define CTITRIGOUTSTATUS 0x134 +#define CTICHINSTATUS 0x138 +#define CTICHOUTSTATUS 0x13c +#define CTIPERIPHID0 0xFE0 +#define CTIPERIPHID1 0xFE4 +#define CTIPERIPHID2 0xFE8 +#define CTIPERIPHID3 0xFEC +#define CTIPCELLID0 0xFF0 +#define CTIPCELLID1 0xFF4 +#define CTIPCELLID2 0xFF8 +#define CTIPCELLID3 0xFFC + +/* The below are from section 3.6.4 of + * CoreSight v1.0 Architecture Specification + */ +#define LOCKACCESS 0xFB0 +#define LOCKSTATUS 0xFB4 + +/* write this value to LOCKACCESS will unlock the module, and + * other value will lock the module + */ +#define LOCKCODE 0xC5ACCE55 + +/** + * struct cti - cross trigger interface struct + * @base: mapped virtual address for the cti base + * @irq: irq number for the cti + * @trig_out_for_irq: triger out number which will cause + * the @irq happen + * + * cti struct used to operate cti registers. + */ +struct cti { + void __iomem *base; + int irq; + int trig_out_for_irq; +}; + +/** + * cti_init - initialize the cti instance + * @cti: cti instance + * @base: mapped virtual address for the cti base + * @irq: irq number for the cti + * @trig_out: triger out number which will cause + * the @irq happen + * + * called by machine code to pass the board dependent + * @base, @irq and @trig_out to cti. + */ +static inline void cti_init(struct cti *cti, + void __iomem *base, int irq, int trig_out) +{ + cti->base = base; + cti->irq = irq; + cti->trig_out_for_irq = trig_out; +} + +/** + * cti_map_trigger - use the @chan to map @trig_in to @trig_out + * @cti: cti instance + * @trig_in: trigger in number + * @trig_out: trigger out number + * @channel: channel number + * + * This function maps one trigger in of @trig_in to one trigger + * out of @trig_out using the channel @chan. + */ +static inline void cti_map_trigger(struct cti *cti, + int trig_in, int trig_out, int chan) +{ + void __iomem *base = cti->base; + + __raw_writel(BIT(chan), base + CTIINEN + trig_in * 4); + __raw_writel(BIT(chan), base + CTIOUTEN + trig_out * 4); +} + +/** + * cti_enable - enable the cti module + * @cti: cti instance + * + * enable the cti module + */ +static inline void cti_enable(struct cti *cti) +{ + __raw_writel(0x1, cti->base + CTICONTROL); +} + +/** + * cti_disable - disable the cti module + * @cti: cti instance + * + * enable the cti module + */ +static inline void cti_disable(struct cti *cti) +{ + __raw_writel(0, cti->base + CTICONTROL); +} + +/** + * cti_irq_ack - clear the cti irq + * @cti: cti instance + * + * clear the cti irq + */ +static inline void cti_irq_ack(struct cti *cti) +{ + void __iomem *base = cti->base; + unsigned long val; + + val = __raw_readl(base + CTIINTACK); + val |= BIT(cti->trig_out_for_irq); + __raw_writel(val, base + CTIINTACK); +} + +/** + * cti_unlock - unlock cti module + * @cti: cti instance + * + * unlock the cti module, or else any writes to the cti + * module is not allowed. + */ +static inline void cti_unlock(struct cti *cti) +{ + __raw_writel(LOCKCODE, cti->base + LOCKACCESS); +} + +/** + * cti_lock - lock cti module + * @cti: cti instance + * + * lock the cti module, so any writes to the cti + * module will be not allowed. + */ +static inline void cti_lock(struct cti *cti) +{ + __raw_writel(~LOCKCODE, cti->base + LOCKACCESS); +} +#endif diff --git a/arch/arm/include/asm/pmu.h b/arch/arm/include/asm/pmu.h index 7544ce6..7ca3d15 100644 --- a/arch/arm/include/asm/pmu.h +++ b/arch/arm/include/asm/pmu.h @@ -22,13 +22,22 @@ enum arm_pmu_type { /* * struct arm_pmu_platdata - ARM PMU platform data * - * @handle_irq: an optional handler which will be called from the interrupt and - * passed the address of the low level handler, and can be used to implement - * any platform specific handling before or after calling it. + * @handle_irq: an optional handler which will be called from the + * interrupt and passed the address of the low level handler, + * and can be used to implement any platform specific handling + * before or after calling it. + * @enable_irq: an optional handler which will be called after + * request_irq and be used to handle some platform specific + * irq enablement + * @disable_irq: an optional handler which will be called before + * free_irq and be used to handle some platform specific + * irq disablement */ struct arm_pmu_platdata { irqreturn_t (*handle_irq)(int irq, void *dev, irq_handler_t pmu_handler); + void (*enable_irq)(int irq); + void (*disable_irq)(int irq); }; #ifdef CONFIG_CPU_HAS_PMU diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index 69cfee0..86db755 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -426,14 +426,18 @@ armpmu_reserve_hardware(void) pr_warning("unable to request IRQ%d for ARM perf " "counters\n", irq); break; - } + } else if (plat->enable_irq) + plat->enable_irq(irq); } if (err) { for (i = i - 1; i >= 0; --i) { irq = platform_get_irq(pmu_device, i); - if (irq >= 0) + if (irq >= 0) { + if (plat->disable_irq) + plat->disable_irq(irq); free_irq(irq, NULL); + } } release_pmu(pmu_device); pmu_device = NULL; @@ -446,11 +450,16 @@ static void armpmu_release_hardware(void) { int i, irq; + struct arm_pmu_platdata *plat = + dev_get_platdata(&pmu_device->dev); for (i = pmu_device->num_resources - 1; i >= 0; --i) { irq = platform_get_irq(pmu_device, i); - if (irq >= 0) + if (irq >= 0) { + if (plat->disable_irq) + plat->disable_irq(irq); free_irq(irq, NULL); + } } armpmu->stop(); diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index d478f53..cbd6b35 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -22,6 +22,7 @@ #include <asm/mach-types.h> #include <asm/mach/map.h> #include <asm/pmu.h> +#include <asm/cti.h> #include <plat/tc.h> #include <plat/board.h> @@ -386,20 +387,95 @@ static struct resource omap3_pmu_resource = { .flags = IORESOURCE_IRQ, }; +static struct resource omap4_pmu_resource[] = { + { + .start = OMAP44XX_IRQ_CTI0, + .end = OMAP44XX_IRQ_CTI0, + .flags = IORESOURCE_IRQ, + }, + { + .start = OMAP44XX_IRQ_CTI1, + .end = OMAP44XX_IRQ_CTI1, + .flags = IORESOURCE_IRQ, + } +}; + static struct platform_device omap_pmu_device = { .name = "arm-pmu", .id = ARM_PMU_DEVICE_CPU, .num_resources = 1, }; +static struct arm_pmu_platdata omap4_pmu_data; +static struct cti omap4_cti[2]; + +static void omap4_enable_cti(int irq) +{ + if (irq == OMAP44XX_IRQ_CTI0) + cti_enable(&omap4_cti[0]); + else if (irq == OMAP44XX_IRQ_CTI1) + cti_enable(&omap4_cti[1]); +} + +static void omap4_disable_cti(int irq) +{ + if (irq == OMAP44XX_IRQ_CTI0) + cti_disable(&omap4_cti[0]); + else if (irq == OMAP44XX_IRQ_CTI1) + cti_disable(&omap4_cti[1]); +} + +static irqreturn_t omap4_pmu_handler(int irq, void *dev, irq_handler_t handler) +{ + if (irq == OMAP44XX_IRQ_CTI0) + cti_irq_ack(&omap4_cti[0]); + else if (irq == OMAP44XX_IRQ_CTI1) + cti_irq_ack(&omap4_cti[1]); + + return handler(irq, dev); +} + +static void omap4_configure_pmu_irq(void) +{ + void __iomem *base0; + void __iomem *base1; + + base0 = ioremap(OMAP44XX_CTI0_BASE, SZ_4K); + base1 = ioremap(OMAP44XX_CTI1_BASE, SZ_4K); + if (!base0 && !base1) { + pr_err("ioremap for OMAP4 CTI failed\n"); + return; + } + + /*configure CTI0 for pmu irq routing*/ + cti_init(&omap4_cti[0], base0, OMAP44XX_IRQ_CTI0, 6); + cti_unlock(&omap4_cti[0]); + cti_map_trigger(&omap4_cti[0], 1, 6, 2); + + /*configure CTI1 for pmu irq routing*/ + cti_init(&omap4_cti[1], base1, OMAP44XX_IRQ_CTI1, 6); + cti_unlock(&omap4_cti[1]); + cti_map_trigger(&omap4_cti[1], 1, 6, 2); + + omap4_pmu_data.handle_irq = omap4_pmu_handler; + omap4_pmu_data.enable_irq = omap4_enable_cti; + omap4_pmu_data.disable_irq = omap4_disable_cti; +} + static void omap_init_pmu(void) { - if (cpu_is_omap24xx()) + if (cpu_is_omap24xx()) { omap_pmu_device.resource = &omap2_pmu_resource; - else if (cpu_is_omap34xx()) + } else if (cpu_is_omap34xx()) { omap_pmu_device.resource = &omap3_pmu_resource; - else + } else if (cpu_is_omap44xx()) { + omap_pmu_device.resource = omap4_pmu_resource; + omap_pmu_device.num_resources = 2; + omap_pmu_device.dev.platform_data = &omap4_pmu_data; + omap4_configure_pmu_irq(); + } else { return; + } platform_device_register(&omap_pmu_device); } diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h index ea2b8a6..b127a16 100644 --- a/arch/arm/plat-omap/include/plat/omap44xx.h +++ b/arch/arm/plat-omap/include/plat/omap44xx.h @@ -57,5 +57,7 @@ #define OMAP44XX_HSUSB_OHCI_BASE (L4_44XX_BASE + 0x64800) #define OMAP44XX_HSUSB_EHCI_BASE (L4_44XX_BASE + 0x64C00) +#define OMAP44XX_CTI0_BASE 0x54148000 +#define OMAP44XX_CTI1_BASE 0x54149000 #endif /* __ASM_ARCH_OMAP44XX_H */ -- 1.7.0.4

14 years

I'm away today.

by Zygmunt Krynicki

Hi everyone. Unfortunately I have to attend my young ones to the hospital. I will take a swap day for Saturday once we return. Best regards Zygmunt

14 years, 1 month

[PATCH 0/2] SROM config code moved to s5p-common directory

by Chander Kashyap

SROM config code is make common for S5P series boards. smdkc100.c refers to s5p_config_srom in s5p-common directory. Chander Kashyap (2): S5P: SROM config code moved to common directory s5p-common S5PC1XX: Refers to SROM config code in s5p-common directory. Header file renamed from smc.h to sromc.h. arch/arm/cpu/armv7/s5p-common/Makefile | 3 +- arch/arm/cpu/armv7/s5p-common/sromc.c | 49 ++++++++++++++++++++++++++ arch/arm/cpu/armv7/s5pc1xx/Makefile | 1 - arch/arm/cpu/armv7/s5pc1xx/sromc.c | 49 -------------------------- arch/arm/include/asm/arch-s5pc1xx/smc.h | 53 ----------------------------- arch/arm/include/asm/arch-s5pc1xx/sromc.h | 53 +++++++++++++++++++++++++++++ board/samsung/smdkc100/smdkc100.c | 4 +- 7 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 arch/arm/cpu/armv7/s5p-common/sromc.c delete mode 100644 arch/arm/cpu/armv7/s5pc1xx/sromc.c delete mode 100644 arch/arm/include/asm/arch-s5pc1xx/smc.h create mode 100644 arch/arm/include/asm/arch-s5pc1xx/sromc.h

14 years, 1 month

Importance (or not) of kernel modules dynamic instrumentation through systemtap

by Frederic Turgis

Hi all, systemtap allows instrumenting dynamically kernel functions with the interest of a scripting language that gives access to function parameters or the capability to directly write C code. https://wiki.linaro.org/Platform/DevPlatform/systemtap I have backported/implemented the support of 2.6.37/2.6.38 kernels in current version of Ubuntu systemtap package (v1.3), which is now uploaded. However, I missed an issue that prevents instrumenting kernel modules on ARM. In fact, I missed it because at work, we are generally probing our drivers (and scheduler/V4L2/...), which are statically linked. We are then wondering in the group if we can live without the capability to instrument kernel modules with systemtap. Knowing that v1.4, which fixes this issue, has been recently migrated to "Debian tested". And issue and fix are documented on the wiki so you can still recompile the tool ;-) Therefore, if this capability is critical to you, please speak. Or wait for upgrade to v1.4 !!!! Regards Fred

14 years, 1 month

Linaro 11.05 Beta-2

by Jamie Bennett

Hi, Currently there is no Ubuntu-based milestone image release between the Beta (2011-03-31) and Release Candidate (2011-05-21); this is a period of 51 days. In a fast moving project like Linaro, a lot can happen in 51 days. With this in mind and to help focus our testing initiative before RC the decision has been made to introduce a Linaro 11.05 Beta-2 milestone. The Beta-2 milestone will take advantage of the fact that the Ubuntu final release happens on 2011-04-28. Linaro 11.05 Beta-2 will be released on the same day, exactly one month before final and will incorporate all the Ubuntu final goodness. It is expected that this milestone will have the greatest test coverage, both manual and automated, of any release so far and will be a dry-run of what is expected in the run up to final release. On 2011-04-26 the Beta-2 candidate images will be selected and http://qatracker.linaro.org set up accordingly. If you have the appropriate hardware please help to test the images and report your results to qatracker using the instructions at: https://wiki.linaro.org/QA/QATracker An announcement will be made on 2011-04-26 to declare the images ready for consumption. Happy Testing ! Regards, Jamie. -- Linaro Release Manager | Platform Project Manager

14 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev