From patchwork Sat Mar 7 11:19:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 447563 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A5BF4140187 for ; Sat, 7 Mar 2015 22:21:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=AbrXng4+; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 7F5EE1A08EC for ; Sat, 7 Mar 2015 22:21:12 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=AbrXng4+; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yk0-x236.google.com (mail-yk0-x236.google.com [IPv6:2607:f8b0:4002:c07::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4ED5A1A0001 for ; Sat, 7 Mar 2015 22:19:57 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass reason="2048-bit key; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=AbrXng4+; dkim-adsp=pass; dkim-atps=neutral Received: by ykr79 with SMTP id 79so1707735ykr.13 for ; Sat, 07 Mar 2015 03:19:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=xbZ4moDZ31/4nWyOEw3VoJczTsF2dVq5Q6EnciKcHw8=; b=AbrXng4+fmyOy8ruv1AQIHECg7LOEJqctXwBsW1sek2M8o3XIYRfyYTcvI+GRQ/NwQ jWSCmOZaXtZEoODVd2X6WrsM8yizPLyLEU4lbRTotYcxn39n+i2dwom28ioQuuV4xtrC N3v6hla9CaTzKKzx63q3NFSWkqIIL6s8aV/31zbOYZ4P4eEeZm1+AMxFHPTchU/dMEQV HanACp9hQb+nyOoJBI+MxrwT6ToOw5qvVkEROPBERC3KbIhO2Q5xx5ohwPBwY+PzGWJE nWcuw4eYMDPSK1neRLrqTiwoAHjKoIlepsm3wG0qWoQL/TQhWeLTZSolB2HzKoYywsw/ n7QA== X-Received: by 10.170.46.3 with SMTP id 3mr19379019yko.24.1425727195039; Sat, 07 Mar 2015 03:19:55 -0800 (PST) Received: from pek-khao-d1.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id c5sm10435033yhf.29.2015.03.07.03.19.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Mar 2015 03:19:53 -0800 (PST) From: Kevin Hao To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc64: use fixed lock token for !CONFIG_PPC_SPLPAR Date: Sat, 7 Mar 2015 19:19:43 +0800 Message-Id: <1425727183-30880-1-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 2.1.0 Cc: Scott Wood , Paul Mackerras X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" It makes no sense to use a variant lock token on a platform which doesn't support for shared-processor logical partitions. Actually we can eliminate a memory load by using a fixed lock token on these platforms. Signed-off-by: Kevin Hao --- arch/powerpc/include/asm/spinlock.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h index 4dbe072eecbe..d303cdad2519 100644 --- a/arch/powerpc/include/asm/spinlock.h +++ b/arch/powerpc/include/asm/spinlock.h @@ -30,7 +30,7 @@ #define smp_mb__after_unlock_lock() smp_mb() /* Full ordering for lock. */ -#ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC_SPLPAR /* use 0x800000yy when locked, where yy == CPU number */ #ifdef __BIG_ENDIAN__ #define LOCK_TOKEN (*(u32 *)(&get_paca()->lock_token)) @@ -187,9 +187,13 @@ extern void arch_spin_unlock_wait(arch_spinlock_t *lock); #ifdef CONFIG_PPC64 #define __DO_SIGN_EXTEND "extsw %0,%0\n" -#define WRLOCK_TOKEN LOCK_TOKEN /* it's negative */ #else #define __DO_SIGN_EXTEND +#endif + +#ifdef CONFIG_PPC_SPLPAR +#define WRLOCK_TOKEN LOCK_TOKEN /* it's negative */ +#else #define WRLOCK_TOKEN (-1) #endif