km: fix lock on completion wait queueti-5.0.11.p7-nextti-5.0.11.p7-k5.10

Simple wait queues replaced wait queues in the completion interface
starting from k5.7. As a result raw_spinlock_t is used to protect the
waiter list. This fixes the lock usage to raw spinlock version. Also
removing the PREEMPT_RT kernel check as raw spinlock version safe to use
in rt kernel.

Kernel commit in ti-linux-5.10.y
  a5c6234e10280 ("completion: Use simple wait queues")

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>

2 files changed, 0 insertions, 38 deletions

diff --git a/src/Kbuild b/src/Kbuild
index cf83713..2679697 100755
--- a/src/Kbuild
+++ b/src/Kbuild
@@ -244,14 +244,6 @@ else
 EXTRA_CFLAGS += -DgcdENABLE_OUTER_CACHE_PATCH=0
 endif
 
-ifneq ($(CONFIG_PREEMPT_RT_BASE),)
-EXTRA_CFLAGS += -DgcdRT_KERNEL=1
-else ifneq ($(CONFIG_PREEMPT_RT),)
-EXTRA_CFLAGS += -DgcdRT_KERNEL=1
-else
-EXTRA_CFLAGS += -DgcdRT_KERNEL=0
-endif
-
 ifeq ($(USE_BANK_ALIGNMENT), 1)
     EXTRA_CFLAGS += -DgcdENABLE_BANK_ALIGNMENT=1
     ifneq ($(BANK_BIT_START), 0)
diff --git a/src/hal/os/linux/kernel/gc_hal_kernel_os.c b/src/hal/os/linux/kernel/gc_hal_kernel_os.c
index 7ba962f..fd8b391 100755
--- a/src/hal/os/linux/kernel/gc_hal_kernel_os.c
+++ b/src/hal/os/linux/kernel/gc_hal_kernel_os.c
@@ -7030,11 +7030,7 @@ gckOS_WaitSignal(
 
     might_sleep();
 
-#if gcdRT_KERNEL
     raw_spin_lock_irq(&signal->obj.wait.lock);
-#else
-    spin_lock_irq(&signal->obj.wait.lock);
-#endif
 
     if (signal->obj.done)
     {
@@ -7056,7 +7052,6 @@ gckOS_WaitSignal(
             ? MAX_SCHEDULE_TIMEOUT
             : Wait * HZ / 1000;
 
-#if gcdRT_KERNEL
         DECLARE_SWAITQUEUE(wait);
         /* using __prepare_to_swait definition, as its not exported. This
          * is same as `wait_for_completion()` except for the manualReset.
@@ -7064,15 +7059,6 @@ gckOS_WaitSignal(
         wait.task = current;
         if (list_empty(&wait.task_list))
             list_add(&wait.task_list, &signal->obj.wait.task_list);
-#else
-        DECLARE_WAITQUEUE(wait, current);
-        wait.flags |= WQ_FLAG_EXCLUSIVE;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)
-        __add_wait_queue_entry_tail(&signal->obj.wait, &wait);
-#else
-        __add_wait_queue_tail(&signal->obj.wait, &wait);
-#endif
-#endif
 
         while (gcvTRUE)
         {
@@ -7085,19 +7071,11 @@ gckOS_WaitSignal(
 
             __set_current_state(TASK_INTERRUPTIBLE);
 
-#if gcdRT_KERNEL
             raw_spin_unlock_irq(&signal->obj.wait.lock);
-#else
-            spin_unlock_irq(&signal->obj.wait.lock);
-#endif
 
             timeout = schedule_timeout(timeout);
 
-#if gcdRT_KERNEL
             raw_spin_lock_irq(&signal->obj.wait.lock);
-#else
-            spin_lock_irq(&signal->obj.wait.lock);
-#endif
 
             if (signal->obj.done)
             {
@@ -7117,21 +7095,13 @@ gckOS_WaitSignal(
             }
         }
 
-#if gcdRT_KERNEL
         /* using __finish_swait definition, as its not exported */
         __set_current_state(TASK_RUNNING);
         if (!list_empty(&wait.task_list))
             list_del_init(&wait.task_list);
-#else
-        __remove_wait_queue(&signal->obj.wait, &wait);
-#endif
     }
 
-#if gcdRT_KERNEL
     raw_spin_unlock_irq(&signal->obj.wait.lock);
-#else
-    spin_unlock_irq(&signal->obj.wait.lock);
-#endif
 OnError:
     /* Return status. */
     gcmkFOOTER_ARG("Signal=0x%X status=%d", Signal, status);