From patchwork Wed Aug 24 20:49:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 662538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3sKKGm15FVz9sRZ; Thu, 25 Aug 2016 06:51:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=S4u3Do/1; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bcf8u-0004qu-Ud; Wed, 24 Aug 2016 20:51:24 +0000 Received: from mail-it0-f47.google.com ([209.85.214.47]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bcf7l-00048b-MX for kernel-team@lists.ubuntu.com; Wed, 24 Aug 2016 20:50:13 +0000 Received: by mail-it0-f47.google.com with SMTP id e63so234369781ith.1 for ; Wed, 24 Aug 2016 13:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=CqUVaNIriPzq3vmJkF3mb6ZC6jAz0FfsERpnj90eptY=; b=S4u3Do/1+HhmISB6/e+L9dnkO3SCEpg0hrqBU1T6MdqoPKZT/iU4fHD6RZX9VKSVdc P1f4+xmzEFdhiJIukQwdtyb6r0U5+17qFfLsTSMLUQ7KOU7tlRCKOiqbdS3oGTe294Cs EbJWxRA+awxZb02wBdEh6EMO/GK+nfLNPcsZbQKBoh4KaW0a9u2sZIb2Ih+mQ6aThXTS Mtx/zPo8SLRr1XsC95PXrCjgTuMFL8Dp15XaCUImJpg7emrDRDkKPt9Ak2R+QzUnScGx 6gmuLccaXBbvlepAv1Xb9hfuM1yl8ohf9b6ZQ4SlnvbWQEo4b0Cs1KDEeYnOrajB9Efq w8jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=CqUVaNIriPzq3vmJkF3mb6ZC6jAz0FfsERpnj90eptY=; b=H6OaWZ9wqszlXYrctQzxU+XIL4YSaVDIQy+21Xf92iXJPHBjkmzNhHvfyUJVt7GSWM Q1U4q7ZUhv8w9whW4lsgRNWgpmWcOrUlz9zd8AftSZE8wnIMAy0kfccpi1vsmjG4VXcu ZY492BbV/r7aeLoHlJ1GkYErVhXhhpFLyy++9nD0ACuMBRWXysCSi/NHM7ikABWaOsw1 +Ak6EOBZKRZDg0qg8oz+6nOod2hwX37+OoHmOpMPpc5k1q6BwdCRjNjA8lvDs7Uq3h8E BJs2AT8nQQCEkionJSx5rsn9TEuH6+gf1uAzaLU06FRr1tjRQRwWyE+ZBEqLdXmFLfCN aAJw== X-Gm-Message-State: AEkoousmo8hY7tZ0htTrA64dz8kcJllhTn5Gm9DD7A3dY5KXu/453ci2X1zF3c1wWrINr924 X-Received: by 10.36.6.1 with SMTP id 1mr1056813itv.50.1472071812456; Wed, 24 Aug 2016 13:50:12 -0700 (PDT) Received: from gbyte.rtg.local (host-174-45-44-32.hln-mt.client.bresnan.net. [174.45.44.32]) by smtp.gmail.com with ESMTPSA id o5sm12310706ith.20.2016.08.24.13.50.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Aug 2016 13:50:12 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 17/24] tools/power turbostat: call __cpuid() instead of __get_cpuid() Date: Wed, 24 Aug 2016 14:49:46 -0600 Message-Id: <1472071793-9500-18-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472071793-9500-1-git-send-email-tim.gardner@canonical.com> References: <1472071793-9500-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Len Brown BugLink: http://bugs.launchpad.net/bugs/1591802 turbostat already checks whether calling each cpuid leavf is legal, and it doesn't look at the function return value, so call the simpler gcc intrinsic __cpuid() instead of __get_cpuid(). syntax only, no functional change Signed-off-by: Len Brown (cherry picked from commit 5aea2f7f645b27635b856311dee5b775d277c686) Signed-off-by: Tim Gardner --- tools/power/x86/turbostat/turbostat.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index db9c9d1..b34241c 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -3103,7 +3103,7 @@ void process_cpuid() eax = ebx = ecx = edx = 0; - __get_cpuid(0, &max_level, &ebx, &ecx, &edx); + __cpuid(0, max_level, ebx, ecx, edx); if (ebx == 0x756e6547 && edx == 0x49656e69 && ecx == 0x6c65746e) genuine_intel = 1; @@ -3112,7 +3112,7 @@ void process_cpuid() fprintf(outf, "CPUID(0): %.4s%.4s%.4s ", (char *)&ebx, (char *)&edx, (char *)&ecx); - __get_cpuid(1, &fms, &ebx, &ecx, &edx); + __cpuid(1, fms, ebx, ecx, edx); family = (fms >> 8) & 0xf; model = (fms >> 4) & 0xf; stepping = fms & 0xf; @@ -3143,7 +3143,7 @@ void process_cpuid() * This check is valid for both Intel and AMD. */ ebx = ecx = edx = 0; - __get_cpuid(0x80000000, &max_extended_level, &ebx, &ecx, &edx); + __cpuid(0x80000000, max_extended_level, ebx, ecx, edx); if (max_extended_level >= 0x80000007) { @@ -3151,7 +3151,7 @@ void process_cpuid() * Non-Stop TSC is advertised by CPUID.EAX=0x80000007: EDX.bit8 * this check is valid for both Intel and AMD */ - __get_cpuid(0x80000007, &eax, &ebx, &ecx, &edx); + __cpuid(0x80000007, eax, ebx, ecx, edx); has_invariant_tsc = edx & (1 << 8); } @@ -3160,7 +3160,7 @@ void process_cpuid() * this check is valid for both Intel and AMD */ - __get_cpuid(0x6, &eax, &ebx, &ecx, &edx); + __cpuid(0x6, eax, ebx, ecx, edx); has_aperf = ecx & (1 << 0); do_dts = eax & (1 << 0); do_ptm = eax & (1 << 6); @@ -3209,7 +3209,7 @@ void process_cpuid() * CPUID 15H TSC/Crystal ratio, possibly Crystal Hz */ eax_crystal = ebx_tsc = crystal_hz = edx = 0; - __get_cpuid(0x15, &eax_crystal, &ebx_tsc, &crystal_hz, &edx); + __cpuid(0x15, eax_crystal, ebx_tsc, crystal_hz, edx); if (ebx_tsc != 0) { @@ -3243,7 +3243,7 @@ void process_cpuid() */ base_mhz = max_mhz = bus_mhz = edx = 0; - __get_cpuid(0x16, &base_mhz, &max_mhz, &bus_mhz, &edx); + __cpuid(0x16, base_mhz, max_mhz, bus_mhz, edx); if (debug) fprintf(outf, "CPUID(0x16): base_mhz: %d max_mhz: %d bus_mhz: %d\n", base_mhz, max_mhz, bus_mhz);