With the "reroll of sas ports" patch, the fusion driver can implement
zero based port id's for each expander, instead of per host unique
ids. Pls apply over yesterdays mptsas patch.
Signed-off-by: Eric Moore <Eric.Moore@xxxxxxxx>
diff -uarN b/drivers/message/fusion/mptbase.h a/drivers/message/fusion/mptbase.h
--- b/drivers/message/fusion/mptbase.h 2006-06-27 15:24:01.000000000 -0600
+++ a/drivers/message/fusion/mptbase.h 2006-06-28 16:53:39.000000000 -0600
@@ -644,7 +644,6 @@
struct work_struct fc_rescan_work;
char fc_rescan_work_q_name[KOBJ_NAME_LEN];
struct workqueue_struct *fc_rescan_work_q;
- u8 port_serial_number;
} MPT_ADAPTER;
/*
diff -uarN b/drivers/message/fusion/mptsas.c a/drivers/message/fusion/mptsas.c
--- b/drivers/message/fusion/mptsas.c 2006-06-27 15:17:03.000000000 -0600
+++ a/drivers/message/fusion/mptsas.c 2006-06-28 16:55:25.000000000 -0600
@@ -144,7 +144,7 @@
* Specific details on ports, wide/narrow
*/
struct mptsas_portinfo_details{
- u8 port_id; /* port number provided to transport */
+ u32 port_id; /* port number provided to transport */
u16 num_phys; /* number of phys belong to this port */
u64 phy_bitmask; /* TODO, extend support for 255 phys */
struct sas_rphy *rphy; /* transport layer rphy object */
@@ -171,6 +171,7 @@
struct list_head list;
u16 handle; /* unique id to address this */
u16 num_phys; /* number of phys */
+ u32 port_serial_number;
struct mptsas_phyinfo *phy_info;
};
@@ -493,7 +494,7 @@
goto out;
port_details->num_phys = 1;
port_details->port_info = port_info;
- port_details->port_id = ioc->port_serial_number++;
+ port_details->port_id = port_info->port_serial_number++;
if (phy_info->phy_id < 64 )
port_details->phy_bitmask |=
(1 << phy_info->phy_id);
@@ -529,8 +530,7 @@
phy_info_cmp->port_details->port_id;
port_details->num_phys =
phy_info_cmp->port_details->num_phys;
-// port_info->port_serial_number--;
- ioc->port_serial_number--;
+ port_info->port_serial_number--;
if (!phy_info_cmp->port_details->num_phys)
kfree(phy_info_cmp->port_details);
} else
-
: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
