From patchwork Wed May 19 09:51:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "liuqi (BA)" X-Patchwork-Id: 12266811 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 51F16C433ED for ; Wed, 19 May 2021 09:56:16 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 195ED600CC for ; Wed, 19 May 2021 09:56:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 195ED600CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=egmtQisxLtkrgbmFXVjCeqsj2El/WCCWJoRLEQ3ebiQ=; b=O3/wTjEEaAqSJ1QjYjz29q7z1 6uMT1rEDS9YofTTPuIVExR6cpXBGmMiW72DYtBpKQym3bLh6j/knYlvGSObu3LDIx2wbRpmhiTrje NRLQbk9naf8D6Qaoyfb1O8VAuHYopZbC6/d70WEkHeAO6ShVHyFtvP0wq1eHjns6VHWntjirkYvSd 8DV+cBExkIID1eGeONll0PJCYE8VXRPAoiK4GHj+2n8ecWY7XKgr2tpFwzpXs8b30fpzeJWGo6YWB /q2NXSD5VUVq/UVK7PpuW40uaepvIXE6kokGZKzMJC1Mq0X5cRdBnJ9gourrHvUdMTX/dXvfHc4D+ MQJn4Dl3w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljIte-003WIU-1q; Wed, 19 May 2021 09:53:46 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljIsH-003Vs7-DM for linux-arm-kernel@desiato.infradead.org; Wed, 19 May 2021 09:52:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=ySyGo+FnIedB9IOe6MFYq4I6NpU6hJTshQrUEDYM2Bk=; b=oL0Bp6as+0IXp9MWOxoSkzuTs3 OVxfT6lcqQiceQh3QqNs8y0feS1xl6M29Injjzl3Z9ZbXUXrWzl44P1Kto35DoP+Ejcwt+wckRc6j cbHIidGx4bKVshGZ1hzG17msJMbRlcnY6pHEZyzFHWMSm3SY0zM2wLMcJdrt8oCtNxOdPeYc0C4cI iKVeWif6xO7YwPvlUJhwrwTWK1ILa5IMn6NSX3BZ6NH67F7JKRv7HpYFepZfSicgUlF3ghtThGtjD 34iwCe/k9mVhbwzVYE4XiiY2yZl2aXYa2Xr1jLTp+KPZML3912EQat6LpadYTkkL1fulBgekQAJ3F BlxVOO5w==; Received: from szxga05-in.huawei.com ([45.249.212.191]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljIsE-00FKl4-EV for linux-arm-kernel@lists.infradead.org; Wed, 19 May 2021 09:52:20 +0000 Received: from dggems702-chm.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4FlSkz0vCLzsRZP; Wed, 19 May 2021 17:49:31 +0800 (CST) Received: from dggema757-chm.china.huawei.com (10.1.198.199) by dggems702-chm.china.huawei.com (10.3.19.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Wed, 19 May 2021 17:52:14 +0800 Received: from localhost.localdomain (10.69.192.56) by dggema757-chm.china.huawei.com (10.1.198.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Wed, 19 May 2021 17:52:13 +0800 From: Qi Liu To: , CC: , Will Deacon , Mark Rutland Subject: [PATCH v2 3/9] drivers/perf: Remove redundant macro and functions in SMMU PMU driver Date: Wed, 19 May 2021 17:51:53 +0800 Message-ID: <1621417919-6632-4-git-send-email-liuqi115@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1621417919-6632-1-git-send-email-liuqi115@huawei.com> References: <1621417919-6632-1-git-send-email-liuqi115@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggema757-chm.china.huawei.com (10.1.198.199) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210519_025218_688193_A29C63E9 X-CRM114-Status: GOOD ( 12.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove SMMU_EVENT_ATTR and smmu_event_sysfs_show(), as there is a general function for this. Cc: Will Deacon Cc: Mark Rutland Signed-off-by: Qi Liu --- drivers/perf/arm_smmuv3_pmu.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c index ff6fab4..9d745a1 100644 --- a/drivers/perf/arm_smmuv3_pmu.c +++ b/drivers/perf/arm_smmuv3_pmu.c @@ -498,32 +498,15 @@ static const struct attribute_group smmu_pmu_cpumask_group = { }; /* Events */ - -static ssize_t smmu_pmu_event_show(struct device *dev, - struct device_attribute *attr, char *page) -{ - struct perf_pmu_events_attr *pmu_attr; - - pmu_attr = container_of(attr, struct perf_pmu_events_attr, attr); - - return sysfs_emit(page, "event=0x%02llx\n", pmu_attr->id); -} - -#define SMMU_EVENT_ATTR(name, config) \ - (&((struct perf_pmu_events_attr) { \ - .attr = __ATTR(name, 0444, smmu_pmu_event_show, NULL), \ - .id = config, \ - }).attr.attr) - static struct attribute *smmu_pmu_events[] = { - SMMU_EVENT_ATTR(cycles, 0), - SMMU_EVENT_ATTR(transaction, 1), - SMMU_EVENT_ATTR(tlb_miss, 2), - SMMU_EVENT_ATTR(config_cache_miss, 3), - SMMU_EVENT_ATTR(trans_table_walk_access, 4), - SMMU_EVENT_ATTR(config_struct_access, 5), - SMMU_EVENT_ATTR(pcie_ats_trans_rq, 6), - SMMU_EVENT_ATTR(pcie_ats_trans_passed, 7), + PMU_EVENT_ATTR_ID(cycles, 0), + PMU_EVENT_ATTR_ID(transaction, 1), + PMU_EVENT_ATTR_ID(tlb_miss, 2), + PMU_EVENT_ATTR_ID(config_cache_miss, 3), + PMU_EVENT_ATTR_ID(trans_table_walk_access, 4), + PMU_EVENT_ATTR_ID(config_struct_access, 5), + PMU_EVENT_ATTR_ID(pcie_ats_trans_rq, 6), + PMU_EVENT_ATTR_ID(pcie_ats_trans_passed, 7), NULL };