From patchwork Mon Nov 26 08:44:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 151996 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5376661ljp; Mon, 26 Nov 2018 00:44:39 -0800 (PST) X-Google-Smtp-Source: AFSGD/XmGxGqJgml+oE/+RYVibDyRZTuJtuqtkg3uA4z69Rr85Cf+WJF/xQh4bSnDbZaP+dwnDfb X-Received: by 2002:a63:507:: with SMTP id 7mr20517920pgf.411.1543221879528; Mon, 26 Nov 2018 00:44:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543221879; cv=none; d=google.com; s=arc-20160816; b=fOPngKbo2xZWlRLnNKotVjonYXbr+KDNUTBJRlQ+20IaYSfZ6KZSbLPXGr+IBsRtDd ylOr4EbVEXCqDQ8lt0hdnFfT7Nn9OHm5UZ9AVGWEjRqfblA4kXBeHC3z7wo1Jl9BPDVR 3wSlPEYJaGGdCFzX5N4EICgwjXcaxuyRPQVnc+9UjzAzhjEwS3g+EM08BtUYndvrX2qY 5qs0OUL9k8MxV9qEuDZBchDJv1TnN2+xLDi9oEVajqBlfKxo9XQRMUql1pEwRY3r0Rvj bENJ9Z4VEtL0XduotM21kQMxcftVCiHYH8in8Y29olPcsc1i+MjePfJ4lIem5tQgodIK 6MwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=jfsMP20PX9AzxiepyEa67RYbHxSdA147CoEw18eFqcM=; b=zhyvs0TejGlyn4pY1Jj1FW4SnwJa2vmzMLDmLrGhzg84Q1y6fiyvVisp85Ya8Ri2uf zy3jLqx7d0s7SqVFBeFUGvuX200H5ueHHiazb4AiFC/AbZKB+BQ+6Z5magzAwZK3pEFm 9Y4lYUuD/+Kd+WDC7OtlxI+BKwqra0BrCC+EUDBmpiaIvpFAYHyfxblyZM8sw8kryw37 XnQgGbrHSj7Dui4pFJultQPGf7J/T0SgyXD0tSr57yucxblSu4pLI2ktgf1lLHdZard5 +iyRwCT8/egyglQF5YI5WydcjbqGgXS4mk5z0K/IPNCJkrRtMqOVUbt7FswBkyx2BEM8 sG9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cbNlZDSp; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si6584329plp.294.2018.11.26.00.44.38; Mon, 26 Nov 2018 00:44:39 -0800 (PST) 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; dkim=pass header.i=@linaro.org header.s=google header.b=cbNlZDSp; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726300AbeKZTiB (ORCPT + 32 others); Mon, 26 Nov 2018 14:38:01 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42402 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726164AbeKZTiA (ORCPT ); Mon, 26 Nov 2018 14:38:00 -0500 Received: by mail-wr1-f66.google.com with SMTP id q18so17910912wrx.9 for ; Mon, 26 Nov 2018 00:44:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jfsMP20PX9AzxiepyEa67RYbHxSdA147CoEw18eFqcM=; b=cbNlZDSpq8IRQ7pT28gQc99KmWLJsf6QyE3TEIsiKTA3YLWt9T8j9XOM0w2wQ/NCat Ljn2vxsTrq7L0/Ec1UKBYgCH3LoLbnaz19rYBoX3AF1Gtou4p/3fbWqaGLg/VhIoZR5p wrnNs3uYO4Yu0IOIyMK1aRTJewKo5zZXGoqBw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jfsMP20PX9AzxiepyEa67RYbHxSdA147CoEw18eFqcM=; b=H4fDTFcie51n7PBO8Wj7wfOKkit7oEt/40GaRra0A5m4a8wSIA4z6AkrnYO5JcchJD HnoC8xLdWLoXkN8pYJbHHTkPJL74vMalL6cVMTBH270CclHVZ3bvKkn86UdLS52yrBQt qXj9Z9f2DbxPi41tI0OuSuVz2urLzIKP2bV/JnoSdEBr7cFxeUXv86RE6yIzh0mJfz8/ EqRAOZw1nqRaoYJr0RUM4Ub797jVXCO6AqV7QZqzsKGwlyc5vtWjxRhXvhDbvnDtZmea rzaxliP4IDq87LPYekb2GlGKX2xItLIxfvDkSz7tr0qTn7zLqeDGxUSx6HKCWLuI6bVD 7JEQ== X-Gm-Message-State: AA+aEWbk9gMLwUcLnhCCx6+vdecCJE2XShWAJSUFC/WxvwZNbJALfgDB pAGuJ1DuisGZG5x/+PXEnYP5ag== X-Received: by 2002:adf:9382:: with SMTP id 2mr7131445wrp.269.1543221874465; Mon, 26 Nov 2018 00:44:34 -0800 (PST) Received: from localhost.localdomain (72.224.136.77.rev.sfr.net. [77.136.224.72]) by smtp.gmail.com with ESMTPSA id a204sm98009wmh.23.2018.11.26.00.44.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Nov 2018 00:44:33 -0800 (PST) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: linux-kernel@vger.kernel.org, viresh.kumar@linaro.org, Chris Redpath , Quentin Perret , Amit Kucheria , Nicolas Dechesne , Niklas Cassel , Greg Kroah-Hartman , "Rafael J. Wysocki" Subject: [PATCH V3 2/2] base/drivers/arch_topology: Default dmips-mhz if they are not set in DT Date: Mon, 26 Nov 2018 09:44:21 +0100 Message-Id: <1543221866-19671-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543221866-19671-1-git-send-email-daniel.lezcano@linaro.org> References: <1543221866-19671-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the case of asymmetric SoC with the same micro-architecture, we have a group of CPUs with smaller OPPs than the other group. One example is the 96boards dragonboard 820c. There is no dmips/MHz difference between both groups, so no need to specify the values in the DT. Unfortunately, without these defined, there is no scaling capacity computation triggered, so we need to write 'capacity-dmips-mhz' for each CPU with the same value in order to force the scaled capacity computation. In order to fix this situation, allocate 'raw_capacity' so the pointer is set and the init_cpu_capacity_callback() function can be called. This was tested on db820c: - specified values in the DT (correct results) - partial values defined in the DT (error + fallback to defaults) - no specified values in the DT (correct results) correct results are: cat /sys/devices/system/cpu/cpu*/cpu_capacity 758 758 1024 1024 ... respectively for CPU0, CPU1, CPU2 and CPU3. That reflects the capacity for the max frequencies 1593600 and 2150400. Cc: Chris Redpath Cc: Quentin Perret Cc: Viresh Kumar Cc: Amit Kucheria Cc: Nicolas Dechesne Cc: Niklas Cassel Signed-off-by: Daniel Lezcano --- drivers/base/arch_topology.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.7.4 Reviewed-by: Viresh Kumar diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index fd5325b..e0c5b60 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -243,9 +243,20 @@ static int __init register_cpufreq_notifier(void) * until we have the necessary code to parse the cpu capacity, so * skip registering cpufreq notifier. */ - if (!acpi_disabled || !raw_capacity) + if (!acpi_disabled) return -EINVAL; + if (!raw_capacity) { + + pr_info("cpu_capacity: No capacity defined in DT, set default " + "values to %ld\n", SCHED_CAPACITY_SCALE); + + raw_capacity = kmalloc_array(num_possible_cpus(), + sizeof(*raw_capacity), GFP_KERNEL); + if (!raw_capacity) + return -ENOMEM; + } + if (!alloc_cpumask_var(&cpus_to_visit, GFP_KERNEL)) { pr_err("cpu_capacity: failed to allocate memory for cpus_to_visit\n"); return -ENOMEM;