drm/amdkfd: Handle case of invalid queue type
[pandora-kernel.git] / drivers / gpu / drm / amd / amdkfd / kfd_device_queue_manager.c
index 6806e64..99e2dbb 100644 (file)
 #include <linux/types.h>
 #include <linux/printk.h>
 #include <linux/bitops.h>
+#include <linux/sched.h>
 #include "kfd_priv.h"
 #include "kfd_device_queue_manager.h"
 #include "kfd_mqd_manager.h"
 #include "cik_regs.h"
 #include "kfd_kernel_queue.h"
-#include "../../radeon/cik_reg.h"
 
 /* Size of the per-pipe EOP queue */
 #define CIK_HPD_EOP_BYTES_LOG2 11
 #define CIK_HPD_EOP_BYTES (1U << CIK_HPD_EOP_BYTES_LOG2)
 
-static bool is_mem_initialized;
-
-static int init_memory(struct device_queue_manager *dqm);
 static int set_pasid_vmid_mapping(struct device_queue_manager *dqm,
                                        unsigned int pasid, unsigned int vmid);
 
@@ -61,11 +58,11 @@ static inline
 enum KFD_MQD_TYPE get_mqd_type_from_queue_type(enum kfd_queue_type type)
 {
        if (type == KFD_QUEUE_TYPE_SDMA)
-               return KFD_MQD_TYPE_CIK_SDMA;
-       return KFD_MQD_TYPE_CIK_CP;
+               return KFD_MQD_TYPE_SDMA;
+       return KFD_MQD_TYPE_CP;
 }
 
-static inline unsigned int get_pipes_num(struct device_queue_manager *dqm)
+inline unsigned int get_pipes_num(struct device_queue_manager *dqm)
 {
        BUG_ON(!dqm || !dqm->dev);
        return dqm->dev->shared_resources.compute_pipe_count;
@@ -82,7 +79,7 @@ static inline unsigned int get_pipes_num_cpsch(void)
        return PIPE_PER_ME_CP_SCHEDULING;
 }
 
-static inline unsigned int
+inline unsigned int
 get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd)
 {
        uint32_t nybble;
@@ -92,7 +89,7 @@ get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd)
        return nybble;
 }
 
-static inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)
+inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)
 {
        unsigned int shared_base;
 
@@ -101,41 +98,7 @@ static inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)
        return shared_base;
 }
 
