Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp5956363ybv; Wed, 12 Feb 2020 03:27:13 -0800 (PST) X-Google-Smtp-Source: APXvYqxbP5tbx1XdzzkRmvsvfhpkRPkcohlI/JLGZpCvZJ+SfhPRzLKzy9NliFYDNxA9/E7xozxQ X-Received: by 2002:a05:6808:312:: with SMTP id i18mr6080056oie.44.1581506833802; Wed, 12 Feb 2020 03:27:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581506833; cv=none; d=google.com; s=arc-20160816; b=QpK8XeeXL2M3q3cPLWEHIrlneNJdeaOma813IpsSaDDjCZp4XMGex9G5xPzrNdXeJa jhHo+mtLaEk7RQTi12Wq4NY/qg5JU+awbL3Wot0J1nMROHGs2wNA1/UqntR/UL/UcAl4 ZyJjpza5lny8HTlsSlJhCcXve5WHvwjvgC6A07z5CmqQNfDYqqz6Bg/90RZoK74G+cjW KEQcJDoy+jfDGQmkGKLHPvRWcYmnceSEMsvraUc9wF1eDw90u75UpRWJUN2gWulpN+uP UV04a7uxgRiprb6LSXFeaFf7YGlWfW2ADrFyxmjwdW3CHIqRnJV6i8Lv+sypU4X7jutW R7PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :mime-version:references:in-reply-to:date:subject:to:from; bh=SijUBaf5LAfjb9zy7UIx7xWnUmWefrVK9+LFvgjVn4I=; b=vsIcwaMyldwzdTv7sZAY9yrfGohi4WGOnArx+IV6RZRNPOqejTW2BOm/Wc5FCqbG+p VMLBgVMH8k/k+IrfMV/mOiWwWP8GIfyiGjg2PYTADl+hFCpJg3lSDoM/PEy6l14GmcSu pB71RoJrrAImvvboRLd3SotptzJM9GcdQnXVnWqG/bzb10biCu0XUSwCFRMFJN63KM/8 Strj8MoA9zt0QCUOpemQeY49pR+/wxPTpq/Qg9l9S8GqRd6DaIFylB4F92sDtMhAzHB5 47+60WGIQUca2fiashKomMFGkVFMJGloYNnm8J5MvHGtkBZp29nKq3wkYDsJMkSCklTi GxOw== 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=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i10si69666otk.195.2020.02.12.03.27.00; Wed, 12 Feb 2020 03:27:13 -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; 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=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727279AbgBLL0d (ORCPT + 99 others); Wed, 12 Feb 2020 06:26:33 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33148 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725821AbgBLL0d (ORCPT ); Wed, 12 Feb 2020 06:26:33 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01CBQUNG071572 for ; Wed, 12 Feb 2020 06:26:32 -0500 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 2y1ufn96j7-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 12 Feb 2020 06:20:36 -0500 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Feb 2020 11:20:29 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 12 Feb 2020 11:20:26 -0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01CBKOBe37093380 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 12 Feb 2020 11:20:24 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 87B09A4068; Wed, 12 Feb 2020 11:20:24 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9E95AA4082; Wed, 12 Feb 2020 11:20:22 +0000 (GMT) Received: from pratiks-thinkpad.ibmuc.com (unknown [9.199.42.59]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 12 Feb 2020 11:20:22 +0000 (GMT) From: Pratik Rajesh Sampat To: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, mpe@ellerman.id.au, svaidy@linux.ibm.com, ego@linux.vnet.ibm.com, linuxram@us.ibm.com, pratik.sampat@in.ibm.com, psampat@linux.ibm.com, pratik.r.sampat@gmail.com Subject: [PATCH v4 3/3] powerpc/powernv: Parse device tree, population of SPR support Date: Wed, 12 Feb 2020 16:50:13 +0530 X-Mailer: git-send-email 2.24.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 20021211-0008-0000-0000-0000035228C7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20021211-0009-0000-0000-00004A72CD7C Message-Id: <1f5138b5080606804162b0a7cf20c134589b96b1.1581505210.git.psampat@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-02-12_06:2020-02-11,2020-02-12 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 priorityscore=1501 mlxscore=0 adultscore=0 clxscore=1015 mlxlogscore=999 bulkscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002120093 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Parse the device tree for nodes self-save, self-restore and populate support for the preferred SPRs based what was advertised by the device tree. Signed-off-by: Pratik Rajesh Sampat Reviewed-by: Ram Pai --- arch/powerpc/platforms/powernv/idle.c | 82 +++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index 97aeb45e897b..27dfadf609e8 100644 --- a/arch/powerpc/platforms/powernv/idle.c +++ b/arch/powerpc/platforms/powernv/idle.c @@ -1436,6 +1436,85 @@ static void __init pnv_probe_idle_states(void) supported_cpuidle_states |= pnv_idle_states[i].flags; } +/* + * Extracts and populates the self save or restore capabilities + * passed from the device tree node + */ +static int extract_save_restore_state_dt(struct device_node *np, int type) +{ + int nr_sprns = 0, i, bitmask_index; + int rc = 0; + u64 *temp_u64; + u64 bit_pos; + + nr_sprns = of_property_count_u64_elems(np, "sprn-bitmask"); + if (nr_sprns <= 0) + return rc; + temp_u64 = kcalloc(nr_sprns, sizeof(u64), GFP_KERNEL); + if (of_property_read_u64_array(np, "sprn-bitmask", + temp_u64, nr_sprns)) { + pr_warn("cpuidle-powernv: failed to find registers in DT\n"); + kfree(temp_u64); + return -EINVAL; + } + /* + * Populate acknowledgment of support for the sprs in the global vector + * gotten by the registers supplied by the firmware. + * The registers are in a bitmask, bit index within + * that specifies the SPR + */ + for (i = 0; i < nr_preferred_sprs; i++) { + bitmask_index = preferred_sprs[i].spr / 64; + bit_pos = preferred_sprs[i].spr % 64; + if ((temp_u64[bitmask_index] & (1UL << bit_pos)) == 0) { + if (type == SELF_RESTORE_TYPE) + preferred_sprs[i].supported_mode &= + ~SELF_RESTORE_STRICT; + else + preferred_sprs[i].supported_mode &= + ~SELF_SAVE_STRICT; + continue; + } + if (type == SELF_RESTORE_TYPE) { + preferred_sprs[i].supported_mode |= + SELF_RESTORE_STRICT; + } else { + preferred_sprs[i].supported_mode |= + SELF_SAVE_STRICT; + } + } + + kfree(temp_u64); + return rc; +} + +static int pnv_parse_deepstate_dt(void) +{ + struct device_node *sr_np, *ss_np; + int rc = 0, i; + + /* Self restore register population */ + sr_np = of_find_node_by_path("/ibm,opal/power-mgt/self-restore"); + if (!sr_np) { + pr_warn("opal: self restore Node not found"); + } else { + rc = extract_save_restore_state_dt(sr_np, SELF_RESTORE_TYPE); + if (rc != 0) + return rc; + } + /* Self save register population */ + ss_np = of_find_node_by_path("/ibm,opal/power-mgt/self-save"); + if (!ss_np) { + pr_warn("opal: self save Node not found"); + pr_warn("Legacy firmware. Assuming default self-restore support"); + for (i = 0; i < nr_preferred_sprs; i++) + preferred_sprs[i].supported_mode &= ~SELF_SAVE_STRICT; + } else { + rc = extract_save_restore_state_dt(ss_np, SELF_SAVE_TYPE); + } + return rc; +} + /* * This function parses device-tree and populates all the information * into pnv_idle_states structure. It also sets up nr_pnv_idle_states @@ -1584,6 +1663,9 @@ static int __init pnv_init_idle_states(void) return rc; pnv_probe_idle_states(); + rc = pnv_parse_deepstate_dt(); + if (rc) + return rc; if (!cpu_has_feature(CPU_FTR_ARCH_300)) { if (!(supported_cpuidle_states & OPAL_PM_SLEEP_ENABLED_ER1)) { power7_fastsleep_workaround_entry = false; -- 2.17.1