Author: bryan Date: 2006-10-04 19:53:29 -0600 (Wed, 04 Oct 2006) New Revision: 1686
Added: trunk/udev/udev-101-fix-sas-path_id-1.patch Log: Added udev-101-fix-sas-path_id-1.patch (fix path_id for SAS devices under Udev-101). Added: trunk/udev/udev-101-fix-sas-path_id-1.patch =================================================================== --- trunk/udev/udev-101-fix-sas-path_id-1.patch (rev 0) +++ trunk/udev/udev-101-fix-sas-path_id-1.patch 2006-10-05 01:53:29 UTC (rev 1686) @@ -0,0 +1,82 @@ +Submitted By: Bryan Kadzban <bryan at linuxfromscratch dot org> +Date: 2006-10-04 +Initial Package Version: 101 +Upstream Status: From Upstream +Origin: http://sourceforge.net/mailarchive/forum.php?thread_id=30678237&forum_id=3157 +Description: Fix path_id script to handle new sysfs layout of SAS devices + under kernel 2.6.18. Patch written by MUNEDA Takahiro. + +diff -Naur udev-101.orig/extras/path_id/path_id udev-101/extras/path_id/path_id +--- udev-101.orig/extras/path_id/path_id ++++ udev-101/extras/path_id/path_id +@@ -278,15 +278,17 @@ handle_sas () { + local DEV=$1 + local cil adapter controller_dev + # SAS device +- sas_host_path="${DEV%%/phy*}" ++ sas_host_path="${DEV%%/port*}" + sas_phy_path="${DEV#*/host*/}" + sas_phy_path="${sas_phy_path%%/target*}" + sas_phy_id="${sas_phy_path%%/*}" +- sas_rphy_id="${sas_phy_path##*/}" +- sas_phy_dev="/sys/class/sas_phy/${sas_phy_id}" ++ sas_phy_id="${sas_phy_id##*port-}" ++ sas_port_id="${sas_phy_path%%/end_device*}" ++ sas_port_id="${sas_port_id##*port-}" ++ sas_end_id="${sas_phy_path##*end_device-}" ++ sas_phy_dev="/sys/class/sas_phy/phy-${sas_phy_id}" + if [ -e "$sas_phy_dev/sas_address" ]; then + read phy_address < $sas_phy_dev/sas_address +- read phy_port < $sas_phy_dev/port_identifier + read phy_id < $sas_phy_dev/phy_identifier + fi + if [ -z "$phy_address" ] ; then +@@ -295,22 +297,32 @@ handle_sas () { + RESULT=1 + return + fi ++ sas_port_dev="/sys/class/sas_port/port-${sas_port_id}" ++ if [ -e "$sas_port_dev/num_phys" ] ; then ++ read phy_port < $sas_port_dev/num_phys ++ fi ++ if [ -z "$phy_port" ] ; then ++ : no initiator address ++ D= ++ RESULT=1 ++ return ++ fi + sas_phy_address="$phy_address:$phy_port:$phy_id" +- sas_rphy_dev="/sys/class/sas_device/${sas_rphy_id}" +- if [ -e "$sas_rphy_dev/sas_address" ]; then +- read rphy_address < $sas_rphy_dev/sas_address +- read rphy_id < $sas_rphy_dev/phy_identifier ++ sas_end_dev="/sys/class/sas_device/end_device-${sas_end_id}" ++ if [ -e "$sas_end_dev/sas_address" ]; then ++ read end_address < $sas_end_dev/sas_address ++ read end_id < $sas_end_dev/phy_identifier + fi +- if [ -z "$rphy_address" ] ; then ++ if [ -z "$end_address" ] ; then + : no initiator address + D= + RESULT=1 + return + fi +- sas_rphy_address="$rphy_address:$rphy_id" ++ sas_end_address="$end_address:$end_id" + controller_dev="${sas_host_path%/host[0-9]*}" + # SAS devices are always endpoints +- d="sas-${sas_phy_address}-${sas_rphy_address}" ++ d="sas-${sas_phy_address}-${sas_end_address}" + D="$controller_dev" + RESULT=0 + } +@@ -470,7 +482,7 @@ handle_device () { + */rport-[0-9]*:[0-9]*-[0-9]*/*) + handle_fc "$D" + ;; +- */phy-[0-9]*:[0-9]*/*) ++ */end_device-[0-9]*:[0-9]*:[0-9]*/*) + handle_sas "$D" + ;; + */fw-host[0-9]*/*) -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
