Re: [patch 164/198] IB/mthca: fill in more device query fields

2005-04-12 Thread Roland Dreier
>> + memset(props, 0, sizeof props);

Alexey> sizeof *props ?

Indeed -- excellent catch considering the volume of patches that went
by today.  I've committed this fix to our svn tree so it won't get
lost, and I'll send it upstream once the patch backlog cleared a bit.

Thanks,
  Roland

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [patch 164/198] IB/mthca: fill in more device query fields

2005-04-12 Thread Alexey Dobriyan
On Tuesday 12 April 2005 10:33, [EMAIL PROTECTED] wrote:

> Implement more of the device_query method in mthca.

> --- 
> 25/drivers/infiniband/hw/mthca/mthca_provider.c~ib-mthca-fill-in-more-device-query-fields
> +++ 25-akpm/drivers/infiniband/hw/mthca/mthca_provider.c
> @@ -52,6 +52,8 @@ static int mthca_query_device(struct ib_

> + memset(props, 0, sizeof props);

sizeof *props ?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[patch 164/198] IB/mthca: fill in more device query fields

2005-04-12 Thread akpm

From: Roland Dreier <[EMAIL PROTECTED]>

Implement more of the device_query method in mthca.

Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 25-akpm/drivers/infiniband/hw/mthca/mthca_cmd.c  |2 +
 25-akpm/drivers/infiniband/hw/mthca/mthca_provider.c |   22 +++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff -puN 
drivers/infiniband/hw/mthca/mthca_cmd.c~ib-mthca-fill-in-more-device-query-fields
 drivers/infiniband/hw/mthca/mthca_cmd.c
--- 
25/drivers/infiniband/hw/mthca/mthca_cmd.c~ib-mthca-fill-in-more-device-query-fields
2005-04-12 03:21:42.632655752 -0700
+++ 25-akpm/drivers/infiniband/hw/mthca/mthca_cmd.c 2005-04-12 
03:21:42.638654840 -0700
@@ -987,6 +987,8 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev
if (dev->hca_type == ARBEL_NATIVE) {
MTHCA_GET(field, outbox, QUERY_DEV_LIM_RSZ_SRQ_OFFSET);
dev_lim->hca.arbel.resize_srq = field & 1;
+   MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_SG_RQ_OFFSET);
+   dev_lim->max_sg = min_t(int, field, dev_lim->max_sg);
MTHCA_GET(size, outbox, QUERY_DEV_LIM_MTT_ENTRY_SZ_OFFSET);
dev_lim->mtt_seg_sz = size;
MTHCA_GET(size, outbox, QUERY_DEV_LIM_MPT_ENTRY_SZ_OFFSET);
diff -puN 
drivers/infiniband/hw/mthca/mthca_provider.c~ib-mthca-fill-in-more-device-query-fields
 drivers/infiniband/hw/mthca/mthca_provider.c
--- 
25/drivers/infiniband/hw/mthca/mthca_provider.c~ib-mthca-fill-in-more-device-query-fields
   2005-04-12 03:21:42.634655448 -0700
+++ 25-akpm/drivers/infiniband/hw/mthca/mthca_provider.c2005-04-12 
03:21:42.639654688 -0700
@@ -52,6 +52,8 @@ static int mthca_query_device(struct ib_
if (!in_mad || !out_mad)
goto out;
 
+   memset(props, 0, sizeof props);
+
props->fw_ver  = mdev->fw_ver;
 
memset(in_mad, 0, sizeof *in_mad);
@@ -71,14 +73,26 @@ static int mthca_query_device(struct ib_
goto out;
}
 
-   props->device_cap_flags = mdev->device_cap_flags;
-   props->vendor_id= be32_to_cpup((u32 *) (out_mad->data + 36)) &
+   props->device_cap_flags= mdev->device_cap_flags;
+   props->vendor_id   = be32_to_cpup((u32 *) (out_mad->data + 36)) 
&
0xff;
-   props->vendor_part_id   = be16_to_cpup((u16 *) (out_mad->data + 30));
-   props->hw_ver   = be16_to_cpup((u16 *) (out_mad->data + 32));
+   props->vendor_part_id  = be16_to_cpup((u16 *) (out_mad->data + 30));
+   props->hw_ver  = be16_to_cpup((u16 *) (out_mad->data + 32));
memcpy(>sys_image_guid, out_mad->data +  4, 8);
memcpy(>node_guid,  out_mad->data + 12, 8);
 
+   props->max_mr_size = ~0ull;
+   props->max_qp  = mdev->limits.num_qps - 
mdev->limits.reserved_qps;
+   props->max_qp_wr   = 0x;
+   props->max_sge = mdev->limits.max_sg;
+   props->max_cq  = mdev->limits.num_cqs - 
mdev->limits.reserved_cqs;
+   props->max_cqe = 0x;
+   props->max_mr  = mdev->limits.num_mpts - 
mdev->limits.reserved_mrws;
+   props->max_pd  = mdev->limits.num_pds - 
mdev->limits.reserved_pds;
+   props->max_qp_rd_atom  = 1 << mdev->qp_table.rdb_shift;
+   props->max_qp_init_rd_atom = 1 << mdev->qp_table.rdb_shift;
+   props->local_ca_ack_delay  = mdev->limits.local_ca_ack_delay;
+
err = 0;
  out:
kfree(in_mad);
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[patch 164/198] IB/mthca: fill in more device query fields

2005-04-12 Thread akpm

From: Roland Dreier [EMAIL PROTECTED]

Implement more of the device_query method in mthca.

Signed-off-by: Roland Dreier [EMAIL PROTECTED]
Signed-off-by: Andrew Morton [EMAIL PROTECTED]
---

 25-akpm/drivers/infiniband/hw/mthca/mthca_cmd.c  |2 +
 25-akpm/drivers/infiniband/hw/mthca/mthca_provider.c |   22 +++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff -puN 
drivers/infiniband/hw/mthca/mthca_cmd.c~ib-mthca-fill-in-more-device-query-fields
 drivers/infiniband/hw/mthca/mthca_cmd.c
--- 
25/drivers/infiniband/hw/mthca/mthca_cmd.c~ib-mthca-fill-in-more-device-query-fields
2005-04-12 03:21:42.632655752 -0700
+++ 25-akpm/drivers/infiniband/hw/mthca/mthca_cmd.c 2005-04-12 
03:21:42.638654840 -0700
@@ -987,6 +987,8 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev
if (dev-hca_type == ARBEL_NATIVE) {
MTHCA_GET(field, outbox, QUERY_DEV_LIM_RSZ_SRQ_OFFSET);
dev_lim-hca.arbel.resize_srq = field  1;
+   MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_SG_RQ_OFFSET);
+   dev_lim-max_sg = min_t(int, field, dev_lim-max_sg);
MTHCA_GET(size, outbox, QUERY_DEV_LIM_MTT_ENTRY_SZ_OFFSET);
dev_lim-mtt_seg_sz = size;
MTHCA_GET(size, outbox, QUERY_DEV_LIM_MPT_ENTRY_SZ_OFFSET);
diff -puN 
drivers/infiniband/hw/mthca/mthca_provider.c~ib-mthca-fill-in-more-device-query-fields
 drivers/infiniband/hw/mthca/mthca_provider.c
--- 
25/drivers/infiniband/hw/mthca/mthca_provider.c~ib-mthca-fill-in-more-device-query-fields
   2005-04-12 03:21:42.634655448 -0700
+++ 25-akpm/drivers/infiniband/hw/mthca/mthca_provider.c2005-04-12 
03:21:42.639654688 -0700
@@ -52,6 +52,8 @@ static int mthca_query_device(struct ib_
if (!in_mad || !out_mad)
goto out;
 
+   memset(props, 0, sizeof props);
+
props-fw_ver  = mdev-fw_ver;
 
memset(in_mad, 0, sizeof *in_mad);
@@ -71,14 +73,26 @@ static int mthca_query_device(struct ib_
goto out;
}
 
-   props-device_cap_flags = mdev-device_cap_flags;
-   props-vendor_id= be32_to_cpup((u32 *) (out_mad-data + 36)) 
+   props-device_cap_flags= mdev-device_cap_flags;
+   props-vendor_id   = be32_to_cpup((u32 *) (out_mad-data + 36)) 

0xff;
-   props-vendor_part_id   = be16_to_cpup((u16 *) (out_mad-data + 30));
-   props-hw_ver   = be16_to_cpup((u16 *) (out_mad-data + 32));
+   props-vendor_part_id  = be16_to_cpup((u16 *) (out_mad-data + 30));
+   props-hw_ver  = be16_to_cpup((u16 *) (out_mad-data + 32));
memcpy(props-sys_image_guid, out_mad-data +  4, 8);
memcpy(props-node_guid,  out_mad-data + 12, 8);
 
+   props-max_mr_size = ~0ull;
+   props-max_qp  = mdev-limits.num_qps - 
mdev-limits.reserved_qps;
+   props-max_qp_wr   = 0x;
+   props-max_sge = mdev-limits.max_sg;
+   props-max_cq  = mdev-limits.num_cqs - 
mdev-limits.reserved_cqs;
+   props-max_cqe = 0x;
+   props-max_mr  = mdev-limits.num_mpts - 
mdev-limits.reserved_mrws;
+   props-max_pd  = mdev-limits.num_pds - 
mdev-limits.reserved_pds;
+   props-max_qp_rd_atom  = 1  mdev-qp_table.rdb_shift;
+   props-max_qp_init_rd_atom = 1  mdev-qp_table.rdb_shift;
+   props-local_ca_ack_delay  = mdev-limits.local_ca_ack_delay;
+
err = 0;
  out:
kfree(in_mad);
_
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [patch 164/198] IB/mthca: fill in more device query fields

2005-04-12 Thread Alexey Dobriyan
On Tuesday 12 April 2005 10:33, [EMAIL PROTECTED] wrote:

 Implement more of the device_query method in mthca.

 --- 
 25/drivers/infiniband/hw/mthca/mthca_provider.c~ib-mthca-fill-in-more-device-query-fields
 +++ 25-akpm/drivers/infiniband/hw/mthca/mthca_provider.c
 @@ -52,6 +52,8 @@ static int mthca_query_device(struct ib_

 + memset(props, 0, sizeof props);

sizeof *props ?
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [patch 164/198] IB/mthca: fill in more device query fields

2005-04-12 Thread Roland Dreier
 + memset(props, 0, sizeof props);

Alexey sizeof *props ?

Indeed -- excellent catch considering the volume of patches that went
by today.  I've committed this fix to our svn tree so it won't get
lost, and I'll send it upstream once the patch backlog cleared a bit.

Thanks,
  Roland

-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/