From owner-svn-src-all@freebsd.org Tue Jan 9 15:57:12 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40D7DE6015D; Tue, 9 Jan 2018 15:57:12 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EDE7182CEE; Tue, 9 Jan 2018 15:57:10 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1888118FBB; Tue, 9 Jan 2018 15:57:10 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w09Fv9Ne069137; Tue, 9 Jan 2018 15:57:09 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w09Fv9Z2069135; Tue, 9 Jan 2018 15:57:09 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201801091557.w09Fv9Z2069135@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 9 Jan 2018 15:57:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327728 - head/sys/dev/psci X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/dev/psci X-SVN-Commit-Revision: 327728 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jan 2018 15:57:12 -0000 Author: andrew Date: Tue Jan 9 15:57:09 2018 New Revision: 327728 URL: https://svnweb.freebsd.org/changeset/base/327728 Log: Add a function to find the PSCI version the firmware implements from outside the PSCI driver. MFC after: 1 week Sponsored by: DARPA, AFRL Modified: head/sys/dev/psci/psci.c head/sys/dev/psci/psci.h Modified: head/sys/dev/psci/psci.c ============================================================================== --- head/sys/dev/psci/psci.c Tue Jan 9 14:33:05 2018 (r327727) +++ head/sys/dev/psci/psci.c Tue Jan 9 15:57:09 2018 (r327728) @@ -314,7 +314,7 @@ psci_attach(device_t dev, psci_initfn_t psci_init) } static int -psci_get_version(struct psci_softc *sc) +_psci_get_version(struct psci_softc *sc) { uint32_t fnid; @@ -326,6 +326,15 @@ psci_get_version(struct psci_softc *sc) return (PSCI_RETVAL_NOT_SUPPORTED); } +int +psci_get_version(void) +{ + + if (psci_softc == NULL) + return (PSCI_RETVAL_NOT_SUPPORTED); + return (_psci_get_version(psci_softc)); +} + #ifdef FDT static int psci_fdt_callfn(psci_callfn_t *callfn) @@ -487,7 +496,7 @@ psci_v0_2_init(device_t dev) sc->psci_fnids[PSCI_FN_SYSTEM_OFF] = PSCI_FNID_SYSTEM_OFF; sc->psci_fnids[PSCI_FN_SYSTEM_RESET] = PSCI_FNID_SYSTEM_RESET; - version = psci_get_version(sc); + version = _psci_get_version(sc); if (version == PSCI_RETVAL_NOT_SUPPORTED) return (1); Modified: head/sys/dev/psci/psci.h ============================================================================== --- head/sys/dev/psci/psci.h Tue Jan 9 14:33:05 2018 (r327727) +++ head/sys/dev/psci/psci.h Tue Jan 9 15:57:09 2018 (r327728) @@ -41,6 +41,7 @@ int psci_cpu_on(unsigned long, unsigned long, unsigned int psci_hvc_despatch(register_t, register_t, register_t, register_t); int psci_smc_despatch(register_t, register_t, register_t, register_t); +int psci_get_version(void); /* * PSCI return codes.