summaryrefslogtreecommitdiff
path: root/extras/path_id
diff options
context:
space:
mode:
authorMUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>2006-10-02 16:02:42 +0200
committerKay Sievers <kay.sievers@suse.de>2006-10-02 16:02:42 +0200
commit56baaedc90fcc7d358d6cfc29e3e95ab70b5cbff (patch)
treed7f4c449b42479da5fea877825548733e8cae88e /extras/path_id
parent178b824905220a84b2bfc7665e6c4b45420e0b05 (diff)
path_id: fix SAS disk handling
Diffstat (limited to 'extras/path_id')
-rw-r--r--extras/path_id/path_id36
1 files changed, 24 insertions, 12 deletions
diff --git a/extras/path_id/path_id b/extras/path_id/path_id
index a9182af6e0..44754cdedd 100644
--- a/extras/path_id/path_id
+++ b/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]*/*)