From patchwork Fri Apr 7 12:56:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 748251 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w00FF16FLz9s80 for ; Fri, 7 Apr 2017 23:05:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="b29fT+na"; 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 3w00FF00b4zDqKd for ; Fri, 7 Apr 2017 23:05:53 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="b29fT+na"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::242]) (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 3w002P6PnBzDqK8 for ; Fri, 7 Apr 2017 22:56:29 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="b29fT+na"; dkim-atps=neutral Received: by mail-pg0-x242.google.com with SMTP id 81so15434442pgh.3 for ; Fri, 07 Apr 2017 05:56:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WKgA8xRqZnjyHP/VeuM1J/nc/BXpxRIdScSgtReRxu0=; b=b29fT+naFIIeBh3jYqYODaE7d8TvFUYIKvFlzQ+qh02RH4xT0e4VEFkgGg9ZYxx99O aJ3M19NL05+VF5i4+Pjs4yVkqr8BCbGEkZxBV4at47FSfmyXRRq2/pI+cxWS+nFpmk0m kaJM42y/AibCMJe30Yc4+ZH7AGx3DTGjEqgwt9nKJbvvKor7oTza2TcSuP/Uis47J20d Ao2/IOTJzmICT+O7t1ADivtCnPQXiqd6CDqGECa7XflFZOukYdTKm5mN0VFw9HlNwN87 xpjF0qzLhsDR3r9aYGL84WyAEOiASgyl6ev+PQ62G8ioG4rtF0n4dgXhmFlRGtPGs+Vn W2Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WKgA8xRqZnjyHP/VeuM1J/nc/BXpxRIdScSgtReRxu0=; b=smJhbjsU85Hh1+Pm+oZ7PfLgr56zdLveyt5IRVzOmffFyfNLJZtU3qRTa99piYEwaI phJM2Vm2dlAIGy8idWAdEr6H9VMA0DvwE/rU9tGjsIvnjDzHjbCHBTFhYazhujRvmo/0 ODf7qm7LZV6IWsYRrS7n1s1FS3d4IYXkjL8Utc0yWPkGgsBQtTjEDqK67PauQ8kAwv/G tfQNBXKR6elNBAMlAMlPsu8F8zAn9wcB+fNj3oh2TNvIoDUcb0MAGp3lX4Y4oyZGLZ9x 7MKf7kU/5S7AELi1DvQ30emEWe/TlHBRCEOiVBtPQPReA73nYNca1AyOnRW7uOn3P50X rZLg== X-Gm-Message-State: AN3rC/6rUbHtK2ZwKFZIYZWOKbgfkXnimum1PlqEbqqvQ9DVy6VbWZd0eREJjOIJ6YHfzg== X-Received: by 10.99.3.139 with SMTP id 133mr3855786pgd.222.1491569788140; Fri, 07 Apr 2017 05:56:28 -0700 (PDT) Received: from roar.au.ibm.com ([203.221.48.234]) by smtp.gmail.com with ESMTPSA id y6sm9715663pgc.40.2017.04.07.05.56.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Apr 2017 05:56:27 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 4/5] powerpc/64s: avoid branch for ppc_msgsnd Date: Fri, 7 Apr 2017 22:56:01 +1000 Message-Id: <20170407125602.31146-5-npiggin@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170407125602.31146-1-npiggin@gmail.com> References: <20170407125602.31146-1-npiggin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Nicholas Piggin --- arch/powerpc/include/asm/dbell.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/include/asm/dbell.h b/arch/powerpc/include/asm/dbell.h index 4db4cfdd829c..8ad66ccb7180 100644 --- a/arch/powerpc/include/asm/dbell.h +++ b/arch/powerpc/include/asm/dbell.h @@ -38,10 +38,8 @@ enum ppc_dbell { static inline void _ppc_msgsnd(u32 msg) { - if (cpu_has_feature(CPU_FTR_HVMODE)) - __asm__ __volatile__ (PPC_MSGSND(%0) : : "r" (msg)); - else - __asm__ __volatile__ (PPC_MSGSNDP(%0) : : "r" (msg)); + __asm__ __volatile__ (ASM_FTR_IFSET(PPC_MSGSND(%1), PPC_MSGSNDP(%1), %0) + : : "i" (CPU_FTR_HVMODE), "r" (msg)); } /* sync before sending message */