From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753698AbcBWOUr (ORCPT ); Tue, 23 Feb 2016 09:20:47 -0500 Received: from mail-bn1bon0071.outbound.protection.outlook.com ([157.56.111.71]:12064 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753202AbcBWOOW (ORCPT ); Tue, 23 Feb 2016 09:14:22 -0500 Authentication-Results: 8bytes.org; dkim=none (message not signed) header.d=none;8bytes.org; dmarc=none action=none header.from=amd.com; From: Suravee Suthikulpanit To: , , , , CC: , , , , , "Suravee Suthikulpanit" , Suravee Suthikulpanit Subject: [PATCH V5 05/10] perf/amd/iommu: Declare pr_fmt and remove unnecessary pr_debug Date: Tue, 23 Feb 2016 08:12:39 -0600 Message-ID: <1456236764-1569-6-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456236764-1569-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1456236764-1569-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [124.121.8.20] X-ClientProxiedBy: HKNPR06CA0045.apcprd06.prod.outlook.com (10.141.16.35) To BLUPR12MB0436.namprd12.prod.outlook.com (25.162.92.141) X-MS-Office365-Filtering-Correlation-Id: 69663fd4-d99e-4324-b98c-08d33c5b9f2a X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0436;2:tWP/ta909l1z6tFzHwuNzb01t8x5Ho7Nt5JrpTiZiFiUpk5IxbDWLZ2yosqhOO+8LyFKtrt/bq+Yv3jQsD0ClvJWWCpQTx2iYePCFXrQkLZlQp/QWN6N4v5V7UYmODywQeK3WeO5XZ+ljDD53US5g0PS/4OcVmAiReZLTO5nNZQsBR8RFvzl5m/UNtR2TZXI;3:He7e+a2qGfFIy9E/r82CXUyBktUxMPkfmBtMbF9tgSofXBPwZsy0wyO+YKwUGaIRivKJoYxMWNxdJhfXT04ZXKrqCl9g5jmjWmuFpQY2GKCdhMc2758F1WUvXaZxTdIG;25:NfbZiHOFgbIZWKt0JRimwVwOZgn6knSTHuM5Iu6coRyXLn9gFmTRi9T4YfRx63V74VvG2sGnOZrove9j7RwUksAgOEs54g7X6IkbeD1IkuuZD0i91MnZVBrn0I9zSdoR8VRveAjtC5CCOvRynAZptSacnSBkQyfQVcT+lerahyXtMcFhA3WM8fXR2YuX6nvqxsMJ/GyhMYG5jTt4QGogU8FBEAJhLWfWuTDiSYhrLwCKP5kuvXAl7vgQCyNtBe4oWZ2gsWdSo891UEw35AfqfIEIqPjCdEh/iy8zA5dkKwEaAq/M8NYWQZRZlmyuHGmCQo1DZxnyLoJJYG8ITrOS4U+DFa+JJqVWCTsyieGISVc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0436; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0436;20:eiPflO1AdUEm3rl/FU6EAgrMOhrMH6T5ckIIBGPnB6L387xN0M4jONagfHcf1OaFuQtWj23gMQlwIGzkiaVt71wAtui9nA9nIi9MeAX45zI24u5kWQtUdnWPXa4bVA1931XAS9WhlkjlESidznrQwEDXT8mK8TJy0etLLnflMmRiigPEM+V5lxvnRcQDuI86qFZQMzGOce1f1FmQXbvSCaV+wD9IDCYiwQalB4MadesageB5YzioEUkTY006iWPYLkwjGVyz1KBn6x8kKoHeq9pylZ4kXlSfHxy/fRoI9Edvt0qpkR8LiMlh39UHZWj8QMoaoCG85SvK9ICpt6JkvLPCv/FHc3aDKAliasSAR2qCYs7m0GUIokUhTOLntloOg7DMoOkYDjfT9Ttso8xDa9kdj7m5hJ7jyGdng3dmdiI6RBSO16Ly6ZxXaWJQJcLEub8EFUDBU/4m0q6GbNv3QB+yfWqsW1U0vKgi+gBiWFJDZgiU0ufZrmtCfpup73jA;4:1T8nu7i+6H3CAOLS3V+kERkB3cQYvg3NErywLSylfxWo9e8YLSyrtZKM2324FGVIz/g82Dy3I+TOv4KJftMvgPgOQCo6gfDrujD4PKLF513K1uY8ZjkIBhNYuwmJ4V69S2EOvDB2Nb1eyWUQ2gEbyPBpbjDbeIlRUwLH77xqrY3dpw15sOGQH84pmwcmrrIH9xN/IalFxDckNxvSsoJqgLEctg9aeuBwzVURorQCID2810XHup7mqr69QbHGgK4i5eSjBkgoJezuHZawMiAybsBBcwkF69HeylJJWgBk6UN2NCl76O32of2/5BhTR714QSvMvb51VMAn+JAdp0jdv9InGwt0xUvLfhau0w017PbmYNdl5Q3Wr9FWJFGgcgAiTDbF3qP0QT7bR7gOWzKZoAe7gwQkKUuD/qZ4gX1OSkA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001);SRVR:BLUPR12MB0436;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0436; X-Forefront-PRVS: 08617F610C X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(6069001)(5004730100002)(48376002)(77096005)(4326007)(2950100001)(2906002)(3846002)(6116002)(42186005)(5008740100001)(19580405001)(1096002)(19580395003)(86362001)(40100003)(50466002)(586003)(122386002)(36756003)(76176999)(5001960100002)(47776003)(66066001)(50986999)(5001770100001)(189998001)(229853001)(50226001)(87976001)(92566002)(2201001);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR12MB0436;H:localhost.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0436;23:cikfV7yTE4QEGrRSvtpuYxCa/6qxSVR2Kiah5KuYlbEE7IMoOPRSG5gyXhPlF2QuRVcFywIUQAIM+fN8+d5w2evwimxEpgXleFWZUZAkFcNBwlqfr/qrpFg3xpcUb8ewtZ8wEn6IA8x0n8GRyGy/vEDg0x4w3KIKr0dlip7JP+y6p363WqUj2u79rob3ntkNcEYmyvxiDbnwpDa6HddkmZoUiz9wHE0/GR/ITSLJKaVl29bkGa0zmDpNHUZ1eu/PQ8/xkDZlV3QtzCrUeUzsB/DtrtaRPd6RUrAeSmpZV8/F5gVnvlzarTo2k3fJKVqOT/tfLb+NOeXPw/stE0NA/VYN6zvBHo62Q0zNN7w1CzqD0rlSZ5J1xQu4sVX6h7iuou1RbrKuyWZseN3BZEzoDr3AOtdIimQ7SdgpYjdlkjFuYNTz35gw1R3lYr3lctbO0dC1UU0BtXu2VjCAhpu6tWQ2X+jfRzlR5SBrGWxr/Nb/NJf5S72DSx84Xd2QXY17OY3OPtv1ACsVvkTVzdpRZ9fKIvGImBdZLk7YXtvzw4ydObCZzqPf4jUIYyYcXXnmxnKc57FCcLLctHQqg206klpbX2+xT7VHAZV0WwcErURrzK/Ucvig3F6M131X9OrpfajlNA2WuxE8Y8fUiBJC/XpYSk2DjCrIfiFedkn/8MDeFvxDZc1cRonlK6ACsXslV5JJxQ7S8p9Gwkikr27XyHAdBAh0zadz0ess7r2IwhhJn1fcpcf0ZOqKm1HhLZVPE4u84UanFFjTYSE/qk6ZmD+sYXjPEGz2whil4eYf7VgLc3vFOBsL6KCCoZdgtOD9sB1k+8A2NxGat/QENA4MG1CawAomV/LgWrgigOw0lFr72MwNqt9KSCYvxuY+8z84VhX4ilqlaDNpsRFop9pX7g4MFWDpJgwlgBUdpT4Z3efB984CXGypotDTH2XG99XK X-Microsoft-Exchange-Diagnostics: 1;BLUPR12MB0436;5:B//Tb/ulc7icQ0qI3yc7FypyhfDvhph4jU1kecrEMhk+IRqxjthN8T5KKpTpgCQ8w1J4CWxuACMlwZajgoRD32tOqvPy+wRnKOkWNM+MqSgEx23eWRX3bkrXefDbLWUmJSYKe3q2KKltpb+ok199fw==;24:CqapsibixDGL1A8zJSNLxmxA+5l/l2vhLJC8KqLFaswKVdx7cRPeGhKFV4ovYPJRWxleeS/TOq86R4Rzl+/XrEHQLogHU7DlAcGH+D2Hmbg=;20:8WpNIOOcoQncQG10JsVOGCIXSCvcqiHKHG9+55wOfD5RCdPANXqm5axwtIv+7qw21Q9iB04UC4xE8XHLlPeuVFyvq42CS3L7W/IA6RQR82S95ON5bcAFLYxwb3oeSzV6STTnjSxQTOPJ9nXPGWBUMO7AUa2WJqbzp6bvACrhxBBBLLCT+O2NdjnVdIfFEJHlbIPNBu7s6YxEogAECN30Ws/6aXRynU3YCPvp2DY/Yh+p/VZnMjcQjCEF6jZU0L88 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2016 14:14:10.7561 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR12MB0436 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch declare pr_fmt for perf/amd_iommu and remove unnecessary pr_debug. Cc: Borislav Petkov Signed-off-by: Suravee Suthikulpanit --- arch/x86/events/amd/iommu.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index 8a29754..ee7b4d3 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -11,6 +11,8 @@ * published by the Free Software Foundation. */ +#define pr_fmt(fmt) "perf/amd_iommu: " fmt + #include #include #include @@ -283,7 +285,6 @@ static void perf_iommu_start(struct perf_event *event, int flags) u64 val; struct hw_perf_event *hwc = &event->hw; - pr_debug("perf: amd_iommu:perf_iommu_start\n"); if (WARN_ON_ONCE(!(hwc->state & PERF_HES_STOPPED))) return; @@ -307,7 +308,6 @@ static void perf_iommu_read(struct perf_event *event) u64 cnt, prev; s64 delta; struct hw_perf_event *hwc = &event->hw; - pr_debug("perf: amd_iommu:perf_iommu_read\n"); if (amd_iommu_pc_get_counter(0, _GET_BANK(event), _GET_CNTR(event), &cnt)) return; @@ -334,8 +334,6 @@ static void perf_iommu_stop(struct perf_event *event, int flags) struct hw_perf_event *hwc = &event->hw; u64 config; - pr_debug("perf: amd_iommu:perf_iommu_stop\n"); - if (hwc->state & PERF_HES_UPTODATE) return; @@ -357,7 +355,6 @@ static int perf_iommu_add(struct perf_event *event, int flags) struct perf_amd_iommu *perf_iommu = container_of(event->pmu, struct perf_amd_iommu, pmu); - pr_debug("perf: amd_iommu:perf_iommu_add\n"); event->hw.state = PERF_HES_UPTODATE | PERF_HES_STOPPED; /* request an iommu bank/counter */ @@ -378,7 +375,6 @@ static void perf_iommu_del(struct perf_event *event, int flags) struct perf_amd_iommu *perf_iommu = container_of(event->pmu, struct perf_amd_iommu, pmu); - pr_debug("perf: amd_iommu:perf_iommu_del\n"); perf_iommu_stop(event, PERF_EF_UPDATE); /* clear the assigned iommu bank/counter */ @@ -438,7 +434,7 @@ static __init int _init_perf_amd_iommu( /* Init events attributes */ if (_init_events_attrs(perf_iommu) != 0) - pr_err("perf: amd_iommu: Only support raw events.\n"); + pr_err("Only support raw events.\n"); perf_iommu->max_banks = amd_iommu_pc_get_max_banks(0); perf_iommu->max_counters = amd_iommu_pc_get_max_counters(0); @@ -451,7 +447,7 @@ static __init int _init_perf_amd_iommu( ret = perf_pmu_register(&perf_iommu->pmu, name, -1); if (ret) { - pr_err("perf: amd_iommu: Failed to initialized.\n"); + pr_err("Error initializing AMD IOMMU perf counters.\n"); amd_iommu_pc_exit(); } else { pr_info("perf: amd_iommu: Detected. (%d banks, %d counters/bank)\n", -- 1.9.1