From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756381AbbCLTin (ORCPT ); Thu, 12 Mar 2015 15:38:43 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:41319 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756364AbbCLTii (ORCPT ); Thu, 12 Mar 2015 15:38:38 -0400 From: Lina Iyer To: bjorn.andersson@sonymobile.com Cc: linux-arm-msm@vger.kernel.org, jhugo@codeaurora.org, agross@codeaurora.org, linux-kernel@vger.kernel.org, Lina Iyer Subject: [PATCH] Lock 7 is cpuidle specific, use non-generic value for locking Date: Thu, 12 Mar 2015 13:38:28 -0600 Message-Id: <1426189108-35488-1-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1425076217-10415-2-git-send-email-bjorn.andersson@sonymobile.com> References: <1425076217-10415-2-git-send-email-bjorn.andersson@sonymobile.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --- drivers/hwspinlock/qcom_hwspinlock.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/hwspinlock/qcom_hwspinlock.c b/drivers/hwspinlock/qcom_hwspinlock.c index 93b62e0..7642524 100644 --- a/drivers/hwspinlock/qcom_hwspinlock.c +++ b/drivers/hwspinlock/qcom_hwspinlock.c @@ -25,16 +25,23 @@ #include "hwspinlock_internal.h" -#define QCOM_MUTEX_APPS_PROC_ID 1 -#define QCOM_MUTEX_NUM_LOCKS 32 +#define QCOM_MUTEX_APPS_PROC_ID 1 +#define QCOM_MUTEX_CPUIDLE_OFFSET 128 +#define QCOM_CPUIDLE_LOCK 7 +#define QCOM_MUTEX_NUM_LOCKS 32 static int qcom_hwspinlock_trylock(struct hwspinlock *lock) { struct regmap_field *field = lock->priv; u32 lock_owner; int ret; + u32 proc_id; - ret = regmap_field_write(field, QCOM_MUTEX_APPS_PROC_ID); + proc_id = hwspin_lock_get_id(lock) == QCOM_CPUIDLE_LOCK ? + QCOM_MUTEX_CPUIDLE_OFFSET + smp_processor_id(): + QCOM_MUTEX_APPS_PROC_ID; + + ret = regmap_field_write(field, proc_id); if (ret) return ret; @@ -42,7 +49,7 @@ static int qcom_hwspinlock_trylock(struct hwspinlock *lock) if (ret) return ret; - return lock_owner == QCOM_MUTEX_APPS_PROC_ID; + return lock_owner == proc_id; } static void qcom_hwspinlock_unlock(struct hwspinlock *lock) -- 2.1.0