From nobody Mon Apr 25 00:06:41 2022 X-Original-To: dev-commits-src-branches@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 1BD7B1A80BFC; Mon, 25 Apr 2022 00:06:42 +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 4Kmlg60Fqlz3kFP; Mon, 25 Apr 2022 00:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650845202; 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=gTmmmV9PS/vwjaxqljNkujeWqqlU78fhDqEvX0EFCys=; b=siVeEd6IBg411ybRBka8LDPTywH9MPA8adN2TrR/VTKeF7Hqg3QHON79xH9Sd6fVPcy8X4 f3eS8rh+iFTKQ1Y9TLtD5eIfnlzt7S8yP2RFGYYZzeuEs1nlAf7iCplhh7FjsjvAG0jsZi 9z5Sp1uux216E8MktzNQAV78YCnQ54lSarYo4umw9geZDU1/SrxuymiPbeJlYp1lbj4Q62 IIM5CEyjv1xnk6nRjcoD+7xacjbYxPOW33l+srF/uEDkVo1v4gIwEsdChi6xW/u07BXTzW EjWmIRlJNR2RxhXR/yehyZeyRggc9HMeKeQsS1mv65sJIT3/94TVsmYSZLfQpg== 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 D941E103BE; Mon, 25 Apr 2022 00:06:41 +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 23P06f8K073921; Mon, 25 Apr 2022 00:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23P06fDq073920; Mon, 25 Apr 2022 00:06:41 GMT (envelope-from git) Date: Mon, 25 Apr 2022 00:06:41 GMT Message-Id: <202204250006.23P06fDq073920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 2f2eb7f1180f - stable/13 - psci: finish psci_present implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2f2eb7f1180f6c63163c8acf44a4322a7c2075bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650845202; 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=gTmmmV9PS/vwjaxqljNkujeWqqlU78fhDqEvX0EFCys=; b=hokASHur8E/FLkF5qsLZnDA2IF91EtDWsG3dh0qIQh45bsb8eggfomIsUt5heO0U5UkuHT uJeg/Rk5ZGvEe97O8M2v0PwvNZ9yox2g31vn/4V1xJDAjYHeycQu1HR7mSVTfj5Z+tqmaN Ucve2MrXPV9IMjVeVGmS6JduDkio9A/5MDna+58anJlQcKtim9polITp6AewlG/s9GgHc3 oQY4aSBhyt5JgJ2jNsBkByKZZ1iugcvt6yRdpmqqQ6fHFutot88yzLUEz8ygVkNOKSi4ZX eOwoPIvD07QNRGuLIeCWF6mphh/AoeXlvG0Cehm6aIz36fn9s6aFMQU3yfZ8bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650845202; a=rsa-sha256; cv=none; b=WUBVcJom+oMUVn32DkBBiE1DJy2H+fLUadB2R7oXxFw9kUD36f6sQh0Sr6+NufyxRmibOm tmwR41sKMbM8t6mlLPwuir0iWQkU9ODKsaL+Ml6uT3EPc0KS1lDl9NexySKoBwSDUOmL9Q WR0IIIt/adxL2GcXurS+PwlLhwV9y/KWOL1ytkdbDPJOnH+Q3KHJr1IWvPvrLfghtvISkS JCry9RNYrPZHWw7hh5TZw2GmfdJeIN/tmtevgSFBaNyFsXrX+xOag40XBexPdbNrwjvnzw LLMvajzfaleULy5AILCktfQD0/g6vRXzAIKoSY8ClIk52Pw7k7ZL/ME7NRqmUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2f2eb7f1180f6c63163c8acf44a4322a7c2075bb commit 2f2eb7f1180f6c63163c8acf44a4322a7c2075bb Author: Kyle Evans AuthorDate: 2022-03-19 03:03:44 +0000 Commit: Kyle Evans CommitDate: 2022-04-25 00:06:23 +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) (cherry picked from commit 2218070b2c3c32b1574f3f3b2d0579b2d4826554) --- 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);