From patchwork Thu Oct 15 13:32:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Moll X-Patchwork-Id: 55015 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f72.google.com (mail-lf0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id 58F002301F for ; Thu, 15 Oct 2015 13:33:04 +0000 (UTC) Received: by lffv3 with SMTP id v3sf2403754lff.1 for ; Thu, 15 Oct 2015 06:33:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ry2LTylLvBSZ3171KfXeCqSNrIlz0etXx16nrBORnHM=; b=F2yjP7vHFveWEmfS/0rUUezKNQCquBEsDQsFtMpgoMwFQZ/gScOWmTv6s1R3UIbm5C tmiQaoYMoPh3SMkyQoyum1MTknAI5gBY/SNNOECc22NtGr+OV4b3/DX4DgL/Arjx+5GZ HiBDVts5JDbS1Lm92SPZBqY7Wa4GC90TnpeDi2c95eaSROISbPQMHhGg8bNib6U7XX8+ d4aWIC/IkoZvKWZTiiyiOPTfwqPTY98DdO9GqKGtSAWkrwkt9Gw20+svlPWsiGZ4Z/XQ JObaQQDIsuj8QUyk53Af1itrITDYu2zFIkCx/bMcRCKSR/r/sTLlNw+bkeuN25oHOO3R qRkg== X-Gm-Message-State: ALoCoQm4F/i51jTWxPWlRCutmn6NRQBQKDkPvrCLxKvHlUaOn4w9op22QJJDp9U7/UJTox0BXDAt X-Received: by 10.112.55.69 with SMTP id q5mr2180969lbp.24.1444915983337; Thu, 15 Oct 2015 06:33:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.88.67 with SMTP id m64ls143140lfb.103.gmail; Thu, 15 Oct 2015 06:33:03 -0700 (PDT) X-Received: by 10.112.158.1 with SMTP id wq1mr4443338lbb.67.1444915983199; Thu, 15 Oct 2015 06:33:03 -0700 (PDT) Received: from mail-lf0-f48.google.com (mail-lf0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id li9si9148203lbc.121.2015.10.15.06.33.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Oct 2015 06:33:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by lffy185 with SMTP id y185so27613215lff.2 for ; Thu, 15 Oct 2015 06:33:03 -0700 (PDT) X-Received: by 10.25.28.73 with SMTP id c70mr2430930lfc.76.1444915982974; Thu, 15 Oct 2015 06:33:02 -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.112.59.35 with SMTP id w3csp637247lbq; Thu, 15 Oct 2015 06:33:02 -0700 (PDT) X-Received: by 10.60.41.9 with SMTP id b9mr5458210oel.37.1444915981945; Thu, 15 Oct 2015 06:33:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n10si7485468oep.97.2015.10.15.06.33.01; Thu, 15 Oct 2015 06:33:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752695AbbJONdA (ORCPT + 1 other); Thu, 15 Oct 2015 09:33:00 -0400 Received: from foss.arm.com ([217.140.101.70]:35773 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752490AbbJONdA (ORCPT ); Thu, 15 Oct 2015 09:33:00 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 692AF31E; Thu, 15 Oct 2015 06:32:57 -0700 (PDT) Received: from hornet.cambridge.arm.com (hornet.cambridge.arm.com [10.2.206.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7DBBE3F49B; Thu, 15 Oct 2015 06:32:59 -0700 (PDT) From: Pawel Moll To: arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, Pawel Moll , Subject: [PATCH 2/2] bus: arm-ccn: Fix irq affinity setting on CPU migration Date: Thu, 15 Oct 2015 14:32:46 +0100 Message-Id: <1444915966-8055-3-git-send-email-pawel.moll@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444915966-8055-1-git-send-email-pawel.moll@arm.com> References: <1444915966-8055-1-git-send-email-pawel.moll@arm.com> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pawel.moll@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mailfrom=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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , When PMU context is migrating between CPUs, interrupt affinity is set as well. Only this should not happen when the CCN interrupt is not being used at all (the driver is using a hrtimer tick instead). Fixed now. Cc: # 4.2+ Signed-off-by: Pawel Moll --- drivers/bus/arm-ccn.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index cc322fb..7082c72 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -1188,7 +1188,8 @@ static int arm_ccn_pmu_cpu_notifier(struct notifier_block *nb, break; perf_pmu_migrate_context(&dt->pmu, cpu, target); cpumask_set_cpu(target, &dt->cpu); - WARN_ON(irq_set_affinity(ccn->irq, &dt->cpu) != 0); + if (ccn->irq) + WARN_ON(irq_set_affinity(ccn->irq, &dt->cpu) != 0); default: break; }