From owner-svn-src-projects@FreeBSD.ORG Sun May 22 02:13:56 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 5B60E106564A;
Sun, 22 May 2011 02:13:56 +0000 (UTC)
(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 4C19D8FC16;
Sun, 22 May 2011 02:13:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4M2DunF054607;
Sun, 22 May 2011 02:13:56 GMT
(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4M2DuZm054605;
Sun, 22 May 2011 02:13:56 GMT
(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201105220213.p4M2DuZm054605@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 22 May 2011 02:13:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r222168 - projects/pseries/powerpc/ofw
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 May 2011 02:13:56 -0000
Author: nwhitehorn
Date: Sun May 22 02:13:55 2011
New Revision: 222168
URL: http://svn.freebsd.org/changeset/base/222168
Log:
IBM firmware is odd. Make RTAS initialization actually work correctly on
SLOF systems.
Modified:
projects/pseries/powerpc/ofw/rtas.c
Modified: projects/pseries/powerpc/ofw/rtas.c
==============================================================================
--- projects/pseries/powerpc/ofw/rtas.c Sun May 22 01:07:54 2011 (r222167)
+++ projects/pseries/powerpc/ofw/rtas.c Sun May 22 02:13:55 2011 (r222168)
@@ -73,11 +73,15 @@ rtas_setup(void *junk)
{
ihandle_t rtasi;
cell_t rtas_size = 0, rtas_ptr;
+ char path[31];
int result;
- rtasi = OF_open("/rtas");
rtas = OF_finddevice("/rtas");
- if (rtasi == 0 || rtas == -1)
+ if (rtas == -1)
+ return;
+ OF_package_to_path(rtas, path, sizeof(path));
+ rtasi = OF_open(path);
+ if (rtasi == -1 || rtasi == 0)
return;
mtx_init(&rtas_mtx, "RTAS", MTX_DEF, 0);
@@ -116,7 +120,7 @@ rtas_setup(void *junk)
(cell_t)rtas_private_data, &rtas_ptr);
OF_close(rtasi);
- if (result == -1) {
+ if (result != 0) {
rtas = 0;
rtas_ptr = 0;
printf("Error initializing RTAS\n");
@@ -188,7 +192,7 @@ rtas_call_method(cell_t token, int nargs
} args;
int n, result;
- if (!rtas_exists() || nargs > 6)
+ if (!rtas_exists() || nargs + nreturns > 12)
return (-1);
args.token = token;