Merge remote-tracking branch 'torvalds/master' into perf/core

[platform/kernel/linux-starfive.git] / drivers / vfio / vfio_iommu_spapr_tce.c

diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c
index 169f07a..60a50ce 100644 (file)
--- a/drivers/vfio/vfio_iommu_spapr_tce.c
+++ b/drivers/vfio/vfio_iommu_spapr_tce.c
@@ -4,6 +4,7 @@
  *
  * Copyright (C) 2013 IBM Corp.  All rights reserved.
  *     Author: Alexey Kardashevskiy <aik@ozlabs.ru>
+ * Copyright Gavin Shan, IBM Corporation 2014.
  *
  * Derived from original vfio_iommu_type1.c:
  * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
@@ -773,6 +774,57 @@ static long tce_iommu_create_default_window(struct tce_container *container)
        return ret;
 }
 
+static long vfio_spapr_ioctl_eeh_pe_op(struct iommu_group *group,
+                                      unsigned long arg)
+{
+       struct eeh_pe *pe;
+       struct vfio_eeh_pe_op op;
+       unsigned long minsz;
+
+       pe = eeh_iommu_group_to_pe(group);
+       if (!pe)
+               return -ENODEV;
+
+       minsz = offsetofend(struct vfio_eeh_pe_op, op);
+       if (copy_from_user(&op, (void __user *)arg, minsz))
+               return -EFAULT;
+       if (op.argsz < minsz || op.flags)
+               return -EINVAL;
+
+       switch (op.op) {
+       case VFIO_EEH_PE_DISABLE:
+               return eeh_pe_set_option(pe, EEH_OPT_DISABLE);
+       case VFIO_EEH_PE_ENABLE:
+               return eeh_pe_set_option(pe, EEH_OPT_ENABLE);
+       case VFIO_EEH_PE_UNFREEZE_IO:
+               return eeh_pe_set_option(pe, EEH_OPT_THAW_MMIO);
+       case VFIO_EEH_PE_UNFREEZE_DMA:
+               return eeh_pe_set_option(pe, EEH_OPT_THAW_DMA);
+       case VFIO_EEH_PE_GET_STATE:
+               return eeh_pe_get_state(pe);
+               break;
+       case VFIO_EEH_PE_RESET_DEACTIVATE:
+               return eeh_pe_reset(pe, EEH_RESET_DEACTIVATE, true);
+       case VFIO_EEH_PE_RESET_HOT:
+               return eeh_pe_reset(pe, EEH_RESET_HOT, true);
+       case VFIO_EEH_PE_RESET_FUNDAMENTAL:
+               return eeh_pe_reset(pe, EEH_RESET_FUNDAMENTAL, true);
+       case VFIO_EEH_PE_CONFIGURE:
+               return eeh_pe_configure(pe);
+       case VFIO_EEH_PE_INJECT_ERR:
+               minsz = offsetofend(struct vfio_eeh_pe_op, err.mask);
+               if (op.argsz < minsz)
+                       return -EINVAL;
+               if (copy_from_user(&op, (void __user *)arg, minsz))
+                       return -EFAULT;
+
+               return eeh_pe_inject_err(pe, op.err.type, op.err.func,
+                                        op.err.addr, op.err.mask);
+       default:
+               return -EINVAL;
+       }
+}
+
 static long tce_iommu_ioctl(void *iommu_data,
                                 unsigned int cmd, unsigned long arg)
 {
@@ -785,14 +837,12 @@ static long tce_iommu_ioctl(void *iommu_data,
                switch (arg) {
                case VFIO_SPAPR_TCE_IOMMU:
                case VFIO_SPAPR_TCE_v2_IOMMU:
-                       ret = 1;
-                       break;
+                       return 1;
+               case VFIO_EEH:
+                       return eeh_enabled();
                default:
-                       ret = vfio_spapr_iommu_eeh_ioctl(NULL, cmd, arg);
-                       break;
+                       return 0;
                }
-
-               return (ret < 0) ? 0 : ret;
        }
 
        /*
@@ -1046,8 +1096,7 @@ static long tce_iommu_ioctl(void *iommu_data,
 
                ret = 0;
                list_for_each_entry(tcegrp, &container->group_list, next) {
-                       ret = vfio_spapr_iommu_eeh_ioctl(tcegrp->grp,
-                                       cmd, arg);
+                       ret = vfio_spapr_ioctl_eeh_pe_op(tcegrp->grp, arg);
                        if (ret)
                                return ret;
                }