X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=ybin%2Fofpath;h=aff5583457e645f878c01e1084e59689cee94b88;hp=f3d5a9064ab19c13fc484aef03f097a87364b491;hb=082b8310e3f92ea8da0b7011549bd86c9fd4ce95;hpb=a36e22176e6917e0218cd69f6cab014b1c5d7a49 diff --git a/ybin/ofpath b/ybin/ofpath index f3d5a90..aff5583 100755 --- a/ybin/ofpath +++ b/ybin/ofpath @@ -8,7 +8,7 @@ ## Portions based on show_of_path.sh: ## ## Copyright (C) 2000 Olaf Hering -## +## ## 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.5-UNRELEASED_UNSUPPORTED +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 @@ -297,11 +297,35 @@ scsi_ofpath() DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)" echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION" ;; - ata_k2) - HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do - lgrep "$i" "k2-s-ata" ; done)" + ata_k2|sata_svw) + #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 @@ -323,11 +347,32 @@ ide_ofpath() echo 1>&2 "$PRG: BUG: IDEBUS == NULL" return 1 fi - local OF1275IDE="/proc/ide/$IDEBUS/devspec" + + case "$(uname -r)" in + 2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*) + echo 1>&2 "$PRG: Linux kernel `uname -r` is not supported" + return 1 + ;; + 2.6.*|2.7.*) + if ! (grep -q '.* .* sysfs ' /proc/mounts 2> /dev/null) ; then + echo 1>&2 "$PRG: sysfs must be mounted for ofpath to support this system" + return 1 + fi + local SYS="$(m=`grep '.* .* sysfs ' /proc/mounts | head -n 1` ; echo `d=${m#* };echo ${d%% *}`)" + if [ -z "$SYS" -o ! -d "$SYS" ] ; then + echo 1>&2 "$PRG: Unable to determine sysfs mountpoint" + return 1 + fi + local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec" + ;; + *) + local OF1275IDE="/proc/ide/$IDEBUS/devspec" + ;; + esac if [ ! -f "$OF1275IDE" ] ; then case "$(cat /proc/device-tree/model)" in - "PowerMac3,6") + 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." @@ -375,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 @@ -404,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*) @@ -646,18 +687,12 @@ chrp() { 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." - 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 ;; *) @@ -753,7 +788,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})" @@ -868,7 +903,7 @@ if [ `uname -s` != Linux ] ; then fi ## check for ppc, i think uname -m is safe for this... -if [ `uname -m` != ppc -o `uname -m` != pp64 ] ; then +if [ `uname -m` != ppc -a `uname -m` != ppc64 ] ; then echo 1>&2 "$PRG: This utility will only work on PowerPC hardware" exit 1 fi @@ -893,6 +928,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 @@ -915,7 +952,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)