X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fscsi_transport_sas.c;h=f3b16066387cf210ddc4b37246558ef18e8c92a8;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=5a625c3fddaed7cc4f4a68105ed415f1c6c198d7;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 5a625c3fd..f3b160663 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -41,7 +41,6 @@ struct sas_host_attrs {
 	struct mutex lock;
 	u32 next_target_id;
 	u32 next_expander_id;
-	int next_port_id;
 };
 #define to_sas_host_attrs(host)	((struct sas_host_attrs *)(host)->shost_data)
 
@@ -66,7 +65,7 @@ get_sas_##title##_names(u32 table_key, char *buf)		\
 	ssize_t len = 0;					\
 	int i;							\
 								\
-	for (i = 0; i < ARRAY_SIZE(table); i++) {		\
+	for (i = 0; i < sizeof(table)/sizeof(table[0]); i++) {	\
 		if (table[i].value & table_key) {		\
 			len += sprintf(buf + len, "%s%s",	\
 				prefix, table[i].name);		\
@@ -84,7 +83,7 @@ get_sas_##title##_names(u32 table_key, char *buf)		\
 	ssize_t len = 0;					\
 	int i;							\
 								\
-	for (i = 0; i < ARRAY_SIZE(table); i++) {		\
+	for (i = 0; i < sizeof(table)/sizeof(table[0]); i++) {	\
 		if (table[i].value == table_key) {		\
 			len += sprintf(buf + len, "%s",		\
 				table[i].name);			\
@@ -147,7 +146,6 @@ static int sas_host_setup(struct transport_container *tc, struct device *dev,
 	mutex_init(&sas_host->lock);
 	sas_host->next_target_id = 0;
 	sas_host->next_expander_id = 0;
-	sas_host->next_port_id = 0;
 	return 0;
 }
 
@@ -176,28 +174,11 @@ static int sas_host_match(struct attribute_container *cont,
 
 static int do_sas_phy_delete(struct device *dev, void *data)
 {
-	int pass = (int)(unsigned long)data;
-
-	if (pass == 0 && scsi_is_sas_port(dev))
-		sas_port_delete(dev_to_sas_port(dev));
-	else if (pass == 1 && scsi_is_sas_phy(dev))
+	if (scsi_is_sas_phy(dev))
 		sas_phy_delete(dev_to_phy(dev));
 	return 0;
 }
 
-/**
- * sas_remove_children  --  tear down a devices SAS data structures
- * @dev:	device belonging to the sas object
- *
- * Removes all SAS PHYs and remote PHYs for a given object
- */
-void sas_remove_children(struct device *dev)
-{
-	device_for_each_child(dev, (void *)0, do_sas_phy_delete);
-	device_for_each_child(dev, (void *)1, do_sas_phy_delete);
-}
-EXPORT_SYMBOL(sas_remove_children);
-
 /**
  * sas_remove_host  --  tear down a Scsi_Host's SAS data structures
  * @shost:	Scsi Host that is torn down
@@ -207,13 +188,13 @@ EXPORT_SYMBOL(sas_remove_children);
  */
 void sas_remove_host(struct Scsi_Host *shost)
 {
-	sas_remove_children(&shost->shost_gendev);
+	device_for_each_child(&shost->shost_gendev, NULL, do_sas_phy_delete);
 }
 EXPORT_SYMBOL(sas_remove_host);
 
 
 /*
- * SAS Phy attributes
+ * SAS Port attributes
  */
 
 #define sas_phy_show_simple(field, name, format_string, cast)		\
@@ -329,7 +310,7 @@ sas_phy_protocol_attr(identify.target_port_protocols,
 sas_phy_simple_attr(identify.sas_address, sas_address, "0x%016llx\n",
 		unsigned long long);
 sas_phy_simple_attr(identify.phy_identifier, phy_identifier, "%d\n", u8);
-//sas_phy_simple_attr(port_identifier, port_identifier, "%d\n", int);
+sas_phy_simple_attr(port_identifier, port_identifier, "%d\n", u8);
 sas_phy_linkspeed_attr(negotiated_linkrate);
 sas_phy_linkspeed_attr(minimum_linkrate_hw);
 sas_phy_linkspeed_attr(minimum_linkrate);
@@ -397,10 +378,9 @@ struct sas_phy *sas_phy_alloc(struct device *parent, int number)
 	device_initialize(&phy->dev);
 	phy->dev.parent = get_device(parent);
 	phy->dev.release = sas_phy_release;
-	INIT_LIST_HEAD(&phy->port_siblings);
 	if (scsi_is_sas_expander_device(parent)) {
 		struct sas_rphy *rphy = dev_to_rphy(parent);
-		sprintf(phy->dev.bus_id, "phy-%d:%d:%d", shost->host_no,
+		sprintf(phy->dev.bus_id, "phy-%d-%d:%d", shost->host_no,
 			rphy->scsi_target_id, number);
 	} else
 		sprintf(phy->dev.bus_id, "phy-%d:%d", shost->host_no, number);
@@ -460,8 +440,8 @@ sas_phy_delete(struct sas_phy *phy)
 {
 	struct device *dev = &phy->dev;
 
-	/* this happens if the phy is still part of a port when deleted */
-	BUG_ON(!list_empty(&phy->port_siblings));
+	if (phy->rphy)
+		sas_rphy_delete(phy->rphy);
 
 	transport_remove_device(dev);
 	device_del(dev);
@@ -483,310 +463,6 @@ int scsi_is_sas_phy(const struct device *dev)
 }
 EXPORT_SYMBOL(scsi_is_sas_phy);
 
-/*
- * SAS Port attributes
- */
-#define sas_port_show_simple(field, name, format_string, cast)		\
-static ssize_t								\
-show_sas_port_##name(struct class_device *cdev, char *buf)		\
-{									\
-	struct sas_port *port = transport_class_to_sas_port(cdev);	\
-									\
-	return snprintf(buf, 20, format_string, cast port->field);	\
-}
-
-#define sas_port_simple_attr(field, name, format_string, type)		\
-	sas_port_show_simple(field, name, format_string, (type))	\
-static CLASS_DEVICE_ATTR(name, S_IRUGO, show_sas_port_##name, NULL)
-
-sas_port_simple_attr(num_phys, num_phys, "%d\n", int);
-
-static DECLARE_TRANSPORT_CLASS(sas_port_class,
-			       "sas_port", NULL, NULL, NULL);
-
-static int sas_port_match(struct attribute_container *cont, struct device *dev)
-{
-	struct Scsi_Host *shost;
-	struct sas_internal *i;
-
-	if (!scsi_is_sas_port(dev))
-		return 0;
-	shost = dev_to_shost(dev->parent);
-
-	if (!shost->transportt)
-		return 0;
-	if (shost->transportt->host_attrs.ac.class !=
-			&sas_host_class.class)
-		return 0;
-
-	i = to_sas_internal(shost->transportt);
-	return &i->port_attr_cont.ac == cont;
-}
-
-
-static void sas_port_release(struct device *dev)
-{
-	struct sas_port *port = dev_to_sas_port(dev);
-
-	BUG_ON(!list_empty(&port->phy_list));
-
-	put_device(dev->parent);
-	kfree(port);
-}
-
-static void sas_port_create_link(struct sas_port *port,
-				 struct sas_phy *phy)
-{
-	sysfs_create_link(&port->dev.kobj, &phy->dev.kobj, phy->dev.bus_id);
-	sysfs_create_link(&phy->dev.kobj, &port->dev.kobj, "port");
-}
-
-static void sas_port_delete_link(struct sas_port *port,
-				 struct sas_phy *phy)
-{
-	sysfs_remove_link(&port->dev.kobj, phy->dev.bus_id);
-	sysfs_remove_link(&phy->dev.kobj, "port");
-}
-
-/** sas_port_alloc - allocate and initialize a SAS port structure
- *
- * @parent:	parent device
- * @port_id:	port number
- *
- * Allocates a SAS port structure.  It will be added to the device tree
- * below the device specified by @parent which must be either a Scsi_Host
- * or a sas_expander_device.
- *
- * Returns %NULL on error
- */
-struct sas_port *sas_port_alloc(struct device *parent, int port_id)
-{
-	struct Scsi_Host *shost = dev_to_shost(parent);
-	struct sas_port *port;
-
-	port = kzalloc(sizeof(*port), GFP_KERNEL);
-	if (!port)
-		return NULL;
-
-	port->port_identifier = port_id;
-
-	device_initialize(&port->dev);
-
-	port->dev.parent = get_device(parent);
-	port->dev.release = sas_port_release;
-
-	mutex_init(&port->phy_list_mutex);
-	INIT_LIST_HEAD(&port->phy_list);
-
-	if (scsi_is_sas_expander_device(parent)) {
-		struct sas_rphy *rphy = dev_to_rphy(parent);
-		sprintf(port->dev.bus_id, "port-%d:%d:%d", shost->host_no,
-			rphy->scsi_target_id, port->port_identifier);
-	} else
-		sprintf(port->dev.bus_id, "port-%d:%d", shost->host_no,
-			port->port_identifier);
-
-	transport_setup_device(&port->dev);
-
-	return port;
-}
-EXPORT_SYMBOL(sas_port_alloc);
-
-/** sas_port_alloc_num - allocate and initialize a SAS port structure
- *
- * @parent:	parent device
- *
- * Allocates a SAS port structure and a number to go with it.  This
- * interface is really for adapters where the port number has no
- * meansing, so the sas class should manage them.  It will be added to
- * the device tree below the device specified by @parent which must be
- * either a Scsi_Host or a sas_expander_device.
- *
- * Returns %NULL on error
- */
-struct sas_port *sas_port_alloc_num(struct device *parent)
-{
-	int index;
-	struct Scsi_Host *shost = dev_to_shost(parent);
-	struct sas_host_attrs *sas_host = to_sas_host_attrs(shost);
-
-	/* FIXME: use idr for this eventually */
-	mutex_lock(&sas_host->lock);
-	if (scsi_is_sas_expander_device(parent)) {
-		struct sas_rphy *rphy = dev_to_rphy(parent);
-		struct sas_expander_device *exp = rphy_to_expander_device(rphy);
-
-		index = exp->next_port_id++;
-	} else
-		index = sas_host->next_port_id++;
-	mutex_unlock(&sas_host->lock);
-	return sas_port_alloc(parent, index);
-}
-EXPORT_SYMBOL(sas_port_alloc_num);
-
-/**
- * sas_port_add - add a SAS port to the device hierarchy
- *
- * @port:	port to be added
- *
- * publishes a port to the rest of the system
- */
-int sas_port_add(struct sas_port *port)
-{
-	int error;
-
-	/* No phys should be added until this is made visible */
-	BUG_ON(!list_empty(&port->phy_list));
-
-	error = device_add(&port->dev);
-
-	if (error)
-		return error;
-
-	transport_add_device(&port->dev);
-	transport_configure_device(&port->dev);
-
-	return 0;
-}
-EXPORT_SYMBOL(sas_port_add);
-
-/**
- * sas_port_free  --  free a SAS PORT
- * @port:	SAS PORT to free
- *
- * Frees the specified SAS PORT.
- *
- * Note:
- *   This function must only be called on a PORT that has not
- *   sucessfully been added using sas_port_add().
- */
-void sas_port_free(struct sas_port *port)
-{
-	transport_destroy_device(&port->dev);
-	put_device(&port->dev);
-}
-EXPORT_SYMBOL(sas_port_free);
-
-/**
- * sas_port_delete  --  remove SAS PORT
- * @port:	SAS PORT to remove
- *
- * Removes the specified SAS PORT.  If the SAS PORT has an
- * associated phys, unlink them from the port as well.
- */
-void sas_port_delete(struct sas_port *port)
-{
-	struct device *dev = &port->dev;
-	struct sas_phy *phy, *tmp_phy;
-
-	if (port->rphy) {
-		sas_rphy_delete(port->rphy);
-		port->rphy = NULL;
-	}
-
-	mutex_lock(&port->phy_list_mutex);
-	list_for_each_entry_safe(phy, tmp_phy, &port->phy_list,
-				 port_siblings) {
-		sas_port_delete_link(port, phy);
-		list_del_init(&phy->port_siblings);
-	}
-	mutex_unlock(&port->phy_list_mutex);
-
-	if (port->is_backlink) {
-		struct device *parent = port->dev.parent;
-
-		sysfs_remove_link(&port->dev.kobj, parent->bus_id);
-		port->is_backlink = 0;
-	}
-
-	transport_remove_device(dev);
-	device_del(dev);
-	transport_destroy_device(dev);
-	put_device(dev);
-}
-EXPORT_SYMBOL(sas_port_delete);
-
-/**
- * scsi_is_sas_port --  check if a struct device represents a SAS port
- * @dev:	device to check
- *
- * Returns:
- *	%1 if the device represents a SAS Port, %0 else
- */
-int scsi_is_sas_port(const struct device *dev)
-{
-	return dev->release == sas_port_release;
-}
-EXPORT_SYMBOL(scsi_is_sas_port);
-
-/**
- * sas_port_add_phy - add another phy to a port to form a wide port
- * @port:	port to add the phy to
- * @phy:	phy to add
- *
- * When a port is initially created, it is empty (has no phys).  All
- * ports must have at least one phy to operated, and all wide ports
- * must have at least two.  The current code makes no difference
- * between ports and wide ports, but the only object that can be
- * connected to a remote device is a port, so ports must be formed on
- * all devices with phys if they're connected to anything.
- */
-void sas_port_add_phy(struct sas_port *port, struct sas_phy *phy)
-{
-	mutex_lock(&port->phy_list_mutex);
-	if (unlikely(!list_empty(&phy->port_siblings))) {
-		/* make sure we're already on this port */
-		struct sas_phy *tmp;
-
-		list_for_each_entry(tmp, &port->phy_list, port_siblings)
-			if (tmp == phy)
-				break;
-		/* If this trips, you added a phy that was already
-		 * part of a different port */
-		if (unlikely(tmp != phy)) {
-			dev_printk(KERN_ERR, &port->dev, "trying to add phy %s fails: it's already part of another port\n", phy->dev.bus_id);
-			BUG();
-		}
-	} else {
-		sas_port_create_link(port, phy);
-		list_add_tail(&phy->port_siblings, &port->phy_list);
-		port->num_phys++;
-	}
-	mutex_unlock(&port->phy_list_mutex);
-}
-EXPORT_SYMBOL(sas_port_add_phy);
-
-/**
- * sas_port_delete_phy - remove a phy from a port or wide port
- * @port:	port to remove the phy from
- * @phy:	phy to remove
- *
- * This operation is used for tearing down ports again.  It must be
- * done to every port or wide port before calling sas_port_delete.
- */
-void sas_port_delete_phy(struct sas_port *port, struct sas_phy *phy)
-{
-	mutex_lock(&port->phy_list_mutex);
-	sas_port_delete_link(port, phy);
-	list_del_init(&phy->port_siblings);
-	port->num_phys--;
-	mutex_unlock(&port->phy_list_mutex);
-}
-EXPORT_SYMBOL(sas_port_delete_phy);
-
-void sas_port_mark_backlink(struct sas_port *port)
-{
-	struct device *parent = port->dev.parent->parent->parent;
-
-	if (port->is_backlink)
-		return;
-	port->is_backlink = 1;
-	sysfs_create_link(&port->dev.kobj, &parent->kobj,
-			  parent->bus_id);
-
-}
-EXPORT_SYMBOL(sas_port_mark_backlink);
-
 /*
  * SAS remote PHY attributes.
  */
@@ -1071,18 +747,6 @@ static void sas_end_device_release(struct device *dev)
 	kfree(edev);
 }
 
-/**
- * sas_rphy_initialize - common rphy intialization
- * @rphy:	rphy to initialise
- *
- * Used by both sas_end_device_alloc() and sas_expander_alloc() to
- * initialise the common rphy component of each.
- */
-static void sas_rphy_initialize(struct sas_rphy *rphy)
-{
-	INIT_LIST_HEAD(&rphy->list);
-}
-
 /**
  * sas_end_device_alloc - allocate an rphy for an end device
  *
@@ -1091,7 +755,7 @@ static void sas_rphy_initialize(struct sas_rphy *rphy)
  * Returns:
  *	SAS PHY allocated or %NULL if the allocation failed.
  */
-struct sas_rphy *sas_end_device_alloc(struct sas_port *parent)
+struct sas_rphy *sas_end_device_alloc(struct sas_phy *parent)
 {
 	struct Scsi_Host *shost = dev_to_shost(&parent->dev);
 	struct sas_end_device *rdev;
@@ -1104,15 +768,9 @@ struct sas_rphy *sas_end_device_alloc(struct sas_port *parent)
 	device_initialize(&rdev->rphy.dev);
 	rdev->rphy.dev.parent = get_device(&parent->dev);
 	rdev->rphy.dev.release = sas_end_device_release;
-	if (scsi_is_sas_expander_device(parent->dev.parent)) {
-		struct sas_rphy *rphy = dev_to_rphy(parent->dev.parent);
-		sprintf(rdev->rphy.dev.bus_id, "end_device-%d:%d:%d",
-			shost->host_no, rphy->scsi_target_id, parent->port_identifier);
-	} else
-		sprintf(rdev->rphy.dev.bus_id, "end_device-%d:%d",
-			shost->host_no, parent->port_identifier);
+	sprintf(rdev->rphy.dev.bus_id, "end_device-%d:%d-%d",
+		shost->host_no, parent->port_identifier, parent->number);
 	rdev->rphy.identify.device_type = SAS_END_DEVICE;
-	sas_rphy_initialize(&rdev->rphy);
 	transport_setup_device(&rdev->rphy.dev);
 
 	return &rdev->rphy;
@@ -1127,7 +785,7 @@ EXPORT_SYMBOL(sas_end_device_alloc);
  * Returns:
  *	SAS PHY allocated or %NULL if the allocation failed.
  */
-struct sas_rphy *sas_expander_alloc(struct sas_port *parent,
+struct sas_rphy *sas_expander_alloc(struct sas_phy *parent,
 				    enum sas_device_type type)
 {
 	struct Scsi_Host *shost = dev_to_shost(&parent->dev);
@@ -1151,7 +809,6 @@ struct sas_rphy *sas_expander_alloc(struct sas_port *parent,
 	sprintf(rdev->rphy.dev.bus_id, "expander-%d:%d",
 		shost->host_no, rdev->rphy.scsi_target_id);
 	rdev->rphy.identify.device_type = type;
-	sas_rphy_initialize(&rdev->rphy);
 	transport_setup_device(&rdev->rphy.dev);
 
 	return &rdev->rphy;
@@ -1166,7 +823,7 @@ EXPORT_SYMBOL(sas_expander_alloc);
  */
 int sas_rphy_add(struct sas_rphy *rphy)
 {
-	struct sas_port *parent = dev_to_sas_port(rphy->dev.parent);
+	struct sas_phy *parent = dev_to_phy(rphy->dev.parent);
 	struct Scsi_Host *shost = dev_to_shost(parent->dev.parent);
 	struct sas_host_attrs *sas_host = to_sas_host_attrs(shost);
 	struct sas_identify *identify = &rphy->identify;
@@ -1194,7 +851,7 @@ int sas_rphy_add(struct sas_rphy *rphy)
 
 	if (identify->device_type == SAS_END_DEVICE &&
 	    rphy->scsi_target_id != -1) {
-		scsi_scan_target(&rphy->dev, 0,
+		scsi_scan_target(&rphy->dev, parent->port_identifier,
 				rphy->scsi_target_id, ~0, 0);
 	}
 
@@ -1239,7 +896,7 @@ void
 sas_rphy_delete(struct sas_rphy *rphy)
 {
 	struct device *dev = &rphy->dev;
-	struct sas_port *parent = dev_to_sas_port(dev->parent);
+	struct sas_phy *parent = dev_to_phy(dev->parent);
 	struct Scsi_Host *shost = dev_to_shost(parent->dev.parent);
 	struct sas_host_attrs *sas_host = to_sas_host_attrs(shost);
 
@@ -1249,7 +906,7 @@ sas_rphy_delete(struct sas_rphy *rphy)
 		break;
 	case SAS_EDGE_EXPANDER_DEVICE:
 	case SAS_FANOUT_EXPANDER_DEVICE:
-		sas_remove_children(dev);
+		device_for_each_child(dev, NULL, do_sas_phy_delete);
 		break;
 	default:
 		break;
@@ -1296,13 +953,15 @@ static int sas_user_scan(struct Scsi_Host *shost, uint channel,
 
 	mutex_lock(&sas_host->lock);
 	list_for_each_entry(rphy, &sas_host->rphy_list, list) {
+		struct sas_phy *parent = dev_to_phy(rphy->dev.parent);
+
 		if (rphy->identify.device_type != SAS_END_DEVICE ||
 		    rphy->scsi_target_id == -1)
 			continue;
 
-		if ((channel == SCAN_WILD_CARD || channel == 0) &&
+		if ((channel == SCAN_WILD_CARD || channel == parent->port_identifier) &&
 		    (id == SCAN_WILD_CARD || id == rphy->scsi_target_id)) {
-			scsi_scan_target(&rphy->dev, 0,
+			scsi_scan_target(&rphy->dev, parent->port_identifier,
 					 rphy->scsi_target_id, lun, 1);
 		}
 	}
@@ -1330,19 +989,16 @@ static int sas_user_scan(struct Scsi_Host *shost, uint channel,
 #define SETUP_OPTIONAL_RPORT_ATTRIBUTE(field, func)			\
 	SETUP_TEMPLATE(rphy_attrs, field, S_IRUGO, i->f->func)
 
-#define SETUP_PHY_ATTRIBUTE(field)					\
-	SETUP_TEMPLATE(phy_attrs, field, S_IRUGO, 1)
-
 #define SETUP_PORT_ATTRIBUTE(field)					\
-	SETUP_TEMPLATE(port_attrs, field, S_IRUGO, 1)
+	SETUP_TEMPLATE(phy_attrs, field, S_IRUGO, 1)
 
-#define SETUP_OPTIONAL_PHY_ATTRIBUTE(field, func)			\
+#define SETUP_OPTIONAL_PORT_ATTRIBUTE(field, func)			\
 	SETUP_TEMPLATE(phy_attrs, field, S_IRUGO, i->f->func)
 
-#define SETUP_PHY_ATTRIBUTE_WRONLY(field)				\
+#define SETUP_PORT_ATTRIBUTE_WRONLY(field)				\
 	SETUP_TEMPLATE(phy_attrs, field, S_IWUGO, 1)
 
-#define SETUP_OPTIONAL_PHY_ATTRIBUTE_WRONLY(field, func)		\
+#define SETUP_OPTIONAL_PORT_ATTRIBUTE_WRONLY(field, func)		\
 	SETUP_TEMPLATE(phy_attrs, field, S_IWUGO, i->f->func)
 
 #define SETUP_END_DEV_ATTRIBUTE(field)					\
@@ -1378,11 +1034,6 @@ sas_attach_transport(struct sas_function_template *ft)
 	i->phy_attr_cont.ac.match = sas_phy_match;
 	transport_container_register(&i->phy_attr_cont);
 
-	i->port_attr_cont.ac.class = &sas_port_class.class;
-	i->port_attr_cont.ac.attrs = &i->port_attrs[0];
-	i->port_attr_cont.ac.match = sas_port_match;
-	transport_container_register(&i->port_attr_cont);
-
 	i->rphy_attr_cont.ac.class = &sas_rphy_class.class;
 	i->rphy_attr_cont.ac.attrs = &i->rphy_attrs[0];
 	i->rphy_attr_cont.ac.match = sas_rphy_match;
@@ -1401,34 +1052,29 @@ sas_attach_transport(struct sas_function_template *ft)
 	i->f = ft;
 
 	count = 0;
-	SETUP_PORT_ATTRIBUTE(num_phys);
 	i->host_attrs[count] = NULL;
 
 	count = 0;
-	SETUP_PHY_ATTRIBUTE(initiator_port_protocols);
-	SETUP_PHY_ATTRIBUTE(target_port_protocols);
-	SETUP_PHY_ATTRIBUTE(device_type);
-	SETUP_PHY_ATTRIBUTE(sas_address);
-	SETUP_PHY_ATTRIBUTE(phy_identifier);
-	//SETUP_PHY_ATTRIBUTE(port_identifier);
-	SETUP_PHY_ATTRIBUTE(negotiated_linkrate);
-	SETUP_PHY_ATTRIBUTE(minimum_linkrate_hw);
-	SETUP_PHY_ATTRIBUTE(minimum_linkrate);
-	SETUP_PHY_ATTRIBUTE(maximum_linkrate_hw);
-	SETUP_PHY_ATTRIBUTE(maximum_linkrate);
-
-	SETUP_PHY_ATTRIBUTE(invalid_dword_count);
-	SETUP_PHY_ATTRIBUTE(running_disparity_error_count);
-	SETUP_PHY_ATTRIBUTE(loss_of_dword_sync_count);
-	SETUP_PHY_ATTRIBUTE(phy_reset_problem_count);
-	SETUP_OPTIONAL_PHY_ATTRIBUTE_WRONLY(link_reset, phy_reset);
-	SETUP_OPTIONAL_PHY_ATTRIBUTE_WRONLY(hard_reset, phy_reset);
+	SETUP_PORT_ATTRIBUTE(initiator_port_protocols);
+	SETUP_PORT_ATTRIBUTE(target_port_protocols);
+	SETUP_PORT_ATTRIBUTE(device_type);
+	SETUP_PORT_ATTRIBUTE(sas_address);
+	SETUP_PORT_ATTRIBUTE(phy_identifier);
+	SETUP_PORT_ATTRIBUTE(port_identifier);
+	SETUP_PORT_ATTRIBUTE(negotiated_linkrate);
+	SETUP_PORT_ATTRIBUTE(minimum_linkrate_hw);
+	SETUP_PORT_ATTRIBUTE(minimum_linkrate);
+	SETUP_PORT_ATTRIBUTE(maximum_linkrate_hw);
+	SETUP_PORT_ATTRIBUTE(maximum_linkrate);
+
+	SETUP_PORT_ATTRIBUTE(invalid_dword_count);
+	SETUP_PORT_ATTRIBUTE(running_disparity_error_count);
+	SETUP_PORT_ATTRIBUTE(loss_of_dword_sync_count);
+	SETUP_PORT_ATTRIBUTE(phy_reset_problem_count);
+	SETUP_OPTIONAL_PORT_ATTRIBUTE_WRONLY(link_reset, phy_reset);
+	SETUP_OPTIONAL_PORT_ATTRIBUTE_WRONLY(hard_reset, phy_reset);
 	i->phy_attrs[count] = NULL;
 
-	count = 0;
-	SETUP_PORT_ATTRIBUTE(num_phys);
-	i->port_attrs[count] = NULL;
-
 	count = 0;
 	SETUP_RPORT_ATTRIBUTE(rphy_initiator_port_protocols);
 	SETUP_RPORT_ATTRIBUTE(rphy_target_port_protocols);
@@ -1471,7 +1117,6 @@ void sas_release_transport(struct scsi_transport_template *t)
 
 	transport_container_unregister(&i->t.host_attrs);
 	transport_container_unregister(&i->phy_attr_cont);
-	transport_container_unregister(&i->port_attr_cont);
 	transport_container_unregister(&i->rphy_attr_cont);
 	transport_container_unregister(&i->end_dev_attr_cont);
 	transport_container_unregister(&i->expander_attr_cont);
@@ -1490,12 +1135,9 @@ static __init int sas_transport_init(void)
 	error = transport_class_register(&sas_phy_class);
 	if (error)
 		goto out_unregister_transport;
-	error = transport_class_register(&sas_port_class);
-	if (error)
-		goto out_unregister_phy;
 	error = transport_class_register(&sas_rphy_class);
 	if (error)
-		goto out_unregister_port;
+		goto out_unregister_phy;
 	error = transport_class_register(&sas_end_dev_class);
 	if (error)
 		goto out_unregister_rphy;
@@ -1509,8 +1151,6 @@ static __init int sas_transport_init(void)
 	transport_class_unregister(&sas_end_dev_class);
  out_unregister_rphy:
 	transport_class_unregister(&sas_rphy_class);
- out_unregister_port:
-	transport_class_unregister(&sas_port_class);
  out_unregister_phy:
 	transport_class_unregister(&sas_phy_class);
  out_unregister_transport:
@@ -1524,7 +1164,6 @@ static void __exit sas_transport_exit(void)
 {
 	transport_class_unregister(&sas_host_class);
 	transport_class_unregister(&sas_phy_class);
-	transport_class_unregister(&sas_port_class);
 	transport_class_unregister(&sas_rphy_class);
 	transport_class_unregister(&sas_end_dev_class);
 	transport_class_unregister(&sas_expander_class);