* linux-next: build failure after merge of the rdma tree
@ 2017-02-15 0:30 Stephen Rothwell
2017-02-15 1:05 ` Doug Ledford
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2017-02-15 0:30 UTC (permalink / raw)
To: Doug Ledford, David Miller, Networking
Cc: linux-next, linux-kernel, Michael Chan, Selvin Xavier, Eddie Wai,
Devesh Sharma, Somnath Kotur, Sriharsha Basavapatna
Hi Doug,
After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_free':
drivers/infiniband/hw/bnxt_re/main.c:231:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
^
drivers/infiniband/hw/bnxt_re/main.c:231:18: note: each undeclared identifier is reported only once for each function it appears in
drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_alloc':
drivers/infiniband/hw/bnxt_re/main.c:271:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
^
Caused by commit
1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver")
interacting with commit
bac9a7e0f5d6 ("bnxt_en: Update to firmware interface spec 1.7.0.")
from the net-next tree.
I added this merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Feb 2017 11:23:25 +1100
Subject: [PATCH] RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/infiniband/hw/bnxt_re/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 6b9f1178050f..bd452a92b386 100644
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -228,7 +228,7 @@ static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id,
}
bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1);
- req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
+ req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
req.ring_id = cpu_to_le16(fw_ring_id);
bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
@@ -268,7 +268,7 @@ static int bnxt_re_net_ring_alloc(struct bnxt_re_dev *rdev, dma_addr_t *dma_arr,
/* Association of ring index with doorbell index and MSIX number */
req.logical_id = cpu_to_le16(map_index);
req.length = cpu_to_le32(ring_mask + 1);
- req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
+ req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;
bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
--
2.10.2
--
Cheers,
Stephen Rothwell
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: linux-next: build failure after merge of the rdma tree
2017-02-15 0:30 linux-next: build failure after merge of the rdma tree Stephen Rothwell
@ 2017-02-15 1:05 ` Doug Ledford
2017-02-15 5:09 ` Selvin Xavier
0 siblings, 1 reply; 4+ messages in thread
From: Doug Ledford @ 2017-02-15 1:05 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, Networking
Cc: linux-next, linux-kernel, Michael Chan, Selvin Xavier, Eddie Wai,
Devesh Sharma, Somnath Kotur, Sriharsha Basavapatna
[-- Attachment #1.1: Type: text/plain, Size: 3198 bytes --]
On 2/14/2017 7:30 PM, Stephen Rothwell wrote:
> Hi Doug,
>
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_free':
> drivers/infiniband/hw/bnxt_re/main.c:231:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
> req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> ^
> drivers/infiniband/hw/bnxt_re/main.c:231:18: note: each undeclared identifier is reported only once for each function it appears in
> drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_alloc':
> drivers/infiniband/hw/bnxt_re/main.c:271:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
> req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> ^
>
> Caused by commit
>
> 1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver")
>
> interacting with commit
>
> bac9a7e0f5d6 ("bnxt_en: Update to firmware interface spec 1.7.0.")
>
> from the net-next tree.
>
> I added this merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 15 Feb 2017 11:23:25 +1100
> Subject: [PATCH] RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thanks Stephen. I had been forewarned about this by Selvin and I
instructed him to send me a fixup patch that would resolve the issue. I
would apply it to my tree before merging with Linus. He just hadn't
time to send it yet. Your patch is sufficient as well, so I may just
pull it in. Thanks again.
> ---
> drivers/infiniband/hw/bnxt_re/main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
> index 6b9f1178050f..bd452a92b386 100644
> --- a/drivers/infiniband/hw/bnxt_re/main.c
> +++ b/drivers/infiniband/hw/bnxt_re/main.c
> @@ -228,7 +228,7 @@ static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id,
> }
>
> bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1);
> - req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> + req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
> req.ring_id = cpu_to_le16(fw_ring_id);
> bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
> sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
> @@ -268,7 +268,7 @@ static int bnxt_re_net_ring_alloc(struct bnxt_re_dev *rdev, dma_addr_t *dma_arr,
> /* Association of ring index with doorbell index and MSIX number */
> req.logical_id = cpu_to_le16(map_index);
> req.length = cpu_to_le32(ring_mask + 1);
> - req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> + req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
> req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;
> bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
> sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
>
--
Doug Ledford <dledford@redhat.com>
GPG Key ID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: build failure after merge of the rdma tree
2017-02-15 1:05 ` Doug Ledford
@ 2017-02-15 5:09 ` Selvin Xavier
0 siblings, 0 replies; 4+ messages in thread
From: Selvin Xavier @ 2017-02-15 5:09 UTC (permalink / raw)
To: Doug Ledford
Cc: Stephen Rothwell, David Miller, Networking, linux-next,
linux-kernel, Michael Chan, Eddie Wai, Devesh Sharma,
Somnath Kotur, Sriharsha Basavapatna
On Wed, Feb 15, 2017 at 6:35 AM, Doug Ledford <dledford@redhat.com> wrote:
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Wed, 15 Feb 2017 11:23:25 +1100
>> Subject: [PATCH] RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Thanks Stephen. I had been forewarned about this by Selvin and I
> instructed him to send me a fixup patch that would resolve the issue. I
> would apply it to my tree before merging with Linus. He just hadn't
> time to send it yet. Your patch is sufficient as well, so I may just
> pull it in. Thanks again.
Thanks Stephen and Doug for taking care of this.
Acked-by: Selvin Xavier <selvin.xavier@broadcom.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: build failure after merge of the rdma tree
@ 2016-01-13 1:35 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2016-01-13 1:35 UTC (permalink / raw)
To: Doug Ledford, David Miller, netdev
Cc: linux-next, linux-kernel, Maor Gottlieb, Achiad Shochat
Hi Doug,
After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_add':
drivers/infiniband/hw/mlx5/main.c:2255:6: error: too few arguments to function 'mlx5_ib_port_link_layer'
if (mlx5_ib_port_link_layer(&dev->ib_dev) ==
^
drivers/infiniband/hw/mlx5/main.c:89:1: note: declared here
mlx5_ib_port_link_layer(struct ib_device *device, u8 port_num)
^
Caused by commit
ebd61f68e1c7 ("IB/mlx5: Support IB device's callback for getting the link layer")
interacting with commit
038d2ef87572 ("IB/mlx5: Add flow steering support")
from the net-next tree.
I have added the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 13 Jan 2016 12:30:50 +1100
Subject: [PATCH] IB/mlx5: merge fix for mlx5_ib_port_link_layer API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/infiniband/hw/mlx5/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 307a8c040a11..a2613d828578 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2252,7 +2252,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
(1ull << IB_USER_VERBS_CMD_CLOSE_XRCD);
}
- if (mlx5_ib_port_link_layer(&dev->ib_dev) ==
+ if (mlx5_ib_port_link_layer(&dev->ib_dev, 1) ==
IB_LINK_LAYER_ETHERNET) {
dev->ib_dev.create_flow = mlx5_ib_create_flow;
dev->ib_dev.destroy_flow = mlx5_ib_destroy_flow;
--
2.6.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-02-15 5:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-15 0:30 linux-next: build failure after merge of the rdma tree Stephen Rothwell
2017-02-15 1:05 ` Doug Ledford
2017-02-15 5:09 ` Selvin Xavier
-- strict thread matches above, loose matches on Subject: below --
2016-01-13 1:35 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).