From owner-svn-src-head@freebsd.org  Thu Oct 19 13:22:54 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 3B7FDE3B779;
 Thu, 19 Oct 2017 13:22:54 +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 mx1.freebsd.org (Postfix) with ESMTPS id 0928B69C4B;
 Thu, 19 Oct 2017 13:22:53 +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 v9JDMrnP055755;
 Thu, 19 Oct 2017 13:22:53 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9JDMrMO055754;
 Thu, 19 Oct 2017 13:22:53 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201710191322.v9JDMrMO055754@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Thu, 19 Oct 2017 13:22:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324754 - 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: 324754
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Oct 2017 13:22:54 -0000

Author: andrew
Date: Thu Oct 19 13:22:52 2017
New Revision: 324754
URL: https://svnweb.freebsd.org/changeset/base/324754

Log:
  Allow later PSCI revisions to also work. The latest ARM Trusted Firmware
  reports version 1.1 so the check was failing. As thjis is a minor change
  from 1.0, and future 1.x revisions are also expected to be backwards
  compatible just ignore the minor revision in the init handler.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/dev/psci/psci.c

Modified: head/sys/dev/psci/psci.c
==============================================================================
--- head/sys/dev/psci/psci.c	Thu Oct 19 12:55:11 2017	(r324753)
+++ head/sys/dev/psci/psci.c	Thu Oct 19 13:22:52 2017	(r324754)
@@ -493,7 +493,7 @@ psci_v0_2_init(device_t dev)
 		return (1);
 
 	if ((PSCI_VER_MAJOR(version) == 0 && PSCI_VER_MINOR(version) == 2) ||
-	    (PSCI_VER_MAJOR(version) == 1 && PSCI_VER_MINOR(version) == 0)) {
+	    PSCI_VER_MAJOR(version) == 1) {
 		if (bootverbose)
 			device_printf(dev, "PSCI version 0.2 available\n");