diff options
author | Alexey Brodkin <abrodkin@synopsys.com> | 2016-10-31 08:59:11 -0400 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2016-10-31 20:12:38 -0400 |
commit | 6227e9f0e9ee988e2cfb425b02ef17f233b1d8d7 (patch) | |
tree | 13e0830b172df4f4fc21bbac426f32687193775d /arch/arc | |
parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) |
ARC: Enable PERF_EVENTS in nSIM driven platforms
Now when we have properly working performance counters in nSIM
even with interrupt support (fix should be a part of upcoming
nSIM engineering build 2016.12-005) we may enable perf support
by default for all platforms that use nSIM for ARC cores simulation.
Note 1: PCT node was missing for some reason in nsimosci.dts
while all other nSIM-related .dts files already had
PCT node for quite some time, so adding it now.
Note 2: All defconfigs were regenerated with "make savedefconfig"
which led to some clean-ups in nsimosci_hs_smp_defconfig:
CONFIG_FRAMEBUFFER_CONSOLE=y was removed because it is
automatically selected now by DRM.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc')
-rw-r--r-- | arch/arc/boot/dts/axc001.dtsi | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/nsim_700.dts | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/nsimosci.dts | 4 | ||||
-rw-r--r-- | arch/arc/configs/nsim_700_defconfig | 1 | ||||
-rw-r--r-- | arch/arc/configs/nsim_hs_defconfig | 1 | ||||
-rw-r--r-- | arch/arc/configs/nsim_hs_smp_defconfig | 1 | ||||
-rw-r--r-- | arch/arc/configs/nsimosci_defconfig | 1 | ||||
-rw-r--r-- | arch/arc/configs/nsimosci_hs_defconfig | 1 | ||||
-rw-r--r-- | arch/arc/configs/nsimosci_hs_smp_defconfig | 3 |
9 files changed, 12 insertions, 4 deletions
diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi index 6ae2c476ad82..53ce226f77a5 100644 --- a/arch/arc/boot/dts/axc001.dtsi +++ b/arch/arc/boot/dts/axc001.dtsi | |||
@@ -71,7 +71,7 @@ | |||
71 | reg-io-width = <4>; | 71 | reg-io-width = <4>; |
72 | }; | 72 | }; |
73 | 73 | ||
74 | arcpmu0: pmu { | 74 | arcpct0: pct { |
75 | compatible = "snps,arc700-pct"; | 75 | compatible = "snps,arc700-pct"; |
76 | }; | 76 | }; |
77 | }; | 77 | }; |
diff --git a/arch/arc/boot/dts/nsim_700.dts b/arch/arc/boot/dts/nsim_700.dts index ce0ccd20b5bf..5ee96b067c08 100644 --- a/arch/arc/boot/dts/nsim_700.dts +++ b/arch/arc/boot/dts/nsim_700.dts | |||
@@ -69,7 +69,7 @@ | |||
69 | }; | 69 | }; |
70 | }; | 70 | }; |
71 | 71 | ||
72 | arcpmu0: pmu { | 72 | arcpct0: pct { |
73 | compatible = "snps,arc700-pct"; | 73 | compatible = "snps,arc700-pct"; |
74 | }; | 74 | }; |
75 | }; | 75 | }; |
diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts index bcf603142a33..3c391ba565ed 100644 --- a/arch/arc/boot/dts/nsimosci.dts +++ b/arch/arc/boot/dts/nsimosci.dts | |||
@@ -83,5 +83,9 @@ | |||
83 | reg = <0xf0003000 0x44>; | 83 | reg = <0xf0003000 0x44>; |
84 | interrupts = <7>; | 84 | interrupts = <7>; |
85 | }; | 85 | }; |
86 | |||
87 | arcpct0: pct { | ||
88 | compatible = "snps,arc700-pct"; | ||
89 | }; | ||
86 | }; | 90 | }; |
87 | }; | 91 | }; |
diff --git a/arch/arc/configs/nsim_700_defconfig b/arch/arc/configs/nsim_700_defconfig index 7314f538847b..b0066a749d4c 100644 --- a/arch/arc/configs/nsim_700_defconfig +++ b/arch/arc/configs/nsim_700_defconfig | |||
@@ -14,6 +14,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
14 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" | 14 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" |
15 | CONFIG_KALLSYMS_ALL=y | 15 | CONFIG_KALLSYMS_ALL=y |
16 | CONFIG_EMBEDDED=y | 16 | CONFIG_EMBEDDED=y |
17 | CONFIG_PERF_EVENTS=y | ||
17 | # CONFIG_SLUB_DEBUG is not set | 18 | # CONFIG_SLUB_DEBUG is not set |
18 | # CONFIG_COMPAT_BRK is not set | 19 | # CONFIG_COMPAT_BRK is not set |
19 | CONFIG_KPROBES=y | 20 | CONFIG_KPROBES=y |
diff --git a/arch/arc/configs/nsim_hs_defconfig b/arch/arc/configs/nsim_hs_defconfig index 65ab9fbf83f2..ebe9ebb92933 100644 --- a/arch/arc/configs/nsim_hs_defconfig +++ b/arch/arc/configs/nsim_hs_defconfig | |||
@@ -14,6 +14,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
14 | CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" | 14 | CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" |
15 | CONFIG_KALLSYMS_ALL=y | 15 | CONFIG_KALLSYMS_ALL=y |
16 | CONFIG_EMBEDDED=y | 16 | CONFIG_EMBEDDED=y |
17 | CONFIG_PERF_EVENTS=y | ||
17 | # CONFIG_SLUB_DEBUG is not set | 18 | # CONFIG_SLUB_DEBUG is not set |
18 | # CONFIG_COMPAT_BRK is not set | 19 | # CONFIG_COMPAT_BRK is not set |
19 | CONFIG_KPROBES=y | 20 | CONFIG_KPROBES=y |
diff --git a/arch/arc/configs/nsim_hs_smp_defconfig b/arch/arc/configs/nsim_hs_smp_defconfig index 3b3990cddbe1..4bde43278be6 100644 --- a/arch/arc/configs/nsim_hs_smp_defconfig +++ b/arch/arc/configs/nsim_hs_smp_defconfig | |||
@@ -12,6 +12,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
12 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" | 12 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" |
13 | CONFIG_KALLSYMS_ALL=y | 13 | CONFIG_KALLSYMS_ALL=y |
14 | CONFIG_EMBEDDED=y | 14 | CONFIG_EMBEDDED=y |
15 | CONFIG_PERF_EVENTS=y | ||
15 | # CONFIG_SLUB_DEBUG is not set | 16 | # CONFIG_SLUB_DEBUG is not set |
16 | # CONFIG_COMPAT_BRK is not set | 17 | # CONFIG_COMPAT_BRK is not set |
17 | CONFIG_KPROBES=y | 18 | CONFIG_KPROBES=y |
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig index 98cf20933bbb..f6fb3d26557e 100644 --- a/arch/arc/configs/nsimosci_defconfig +++ b/arch/arc/configs/nsimosci_defconfig | |||
@@ -14,6 +14,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
14 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" | 14 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" |
15 | CONFIG_KALLSYMS_ALL=y | 15 | CONFIG_KALLSYMS_ALL=y |
16 | CONFIG_EMBEDDED=y | 16 | CONFIG_EMBEDDED=y |
17 | CONFIG_PERF_EVENTS=y | ||
17 | # CONFIG_SLUB_DEBUG is not set | 18 | # CONFIG_SLUB_DEBUG is not set |
18 | # CONFIG_COMPAT_BRK is not set | 19 | # CONFIG_COMPAT_BRK is not set |
19 | CONFIG_KPROBES=y | 20 | CONFIG_KPROBES=y |
diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig index ddf8b96d494e..b9f0fe00044b 100644 --- a/arch/arc/configs/nsimosci_hs_defconfig +++ b/arch/arc/configs/nsimosci_hs_defconfig | |||
@@ -14,6 +14,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
14 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" | 14 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" |
15 | CONFIG_KALLSYMS_ALL=y | 15 | CONFIG_KALLSYMS_ALL=y |
16 | CONFIG_EMBEDDED=y | 16 | CONFIG_EMBEDDED=y |
17 | CONFIG_PERF_EVENTS=y | ||
17 | # CONFIG_SLUB_DEBUG is not set | 18 | # CONFIG_SLUB_DEBUG is not set |
18 | # CONFIG_COMPAT_BRK is not set | 19 | # CONFIG_COMPAT_BRK is not set |
19 | CONFIG_KPROBES=y | 20 | CONFIG_KPROBES=y |
diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig index ceb90745326e..6da71ba253a9 100644 --- a/arch/arc/configs/nsimosci_hs_smp_defconfig +++ b/arch/arc/configs/nsimosci_hs_smp_defconfig | |||
@@ -10,6 +10,7 @@ CONFIG_IKCONFIG_PROC=y | |||
10 | # CONFIG_PID_NS is not set | 10 | # CONFIG_PID_NS is not set |
11 | CONFIG_BLK_DEV_INITRD=y | 11 | CONFIG_BLK_DEV_INITRD=y |
12 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" | 12 | CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" |
13 | CONFIG_PERF_EVENTS=y | ||
13 | # CONFIG_COMPAT_BRK is not set | 14 | # CONFIG_COMPAT_BRK is not set |
14 | CONFIG_KPROBES=y | 15 | CONFIG_KPROBES=y |
15 | CONFIG_MODULES=y | 16 | CONFIG_MODULES=y |
@@ -34,7 +35,6 @@ CONFIG_INET=y | |||
34 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 35 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
35 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 36 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
36 | # CONFIG_INET_XFRM_MODE_BEET is not set | 37 | # CONFIG_INET_XFRM_MODE_BEET is not set |
37 | # CONFIG_INET_LRO is not set | ||
38 | # CONFIG_IPV6 is not set | 38 | # CONFIG_IPV6 is not set |
39 | # CONFIG_WIRELESS is not set | 39 | # CONFIG_WIRELESS is not set |
40 | CONFIG_DEVTMPFS=y | 40 | CONFIG_DEVTMPFS=y |
@@ -72,7 +72,6 @@ CONFIG_SERIAL_OF_PLATFORM=y | |||
72 | # CONFIG_HWMON is not set | 72 | # CONFIG_HWMON is not set |
73 | CONFIG_DRM=y | 73 | CONFIG_DRM=y |
74 | CONFIG_DRM_ARCPGU=y | 74 | CONFIG_DRM_ARCPGU=y |
75 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
76 | CONFIG_LOGO=y | 75 | CONFIG_LOGO=y |
77 | # CONFIG_HID is not set | 76 | # CONFIG_HID is not set |
78 | # CONFIG_USB_SUPPORT is not set | 77 | # CONFIG_USB_SUPPORT is not set |