aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuud Derwig <rderwig@synopsys.com>2014-12-03 09:52:41 -0500
committerVineet Gupta <vgupta@synopsys.com>2015-06-24 20:30:21 -0400
commit2924cd18c434c79ee777dc63616a8505045d7509 (patch)
treeaf6d38f463b61b420199331823deb1ab920b9ea5
parent5fa2daaa8d8223d06fcdba171a7a668dc8e8b179 (diff)
ARCv2: [vdk] dts files and defconfig for HS38 VDK
- CONFIG_ARC_UBOOT_SUPPORT to handle arguments passed in r0, r1, r2 - CONFIG_DEVTMPFS_MOUNT for mouting rootfs since it uses external cpio for rootfs Cc: Grant Likely <grant.likely@linaro.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: devicetree@vger.kernel.org Signed-off-by: Ruud Derwig <rderwig@synopsys.com> [vgupta: folded the Main baord DT files for smp/up into one] Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r--arch/arc/boot/dts/vdk_axc003.dtsi61
-rw-r--r--arch/arc/boot/dts/vdk_axc003_idu.dtsi76
-rw-r--r--arch/arc/boot/dts/vdk_axs10x_mb.dtsi93
-rw-r--r--arch/arc/boot/dts/vdk_hs38.dts21
-rw-r--r--arch/arc/boot/dts/vdk_hs38_smp.dts21
-rw-r--r--arch/arc/configs/vdk_hs38_defconfig102
-rw-r--r--arch/arc/configs/vdk_hs38_smp_defconfig104
-rw-r--r--arch/arc/kernel/asm-offsets.c2
-rw-r--r--arch/arc/mm/tlbex.S2
-rw-r--r--arch/arc/plat-axs10x/axs10x.c8
10 files changed, 490 insertions, 0 deletions
diff --git a/arch/arc/boot/dts/vdk_axc003.dtsi b/arch/arc/boot/dts/vdk_axc003.dtsi
new file mode 100644
index 000000000000..9393fd902f0d
--- /dev/null
+++ b/arch/arc/boot/dts/vdk_axc003.dtsi
@@ -0,0 +1,61 @@
1/*
2 * Copyright (C) 2013, 2014 Synopsys, Inc. (www.synopsys.com)
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 */
8
9/*
10 * Device tree for AXC003 CPU card: HS38x UP configuration (VDK version)
11 */
12
13/ {
14 compatible = "snps,arc";
15 clock-frequency = <50000000>;
16 #address-cells = <1>;
17 #size-cells = <1>;
18
19 cpu_card {
20 compatible = "simple-bus";
21 #address-cells = <1>;
22 #size-cells = <1>;
23
24 ranges = <0x00000000 0xf0000000 0x10000000>;
25
26 cpu_intc: archs-intc@cpu {
27 compatible = "snps,archs-intc";
28 interrupt-controller;
29 #interrupt-cells = <1>;
30 };
31
32 debug_uart: dw-apb-uart@0x5000 {
33 compatible = "snps,dw-apb-uart";
34 reg = <0x5000 0x100>;
35 clock-frequency = <2403200>;
36 interrupt-parent = <&cpu_intc>;
37 interrupts = <19>;
38 baud = <115200>;
39 reg-shift = <2>;
40 reg-io-width = <4>;
41 };
42
43 };
44
45 mb_intc: dw-apb-ictl@0xe0012000 {
46 #interrupt-cells = <1>;
47 compatible = "snps,dw-apb-ictl";
48 reg = < 0xe0012000 0x200 >;
49 interrupt-controller;
50 interrupt-parent = <&cpu_intc>;
51 interrupts = < 18 >;
52 };
53
54 memory {
55 #address-cells = <1>;
56 #size-cells = <1>;
57 ranges = <0x00000000 0x80000000 0x40000000>;
58 device_type = "memory";
59 reg = <0x00000000 0x20000000>; /* 512MiB */
60 };
61};
diff --git a/arch/arc/boot/dts/vdk_axc003_idu.dtsi b/arch/arc/boot/dts/vdk_axc003_idu.dtsi
new file mode 100644
index 000000000000..9bee8ed09eb0
--- /dev/null
+++ b/arch/arc/boot/dts/vdk_axc003_idu.dtsi
@@ -0,0 +1,76 @@
1/*
2 * Copyright (C) 2014, 2015 Synopsys, Inc. (www.synopsys.com)
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 */
8
9/*
10 * Device tree for AXC003 CPU card:
11 * HS38x2 (Dual Core) with IDU intc (VDK version)
12 */
13
14/ {
15 compatible = "snps,arc";
16 clock-frequency = <50000000>;
17 #address-cells = <1>;
18 #size-cells = <1>;
19
20 cpu_card {
21 compatible = "simple-bus";
22 #address-cells = <1>;
23 #size-cells = <1>;
24
25 ranges = <0x00000000 0xf0000000 0x10000000>;
26
27 cpu_intc: archs-intc@cpu {
28 compatible = "snps,archs-intc";
29 interrupt-controller;
30 #interrupt-cells = <1>;
31 };
32
33 idu_intc: idu-interrupt-controller {
34 compatible = "snps,archs-idu-intc";
35 interrupt-controller;
36 interrupt-parent = <&cpu_intc>;
37
38 /*
39 * <hwirq distribution>
40 * distribution: 0=RR; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3
41 */
42 #interrupt-cells = <2>;
43
44 interrupts = <24 25 26 27>;
45 };
46
47 debug_uart: dw-apb-uart@0x5000 {
48 compatible = "snps,dw-apb-uart";
49 reg = <0x5000 0x100>;
50 clock-frequency = <2403200>;
51 interrupt-parent = <&idu_intc>;
52 interrupts = <2 0>;
53 baud = <115200>;
54 reg-shift = <2>;
55 reg-io-width = <4>;
56 };
57
58 };
59
60 mb_intc: dw-apb-ictl@0xe0012000 {
61 #interrupt-cells = <1>;
62 compatible = "snps,dw-apb-ictl";
63 reg = < 0xe0012000 0x200 >;
64 interrupt-controller;
65 interrupt-parent = <&idu_intc>;
66 interrupts = < 0 0 >;
67 };
68
69 memory {
70 #address-cells = <1>;
71 #size-cells = <1>;
72 ranges = <0x00000000 0x80000000 0x40000000>;
73 device_type = "memory";
74 reg = <0x00000000 0x20000000>; /* 512MiB */
75 };
76};
diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
new file mode 100644
index 000000000000..45cd665fca23
--- /dev/null
+++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
@@ -0,0 +1,93 @@
1/*
2 * Support for peripherals on the AXS10x mainboard (VDK version)
3 *
4 * Copyright (C) 2013-15 Synopsys, Inc. (www.synopsys.com)
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10
11/ {
12 axs10x_mb_vdk {
13 compatible = "simple-bus";
14 #address-cells = <1>;
15 #size-cells = <1>;
16 ranges = <0x00000000 0xe0000000 0x10000000>;
17 interrupt-parent = <&mb_intc>;
18
19 clocks {
20 apbclk: apbclk {
21 compatible = "fixed-clock";
22 clock-frequency = <50000000>;
23 #clock-cells = <0>;
24 };
25
26 };
27
28 ethernet@0x18000 {
29 #interrupt-cells = <1>;
30 compatible = "snps,dwmac";
31 reg = < 0x18000 0x2000 >;
32 interrupts = < 4 >;
33 interrupt-names = "macirq";
34 phy-mode = "rgmii";
35 snps,phy-addr = < 0 >; // VDK model phy address is 0
36 snps,pbl = < 32 >;
37 clocks = <&apbclk>;
38 clock-names = "stmmaceth";
39 };
40
41 ehci@0x40000 {
42 compatible = "generic-ehci";
43 reg = < 0x40000 0x100 >;
44 interrupts = < 8 >;
45 };
46
47 uart@0x20000 {
48 compatible = "snps,dw-apb-uart";
49 reg = <0x20000 0x100>;
50 clock-frequency = <2403200>;
51 interrupts = <17>;
52 baud = <115200>;
53 reg-shift = <2>;
54 reg-io-width = <4>;
55 };
56
57 uart@0x21000 {
58 compatible = "snps,dw-apb-uart";
59 reg = <0x21000 0x100>;
60 clock-frequency = <2403200>;
61 interrupts = <18>;
62 baud = <115200>;
63 reg-shift = <2>;
64 reg-io-width = <4>;
65 };
66
67 uart@0x22000 {
68 compatible = "snps,dw-apb-uart";
69 reg = <0x22000 0x100>;
70 clock-frequency = <2403200>;
71 interrupts = <19>;
72 baud = <115200>;
73 reg-shift = <2>;
74 reg-io-width = <4>;
75 };
76
77/* PGU output directly sent to virtual LCD screen; hdmi controller not modelled */
78 pgu@0x17000 {
79 compatible = "snps,arcpgufb";
80 reg = <0x17000 0x400>;
81 clock-frequency = <51000000>; /* PGU'clock is initated in init function */
82 /* interrupts = <5>; PGU interrupts not used, this vector is used for ps2 below */
83 };
84
85/* VDK has additional ps2 keyboard/mouse interface integrated in LCD screen model */
86 ps2: ps2@e0017400 {
87 compatible = "snps,arc_ps2";
88 reg = <0x17400 0x14>;
89 interrupts = <5>;
90 interrupt-names = "arc_ps2_irq";
91 };
92 };
93};
diff --git a/arch/arc/boot/dts/vdk_hs38.dts b/arch/arc/boot/dts/vdk_hs38.dts
new file mode 100644
index 000000000000..5d803dd2de59
--- /dev/null
+++ b/arch/arc/boot/dts/vdk_hs38.dts
@@ -0,0 +1,21 @@
1/*
2 * Copyright (C) 2013 Synopsys, Inc. (www.synopsys.com)
3 *
4 * ARC HS38 Virtual Development Kit (VDK)
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10/dts-v1/;
11
12/include/ "vdk_axc003.dtsi"
13/include/ "vdk_axs10x_mb.dtsi"
14
15/ {
16 compatible = "snps,axs103";
17
18 chosen {
19 bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0";
20 };
21};
diff --git a/arch/arc/boot/dts/vdk_hs38_smp.dts b/arch/arc/boot/dts/vdk_hs38_smp.dts
new file mode 100644
index 000000000000..031a5bc79b3e
--- /dev/null
+++ b/arch/arc/boot/dts/vdk_hs38_smp.dts
@@ -0,0 +1,21 @@
1/*
2 * Copyright (C) 2013 Synopsys, Inc. (www.synopsys.com)
3 *
4 * ARC HS38 Virtual Development Kit, SMP version (VDK)
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10/dts-v1/;
11
12/include/ "vdk_axc003_idu.dtsi"
13/include/ "vdk_axs10x_mb.dtsi"
14
15/ {
16 compatible = "snps,axs103";
17
18 chosen {
19 bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0";
20 };
21};
diff --git a/arch/arc/configs/vdk_hs38_defconfig b/arch/arc/configs/vdk_hs38_defconfig
new file mode 100644
index 000000000000..ef35ef3923dd
--- /dev/null
+++ b/arch/arc/configs/vdk_hs38_defconfig
@@ -0,0 +1,102 @@
1CONFIG_CROSS_COMPILE="arc-linux-uclibc-"
2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_DEFAULT_HOSTNAME="ARCLinux"
4# CONFIG_CROSS_MEMORY_ATTACH is not set
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y
8CONFIG_BLK_DEV_INITRD=y
9CONFIG_EMBEDDED=y
10CONFIG_PERF_EVENTS=y
11# CONFIG_VM_EVENT_COUNTERS is not set
12# CONFIG_SLUB_DEBUG is not set
13# CONFIG_COMPAT_BRK is not set
14CONFIG_PARTITION_ADVANCED=y
15CONFIG_ARC_PLAT_AXS10X=y
16CONFIG_AXS103=y
17CONFIG_ISA_ARCV2=y
18CONFIG_ARC_UBOOT_SUPPORT=y
19CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38"
20CONFIG_PREEMPT=y
21CONFIG_NET=y
22CONFIG_PACKET=y
23CONFIG_UNIX=y
24CONFIG_NET_KEY=y
25CONFIG_INET=y
26CONFIG_IP_PNP=y
27CONFIG_IP_PNP_DHCP=y
28CONFIG_IP_PNP_BOOTP=y
29CONFIG_IP_PNP_RARP=y
30# CONFIG_IPV6 is not set
31CONFIG_DEVTMPFS=y
32CONFIG_DEVTMPFS_MOUNT=y
33# CONFIG_STANDALONE is not set
34# CONFIG_PREVENT_FIRMWARE_BUILD is not set
35# CONFIG_FIRMWARE_IN_KERNEL is not set
36CONFIG_MTD=y
37CONFIG_MTD_CMDLINE_PARTS=y
38CONFIG_MTD_BLOCK=y
39CONFIG_MTD_SLRAM=y
40CONFIG_BLK_DEV_RAM=y
41CONFIG_SCSI=y
42CONFIG_BLK_DEV_SD=y
43CONFIG_NETDEVICES=y
44# CONFIG_NET_VENDOR_ARC is not set
45# CONFIG_NET_VENDOR_BROADCOM is not set
46# CONFIG_NET_VENDOR_INTEL is not set
47# CONFIG_NET_VENDOR_MARVELL is not set
48# CONFIG_NET_VENDOR_MICREL is not set
49# CONFIG_NET_VENDOR_NATSEMI is not set
50# CONFIG_NET_VENDOR_SEEQ is not set
51CONFIG_STMMAC_ETH=y
52# CONFIG_NET_VENDOR_VIA is not set
53# CONFIG_NET_VENDOR_WIZNET is not set
54CONFIG_NATIONAL_PHY=y
55CONFIG_MOUSE_PS2_TOUCHKIT=y
56CONFIG_SERIO_ARC_PS2=y
57# CONFIG_LEGACY_PTYS is not set
58# CONFIG_DEVKMEM is not set
59CONFIG_SERIAL_8250=y
60CONFIG_SERIAL_8250_CONSOLE=y
61CONFIG_SERIAL_8250_DW=y
62CONFIG_SERIAL_OF_PLATFORM=y
63# CONFIG_HW_RANDOM is not set
64# CONFIG_HWMON is not set
65CONFIG_FB=y
66CONFIG_ARCPGU_RGB888=y
67CONFIG_ARCPGU_DISPTYPE=0
68# CONFIG_VGA_CONSOLE is not set
69CONFIG_FRAMEBUFFER_CONSOLE=y
70CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
71CONFIG_LOGO=y
72# CONFIG_LOGO_LINUX_MONO is not set
73# CONFIG_LOGO_LINUX_VGA16 is not set
74# CONFIG_LOGO_LINUX_CLUT224 is not set
75CONFIG_USB=y
76CONFIG_USB_EHCI_HCD=y
77# CONFIG_USB_EHCI_TT_NEWSCHED is not set
78CONFIG_USB_EHCI_HCD_PLATFORM=y
79CONFIG_USB_OHCI_HCD=y
80CONFIG_USB_OHCI_HCD_PLATFORM=y
81CONFIG_USB_STORAGE=y
82CONFIG_USB_SERIAL=y
83# CONFIG_IOMMU_SUPPORT is not set
84CONFIG_EXT3_FS=y
85CONFIG_EXT4_FS=y
86CONFIG_MSDOS_FS=y
87CONFIG_VFAT_FS=y
88CONFIG_NTFS_FS=y
89CONFIG_TMPFS=y
90CONFIG_JFFS2_FS=y
91CONFIG_NFS_FS=y
92CONFIG_NLS_CODEPAGE_437=y
93CONFIG_NLS_ISO8859_1=y
94# CONFIG_ENABLE_WARN_DEPRECATED is not set
95# CONFIG_ENABLE_MUST_CHECK is not set
96CONFIG_STRIP_ASM_SYMS=y
97CONFIG_DEBUG_SHIRQ=y
98CONFIG_LOCKUP_DETECTOR=y
99CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10
100# CONFIG_SCHED_DEBUG is not set
101# CONFIG_DEBUG_PREEMPT is not set
102# CONFIG_FTRACE is not set
diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
new file mode 100644
index 000000000000..634509e5e572
--- /dev/null
+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
@@ -0,0 +1,104 @@
1CONFIG_CROSS_COMPILE="arc-linux-uclibc-"
2# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_DEFAULT_HOSTNAME="ARCLinux"
4# CONFIG_CROSS_MEMORY_ATTACH is not set
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y
8CONFIG_BLK_DEV_INITRD=y
9CONFIG_EMBEDDED=y
10CONFIG_PERF_EVENTS=y
11# CONFIG_VM_EVENT_COUNTERS is not set
12# CONFIG_SLUB_DEBUG is not set
13# CONFIG_COMPAT_BRK is not set
14CONFIG_PARTITION_ADVANCED=y
15CONFIG_ARC_PLAT_AXS10X=y
16CONFIG_AXS103=y
17CONFIG_ISA_ARCV2=y
18CONFIG_SMP=y
19# CONFIG_ARC_HAS_GRTC is not set
20CONFIG_ARC_UBOOT_SUPPORT=y
21CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp"
22CONFIG_PREEMPT=y
23CONFIG_NET=y
24CONFIG_PACKET=y
25CONFIG_UNIX=y
26CONFIG_NET_KEY=y
27CONFIG_INET=y
28CONFIG_IP_PNP=y
29CONFIG_IP_PNP_DHCP=y
30CONFIG_IP_PNP_BOOTP=y
31CONFIG_IP_PNP_RARP=y
32# CONFIG_IPV6 is not set
33CONFIG_DEVTMPFS=y
34CONFIG_DEVTMPFS_MOUNT=y
35# CONFIG_STANDALONE is not set
36# CONFIG_PREVENT_FIRMWARE_BUILD is not set
37# CONFIG_FIRMWARE_IN_KERNEL is not set
38CONFIG_MTD=y
39CONFIG_MTD_CMDLINE_PARTS=y
40CONFIG_MTD_BLOCK=y
41CONFIG_MTD_SLRAM=y
42CONFIG_BLK_DEV_RAM=y
43CONFIG_SCSI=y
44CONFIG_BLK_DEV_SD=y
45CONFIG_NETDEVICES=y
46# CONFIG_NET_VENDOR_ARC is not set
47# CONFIG_NET_VENDOR_BROADCOM is not set
48# CONFIG_NET_VENDOR_INTEL is not set
49# CONFIG_NET_VENDOR_MARVELL is not set
50# CONFIG_NET_VENDOR_MICREL is not set
51# CONFIG_NET_VENDOR_NATSEMI is not set
52# CONFIG_NET_VENDOR_SEEQ is not set
53CONFIG_STMMAC_ETH=y
54# CONFIG_NET_VENDOR_VIA is not set
55# CONFIG_NET_VENDOR_WIZNET is not set
56CONFIG_NATIONAL_PHY=y
57CONFIG_MOUSE_PS2_TOUCHKIT=y
58CONFIG_SERIO_ARC_PS2=y
59# CONFIG_LEGACY_PTYS is not set
60# CONFIG_DEVKMEM is not set
61CONFIG_SERIAL_8250=y
62CONFIG_SERIAL_8250_CONSOLE=y
63CONFIG_SERIAL_8250_DW=y
64CONFIG_SERIAL_OF_PLATFORM=y
65# CONFIG_HW_RANDOM is not set
66# CONFIG_HWMON is not set
67CONFIG_FB=y
68CONFIG_ARCPGU_RGB888=y
69CONFIG_ARCPGU_DISPTYPE=0
70# CONFIG_VGA_CONSOLE is not set
71CONFIG_FRAMEBUFFER_CONSOLE=y
72CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
73CONFIG_LOGO=y
74# CONFIG_LOGO_LINUX_MONO is not set
75# CONFIG_LOGO_LINUX_VGA16 is not set
76# CONFIG_LOGO_LINUX_CLUT224 is not set
77CONFIG_USB=y
78CONFIG_USB_EHCI_HCD=y
79# CONFIG_USB_EHCI_TT_NEWSCHED is not set
80CONFIG_USB_EHCI_HCD_PLATFORM=y
81CONFIG_USB_OHCI_HCD=y
82CONFIG_USB_OHCI_HCD_PLATFORM=y
83CONFIG_USB_STORAGE=y
84CONFIG_USB_SERIAL=y
85# CONFIG_IOMMU_SUPPORT is not set
86CONFIG_EXT3_FS=y
87CONFIG_EXT4_FS=y
88CONFIG_MSDOS_FS=y
89CONFIG_VFAT_FS=y
90CONFIG_NTFS_FS=y
91CONFIG_TMPFS=y
92CONFIG_JFFS2_FS=y
93CONFIG_NFS_FS=y
94CONFIG_NLS_CODEPAGE_437=y
95CONFIG_NLS_ISO8859_1=y
96# CONFIG_ENABLE_WARN_DEPRECATED is not set
97# CONFIG_ENABLE_MUST_CHECK is not set
98CONFIG_STRIP_ASM_SYMS=y
99CONFIG_DEBUG_SHIRQ=y
100CONFIG_LOCKUP_DETECTOR=y
101CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10
102# CONFIG_SCHED_DEBUG is not set
103# CONFIG_DEBUG_PREEMPT is not set
104# CONFIG_FTRACE is not set
diff --git a/arch/arc/kernel/asm-offsets.c b/arch/arc/kernel/asm-offsets.c
index 605281f5b301..ecaf34e9235c 100644
--- a/arch/arc/kernel/asm-offsets.c
+++ b/arch/arc/kernel/asm-offsets.c
@@ -37,6 +37,8 @@ int main(void)
37 37
38 DEFINE(TASK_ACT_MM, offsetof(struct task_struct, active_mm)); 38 DEFINE(TASK_ACT_MM, offsetof(struct task_struct, active_mm));
39 DEFINE(TASK_TGID, offsetof(struct task_struct, tgid)); 39 DEFINE(TASK_TGID, offsetof(struct task_struct, tgid));
40 DEFINE(TASK_PID, offsetof(struct task_struct, pid));
41 DEFINE(TASK_COMM, offsetof(struct task_struct, comm));
40 42
41 DEFINE(MM_CTXT, offsetof(struct mm_struct, context)); 43 DEFINE(MM_CTXT, offsetof(struct mm_struct, context));
42 DEFINE(MM_PGD, offsetof(struct mm_struct, pgd)); 44 DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
diff --git a/arch/arc/mm/tlbex.S b/arch/arc/mm/tlbex.S
index 8624ebd7114e..f6f4c3cb505d 100644
--- a/arch/arc/mm/tlbex.S
+++ b/arch/arc/mm/tlbex.S
@@ -313,6 +313,7 @@ ENTRY(EV_TLBMissI)
313 CONV_PTE_TO_TLB 313 CONV_PTE_TO_TLB
314 COMMIT_ENTRY_TO_MMU 314 COMMIT_ENTRY_TO_MMU
315 TLBMISS_RESTORE_REGS 315 TLBMISS_RESTORE_REGS
316EV_TLBMissI_fast_ret: ; additional label for VDK OS-kit instrumentation
316 rtie 317 rtie
317 318
318END(EV_TLBMissI) 319END(EV_TLBMissI)
@@ -378,6 +379,7 @@ ENTRY(EV_TLBMissD)
378 379
379 COMMIT_ENTRY_TO_MMU 380 COMMIT_ENTRY_TO_MMU
380 TLBMISS_RESTORE_REGS 381 TLBMISS_RESTORE_REGS
382EV_TLBMissD_fast_ret: ; additional label for VDK OS-kit instrumentation
381 rtie 383 rtie
382 384
383;-------- Common routine to call Linux Page Fault Handler ----------- 385;-------- Common routine to call Linux Page Fault Handler -----------
diff --git a/arch/arc/plat-axs10x/axs10x.c b/arch/arc/plat-axs10x/axs10x.c
index ad0a7ef84660..99f7da513a48 100644
--- a/arch/arc/plat-axs10x/axs10x.c
+++ b/arch/arc/plat-axs10x/axs10x.c
@@ -15,6 +15,8 @@
15 */ 15 */
16 16
17#include <linux/of_platform.h> 17#include <linux/of_platform.h>
18
19#include <asm/asm-offsets.h>
18#include <asm/clk.h> 20#include <asm/clk.h>
19#include <asm/io.h> 21#include <asm/io.h>
20#include <asm/mach_desc.h> 22#include <asm/mach_desc.h>
@@ -473,4 +475,10 @@ MACHINE_START(AXS103, "axs103")
473#endif 475#endif
474MACHINE_END 476MACHINE_END
475 477
478/*
479 * For the VDK OS-kit, to get the offset to pid and command fields
480 */
481char coware_swa_pid_offset[TASK_PID];
482char coware_swa_comm_offset[TASK_COMM];
483
476#endif /* CONFIG_AXS103 */ 484#endif /* CONFIG_AXS103 */