From patchwork Mon Apr 21 21:53:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 28752 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D39AA2032B for ; Mon, 21 Apr 2014 21:55:45 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wn1sf17336124obc.9 for ; Mon, 21 Apr 2014 14:55:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=xJlofSDcDFqX1Wee5xXqeUYNg9ublDkU3cK7Al2bgio=; b=WhLGOuhlriYDqS4dmwnUpZDILko5raYjv0JKUBWRnOavhPhM6Mj9TmARBkt4KKK6kT 8/27IM4mtzav0tXQdl1CCMkDbdEJeXkYOYMZ9yTxE3FVfd5TCc00yC4/WcjTdUJq/Qrn yCAy67Jf7DqfFzxZBD6oMZLh8wfnMjNXK6FlVkKtPOQylA8ydPetg643zBAtP2H+gDcX fs+yJ1McoTHV6XhbSGDFfKKk7STnctoD8qPYXnxyHoONwBWv7YgklIvkp+k0RosEudPw S7wNrY5ahsm3f6z49uV7mP0UYOcoL5sgK3bGvfoFbBm/0T8GBzWvT+wuzGxt5dHNB3GZ aYcg== X-Gm-Message-State: ALoCoQkU8l79tAELIChc8Qy0J7qDVm8d13fc7IhTQ5b1iSR+3Bo9VT3qLN1IYoc3nEeLFcBSTAOI X-Received: by 10.42.211.15 with SMTP id gm15mr16574312icb.28.1398117345404; Mon, 21 Apr 2014 14:55:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.35.210 with SMTP id n76ls829592qgn.15.gmail; Mon, 21 Apr 2014 14:55:45 -0700 (PDT) X-Received: by 10.58.185.145 with SMTP id fc17mr37576520vec.14.1398117345267; Mon, 21 Apr 2014 14:55:45 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id i7si6472913vei.193.2014.04.21.14.55.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Apr 2014 14:55:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id jx11so8610637veb.17 for ; Mon, 21 Apr 2014 14:55:45 -0700 (PDT) X-Received: by 10.52.191.100 with SMTP id gx4mr28110231vdc.4.1398117345195; Mon, 21 Apr 2014 14:55:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp321105vcb; Mon, 21 Apr 2014 14:55:44 -0700 (PDT) X-Received: by 10.224.167.80 with SMTP id p16mr43159896qay.62.1398117343723; Mon, 21 Apr 2014 14:55:43 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id i96si6035513qge.3.2014.04.21.14.55.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Apr 2014 14:55:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WcMA4-0003Dv-3u; Mon, 21 Apr 2014 21:54:00 +0000 Received: from mail-yk0-f181.google.com ([209.85.160.181]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WcM9t-0002zP-6R for linux-arm-kernel@lists.infradead.org; Mon, 21 Apr 2014 21:53:49 +0000 Received: by mail-yk0-f181.google.com with SMTP id 131so3844966ykp.40 for ; Mon, 21 Apr 2014 14:53:30 -0700 (PDT) X-Received: by 10.236.128.180 with SMTP id f40mr21853842yhi.71.1398117210836; Mon, 21 Apr 2014 14:53:30 -0700 (PDT) Received: from localhost.localdomain (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPSA id t63sm74182258yhm.32.2014.04.21.14.53.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Apr 2014 14:53:30 -0700 (PDT) From: Alex Elder To: bcm@fixthebug.org, mporter@linaro.org Subject: [PATCH v2 05/10] ARM: bcm: don't special-case CPU 0 in bcm_kona_smc() Date: Mon, 21 Apr 2014 16:53:06 -0500 Message-Id: <1398117191-2433-6-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1398117191-2433-1-git-send-email-elder@linaro.org> References: <1398117191-2433-1-git-send-email-elder@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140421_145349_316558_2EE742D8 X-CRM114-Status: GOOD ( 11.47 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.181 listed in list.dnswl.org] Cc: bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 There's logic in bcm_kona_smc() to ensure __bcm_kona_smc() gets called on CPU 0; if already executing on CPU 0, that function is called directly. The direct call is not protected from interrupts, however, which is not safe. Note that smp_call_function_single() is designed to handle the case where the target cpu is the current one. It also gets a reference to the CPU and disables IRQs across the call. So we can simplify things and at the same time be protected against interrupts by calling smp_call_function_single() unconditionally. Signed-off-by: Alex Elder Reviewed-by: Tim Kryger Reviewed-by: Markus Mayer Reviewed-by: Matt Porter --- arch/arm/mach-bcm/bcm_kona_smc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c index 47cf360..6fdcf96 100644 --- a/arch/arm/mach-bcm/bcm_kona_smc.c +++ b/arch/arm/mach-bcm/bcm_kona_smc.c @@ -114,12 +114,7 @@ unsigned bcm_kona_smc(unsigned service_id, unsigned arg0, unsigned arg1, * Due to a limitation of the secure monitor, we must use the SMP * infrastructure to forward all secure monitor calls to Core 0. */ - if (get_cpu() != 0) - smp_call_function_single(0, __bcm_kona_smc, (void *)&data, 1); - else - __bcm_kona_smc(&data); - - put_cpu(); + smp_call_function_single(0, __bcm_kona_smc, &data, 1); return data.result; }