From: Andre Wuttke Date: Tue, 7 Jun 2016 14:24:08 +0000 (+0200) Subject: sif: using FW release version in device attibutes X-Git-Tag: v4.1.12-92~129^2~28 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ae147b3db966b05466deb829a3f825c516b09755;p=users%2Fjedix%2Flinux-maple.git sif: using FW release version in device attibutes Signed-off-by: Andre Wuttke Reviewed-by: Åsmund Østvold Pre-check: Åsmund Østvold --- diff --git a/drivers/infiniband/hw/sif/sif_query.c b/drivers/infiniband/hw/sif/sif_query.c index 60be5ee8f3840..b323d350281e4 100644 --- a/drivers/infiniband/hw/sif/sif_query.c +++ b/drivers/infiniband/hw/sif/sif_query.c @@ -46,7 +46,6 @@ int sif_query_device(struct ib_device *ibdev, struct ib_device_attr *props) { int ret; struct sif_dev *sdev = to_sdev(ibdev); - struct sif_eps *es = &sdev->es[sdev->mbox_epsc]; struct psif_epsc_device_attr ldev; ret = epsc_query_device(sdev, &ldev); @@ -54,8 +53,7 @@ int sif_query_device(struct ib_device *ibdev, struct ib_device_attr *props) return ret; memset(props, 0, sizeof(*props)); - /* TBD: x.y.z - 16 bit per sublevel - we use x.y.0 for now */ - props->fw_ver = (u64)es->ver.fw_major << 32 | (u64)es->ver.fw_minor << 16; + props->fw_ver = ldev.fw_ver; props->sys_image_guid = cpu_to_be64(ldev.sys_image_guid); props->max_mr_size = ~0ull; props->page_size_cap = 0xfffffe00; /* TBD: Sensible value? Use what Mellanox uses */