From patchwork Mon Jun 29 08:02:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 50406 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7A90C228D9 for ; Mon, 29 Jun 2015 08:13:37 +0000 (UTC) Received: by wibdu3 with SMTP id du3sf5588400wib.2 for ; Mon, 29 Jun 2015 01:13:36 -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 :mime-version:cc:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=Ew0SyIYNbzrZc9ulDQE4ZIe6voqgP/+W4asDWBP6S1s=; b=UttsQUw+ncRczuXzEdUIUkrREDLzT4uNFhqCbCI2mqwddtrX16UNrz2HAWOAdbpc9x vGJZBrNAvh1ip62F7AhRF24XkNFtytRNAiuxjFLFGHBzqfmAwlWVAIJv75CF6IcjIRS3 4cV8NDz1JP40/a6sDx7tN5gE8XGa3IDh2WjIoTQ11TWvI8uSCtHJBvrnN1w3lVtkHfMQ moIEW6AZcQ5M6hpt+j9wVsQqV4KLiNhyiKkrt3FBWZv7SF6NPKPxCrzaK6kihRp05dZw BZT0rY+lkrEO3V7k9kCgDUmslnvxezjt3dnYVJ5xjpPQ0dcA7GVIRnELp9R1QzIU2ga9 i4qQ== X-Gm-Message-State: ALoCoQmWQ743hDaFrDTPUZXM0xk4IGAfJ2rlXagy6OKwqZwBvdxODiz6yRtlCY25uujPt0yc7g83 X-Received: by 10.180.182.49 with SMTP id eb17mr7926909wic.2.1435565616837; Mon, 29 Jun 2015 01:13:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.70 with SMTP id be6ls687522lab.103.gmail; Mon, 29 Jun 2015 01:13:36 -0700 (PDT) X-Received: by 10.112.137.99 with SMTP id qh3mr12981914lbb.108.1435565616377; Mon, 29 Jun 2015 01:13:36 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id qq9si34424815lbc.143.2015.06.29.01.13.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2015 01:13:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lagx9 with SMTP id x9so115878903lag.1 for ; Mon, 29 Jun 2015 01:13:36 -0700 (PDT) X-Received: by 10.112.234.200 with SMTP id ug8mr12853658lbc.117.1435565616210; Mon, 29 Jun 2015 01:13:36 -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.108.230 with SMTP id hn6csp1534630lbb; Mon, 29 Jun 2015 01:13:35 -0700 (PDT) X-Received: by 10.68.205.196 with SMTP id li4mr29358870pbc.122.1435565614434; Mon, 29 Jun 2015 01:13:34 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id bp13si57218984pdb.12.2015.06.29.01.13.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2015 01:13:34 -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 1Z9U9M-0002oc-1d; Mon, 29 Jun 2015 08:10:44 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z9U9H-0001aB-VD for linux-arm-kernel@lists.infradead.org; Mon, 29 Jun 2015 08:10:41 +0000 Received: from 172.24.2.119 (EHLO szxeml425-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CNU72725; Mon, 29 Jun 2015 16:03:13 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.158.1; Mon, 29 Jun 2015 16:03:05 +0800 From: Shannon Zhao To: Subject: [PATCH] arm64: perf: fix unassigned cpu_pmu->plat_device when probing PMU PPIs Date: Mon, 29 Jun 2015 16:02:40 +0800 Message-ID: <1435564960-9516-1-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150629_011040_415790_8DBFED9B X-CRM114-Status: GOOD ( 15.02 ) X-Spam-Score: -4.9 (----) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-4.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [119.145.14.65 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [119.145.14.65 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: alex.bennee@linaro.org, will.deacon@arm.com, shannon.zhao@linaro.org, christoffer.dall@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , 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: patch@linaro.org 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.42 as permitted sender) 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 From: Shannon Zhao Commit d795ef9aa831 ("arm64: perf: don't warn about missing interrupt-affinity property for PPIs") added a check for PPIs so that we avoid parsing the interrupt-affinity property for these naturally affine interrupts. Unfortunately, this check can trigger an early (successful) return and we will not assign the value of cpu_pmu->plat_device. This patch fixes the issue. Signed-off-by: Shannon Zhao --- arch/arm64/kernel/perf_event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 702591f..fd26e57 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -1318,7 +1318,7 @@ static int armpmu_device_probe(struct platform_device *pdev) /* Don't bother with PPIs; they're already affine */ irq = platform_get_irq(pdev, 0); if (irq >= 0 && irq_is_percpu(irq)) - return 0; + goto out; irqs = kcalloc(pdev->num_resources, sizeof(*irqs), GFP_KERNEL); if (!irqs) @@ -1355,6 +1355,7 @@ static int armpmu_device_probe(struct platform_device *pdev) else kfree(irqs); +out: cpu_pmu->plat_device = pdev; return 0; }