summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into androidHEADmasterandroidJon Medhurst2014-04-245-111/+71
|\
| * gator: Use for_each_kernel_tracepoint in Linux 3.15Drew Richardson2014-04-242-1/+62
| | | | | | | | | | | | | | | | | | Starting with Linux 3.15, unexported tracepoints can't be used directly. Use for_each_kernel_tracepoint to iterate over all tracepoints and save off the tracepoints we're interested in. Signed-off-by: Drew Richardson <drew.richardson@arm.com> Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator: Remove generic GPU tracepoint supportDrew Richardson2014-04-243-110/+9
| | | | | | | | | | | | | | | | These tracepoints are not used by anything and removing them lets us avoid any rework required for the tracepoint API changes in Linux 3.15. Signed-off-by: Drew Richardson <drew.richardson@arm.com> Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2014-04-10119-1122/+4349
|\|
| * gator-daemon: Fix compilation error: 'sa_family_t' does not name a typeJon Medhurst2014-04-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling on Linaro Android we get the following error: bionic/libc/kernel/common/linux/netlink.h:52:2: error: 'sa_family_t' does not name a type sa_family_t nl_family; This is related to an issue that was fixed in Linux 3.1 by commit 6602a4baf4d1a73c (net: Make userland include of netlink.h more sane) but it seems that the Linux headers used by bionic predate that. Fortunately, the fix for us is simple: reorder the header file includes so that the definition of sa_family_t from sys/socket.h is picked up before being used by linux/netlink.h Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2014-04-091-2/+2
| | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator: Version 5.18DS-5.18Jon Medhurst2014-04-09119-1124/+4350
| | | | | | | | Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2013-12-1952-504/+1104
|\|
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-12-181-2/+2
| | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Handle task struct correctlyDrew Richardson2013-12-182-24/+52
| | | | | | | | | | | | | | | | | | | | Use put_task_struct/get_task_struct to ensure the task_struct pointer is still valid. Change translate_buffer to ensure that both arguments are written atomically. Drop additional requests if the translate_buffer is full. Signed-off-by: Drew Richardson <drew.richardson@arm.com> Signed-off-by: Pawel Moll <pawel.moll@arm.com>
| * gator: Version 5.17Jon Medhurst2013-12-1851-486/+1058
| | | | | | | | Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2013-10-1140-642/+1850
|\|
| * gator-driver: Fix building on Linux 3.12Jon Medhurst2013-10-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | In Linux 3.12 the local timer API was removed by commit 060fd304 (ARM: smp: Remove local timer API) so disable the check for this as it stops compilation. We need the check for kernels before 3.12 because otherwise we would get incorrect timing information on A5/A9. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-10-101-2/+2
| | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator: Version 5.16Jon Medhurst2013-10-1040-644/+1850
| | | | | | | | Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2013-06-1749-1181/+984
|\|
| * gator: Prevent BUG() when no device-tree cpu nodes present.Jon Medhurst2013-06-171-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When IKS support is enabled in gator but we are running on boards without a device-tree or where there are no cpu nodes in the device-tree, then calc_first_cluster_size will call BUG_ON() because mpidr_cpuids_count == 0. To work around this, we will instead set a flag to indicate we haven't managed to create an mpidr table and fallback to the behaviour we would have if IKS wasn't enabled. This means that IKS support will only function as expected if there are device-tree nodes for CPUs but we expect that to always be the case anyway. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2013-06-111-0/+8
| | | | | | | | | | | | | | At the moment, we only have users with the old style interface, so make our life easier by making it the default. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-06-111-2/+2
| | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator: Version 5.15Jon Medhurst2013-06-1150-1190/+969
| | | | | | | | Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2013-04-261-0/+8
|\|
| * gator: Use device-tree when available for address of pl310 cacheJon Medhurst2013-04-261-0/+8
| | | | | | | | | | | | | | This helps us avoid probing hard coded addresses which can cause data aborts and crash the system, as happens on the A9 RTSM. Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2013-04-03116-1397/+12450
|\|
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2013-04-031-0/+8
| | | | | | | | | | | | | | At the moment, we only have users with the old style interface, so make our life easier by making it the default. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-04-031-2/+2
| | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator: Version 5.14Jon Medhurst2013-04-03116-1407/+12452
| | | | | | | | Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | gator-daemon: Add files missing from original commit of DS-5.13Jon Medhurst2013-01-153-0/+405
|\|
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2013-01-151-0/+8
| | | | | | | | | | | | | | At the moment, we only have users with the old style interface, so make our life easier by making it the default. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-01-151-2/+2
| | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator: Version 5.13Jon Medhurst2013-01-1562-2737/+3274
| | | | | | | | Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2013-01-1459-2727/+2867
|\ \
| * | gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2013-01-141-0/+8
| | | | | | | | | | | | | | | | | | | | | At the moment, we only have users with the old style interface, so make our life easier by making it the default. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * | gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * | gator: Version 5.13Jon Medhurst2013-01-1459-2737/+2869
| |/ | | | | | | Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2012-11-0558-956/+1048
|\|
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2012-10-261-0/+8
| | | | | | | | | | | | | | At the moment, we only have users with the old style interface, so make our life easier by making it the default. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2012-10-261-2/+2
| | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Stop using VM_EXECUTABLEJon Medhurst2012-10-261-11/+6
| | | | | | | | | | | | | | | | | | | | | | In Linux 3.7, commit e9714acf (mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas) breaks Gator's get_exec_cookie() as it uses the removed flag. Fix this in a similar as commit 2dd8ad81 (mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file) Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator: Version 5.12Jon Medhurst2012-10-2658-956/+1045
| | | | | | | | Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2012-08-1049-1492/+3280
|\|
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2012-08-101-0/+8
| | | | | | | | | | | | | | At the moment, we only have users with the old style interface, so make our life easier by making it the default. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2012-08-101-2/+2
| | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator: Version 5.11Jon Medhurst2012-08-1049-1501/+3281
| | | | | | | | Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2012-07-134-14/+51
|\|
| * gator-driver: Move work scheduling to timersWade Cherry2012-07-134-14/+51
| | | | | | | | | | | | | | ... in order to work around deadlocks in kernel >= 3.5... Signed-off-by: Wade Cherry <wade.cherry@arm.com> Signed-off-by: Pawel Moll <pawel.moll@arm.com>
* | Merge branch 'master' into androidJon Medhurst2012-05-181-2/+2
|\|
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2012-05-181-2/+2
| | | | | | | | | | | | | | | | Make this a #warning as in version 5.9. This lets Gator build (with much reduced functionality) on platforms which require CONFIG_PERF_EVENTS to be disabled for whatever reason. Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | Merge branch 'master' into androidJon Medhurst2012-05-1686-2472/+10508
|\|
| * gator-daemon: Fix sequence-point compile errorJon Medhurst2012-05-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In mxml/mxml-file.c in the expression: (getc(fp) << 8) | getc(fp) the C standard allows right-hand getc() to be called before left hand one, which would cause a bug. The compiler gives an warning about this and we are treating warnings as errors this breaks the build with: error: operation on 'fp->_r' may be undefined [-Werror=sequence-point] We can fix this by rewriting the expressions in two parts, however the code in question has licensing clauses for modified versions which have not yet been resolved. Therefore, for now, we will disable the problematic error in the makefiles. Signed-off-by: Jon Medhurst <tixy@linaro.org>
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2012-05-161-0/+8
| | | | | | | | | | | | | | At the moment, we only have users with the old style interface, so make our life easier by making it the default. Signed-off-by: Jon Medhurst <tixy@linaro.org>