diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 56442d2..0aac0ae 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig

@@ -80,6 +80,7 @@ config SPARC64
        select NO_BOOTMEM
        select HAVE_ARCH_AUDITSYSCALL
        select ARCH_SUPPORTS_ATOMIC_RMW
+       select SPARC_ADI

 config ARCH_DEFCONFIG
        string

@@ -314,6 +315,17 @@ if SPARC64
 source "kernel/power/Kconfig"
 endif

+config SPARC_ADI
+       bool "Application Data Integrity support"
+       def_bool y if SPARC64

 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
        depends on SPARC64 && SMP

diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h
index 6924bde..9a71701 100644
--- a/arch/sparc/include/asm/processor_64.h
+++ b/arch/sparc/include/asm/processor_64.h

@@ -97,6 +97,25 @@ struct thread_struct {
 struct task_struct;
 unsigned long thread_saved_pc(struct task_struct *);

+#ifdef CONFIG_SPARC_ADI
+extern struct adi_caps *get_adi_caps(void);
+extern long get_sparc_adicaps(unsigned long);
+extern long set_sparc_pstate_mcde(unsigned long);
+extern long enable_sparc_adi(unsigned long, unsigned long);
+extern long disable_sparc_adi(unsigned long, unsigned long);
+extern long get_sparc_adi_status(unsigned long);
+extern bool adi_capable(void);
+
+#define GET_SPARC_ADICAPS(a)   get_sparc_adicaps(a)
+#define SET_SPARC_MCDE(a)      set_sparc_pstate_mcde(a)
+#define ENABLE_SPARC_ADI(a, b) enable_sparc_adi(a, b)
+#define DISABLE_SPARC_ADI(a, b)        disable_sparc_adi(a, b)
+#define GET_SPARC_ADI_STATUS(a)        get_sparc_adi_status(a)
+#define ADI_CAPABLE()          adi_capable()

+#else
+#define ADI_CAPABLE()          0
+#endif
+
 /* On Uniprocessor, even in RMO processes see TSO semantics */
 #ifdef CONFIG_SMP
 #define TSTATE_INITIAL_MM      TSTATE_TSO

diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 6f80936..79f981c 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c

@@ -1007,6 +1013,80 @@ static int mdesc_open(struct inode *inode, struct file *file)
        return 0;
 }

+bool adi_capable(void)
+{
+       return adi_state.enabled;
+}
+
+struct adi_caps *get_adi_caps(void)
+{
+       return &adi_state.caps;
+}
+
+void __init
+init_adi(void)
+{
+       struct mdesc_handle *hp = mdesc_grab();
+       const char *prop;
+       u64 pn, *val;
+       int len;
+
+       adi_state.enabled = false;
+
+       if (!hp)
+               return;
+
+       pn = mdesc_node_by_name(hp, MDESC_NODE_NULL, "cpu");
+       if (pn == MDESC_NODE_NULL)
+               goto out;
+
+       prop = mdesc_get_property(hp, pn, "hwcap-list", &len);
+       if (!prop)
+               goto out;
+
+       /*
+        * Look for "adp" keyword in hwcap-list which would indicate
+        * ADI support
+        */
+       while (len) {
+               int plen;
+
+               if (!strcmp(prop, "adp")) {
+                       adi_state.enabled = true;
+                       break;
+               }
+
+               plen = strlen(prop) + 1;
+               prop += plen;
+               len -= plen;
+       }
+
+       if (!adi_state.enabled)
+               goto out;
+
+       pn = mdesc_node_by_name(hp, MDESC_NODE_NULL, "platform");
+       if (pn == MDESC_NODE_NULL)
+               goto out;
+
+       val = (u64 *) mdesc_get_property(hp, pn, "adp-blksz", &len);
+       if (!val)
+               goto out;
+       adi_state.caps.blksz = *val;
+
+       val = (u64 *) mdesc_get_property(hp, pn, "adp-nbits", &len);
+       if (!val)
+               goto out;
+       adi_state.caps.nbits = *val;
+
+       val = (u64 *) mdesc_get_property(hp, pn, "ue-on-adp", &len);
+       if (!val)
+               goto out;
+       adi_state.caps.ue_on_adi = *val;
+
+out:
+       mdesc_release(hp);
+}
+

 static ssize_t mdesc_read(struct file *file, char __user *buf,
                          size_t len, loff_t *offp)
 {

diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index d21cd62..29db583 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c

@@ -2531,6 +2589,38 @@ void sun4v_do_mna(struct pt_regs *regs, unsigned long addr, unsigned long type_c
        force_sig_info(SIGBUS, &info, current);
 }

+void sun4v_mem_corrupt_detect_precise(struct pt_regs *regs, unsigned long addr,
+                                     unsigned long context)
+{
+       siginfo_t info;
+
+       if (!ADI_CAPABLE()) {
+               bad_trap(regs, 0x1a);
+               return;
+       }
+
+       if (notify_die(DIE_TRAP, "memory corruption precise exception", regs,
+                      0, 0x8, SIGSEGV) == NOTIFY_STOP)
+               return;
+
+       if (regs->tstate & TSTATE_PRIV) {
+               pr_emerg("sun4v_mem_corrupt_detect_precise: ADDR[%016lx] "
+                       "CTX[%lx], going.\n", addr, context);
+               die_if_kernel("MCD precise", regs);
+       }
+
+       if (test_thread_flag(TIF_32BIT)) {
+               regs->tpc &= 0xffffffff;
+               regs->tnpc &= 0xffffffff;
+       }
+       info.si_signo = SIGSEGV;
+       info.si_code = SEGV_ADIPERR;
+       info.si_errno = 0;
+       info.si_addr = (void __user *) addr;
+       info.si_trapno = 0;
+       force_sig_info(SIGSEGV, &info, current);
+}
+

 void do_privop(struct pt_regs *regs)
 {
        enum ctx_state prev_state = exception_enter();

diff --git a/kernel/sys.c b/kernel/sys.c
index 6af9212..fa7b5d9 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c

@@ -103,6 +103,21 @@
 #ifndef SET_FP_MODE
 # define SET_FP_MODE(a,b)      (-EINVAL)
 #endif
+#ifndef GET_SPARC_ADICAPS
+# define GET_SPARC_ADICAPS(a)          (-EINVAL)
+#endif
+#ifndef SET_SPARC_MCDE
+# define SET_SPARC_MCDE(a)             (-EINVAL)
+#endif
+#ifndef ENABLE_SPARC_ADI
+# define ENABLE_SPARC_ADI(a, b)                (-EINVAL)
+#endif
+#ifndef DISABLE_SPARC_ADI
+# define DISABLE_SPARC_ADI(a, b)       (-EINVAL)
+#endif
+#ifndef GET_SPARC_ADI_STATUS
+# define GET_SPARC_ADI_STATUS(a)       (-EINVAL)
+#endif