From nobody Sat Mar 19 03:47:21 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1667D1A329C1; Sat, 19 Mar 2022 03:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KL6Jn6dslz4Yvb; Sat, 19 Mar 2022 03:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647661642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fUXSp8w33m+pYVZq3NCXBZLKxB0/0xHVscKaRbknm8=; b=GjLxNXIRAjtNPTiWUiULFlJaysmEs2TFm/UhQnJ2czxGOWlRnaK2PtzTVt0/TIUZ0TjV7Z 5GJZQ9S7am2AbdZ6jx1wbB4Nj/iu18UgpUtfePZyxSs27hJNSvtN51uwrkDnA0YyoXznf8 13g3oLB7+MbmojAiGnainCPn3NKW1hsKrEJYJPJudxnuccEfsJXDAgsb9VmmDoepFOVNqU CjqlynV9JhHTqkxG4TIphN9rgIL6AygisqoC/WOMB3e2qMW+Xn6Op1FjS1EraXcyBsyNvh vAp0dtOwA77HP2t43sXtrdaCAXOtZCGdURHS43My/Uf8JZjsTV4h3Biga7jUIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B73953A8D; Sat, 19 Mar 2022 03:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22J3lLVG062781; Sat, 19 Mar 2022 03:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22J3lLsT062780; Sat, 19 Mar 2022 03:47:21 GMT (envelope-from git) Date: Sat, 19 Mar 2022 03:47:21 GMT Message-Id: <202203190347.22J3lLsT062780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 2218070b2c3c - main - psci: finish psci_present implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2218070b2c3c32b1574f3f3b2d0579b2d4826554 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647661642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fUXSp8w33m+pYVZq3NCXBZLKxB0/0xHVscKaRbknm8=; b=gJlXsNKwFpoIye4KG2pXpY7Jiip7O9NiHh8K7n1XOmu0OUMk1QDCw2VqTm/OQt+CL/76Ua iPmvkGq0kbUQKOcEphq8mRuqnchXO5+TkUq6OwQCtEbfUj1sYRtJZXVlUA4UC5DANPNlct kU6mOE8DFv0UL6HmreV0VWMlGb4Bb3po4R6nFOXceJDWmtX5N4ycYgdMSrneLqbytuYWJG erDhfBeUAMpuvwuhahjfTVk3FtvITJgRKEOdl8jSyYgKJ3w2Bko3wUk7sYvgMtzEELPI0Z Da4uaJnURG9wqHyviVCeC8Phq0ay0l3rETMmwWzkVleVrr4dnJ9XknepD8AZWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647661642; a=rsa-sha256; cv=none; b=GoiC/a0IH3wRg0If3yHxvhZQHNgQl29XMrF5CtxBeG7/HyOW8u4FQVYuLJid+OMBmr7b53 HXtc713Vo5XeBFQQ6HZcXd4l5wLZkSWv4tpozqUytY68ENhfVL41zHVcdR7Y3L/bwJtX07 tw94YtO4l8SgQJrgnUgpIxgLpolWhvZFK/+1JJODuLMrZ2gJKq4kEXKlWRIyPaG5cKmMlG qcaqQu2U4nIgpvvvbNrO8F+jdqZS1UPpXw2+Zb6fOIkacv7u0Gl/lRtxrwJRgGMFYus95B XK1t9U5tG0s92EBrMLFJlHsSH7kV7iJ98qvhiGBMVFT9Kmq1tMKkyJgxQS3NaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2218070b2c3c32b1574f3f3b2d0579b2d4826554 commit 2218070b2c3c32b1574f3f3b2d0579b2d4826554 Author: Kyle Evans AuthorDate: 2022-03-19 03:03:44 +0000 Commit: Kyle Evans CommitDate: 2022-03-19 03:04:32 +0000 psci: finish psci_present implementation This was already declared in psci.h, but it was never defined/set. Do this now, so we can use it to decide if enable-method in /cpus FDT nodes should be inspected later on. While we're here, convert it to a boolean. Reviewed by: andrew (slightly earlier version) Differential Revision: https://reviews.freebsd.org/D34553 --- sys/dev/psci/psci.c | 2 ++ sys/dev/psci/psci.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/psci/psci.c b/sys/dev/psci/psci.c index f2bd4c698e5a..dd760d8e221a 100644 --- a/sys/dev/psci/psci.c +++ b/sys/dev/psci/psci.c @@ -84,6 +84,7 @@ static int psci_v0_1_init(device_t dev, int default_version); static int psci_v0_2_init(device_t dev, int default_version); struct psci_softc *psci_softc = NULL; +bool psci_present; #ifdef __arm__ #define USE_ACPI 0 @@ -347,6 +348,7 @@ psci_attach(device_t dev, psci_initfn_t psci_init, int default_version) return (ENXIO); psci_softc = sc; + psci_present = true; return (0); } diff --git a/sys/dev/psci/psci.h b/sys/dev/psci/psci.h index f2c8a43c81ea..8004498426c5 100644 --- a/sys/dev/psci/psci.h +++ b/sys/dev/psci/psci.h @@ -37,7 +37,7 @@ typedef int (*psci_callfn_t)(register_t, register_t, register_t, register_t, register_t, register_t, register_t, register_t, struct arm_smccc_res *res); -extern int psci_present; +extern bool psci_present; int psci_cpu_on(unsigned long, unsigned long, unsigned long); void psci_reset(void);