Add support for pci-ide to ofpath

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index be3f8cd4d8f55f2281acb9f56ffc802feb799cd1..981da9d22b4cdaf0ea28e45f43cb106e6668e0e8 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -27,7 +27,7 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"

-VERSION=1.0.3-DEVEL_DO_NOT_DISTRIBUTE-patch-36
+VERSION=1.0.3-DEVEL_DO_NOT_DISTRIBUTE-patch-38

 DEBUG=0
 export LC_COLLATE=C
 
 DEBUG=0
 export LC_COLLATE=C
 


@@ -302,6 +302,10 @@ ide_ofpath()
     fi
 
     local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
     fi
 
     local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"

+    if [ -z "$IDEBUS" ] ; then
+       echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
+       return 1
+    fi

     local OF1275IDE="/proc/ide/$IDEBUS/devspec"
 
     if [ ! -f "$OF1275IDE" ] ; then
     local OF1275IDE="/proc/ide/$IDEBUS/devspec"
 
     if [ ! -f "$OF1275IDE" ] ; then


@@ -315,10 +319,6 @@ ide_ofpath()
                fi
                ;;
            *)
                fi
                ;;
            *)

-               if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-                   echo "$PRG: /dev/$DEVNODE: Device not configured"
-                   return 1
-               fi

                local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
                if [ -z "$CDROM" ] ; then
                    if [ "$DEVNODE" = hda ] ; then
                local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
                if [ -z "$CDROM" ] ; then
                    if [ "$DEVNODE" = hda ] ; then


@@ -332,15 +332,37 @@ ide_ofpath()
                ;;
        esac
     else
                ;;
        esac
     else

-       local DEVSPEC="$(cat /proc/ide/$IDEBUS/devspec)"
+       local DEVSPEC="$(cat $OF1275IDE)"

        [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVSPEC=$DEVSPEC"
        [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVSPEC=$DEVSPEC"

+       if [ -z "$DEVSPEC" ] ; then
+           echo 1>&2 "$PRG: KERNEL BUG: $OF1275IDE exists, but is empty"
+           return 1
+       fi
+
+       case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
+           ata)
+               local CHANNEL=""
+               ;;
+           pci-ata)
+               if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
+                   echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
+                   return 1
+               fi
+               local CHANNEL="/@$(cat /proc/ide/${IDEBUS}/channel)"
+               ;;
+           *)
+               echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
+               return 1
+               ;;
+       esac
+

        case "$DEVNODE" in
            hda|hdc|hde|hdg|hdi)
        case "$DEVNODE" in
            hda|hdc|hde|hdg|hdi)

-               echo "${DEVSPEC}/disk@0:$PARTITION"
+               echo "${DEVSPEC}${CHANNEL}/disk@0:$PARTITION"

                return 0
                ;;
            hdb|hdd|hdf|hdh|hdj)
                return 0
                ;;
            hdb|hdd|hdf|hdh|hdj)

-               echo "${DEVSPEC}/disk@1:$PARTITION"
+               echo "${DEVSPEC}${CHANNEL}/disk@1:$PARTITION"

                return 0
                ;;
            *)
                return 0
                ;;
            *)