From patchwork Mon Nov 16 12:35:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linu Cherian X-Patchwork-Id: 11908381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FB44C8B4EB for ; Mon, 16 Nov 2020 12:41:39 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1E112073C for ; Mon, 16 Nov 2020 12:41:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3U1+l4tH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="UqmaZpe/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1E112073C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=marvell.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=zQFZBggusBFY3jasvltYgzpka6NT9kjhBPnhjXT3JcM=; b=3U1+l4tH9UToQmzs3peUV/66ec 8aJkq+z5pCOQBN0E6p/bjIT1RaZ5PLMisv0xU9Dldy/MKR4pROgZWTutisQNasfPXxuYPGXn9Nh1c aykY1iLb2UEVADAE1MjZNMkR5mJzZIoW+1BDzmmYtZpYjyWzyK9+lBGqEktRsE18FRS5U1F5FmAIk B2B1buwXjnKCVUPgUI0SSvUaX5ijvtXrHyyfYZbWGgNNLwfNwieaJ0OV4MdsgolgNivHMQQxlSfbH nL7EshIPI3iOKwTWBJ/PEBoLf28yEy/XG/rUeCVXXHDWK3JUtz/3x3cZybCy2sOgoc3FcapZ1ASkg WfPaZBLA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kedjY-0000fy-E6; Mon, 16 Nov 2020 12:35:48 +0000 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174] helo=mx0b-0016f401.pphosted.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kedjV-0000eV-0i for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2020 12:35:46 +0000 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AGCUkUA019905; Mon, 16 Nov 2020 04:35:35 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=ngni3SWmVIoitinPiqX1KU7bliY6xD7wcZKtSL8tWDc=; b=UqmaZpe/iZap6WSGo5v94itcvAUP9tVbvcDgRAPscanqfOTryQwONnjwptERIPHu2oRL +59e57VdoB27cB4PYblGrD5xNX9yT53T6H8M1dIV6LCPsUpc/9wKeCO0i9b/jP9elUVs fDCpqlSfAjUo3RKEnPoQ6Qj7HO+jPTH96S72CVjgK5Ik07yANR4p3hotDA/X0FzYDcRT hnVMkcWzTXxqXGgZV2EgvOw+yKGxW7lMnH5KF78CGtEspvLlBO7JGWVWYX56tYDiDeaa dBWf1mAVVe6ehg5VJJYjgUSnZWErrzEWUrlowu6rzYkYJmoXl35A9gmiQaNEY5SCzCN8 Aw== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 34tdftw95d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 16 Nov 2020 04:35:35 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 16 Nov 2020 04:35:35 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 16 Nov 2020 04:35:34 -0800 Received: from virtx40.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 16 Nov 2020 04:35:31 -0800 From: Linu Cherian To: , Subject: [PATCH stable-5.9 1/2] coresight: etm: perf: Sink selection using sysfs is deprecated Date: Mon, 16 Nov 2020 18:05:09 +0530 Message-ID: <20201116123510.28980-1-lcherian@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-11-16_05:2020-11-13, 2020-11-16 signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_073545_212942_74ACC9CB X-CRM114-Status: GOOD ( 14.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel test robot , mathieu.poirier@linaro.org, suzuki.poulose@arm.com, coresight@lists.linaro.org, Linu Cherian , linuc.decode@gmail.com, linux-arm-kernel@lists.infradead.org, mike.leach@linaro.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org commit bb1860efc817c18fce4112f25f51043e44346d1b upstream. When commit 6d578258b955 ("coresight: Make sysfs functional on topologies with per core sink") was merged to stable, this patch was a pre-requisite and got missed out leading to build breakages. When using the perf interface, sink selection using sysfs is deprecated. Signed-off-by: Linu Cherian Signed-off-by: Mathieu Poirier Link: https://lore.kernel.org/r/20200916191737.4001561-14-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman Reported-by: kernel test robot --- drivers/hwtracing/coresight/coresight-etm-perf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index be591b557df9..75379184f391 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -222,8 +222,6 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, if (event->attr.config2) { id = (u32)event->attr.config2; sink = coresight_get_sink_by_id(id); - } else { - sink = coresight_get_enabled_sink(true); } mask = &event_data->mask;