-static uint32_t compute_sh_mem_bases_64bit(unsigned int top_address_nybble);
-static void init_process_memory(struct device_queue_manager *dqm,
-                               struct qcm_process_device *qpd)
-{
-       struct kfd_process_device *pdd;
-       unsigned int temp;
-
-       BUG_ON(!dqm || !qpd);
-
-       pdd = qpd_to_pdd(qpd);
-
-       /* check if sh_mem_config register already configured */
-       if (qpd->sh_mem_config == 0) {
-               qpd->sh_mem_config =
-                       ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED) |
-                       DEFAULT_MTYPE(MTYPE_NONCACHED) |
-                       APE1_MTYPE(MTYPE_NONCACHED);
-               qpd->sh_mem_ape1_limit = 0;
-               qpd->sh_mem_ape1_base = 0;
-       }
-
-       if (qpd->pqm->process->is_32bit_user_mode) {
-               temp = get_sh_mem_bases_32(pdd);
-               qpd->sh_mem_bases = SHARED_BASE(temp);
-               qpd->sh_mem_config |= PTR32;
-       } else {
-               temp = get_sh_mem_bases_nybble_64(pdd);
-               qpd->sh_mem_bases = compute_sh_mem_bases_64bit(temp);
-       }
-
-       pr_debug("kfd: is32bit process: %d sh_mem_bases nybble: 0x%X and register 0x%X\n",
-               qpd->pqm->process->is_32bit_user_mode, temp, qpd->sh_mem_bases);
-}
-
-static void program_sh_mem_settings(struct device_queue_manager *dqm,
+void program_sh_mem_settings(struct device_queue_manager *dqm,
                                        struct qcm_process_device *qpd)
 {
        return kfd2kgd->program_sh_mem_settings(dqm->dev->kgd, qpd->vmid,
@@ -175,6 +138,9 @@ static void deallocate_vmid(struct device_queue_manager *dqm,
 {
        int bit = qpd->vmid - KFD_VMID_START_OFFSET;
 
+       /* Release the vmid mapping */
+       set_pasid_vmid_mapping(dqm, 0, qpd->vmid);
+
        set_bit(bit, (unsigned long *)&dqm->vmid_bitmap);
        qpd->vmid = 0;
        q->properties.vmid = 0;
@@ -229,12 +195,12 @@ static int create_queue_nocpsch(struct device_queue_manager *dqm,
 static int allocate_hqd(struct device_queue_manager *dqm, struct queue *q)
 {
        bool set;
-       int pipe, bit;
+       int pipe, bit, i;
 
        set = false;
 
-       for (pipe = dqm->next_pipe_to_allocate; pipe < get_pipes_num(dqm);
-                       pipe = (pipe + 1) % get_pipes_num(dqm)) {
+       for (pipe = dqm->next_pipe_to_allocate, i = 0; i < get_pipes_num(dqm);
+                       pipe = ((pipe + 1) % get_pipes_num(dqm)), ++i) {
                if (dqm->allocated_queues[pipe] != 0) {
                        bit = find_first_bit(
                                (unsigned long *)&dqm->allocated_queues[pipe],
@@ -275,7 +241,7 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm,
 
        BUG_ON(!dqm || !q || !qpd);
 
-       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_COMPUTE);
+       mqd = dqm->ops.get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);
        if (mqd == NULL)
                return -ENOMEM;
 
@@ -290,6 +256,18 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm,
                return retval;
        }
 
+       pr_debug("kfd: loading mqd to hqd on pipe (%d) queue (%d)\n",
+                       q->pipe,
+                       q->queue);
+
+       retval = mqd->load_mqd(mqd, q->mqd, q->pipe,
+                       q->queue, (uint32_t __user *) q->properties.write_ptr);
+       if (retval != 0) {
+               deallocate_hqd(dqm, q);
+               mqd->uninit_mqd(mqd, q->mqd, q->mqd_mem_obj);
+               return retval;
+       }
+
        return 0;
 }
 
@@ -298,7 +276,8 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm,
                                struct queue *q)
 {
        int retval;
-       struct mqd_manager *mqd, *mqd_sdma;
+       struct mqd_manager *mqd;
+
        BUG_ON(!dqm || !q || !q->mqd || !qpd);
 
        retval = 0;
@@ -306,33 +285,37 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm,
        pr_debug("kfd: In Func %s\n", __func__);
 
        mutex_lock(&dqm->lock);
-       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_COMPUTE);
-       if (mqd == NULL) {
-               retval = -ENOMEM;
-               goto out;
-       }
 
-       mqd_sdma = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_SDMA);
-       if (mqd_sdma == NULL) {
-               mutex_unlock(&dqm->lock);
-               return -ENOMEM;
+       if (q->properties.type == KFD_QUEUE_TYPE_COMPUTE) {
+               mqd = dqm->ops.get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);
+               if (mqd == NULL) {
+                       retval = -ENOMEM;
+                       goto out;
+               }
+               deallocate_hqd(dqm, q);
+       } else if (q->properties.type == KFD_QUEUE_TYPE_SDMA) {
+               mqd = dqm->ops.get_mqd_manager(dqm, KFD_MQD_TYPE_SDMA);
+               if (mqd == NULL) {
+                       retval = -ENOMEM;
+                       goto out;
+               }
+               dqm->sdma_queue_count--;
+               deallocate_sdma_queue(dqm, q->sdma_id);
+       } else {
+               pr_debug("q->properties.type is invalid (%d)\n",
+                               q->properties.type);
+               retval = -EINVAL;
+               goto out;
        }
 
        retval = mqd->destroy_mqd(mqd, q->mqd,
-                               KFD_PREEMPT_TYPE_WAVEFRONT,
+                               KFD_PREEMPT_TYPE_WAVEFRONT_RESET,
                                QUEUE_PREEMPT_DEFAULT_TIMEOUT_MS,
                                q->pipe, q->queue);
 
        if (retval != 0)
                goto out;
 
-       if (q->properties.type == KFD_QUEUE_TYPE_COMPUTE)
-               deallocate_hqd(dqm, q);
-       else if (q->properties.type == KFD_QUEUE_TYPE_SDMA) {
-               dqm->sdma_queue_count--;
-               deallocate_sdma_queue(dqm, q->sdma_id);
-       }
-
        mqd->uninit_mqd(mqd, q->mqd, q->mqd_mem_obj);
 
        list_del(&q->list);
@@ -348,20 +331,29 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q)
 {
        int retval;
        struct mqd_manager *mqd;
+       bool prev_active = false;
 
        BUG_ON(!dqm || !q || !q->mqd);
 
        mutex_lock(&dqm->lock);
-       mqd = dqm->get_mqd_manager(dqm, q->properties.type);
+       mqd = dqm->ops.get_mqd_manager(dqm, q->properties.type);
        if (mqd == NULL) {
                mutex_unlock(&dqm->lock);
                return -ENOMEM;
        }
 
-       retval = mqd->update_mqd(mqd, q->mqd, &q->properties);
        if (q->properties.is_active == true)
+               prev_active = true;
+
+       /*
+        *
+        * check active state vs. the previous state
+        * and modify counter accordingly
+        */
+       retval = mqd->update_mqd(mqd, q->mqd, &q->properties);
+       if ((q->properties.is_active == true) && (prev_active == false))
                dqm->queue_count++;
-       else
+       else if ((q->properties.is_active == false) && (prev_active == true))
                dqm->queue_count--;
 
        if (sched_policy != KFD_SCHED_POLICY_NO_HWS)
@@ -395,6 +387,7 @@ static int register_process_nocpsch(struct device_queue_manager *dqm,
                                        struct qcm_process_device *qpd)
 {
        struct device_process_node *n;
+       int retval;
 
        BUG_ON(!dqm || !qpd);
 
@@ -409,12 +402,13 @@ static int register_process_nocpsch(struct device_queue_manager *dqm,
        mutex_lock(&dqm->lock);
        list_add(&n->list, &dqm->queues);
 
-       init_process_memory(dqm, qpd);
+       retval = dqm->ops_asic_specific.register_process(dqm, qpd);
+
        dqm->processes_count++;
 
        mutex_unlock(&dqm->lock);
 
-       return 0;
+       return retval;
 }
 
 static int unregister_process_nocpsch(struct device_queue_manager *dqm,
@@ -459,48 +453,7 @@ set_pasid_vmid_mapping(struct device_queue_manager *dqm, unsigned int pasid,
                                                vmid);
 }
 
-static uint32_t compute_sh_mem_bases_64bit(unsigned int top_address_nybble)
-{
-       /* In 64-bit mode, we can only control the top 3 bits of the LDS,
-        * scratch and GPUVM apertures.
-        * The hardware fills in the remaining 59 bits according to the
-        * following pattern:
-        * LDS:         X0000000'00000000 - X0000001'00000000 (4GB)
-        * Scratch:     X0000001'00000000 - X0000002'00000000 (4GB)
-        * GPUVM:       Y0010000'00000000 - Y0020000'00000000 (1TB)
-        *
-        * (where X/Y is the configurable nybble with the low-bit 0)
-        *
-        * LDS and scratch will have the same top nybble programmed in the
-        * top 3 bits of SH_MEM_BASES.PRIVATE_BASE.
-        * GPUVM can have a different top nybble programmed in the
-        * top 3 bits of SH_MEM_BASES.SHARED_BASE.
-        * We don't bother to support different top nybbles
-        * for LDS/Scratch and GPUVM.
-        */
-
-       BUG_ON((top_address_nybble & 1) || top_address_nybble > 0xE ||
-               top_address_nybble == 0);
-
-       return PRIVATE_BASE(top_address_nybble << 12) |
-                       SHARED_BASE(top_address_nybble << 12);
-}
-
-static int init_memory(struct device_queue_manager *dqm)
-{
-       int i, retval;
-
-       for (i = 8; i < 16; i++)
-               set_pasid_vmid_mapping(dqm, 0, i);
-
-       retval = kfd2kgd->init_memory(dqm->dev->kgd);
-       if (retval == 0)
-               is_mem_initialized = true;
-       return retval;
-}
-
-
-static int init_pipelines(struct device_queue_manager *dqm,
+int init_pipelines(struct device_queue_manager *dqm,
                        unsigned int pipes_num, unsigned int first_pipe)
 {
        void *hpdptr;
@@ -533,7 +486,7 @@ static int init_pipelines(struct device_queue_manager *dqm,
 
        memset(hpdptr, 0, CIK_HPD_EOP_BYTES * pipes_num);
 
-       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_COMPUTE);
+       mqd = dqm->ops.get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);
        if (mqd == NULL) {
                kfd_gtt_sa_free(dqm->dev, dqm->pipeline_mem);
                return -ENOMEM;
@@ -560,10 +513,6 @@ static int init_scheduler(struct device_queue_manager *dqm)
        pr_debug("kfd: In %s\n", __func__);
 
        retval = init_pipelines(dqm, get_pipes_num(dqm), KFD_DQM_FIRST_PIPE);
-       if (retval != 0)
-               return retval;
-
-       retval = init_memory(dqm);
 
        return retval;
 }
@@ -643,7 +592,7 @@ static int allocate_sdma_queue(struct device_queue_manager *dqm,
 static void deallocate_sdma_queue(struct device_queue_manager *dqm,
                                unsigned int sdma_queue_id)
 {
-       if (sdma_queue_id < 0 || sdma_queue_id >= CIK_SDMA_QUEUES)
+       if (sdma_queue_id >= CIK_SDMA_QUEUES)
                return;
        set_bit(sdma_queue_id, (unsigned long *)&dqm->sdma_bitmap);
 }
@@ -668,7 +617,7 @@ static int create_sdma_queue_nocpsch(struct device_queue_manager *dqm,
        struct mqd_manager *mqd;
        int retval;
 
-       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_SDMA);
+       mqd = dqm->ops.get_mqd_manager(dqm, KFD_MQD_TYPE_SDMA);
        if (!mqd)
                return -ENOMEM;
 
@@ -737,7 +686,7 @@ static int initialize_cpsch(struct device_queue_manager *dqm)
        dqm->queue_count = dqm->processes_count = 0;
        dqm->sdma_queue_count = 0;
        dqm->active_runlist = false;
-       retval = init_pipelines(dqm, get_pipes_num(dqm), 0);
+       retval = dqm->ops_asic_specific.initialize(dqm);
        if (retval != 0)
                goto fail_init_pipelines;
 
@@ -871,7 +820,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
        if (q->properties.type == KFD_QUEUE_TYPE_SDMA)
                select_sdma_engine_id(q);
 
-       mqd = dqm->get_mqd_manager(dqm,
+       mqd = dqm->ops.get_mqd_manager(dqm,
                        get_mqd_type_from_queue_type(q->properties.type));
 
        if (mqd == NULL) {
@@ -910,7 +859,7 @@ static int fence_wait_timeout(unsigned int *fence_addr,
                        pr_err("kfd: qcm fence wait loop timeout expired\n");
                        return -ETIME;
                }
-               cpu_relax();
+               schedule();
        }
 
        return 0;
@@ -1016,7 +965,7 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,
 
        /* remove queue from list to prevent rescheduling after preemption */
        mutex_lock(&dqm->lock);
-       mqd = dqm->get_mqd_manager(dqm,
+       mqd = dqm->ops.get_mqd_manager(dqm,
                        get_mqd_type_from_queue_type(q->properties.type));
        if (!mqd) {
                retval = -ENOMEM;
@@ -1057,8 +1006,7 @@ static bool set_cache_memory_policy(struct device_queue_manager *dqm,
                                   void __user *alternate_aperture_base,
                                   uint64_t alternate_aperture_size)
 {
-       uint32_t default_mtype;
-       uint32_t ape1_mtype;
+       bool retval;
 
        pr_debug("kfd: In func %s\n", __func__);
 
@@ -1095,18 +1043,13 @@ static bool set_cache_memory_policy(struct device_queue_manager *dqm,
                qpd->sh_mem_ape1_limit = limit >> 16;
        }
 
-       default_mtype = (default_policy == cache_policy_coherent) ?
-                       MTYPE_NONCACHED :
-                       MTYPE_CACHED;
-
-       ape1_mtype = (alternate_policy == cache_policy_coherent) ?
-                       MTYPE_NONCACHED :
-                       MTYPE_CACHED;
-
-       qpd->sh_mem_config = (qpd->sh_mem_config & PTR32)
-                       | ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED)
-                       | DEFAULT_MTYPE(default_mtype)
-                       | APE1_MTYPE(ape1_mtype);
+       retval = dqm->ops_asic_specific.set_cache_memory_policy(
+                       dqm,
+                       qpd,
+                       default_policy,
+                       alternate_policy,
+                       alternate_aperture_base,
+                       alternate_aperture_size);
 
        if ((sched_policy == KFD_SCHED_POLICY_NO_HWS) && (qpd->vmid != 0))
                program_sh_mem_settings(dqm, qpd);
@@ -1116,7 +1059,7 @@ static bool set_cache_memory_policy(struct device_queue_manager *dqm,
                qpd->sh_mem_ape1_limit);
 
        mutex_unlock(&dqm->lock);
-       return true;
+       return retval;
 
 out:
        mutex_unlock(&dqm->lock);
@@ -1129,6 +1072,8 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)
 
        BUG_ON(!dev);
 
+       pr_debug("kfd: loading device queue manager\n");
+
        dqm = kzalloc(sizeof(struct device_queue_manager), GFP_KERNEL);
        if (!dqm)
                return NULL;
@@ -1138,40 +1083,50 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)
        case KFD_SCHED_POLICY_HWS:
        case KFD_SCHED_POLICY_HWS_NO_OVERSUBSCRIPTION:
                /* initialize dqm for cp scheduling */
-               dqm->create_queue = create_queue_cpsch;
-               dqm->initialize = initialize_cpsch;
-               dqm->start = start_cpsch;
-               dqm->stop = stop_cpsch;
-               dqm->destroy_queue = destroy_queue_cpsch;
-               dqm->update_queue = update_queue;
-               dqm->get_mqd_manager = get_mqd_manager_nocpsch;
-               dqm->register_process = register_process_nocpsch;
-               dqm->unregister_process = unregister_process_nocpsch;
-               dqm->uninitialize = uninitialize_nocpsch;
-               dqm->create_kernel_queue = create_kernel_queue_cpsch;
-               dqm->destroy_kernel_queue = destroy_kernel_queue_cpsch;
-               dqm->set_cache_memory_policy = set_cache_memory_policy;
+               dqm->ops.create_queue = create_queue_cpsch;
+               dqm->ops.initialize = initialize_cpsch;
+               dqm->ops.start = start_cpsch;
+               dqm->ops.stop = stop_cpsch;
+               dqm->ops.destroy_queue = destroy_queue_cpsch;
+               dqm->ops.update_queue = update_queue;
+               dqm->ops.get_mqd_manager = get_mqd_manager_nocpsch;
+               dqm->ops.register_process = register_process_nocpsch;
+               dqm->ops.unregister_process = unregister_process_nocpsch;
+               dqm->ops.uninitialize = uninitialize_nocpsch;
+               dqm->ops.create_kernel_queue = create_kernel_queue_cpsch;
+               dqm->ops.destroy_kernel_queue = destroy_kernel_queue_cpsch;
+               dqm->ops.set_cache_memory_policy = set_cache_memory_policy;
                break;
        case KFD_SCHED_POLICY_NO_HWS:
                /* initialize dqm for no cp scheduling */
-               dqm->start = start_nocpsch;
-               dqm->stop = stop_nocpsch;
-               dqm->create_queue = create_queue_nocpsch;
-               dqm->destroy_queue = destroy_queue_nocpsch;
-               dqm->update_queue = update_queue;
-               dqm->get_mqd_manager = get_mqd_manager_nocpsch;
-               dqm->register_process = register_process_nocpsch;
-               dqm->unregister_process = unregister_process_nocpsch;
-               dqm->initialize = initialize_nocpsch;
-               dqm->uninitialize = uninitialize_nocpsch;
-               dqm->set_cache_memory_policy = set_cache_memory_policy;
+               dqm->ops.start = start_nocpsch;
+               dqm->ops.stop = stop_nocpsch;
+               dqm->ops.create_queue = create_queue_nocpsch;
+               dqm->ops.destroy_queue = destroy_queue_nocpsch;
+               dqm->ops.update_queue = update_queue;
+               dqm->ops.get_mqd_manager = get_mqd_manager_nocpsch;
+               dqm->ops.register_process = register_process_nocpsch;
+               dqm->ops.unregister_process = unregister_process_nocpsch;
+               dqm->ops.initialize = initialize_nocpsch;
+               dqm->ops.uninitialize = uninitialize_nocpsch;
+               dqm->ops.set_cache_memory_policy = set_cache_memory_policy;
                break;
        default:
                BUG();
                break;
        }
 
-       if (dqm->initialize(dqm) != 0) {
+       switch (dev->device_info->asic_family) {
+       case CHIP_CARRIZO:
+               device_queue_manager_init_vi(&dqm->ops_asic_specific);
+               break;
+
+       case CHIP_KAVERI:
+               device_queue_manager_init_cik(&dqm->ops_asic_specific);
+               break;
+       }
+
+       if (dqm->ops.initialize(dqm) != 0) {
                kfree(dqm);
                return NULL;
        }
@@ -1183,7 +1138,6 @@ void device_queue_manager_uninit(struct device_queue_manager *dqm)
 {
        BUG_ON(!dqm);
 
-       dqm->uninitialize(dqm);
+       dqm->ops.uninitialize(dqm);
        kfree(dqm);
 }
-