Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp2020205ybn; Thu, 26 Sep 2019 05:57:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqzvjuQ+8idvGsex98wk4oNRP80NBL+oQCaU7LVeC2UOHykFPVHIngfyDEm5KZeNpxUq/4Py X-Received: by 2002:a50:fa0d:: with SMTP id b13mr1249615edq.66.1569502657495; Thu, 26 Sep 2019 05:57:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569502657; cv=none; d=google.com; s=arc-20160816; b=JOVcy3i4Jll4i97Y1hmqTFzikaylSjAPw/kzyjgEj+icTYw1LQdOkIw88yprLyWDs4 VibBIuin6uUG+yRw9myH5BIZizTWkfwBaFUmCDIpgU5S7UCmj8I7VrdxsCISNoaIwO8d 261eiD8Za/Tw0xs9abYzpCg3zE32mTJK/UPTQmxj4wKdrkIgHqLb4MVwF1ATdW5iuZwK mAvobdaX1WMy+TiglKcBIZArKphylCK6MWTlGA7OqOMRBaCCOz7JEBhCbfSpDkQb3Z95 xpiqCBF0IAqhbUwTYhw4MvRJRH4X3J6DJO3gqbxMbPRy8meI96a7JcBalmsOY3sCC7XR NT0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=f212N7z80cWSeQDmq/H61xQ7sqoyQfE+s4VoOhxREpc=; b=xQtzPKWqtzIboAOFjQyeSVMZh6GituS21BmJNhtf3ZXgUvydf4RFiiROEXEcVqPmJY YFkfLWj0A9ylEcvUEC7NVkjL55nuCICLL+hN1vinaUHJeMoJXNj43JPDQxShQOTymIKN udH9vMi3zmXbCIC1TUoA4aRdrMv+80GlcMv/qHnbwhInMTP+i5jKhfi0230ZwHCk0Wu2 7khAF4DYNE43A9JU8ciRRZp5L3LWiab32c9sg6+oMxBlYSMkYpIOPi0AyN5+UHc4Lt3r fK6bmPFHsvVbo6+/cNvI6DEFZunGE1TPy0DHeYMTZtAEZdE7Xuf7GsPjfjTgSbUjYPxv X3Cw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y43si1285143edd.42.2019.09.26.05.57.13; Thu, 26 Sep 2019 05:57:37 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726851AbfIZMzQ (ORCPT + 99 others); Thu, 26 Sep 2019 08:55:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44550 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726152AbfIZMzP (ORCPT ); Thu, 26 Sep 2019 08:55:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B71CA30BC58E; Thu, 26 Sep 2019 12:55:15 +0000 (UTC) Received: from prarit.bos.redhat.com (prarit-guest.khw1.lab.eng.bos.redhat.com [10.16.200.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A3D7608C2; Thu, 26 Sep 2019 12:55:15 +0000 (UTC) From: Prarit Bhargava To: platform-driver-x86@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Prarit Bhargava , Srinivas Pandruvada Subject: [PATCH 3/7] intel-speed-select: Add check for CascadeLake-N models Date: Thu, 26 Sep 2019 08:54:57 -0400 Message-Id: <20190926125501.1616-4-prarit@redhat.com> In-Reply-To: <20190926125501.1616-1-prarit@redhat.com> References: <20190926125501.1616-1-prarit@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 26 Sep 2019 12:55:15 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Three CascadeLake-N models (6252N, 6230N, and 5218N) have SST-PBF support. Return an error if the CascadeLake processor is not one of these specific models. Signed-off-by: Prarit Bhargava Cc: Srinivas Pandruvada --- .../x86/intel-speed-select/isst-config.c | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/tools/power/x86/intel-speed-select/isst-config.c b/tools/power/x86/intel-speed-select/isst-config.c index bb6f8f5986c9..ae8e3b5153ad 100644 --- a/tools/power/x86/intel-speed-select/isst-config.c +++ b/tools/power/x86/intel-speed-select/isst-config.c @@ -71,7 +71,7 @@ void debug_printf(const char *format, ...) va_end(args); } -static void update_cpu_model(void) +static int update_cpu_model(void) { unsigned int ebx, ecx, edx; unsigned int fms, family; @@ -81,6 +81,32 @@ static void update_cpu_model(void) cpu_model = (fms >> 4) & 0xf; if (family == 6 || family == 0xf) cpu_model += ((fms >> 16) & 0xf) << 4; + + /* only three CascadeLake-N models are supported */ + if (cpu_model == 0x55) { + FILE *fp; + size_t n; + char *line; + int ret = 1; + + fp = fopen("/proc/cpuinfo", "r"); + if (!fp) + err(-1, "cannot open /proc/cpuinfo\n"); + + while (getline(&line, &n, fp) > 0) { + if (strstr(line, "model name")) { + if (strstr(line, "6252N") || + strstr(line, "6230N") || + strstr(line, "5218N")) + ret = 0; + break; + } + } + free(line); + fclose(fp); + return ret; + } + return 0; } /* Open a file, and exit on failure */ @@ -1638,7 +1664,9 @@ static void cmdline(int argc, char **argv) fprintf(stderr, "Feature name and|or command not specified\n"); exit(0); } - update_cpu_model(); + ret = update_cpu_model(); + if (ret) + err(-1, "Invalid CPU model (%d)\n", cpu_model); printf("Intel(R) Speed Select Technology\n"); printf("Executing on CPU model:%d[0x%x]\n", cpu_model, cpu_model); set_max_cpu_num(); -- 2.21.0