X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=ybin%2Fofpath;h=b4981d79443c1abe323503951998233fec752f02;hp=4c4ceaa20b537e3b707b659485e238af3447d828;hb=1d8bdec959fa2675b7c1b752cac22fa47edb9394;hpb=eb8b0d5d9f4823a7033ef2baa1cababd4b5574e1

diff --git a/ybin/ofpath b/ybin/ofpath
index 4c4ceaa..b4981d7 100755
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -8,7 +8,7 @@
 ## Portions based on show_of_path.sh:
 ##
 ## Copyright (C) 2000 Olaf Hering <olh@suse.de>
-## 
+##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License
 ## as published by the Free Software Foundation; either version 2
@@ -27,7 +27,7 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"
-VERSION=1.0.6-pre2
+VERSION=1.0.7
 DEBUG=0
 export LC_COLLATE=C
 
@@ -116,11 +116,11 @@ linecount()
 ## small tr replacment which handles a specific need of this script.
 smalltr()
 {
-    case "$1" in 
+    case "$1" in
 	a) echo 1 ;; b) echo 2 ;; c) echo 3 ;; d) echo 4 ;; e) echo 5 ;; f) echo 6 ;;
 	g) echo 7 ;; h) echo 8 ;; i) echo 9 ;; j) echo 10 ;; k) echo 11 ;; l) echo 12 ;;
 	m) echo 13 ;; n) echo 14 ;; o) echo 15 ;; p) echo 16 ;;
-	1) echo a ;; 2) echo b ;; 3) echo c ;; 4) echo d ;; 5) echo e ;; 
+	1) echo a ;; 2) echo b ;; 3) echo c ;; 4) echo d ;; 5) echo e ;;
 	6) echo f ;; 7) echo g ;; 8) echo h ;; 9) echo i ;; 10) echo j ;;
 	11) echo k ;; 12) echo l ;; 13) echo m ;; 14) echo n ;; 15) echo o ;;
 	16) echo p ;;
@@ -250,7 +250,7 @@ scsiinfo()
 	DEVHOST="$(v=$(echo ${DEVINFO##*Host: scsi}) ; echo ${v%% *})"
 	[ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVHOST=$DEVHOST"
 
-	if [ "$DEVTYPE" = "Direct-Access" ] ; then
+	if [ "$DEVTYPE" = "Direct-Access" ] || [ "$DEVTYPE" = "Direct-Access-RBC" ] ; then
 	    DEVCOUNT="$(($DEVCOUNT + 1))"
 	    [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVCOUNT=$DEVCOUNT"
 	    if [ "$SUBDEV" = "$DEVCOUNT" ] ; then
@@ -298,10 +298,34 @@ scsi_ofpath()
 	    echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
 	    ;;
 	ata_k2|sata_svw)
-	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
-			lgrep "$i" "k2-s-ata" ; done)"
+            #Not all G5 device trees have a compatible "k2-sata" node 
+            #per channel use parent
+	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible ` ; do
+			lgrep "$i" "k2-s-ata" ; done | sort)"
 	    DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
-	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$DEVICE_ID/disk@0:$PARTITION"
+	    K2_DEVICE_ID=0
+	    while [ "$DEVICE_PATH" = "" ] ; do
+	        SCSI_HOSTNUMBER=`expr $SCSI_HOSTNUMBER - 1`
+	        let "K2_DEVICE_ID += 1"
+	        DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+	    done
+	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$K2_DEVICE_ID/disk@0:$PARTITION"
+	    ;;
+	usb-storage)
+            HOST_LIST="$(for i in `find /proc/device-tree -name name | grep usb` ; do
+                        lgrep "$i" "disk" ; done)"
+            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+            echo "${DEVICE_PATH##*device-tree}:$PARTITION"
+	    ;;
+	sbp2|"")
+            # sbp-2 driver may not have a dir in /proc/scsi
+            HOST_LIST="$(for i in `find /proc/device-tree -name name` ; do
+                        lgrep "$i" "sbp-2" ; done)"
+            if [ "$SCSI_HOSTNUMBER" = "" ] ; then
+                SCSI_HOSTNUMBER=1
+            fi
+            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+            echo "${DEVICE_PATH##*device-tree}/disk@0:$PARTITION"
 	    ;;
 	*)
 	    echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported"
@@ -314,7 +338,7 @@ scsi_ofpath()
 ide_ofpath()
 {
     if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-	echo 2>&1 "$PRG: /dev/$DEVNODE: Device not configured"
+	echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
 	return 1
     fi
 
@@ -326,7 +350,7 @@ ide_ofpath()
 
     case "$(uname -r)" in
 	2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*)
-	    echo "$PRG: Linux kernel `uname -r` is not supported"
+	    echo 1>&2 "$PRG: Linux kernel `uname -r` is not supported"
 	    return 1
 	    ;;
 	2.6.*|2.7.*)
@@ -336,7 +360,7 @@ ide_ofpath()
 	    fi
 	    local SYS="$(m=`grep '.* .* sysfs ' /proc/mounts | head -n 1` ; echo `d=${m#* };echo ${d%% *}`)"
 	    if [ -z "$SYS" -o ! -d "$SYS" ] ; then
-		echo 2>&1 "$PRG: Unable to determine sysfs mountpoint"
+		echo 1>&2 "$PRG: Unable to determine sysfs mountpoint"
 		return 1
 	    fi
 	    local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec"
@@ -348,7 +372,7 @@ ide_ofpath()
 
     if [ ! -f "$OF1275IDE" ] ; then
 	case "$(cat /proc/device-tree/model)" in
-	    PowerMac3*|PowerMac4*|PowerMac5*|PowerMac6*|PowerMac7*|X*)
+	    PowerMac3*|PowerMac4*|PowerMac5*|PowerMac6*|PowerMac7*|RackMac*)
 		local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
 		if [ -z "$CDROM" ] ; then
 		    echo 1>&2 "$PRG: WARNING: Your kernel is too old for proper support, device may be innaccurate."
