Commit e620ebfc authored by Bart Van Assche's avatar Bart Van Assche Committed by Jason Gunthorpe
Browse files

IB/srpt: Support HCAs with more than two ports 



Since there are adapters that have four ports, increase the size of
the srpt_device.port[] array. This patch avoids that the following
warning is hit with quad port Chelsio adapters:

    WARN_ON(sdev->device->phys_port_cnt > ARRAY_SIZE(sdev->port));

Reported-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 68348441

drivers/infiniband/ulp/srpt/ib_srpt.c

+2 −3
Original line number Diff line number Diff line
@@ -2970,7 +2970,8 @@ static void srpt_add_one(struct ib_device *device) 


	pr_debug("device = %p\n", device);



	sdev = kzalloc(sizeof(*sdev), GFP_KERNEL);

	sdev = kzalloc(struct_size(sdev, port, device->phys_port_cnt),

		       GFP_KERNEL);

	if (!sdev)

		goto err;
@@ -3024,8 +3025,6 @@ static void srpt_add_one(struct ib_device *device) 
			      srpt_event_handler);

	ib_register_event_handler(&sdev->event_handler);



	WARN_ON(sdev->device->phys_port_cnt > ARRAY_SIZE(sdev->port));



	for (i = 1; i <= sdev->device->phys_port_cnt; i++) {

		sport = &sdev->port[i - 1];

		INIT_LIST_HEAD(&sport->nexus_list);

drivers/infiniband/ulp/srpt/ib_srpt.h

+2 −2
Original line number Diff line number Diff line
@@ -396,9 +396,9 @@ struct srpt_port { 
 * @sdev_mutex:	   Serializes use_srq changes.

 * @use_srq:       Whether or not to use SRQ.

 * @ioctx_ring:    Per-HCA SRQ.

 * @port:          Information about the ports owned by this HCA.

 * @event_handler: Per-HCA asynchronous IB event handler.

 * @list:          Node in srpt_dev_list.

 * @port:          Information about the ports owned by this HCA.

 */

struct srpt_device {

	struct ib_device	*device;
@@ -410,9 +410,9 @@ struct srpt_device { 
	struct mutex		sdev_mutex;

	bool			use_srq;

	struct srpt_recv_ioctx	**ioctx_ring;

	struct srpt_port	port[2];

	struct ib_event_handler	event_handler;

	struct list_head	list;

	struct srpt_port        port[];

};



#endif				/* IB_SRPT_H */