From patchwork Thu Mar 8 05:01:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130940 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6065211lja; Wed, 7 Mar 2018 21:46:35 -0800 (PST) X-Google-Smtp-Source: AG47ELsRC5CP2vdjroIkk9nn/FV2G5gMeaZgw5Cz9kXnQi7Gxc0oquEzCk8VKGjCLTkVo789BOAN X-Received: by 2002:a17:902:b690:: with SMTP id c16-v6mr23236666pls.264.1520487995681; Wed, 07 Mar 2018 21:46:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520487995; cv=none; d=google.com; s=arc-20160816; b=FAjsCxNxOSwrvgjrRO7w2DfcFkfvmaaalmxTo6NuOfegjzj0955aAPdfC3oai+8pTO +YXhQed4Qj8kuCdSAgd/A37lqysxyFQORg2zDmRt9E8AohCqZ9GgYM7M4croTFqVzmEE aHwdf8t3SH4ieZB1ztG0wyBVjzykkRb9onHdyKYml6hZ52YPkLOQH+5XAHf0rDW9CXlJ pSxOJGpxBlRuvn6Xv9OkvYCbBZuZ8W4Vg/09bCPN4xGYLpneXNnZKgYg1qBzIEI4G2sL lLfNGJDBwerTr+aw6W0xDp77s5YK/EoAyL64EanjrQXDCJAZO2K7FA4HHiDp1MzI+1Xc 4QrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=mbpM3bTu/E1T2SDyZlVur64ZGk5CAplt/nA+w10opyo=; b=OB2IgYMwuensaWBcYesb2gOqnKY0QJoHXRGagqpIfVz4TG9FrxFgYFZVQZLheWU4Z8 RQTP0fPby+MFoCBsm5s8u71nB4h2JMgMCsqJNAG5MPeqwRli8uwFn8VIG2A2+Cn6UEBb m+obh6APDi6G4cw+9uu/qjCkCMtyBFsIFs7HS8vtZa0bEcjp4rrfQ9v2LiCMt5J54KfE 5DqiKAy/BbX+BunoYVLwlp67W6nT7Xlli2VQAjPOQtfNnBCpnTVMko4bKPXSqKWjo/uo jCXsUQqKk7q0krKOV1ejaCRL2YuIX5BXJqaTfhbJqzNYSvZEDAmJwfs2+/a4fsA3J9hU +aLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=LT4PZtMm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o18si12416872pge.300.2018.03.07.21.46.35; Wed, 07 Mar 2018 21:46:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=LT4PZtMm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966242AbeCHFqb (ORCPT + 28 others); Thu, 8 Mar 2018 00:46:31 -0500 Received: from mail-by2nam03on0127.outbound.protection.outlook.com ([104.47.42.127]:45712 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965997AbeCHFFK (ORCPT ); Thu, 8 Mar 2018 00:05:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mbpM3bTu/E1T2SDyZlVur64ZGk5CAplt/nA+w10opyo=; b=LT4PZtMmXg0PJi77+ObktBZodSS9FXjnC7YIKoJP+2TNMOCXxP4UBkKIafH19JZsdHPuqO2USkLlrCzKHAvwkf7mGWFpSWJ+PX4RCCFHgbw9C93pWca5YSo5l61WXdCsxIt8DACNPzm+uZ2TNCkpkpzNlRLR9zCHFTRq8mQOcmQ= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0981.namprd21.prod.outlook.com (52.132.133.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.1; Thu, 8 Mar 2018 05:05:03 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 05:05:03 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Mark Rutland , Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 003/101] drivers/perf: arm_pmu: handle no platform_device Thread-Topic: [PATCH AUTOSEL for 4.4 003/101] drivers/perf: arm_pmu: handle no platform_device Thread-Index: AQHTtpp41YPk/YUCoUOXlmWEWl2Tfw== Date: Thu, 8 Mar 2018 05:01:08 +0000 Message-ID: <20180308050023.8548-3-alexander.levin@microsoft.com> References: <20180308050023.8548-1-alexander.levin@microsoft.com> In-Reply-To: <20180308050023.8548-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0981; 7:CleHxz7VwzXYmdRyCdj3WSiONJj34Xp3nq+BlAGscAEuQZul6G7rdz/eF4n62BNLRBIeIxQBo1PHveuQjlVn7P9j5EhiCe8OLFdZKcxC16r6ECUrDZYnmJ7QZ7TFxpU3XfDxvUYYwXXQinDbc6UxCEy9JbLTafcj9+Sq2k6rPZsJXk8tLtSQZFHl3IgY0iyOaLJmjJeqO3waN6lO96JP9/1zebsjBGXOLKAHfqvHAC+KCyNN/LQPnSV9Dtxdwzk2; 20:SdV++a48svm3tNKim/TCIHo/gaOvoESbFX04Lq+4rrL83wneRnAPj+B542N80Dn1A573L9jkoI4Bd63T5MkVe5OZP8kAC+5/8l8EPomZuNtyhFIA5Vbh0/s6Rpn008MrYpT4dpYy3KyizQ1j0jJL9NKNGelvGS0gtwAo0s0FgdU= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 717cec56-8c29-4c5a-68f4-08d584b22733 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0981; x-ms-traffictypediagnostic: DM5PR2101MB0981: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231220)(944501244)(52105095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0981; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0981; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(39380400002)(396003)(366004)(346002)(376002)(199004)(189003)(305945005)(86612001)(2906002)(7736002)(6486002)(36756003)(54906003)(110136005)(6436002)(2950100002)(10290500003)(316002)(186003)(22452003)(10090500001)(478600001)(105586002)(6512007)(53936002)(66066001)(68736007)(76176011)(102836004)(3280700002)(107886003)(25786009)(8936002)(59450400001)(106356001)(6506007)(5660300001)(3846002)(97736004)(14454004)(2501003)(26005)(5250100002)(4326008)(3660700001)(86362001)(6116002)(81166006)(99286004)(72206003)(2900100001)(1076002)(8676002)(81156014)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0981; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Mo1sXKRlqpHTqmnrz7sc33ua/pLTNpxF9Ddg07oic6WzWnbhexKJ6eR5W9s/WtxBISNA6RXrU6WLYkAMvaNXeIrrmkgq55RSceqqoClJAyQDoUABpw4w9iq1EAwNcFQPZBvQ4V2VVCYrJoeffSMMdduTtO+vKSJT/p2ToryLNs1YOyOqUjWJrgRHMa4chXVOpOyNupFcUiDv3KaMRm3gH7QoyTQeds5bK9pF1J8PapePNZMiejvBPDX8BygM+qH1EZ1aFmiOy10wiPxHwUYC2nvpZ7DogLKxSEF+LYTMSeHARg14WjGwNs1RNbn0HnvXSXuiRn6s8XWiKzQinmCMPQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 717cec56-8c29-4c5a-68f4-08d584b22733 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 05:01:08.7490 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0981 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Rutland [ Upstream commit 7654137071fa706e5c91f4f27bc2a5cd7e435a9b ] In armpmu_dispatch_irq() we look at arm_pmu::plat_device to acquire platdata, so that we can defer to platform-specific IRQ handling, required on some 32-bit parts. With the advent of ACPI we won't always have a platform_device, and so we must avoid trying to dereference fields from it. This patch fixes up armpmu_dispatch_irq() to avoid doing so, introducing a new armpmu_get_platdata() helper. Signed-off-by: Mark Rutland Tested-by: Jeremy Linton Cc: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/arm_pmu.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.14.1 diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 8af1f900ea65..1ba58fb6f796 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -321,10 +321,16 @@ validate_group(struct perf_event *event) return 0; } +static struct arm_pmu_platdata *armpmu_get_platdata(struct arm_pmu *armpmu) +{ + struct platform_device *pdev = armpmu->plat_device; + + return pdev ? dev_get_platdata(&pdev->dev) : NULL; +} + static irqreturn_t armpmu_dispatch_irq(int irq, void *dev) { struct arm_pmu *armpmu; - struct platform_device *plat_device; struct arm_pmu_platdata *plat; int ret; u64 start_clock, finish_clock; @@ -336,8 +342,8 @@ static irqreturn_t armpmu_dispatch_irq(int irq, void *dev) * dereference. */ armpmu = *(void **)dev; - plat_device = armpmu->plat_device; - plat = dev_get_platdata(&plat_device->dev); + + plat = armpmu_get_platdata(armpmu); start_clock = sched_clock(); if (plat && plat->handle_irq)