@@ -396,8 +420,12 @@ ide_ofpath()
 		local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
 		local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
 		;;
+	    spi)
+		local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
+		local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
+		;;
 	    *)
-		echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
+		echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
 		return 1
 		;;
 	esac
@@ -425,19 +453,11 @@ newworld()
 {
     case "$DEVNODE" in
 	sd*)
-	    if ls -l /proc/device-tree | grep -q ^lr ; then
-		true
-	    else
-		echo 1>&2 "$PRG: /proc/device-tree is broken.  Do not use BootX to boot, use yaboot."
-		echo 1>&2 "$PRG: The yaboot HOWTO can be found here: http://www.alaska.net/~erbenson/doc"
-		return 1
-	    fi
-
 	    ## use common scsiinfo function to get info we need.
 	    scsiinfo || return 1
 
 	    ## now we have the data for /@$DEVID:$PARTITION
-	    ## find the actual OF path.	
+	    ## find the actual OF path.
 	    scsi_ofpath || return 1
 	    ;;
 	hd*)
@@ -667,7 +687,7 @@ chrp()
 {
     case "$DEVNODE" in
 	sd*)
-	    if ls -l /proc/device-tree | grep -q ^lr ; then
+	    if ls -l /proc/device-tree | grep -q ^d ; then
 		true
 	    else
 		echo 1>&2 "$PRG: /proc/device-tree is broken."
@@ -678,7 +698,7 @@ chrp()
 	    scsiinfo || return 1
 
 	    ## now we have the data for /@$DEVID:$PARTITION
-	    ## find the actual OF path.	
+	    ## find the actual OF path.
 	    scsi_ofpath || return 1
 	    ;;
 	*)
@@ -774,7 +794,7 @@ fixdevfs()
 	    local DEVTYPE="$(v=$(echo ${DEVINFO##*Type: }) ; echo ${v%% *})"
 	    [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: fixdevfs: DEVTYPE=$DEVTYPE"
 
-	    if [ "$DEVTYPE" = "Direct-Access" ] ; then
+	    if [ "$DEVTYPE" = "Direct-Access" ] || [ "$DEVTYPE" = "Direct-Access-RBC" ] ; then
 		## Lets find out some more information
 		## get the device id.
 		local DEVID="$(v=$(echo ${DEVINFO##*Id: }) ; n=$(echo ${v%% *}) ; echo ${n#*0})"
@@ -914,6 +934,8 @@ elif (cat /proc/cpuinfo 2>/dev/null | grep ^motherboard | grep -q AAPL) ; then
     SUBARCH=OldWorld
 elif (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
     SUBARCH=CHRP
+elif (cat /proc/cpuinfo 2>/dev/null | grep ^machine | grep -q 'CHRP Pegasos') ; then
+    SUBARCH=Pegasos
 else
     echo 1>&2 "$PRG: This machine is not yet supported"
     exit 1
@@ -936,7 +958,8 @@ PARTITION="${DEVICE##*[a-z]}"
 
 ## use appropriate search for right sub arch.
 case "$SUBARCH" in
-    NewWorld)
+    # Pegasos OF seems to be NewWorld-ish enough to cope with this.
+    NewWorld|Pegasos)
 	newworld || exit 1
 	;;
     OldWorld)