From patchwork Wed Sep 5 14:00:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 146000 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4978991ljw; Wed, 5 Sep 2018 07:05:13 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbxLxRukaayYkDAnb6EFuth3TpHimz4DmhlCzrvppU4IYtffy6rDl8xu/BHw6kJnKWERy99 X-Received: by 2002:a37:c511:: with SMTP id p17-v6mr28676626qki.136.1536156313720; Wed, 05 Sep 2018 07:05:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536156313; cv=none; d=google.com; s=arc-20160816; b=1CI+c2HoRmeQl4ljj2/AqmCpic1hnZJ9+k/J7Xqg5xyVyx/PiUQYU1JYdpyA0RFgeP Qk6524ORzbMO/J1RPpRFB8V26R9mvlnbVulLn1SCQr7Mbjy+kfidi2ybS+Hy1ErIWj9W cYB+wbQTEwFg5kjzjKmSTudYGtvDBERd+e8UP7R/+uzS6/qEuexPvZmNg6iViL7QKJsH zieK+VBmmRvsTQQINBtD2dw4F8IKkcqC3cGHEAsqzUXvSoFNIyRge0sho37EKgwVNVva TyKRyVB89Ffs9ypzVfXaDr3pIdci60feEsCp6i+cDPgrNaPdHmFwDId0cLn46bbaHFVR LqIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to; bh=YUAtHcrAR1L2jhruLyjVw9TqXbV48Qf98WIegqphh6g=; b=MLYIGLV+ykfXC24XXbdQwl+TztjCsoT3hsH8/3fJiet2N45OPuWHMvNztEpzWtjV7Q AYQWJTKRFH3JnK6Zzkj7KZuoV3/8QhKBGDnM8R4v+7/Oc+Jakea8Gh37k0nMSBzDc/6c sag0YhvRkYhWHZmUwJoJfWxGIYj+wTuYsDBlGrudmbBRnVaX3g35IAFjFWJbIZ8+uYqx Jtk3S+9Ihn3UckTQyGYMaNmo7VTeUd3eTcVBWQA4w8U8KajZSBIE25bE2slx4J59I+gM GLmA3QmrbE5ybLJDf8ERkS6EKsD+/CtDGKGRiuT06cIedBT5ijzZcBPg2h7OP5a0/fDA pgbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id c16-v6si1472429qkb.72.2018.09.05.07.05.13; Wed, 05 Sep 2018 07:05:13 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 3AC33685DF; Wed, 5 Sep 2018 14:05:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id E2AB960949; Wed, 5 Sep 2018 14:03:32 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0140968600; Wed, 5 Sep 2018 14:03:14 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 2D88F68610 for ; Wed, 5 Sep 2018 14:00:13 +0000 (UTC) Received: from mxback6j.mail.yandex.net (mxback6j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10f]) by forward100o.mail.yandex.net (Yandex) with ESMTP id A24992A27480 for ; Wed, 5 Sep 2018 17:00:11 +0300 (MSK) Received: from smtp2o.mail.yandex.net (smtp2o.mail.yandex.net [2a02:6b8:0:1a2d::26]) by mxback6j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id MhgkJBSXrj-0BiC2N6Y; Wed, 05 Sep 2018 17:00:11 +0300 Received: by smtp2o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id XcngjjK9pV-0AJeO6PF; Wed, 05 Sep 2018 17:00:10 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 5 Sep 2018 14:00:07 +0000 Message-Id: <1536156008-9721-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536156008-9721-1-git-send-email-odpbot@yandex.ru> References: <1536156008-9721-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 693 Subject: [lng-odp] [PATCH v5 2/3] linux-gen: x86: as a last resort parse max cpu freq from bogomips value X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 693 (lumag:fix-cpu_max_hz) ** https://github.com/Linaro/odp/pull/693 ** Patch: https://github.com/Linaro/odp/pull/693.patch ** Base sha: 0a5d67beda902557056d5b5146d8cbe86e5001b0 ** Merge commit sha: a057d7593fa6375352a84ec9ce2c997b6581b790 **/ .../arch/x86/odp_sysinfo_parse.c | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index 504aa3efa..5084e6b5f 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -15,34 +15,54 @@ int cpuinfo_parser(FILE *file, system_info_t *sysinfo) char str[1024]; char *pos, *pos_end; double ghz = 0.0; + double mhz = 0.0; uint64_t hz; int id = 0; + bool freq_set = false; strcpy(sysinfo->cpu_arch_str, "x86"); while (fgets(str, sizeof(str), file) != NULL && id < CONFIG_NUM_CPU) { pos = strstr(str, "model name"); if (pos) { + freq_set = false; + /* Copy model name between : and @ characters */ pos = strchr(str, ':'); pos_end = strchr(str, '@'); - if (pos == NULL || pos_end == NULL) + if (pos == NULL) continue; - *(pos_end - 1) = '\0'; + if (pos_end != NULL) + *(pos_end - 1) = '\0'; + strncpy(sysinfo->model_str[id], pos + 2, MODEL_STR_SIZE - 1); if (sysinfo->cpu_hz_max[id]) { + freq_set = true; id++; continue; } /* max frequency needs to be set */ - if (sscanf(pos_end, "@ %lfGHz", &ghz) == 1) { + if (pos_end != NULL && + sscanf(pos_end, "@ %lfGHz", &ghz) == 1) { hz = (uint64_t)(ghz * 1000000000.0); - sysinfo->cpu_hz_max[id] = hz; + sysinfo->cpu_hz_max[id++] = hz; + freq_set = true; + } + } else if (!freq_set && + strstr(str, "bogomips") != NULL) { + pos = strchr(str, ':'); + if (pos == NULL) + continue; + + if (sscanf(pos + 2, "%lf", &mhz) == 1) { + /* On typical x86 BogoMIPS is freq * 2 */ + hz = (uint64_t)(mhz * 1000000.0 / 2); + sysinfo->cpu_hz_max[id++] = hz; + freq_set = true; } - id++; } }