From patchwork Tue Feb 20 20:56:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 128967 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp5054192ljc; Tue, 20 Feb 2018 12:56:56 -0800 (PST) X-Google-Smtp-Source: AH8x2271I3Ge3nkIJfnNmealweFAuqoDTUvpbSgCatxzogLHY/0vIV6uNa/VLzSxgVXfrHIx8IkQ X-Received: by 2002:a17:902:724a:: with SMTP id c10-v6mr839890pll.98.1519160216177; Tue, 20 Feb 2018 12:56:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519160216; cv=none; d=google.com; s=arc-20160816; b=NtZsdq1gQ4jXSCXXm8GSAV4ld6qVCa5GIJVWge6A9bLRRJDjBSjejVKfxX/UltiVsN QGvnz5DXFMk87PJOegve63ekhfrn7e5Zx3FXQr9ow1scs3wMwKa2LNezjb8v5LfMkIyi tQvlnHB0hUa3prfhgFUlLyJKAfpOGqgYgTxNlSp70YHhztMZ1++h2XmOhKfTjloybM/5 Chey1lRbfVaWTL4Doke2BcQmF/S5n2u4WLrApbqrjDWkFpM4ZWFyBSfHZY8EOqEIOKzL yhi6FHb1uE8wibVu9L0LiTqxkykIl8Rl423c8uLBQT9+pJuAxCMMaF5eI0xzewjyr5Hj 5/Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Un+YdWBfHrAAxusvRb+O6OtaGPl5/27nSDMeZb83ItI=; b=pO/O5qQEmm3EvHrMOS0OS5T0xc3f+1ibpqEDx+yJYITLtHhjdDeJKQPmBu+Q5jmwav 2+vka5parNByfsRq07YlYy0M7pCjwMbrIAo/KV1Zn41BzDb1v0hTNN08NC3NwITQbMDz TTv4NwnECdULWWG2a0qzAUfS51UfwLLSK8NZo7J74xx4IA2RyTN0fKloDkdYP1tVgwAR EPSLWfk7usYCAfLjbxL0L56KsuyJ4uEXJs8tKjK6wFKoDjAaElAKfHYGaOS3gLQ8xMTK ApHVRFRQTUs8ETZiZV1hbe5p/48SOrgumTtlWIjs30WAnCURkWQA4pHR2lJEvowHEkZT rp7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1-v6si9191831plz.783.2018.02.20.12.56.55; Tue, 20 Feb 2018 12:56:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751470AbeBTU4w (ORCPT + 28 others); Tue, 20 Feb 2018 15:56:52 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:35653 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751270AbeBTU4u (ORCPT ); Tue, 20 Feb 2018 15:56:50 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MN3u4-1eqRtX2Lea-006gDj; Tue, 20 Feb 2018 21:56:39 +0100 From: Arnd Bergmann To: Selvin Xavier , Devesh Sharma , Somnath Kotur , Sriharsha Basavapatna , Doug Ledford , Jason Gunthorpe Cc: Arnd Bergmann , Bart Van Assche , Eddie Wai , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] infiniband: qplib_fp: fix pointer cast Date: Tue, 20 Feb 2018 21:56:26 +0100 Message-Id: <20180220205638.1959033-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:UsVEUP5YRm5GTLXIFRv9PjJVrPSCuF++k8RY9xC1anBdbTXPHSp UVhCTxxko4ttVyPMYBUhU7uSTcgGhmt4dlX7IgdM+y39lGuUIMpTQq4mD9gnfY0jo8H+n0Y 6rfIoRFcFLordE4PTIARNWWrSNhYSRWckAYKuAwAMNlHBYP2y9nHu0ZtMwXQGQHpuUq9oCG 6D4Mci/9WUbDbjoVprvxw== X-UI-Out-Filterresults: notjunk:1; V01:K0:WrFKAHds2Jg=:wCMKKuiTelSrhn6UzCVvyz QeRJF/EwbV62W9whmdjStwScFzv9V9ZTxTMQESS/GaFqtBsj0GRHbo9qL2IULZWKi4pJQ6Esn HyiQcxVyVDUNk6ifWok/C50XinraJ40kls1UFJe4dJLamDsb0AoiYP5eUjsEhrgK425h64Wae 4DY1sqpS/jCKa5LMUyIeDMCQrs/JW4u0zHSD6TnAk5Uq25yfCfTj2rjdfHuBRMm8jNopX2/tb AfE7YpXV95U6E8vW+TAMtAaYEXfoTFs4UTg3/jdI8bi0fdCqI6RvvB7uahXzQnqkTJfuh/sgz w9EH09qKf5QZCNxLdbekV5FZuwxME0zVFoY4ATCa9yHLDOZLfaClQgjMTU8aiiMIAqJvQ63x4 VX0CU6v1DcQKUpgqWvOIZR0XeLU5p3t43BTNhxC10hg6bFw0Sljq0Xu5y9kNzSYTKjFzm32pB +2q9nM/yRBkj+ZQNbfzlS0z4n2iljJj98ocY1iFExuzkOhNtYCfhQlty0YBHAwQeIsZOzaD1a r5U9C19320aADPOMkMvdwaW7KyawghF4ovPYcx3Y6lDQv5NwVY8vrLW7MSeDgn763KALOHqqI yD1x41GeubbVjc9irCL2Scm5zBHK5MVXtKRfrICJt+p1EgGA9BreRf3ldn7Iss/8L9ZuF5kzo Za/Y71PcEZghId3bI1nrEOCjLXeL9/b/DrQnVaGhFqDG3W1YFgN1C/7B+US6qxMy6WEJIHvDu 8a+8EdCGgt+IyD2PMUqdWXqnWZPvCroPCHsPLA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building for a 32-bit target results in a couple of warnings from casting between a 32-bit pointer and a 64-bit integer: drivers/infiniband/hw/bnxt_re/qplib_fp.c: In function 'bnxt_qplib_service_nq': drivers/infiniband/hw/bnxt_re/qplib_fp.c:333:23: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] bnxt_qplib_arm_srq((struct bnxt_qplib_srq *)q_handle, ^ drivers/infiniband/hw/bnxt_re/qplib_fp.c:336:12: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] (struct bnxt_qplib_srq *)q_handle, ^ In file included from include/linux/byteorder/little_endian.h:5, from arch/arm/include/uapi/asm/byteorder.h:22, from include/asm-generic/bitops/le.h:6, from arch/arm/include/asm/bitops.h:342, from include/linux/bitops.h:38, from include/linux/kernel.h:11, from include/linux/interrupt.h:6, from drivers/infiniband/hw/bnxt_re/qplib_fp.c:39: drivers/infiniband/hw/bnxt_re/qplib_fp.c: In function 'bnxt_qplib_create_srq': include/uapi/linux/byteorder/little_endian.h:31:43: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] #define __cpu_to_le64(x) ((__force __le64)(__u64)(x)) ^ include/linux/byteorder/generic.h:86:21: note: in expansion of macro '__cpu_to_le64' #define cpu_to_le64 __cpu_to_le64 ^~~~~~~~~~~~~ drivers/infiniband/hw/bnxt_re/qplib_fp.c:569:19: note: in expansion of macro 'cpu_to_le64' req.srq_handle = cpu_to_le64(srq); Using a uintptr_t as an intermediate works on all architectures. Fixes: 37cb11acf1f7 ("RDMA/bnxt_re: Add SRQ support for Broadcom adapters") Signed-off-by: Arnd Bergmann --- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.c b/drivers/infiniband/hw/bnxt_re/qplib_fp.c index 1b0e94697fe3..9885d7d428e3 100644 --- a/drivers/infiniband/hw/bnxt_re/qplib_fp.c +++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.c @@ -283,7 +283,7 @@ static void bnxt_qplib_service_nq(unsigned long data) u32 sw_cons, raw_cons; u16 type; int budget = nq->budget; - u64 q_handle; + uintptr_t q_handle; /* Service the NQ until empty */ raw_cons = hwq->cons; @@ -566,7 +566,7 @@ int bnxt_qplib_create_srq(struct bnxt_qplib_res *res, /* Configure the request */ req.dpi = cpu_to_le32(srq->dpi->dpi); - req.srq_handle = cpu_to_le64(srq); + req.srq_handle = cpu_to_le64((uintptr_t)srq); req.srq_size = cpu_to_le16((u16)srq->hwq.max_elements); pbl = &srq->hwq.pbl[PBL_LVL_0]; From patchwork Tue Feb 20 20:56:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 128968 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp5054329ljc; Tue, 20 Feb 2018 12:57:10 -0800 (PST) X-Google-Smtp-Source: AH8x226soqb4yfYsiD9rkHcEWrt8KA7N5mLqxaHkR0dPZZ5s8xHvrAXhdT9nGjbgZ3f1cMD8fIOq X-Received: by 10.99.52.203 with SMTP id b194mr720197pga.349.1519160229902; Tue, 20 Feb 2018 12:57:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519160229; cv=none; d=google.com; s=arc-20160816; b=XUKpyqfLl4tpYGC47xYAae0kgG5x6dgY/0aBwzvTkgKkl/kdBlOXWyh/KSP5mx0NaP s3/LKQ7rO58rNZfxims0z7tXwtD6KdVDXIzHnFDuRISEONKOOST3/hy/5b+PoOYVk7bm L9yZMS5irA/2NU0DRiPONDCzADm+RLc3CoXqWBqhmwjPGO//cPzMGKPlbSYu0ZzAZjHy ss9NPAQrpjwEhe8+yTrn8xQP/BFt6+JXpelMRnF6+9LgWY8as33HXslAshjMNJ+vEHbS PgWFtcj8UMwTh3JQk+Q8LYP8kOl/OIGerpO+5MlmN1/tIg6U8COEUtITWPF9RDj3M0mY /vhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=TuSDoUBbY3YNTbpk6a/mHhbTqnAfk6CXjORG7InERy0=; b=Am+lGykWPN/jFbnfTqa8GsmdXbU10uWczIYKhh4txezQCAL2fO4cM7acCflZaPJpG2 MFUIyZ78GQtXhiP6MP1P5D+FmUh5UOXw5l09XFpISRLi7PK9nTGHMBnqL9nU5YBjIBQI cZZIdXw45ScSBBMrL6b/6yubgVU3vEcRiO1qvqc4NOoBoJ+GtL/kfosV4W1bPaiE4iNN 6NpqQDZjFxTlax1taqryWkp4vvP8v7caILO7NBz8AGhDwhE0NXrZSbRNHi6NCqCAq0dq jG8Ma89T2yNTOvOIywEAeGV0Wryu163eDtoIa74v25CELU4/a63TElmUBdwY4VdGt3Iv mVQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1-v6si9191831plz.783.2018.02.20.12.57.09; Tue, 20 Feb 2018 12:57:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751501AbeBTU5G (ORCPT + 28 others); Tue, 20 Feb 2018 15:57:06 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:56733 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751270AbeBTU5F (ORCPT ); Tue, 20 Feb 2018 15:57:05 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MHGU7-1f2JSl2nQp-00E7we; Tue, 20 Feb 2018 21:56:48 +0100 From: Arnd Bergmann To: Selvin Xavier , Devesh Sharma , Somnath Kotur , Sriharsha Basavapatna , Doug Ledford , Jason Gunthorpe Cc: Arnd Bergmann , Leon Romanovsky , Dasaratharaman Chandramouli , Eddie Wai , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] infiniband: bnxt_re: use BIT_ULL() for 64-bit bit masks Date: Tue, 20 Feb 2018 21:56:27 +0100 Message-Id: <20180220205638.1959033-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180220205638.1959033-1-arnd@arndb.de> References: <20180220205638.1959033-1-arnd@arndb.de> X-Provags-ID: V03:K0:KhaiDgnSD+cMVSEl4+FmNZV5Xvd8iAdqyCgQ6IqXONx796W7T67 7oJ4p9mwdhNdqkqOw79AcPVcTpWi7LFsrTvA//UH/GBJzziGlz3xQ/SsiULN8El8ztKVqNn q5DaMODZho3RXtoyVtXXVYfojMZq4K7gPIcEDLgyvfXerYefdCqeN3FDMEu/XUMfWNP+zfu T3MKgGHStbusx+dE4VGRw== X-UI-Out-Filterresults: notjunk:1; V01:K0:rLqOSOpHLl4=:ULde+PK2ZaeuPJmF3bWEZL kMHKeSyyhr98hAX+UEK2++XNPFFwO3xRTjR+mk5Y1fDQRdqADCFjSAkeHsUnHQBOHHyPiqRaz 1PFssl9hvMdASmYwrd8LwagQfAElufyHF16NOoqRxnrq2jEAFWuI62uVHSnUNkklaDiC0gL9h RrPN6AoKtpraedF7AqYVdNi9g8B1g03J/6TS6puv+VB42C5jN9vl+q3s3E5nIdEkez5Rd6KKF GqHEIggXwb8oiBi/6DmmkRGnobmm1USKLASD5WQ+b62h3n0VrSGFshkUIL4qD++0I7IivkwbY VrEGNC7RTWwmLOVNEkRjIT1Plt30SeiI5Ngw65uEyyyjzoDmTO9itH8Ul35rgcfJmeEVuigxG oM+V1LESskcvz76RGLrlyUGRgNmdLhrFVkplnxZdYCpw6gRevNXBTFnWBUEYNoYy8k3ilA/Zn ZYMIjNzKUvQPmGD9H/JPy7hp/wU7+ll4Y2QXUWXhBqZqF4D6mePnWqtS2xabgodDICY6ihGq6 leF1B1jdAnglWTg480CQgFZOgTwq3OxSxxsPB812edIR14abzHf7/7s54HAYM9kucZ/pg5IJ6 MlqsOAdfvIu04l/kxM+LVLNWNsaXbdm9oRqM9xmb4F9G8mlRk0iPi+sl6MOigQBs1d14jg5fo kBzHozbq8AFmeapNlYGMMXnKp4NGg6BQR+VM/DO8jBhmyVGIUxOsiue6R0pnnDfTpi+PRe6+0 E7waCwnQLECQZpPWPjOIGES6exPE1Cdh3SUMgg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 32-bit targets, we otherwise get a warning about an impossible constant integer expression: In file included from include/linux/kernel.h:11, from include/linux/interrupt.h:6, from drivers/infiniband/hw/bnxt_re/ib_verbs.c:39: drivers/infiniband/hw/bnxt_re/ib_verbs.c: In function 'bnxt_re_query_device': include/linux/bitops.h:7:24: error: left shift count >= width of type [-Werror=shift-count-overflow] #define BIT(nr) (1UL << (nr)) ^~ drivers/infiniband/hw/bnxt_re/bnxt_re.h:61:34: note: in expansion of macro 'BIT' #define BNXT_RE_MAX_MR_SIZE_HIGH BIT(39) ^~~ drivers/infiniband/hw/bnxt_re/bnxt_re.h:62:30: note: in expansion of macro 'BNXT_RE_MAX_MR_SIZE_HIGH' #define BNXT_RE_MAX_MR_SIZE BNXT_RE_MAX_MR_SIZE_HIGH ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/infiniband/hw/bnxt_re/ib_verbs.c:149:25: note: in expansion of macro 'BNXT_RE_MAX_MR_SIZE' ib_attr->max_mr_size = BNXT_RE_MAX_MR_SIZE; ^~~~~~~~~~~~~~~~~~~ Fixes: 872f3578241d ("RDMA/bnxt_re: Add support for MRs with Huge pages") Signed-off-by: Arnd Bergmann --- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 4 ++-- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/infiniband/hw/bnxt_re/bnxt_re.h b/drivers/infiniband/hw/bnxt_re/bnxt_re.h index ca32057e886f..32dbde48f3e6 100644 --- a/drivers/infiniband/hw/bnxt_re/bnxt_re.h +++ b/drivers/infiniband/hw/bnxt_re/bnxt_re.h @@ -57,8 +57,8 @@ #define BNXT_RE_PAGE_SIZE_8M BIT(BNXT_RE_PAGE_SHIFT_8M) #define BNXT_RE_PAGE_SIZE_1G BIT(BNXT_RE_PAGE_SHIFT_1G) -#define BNXT_RE_MAX_MR_SIZE_LOW BIT(BNXT_RE_PAGE_SHIFT_1G) -#define BNXT_RE_MAX_MR_SIZE_HIGH BIT(39) +#define BNXT_RE_MAX_MR_SIZE_LOW BIT_ULL(BNXT_RE_PAGE_SHIFT_1G) +#define BNXT_RE_MAX_MR_SIZE_HIGH BIT_ULL(39) #define BNXT_RE_MAX_MR_SIZE BNXT_RE_MAX_MR_SIZE_HIGH #define BNXT_RE_MAX_QPC_COUNT (64 * 1024) diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c index ae9e9ff54826..56878387c8f9 100644 --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c @@ -3548,7 +3548,7 @@ struct ib_mr *bnxt_re_reg_user_mr(struct ib_pd *ib_pd, u64 start, u64 length, int umem_pgs, page_shift, rc; if (length > BNXT_RE_MAX_MR_SIZE) { - dev_err(rdev_to_dev(rdev), "MR Size: %lld > Max supported:%ld\n", + dev_err(rdev_to_dev(rdev), "MR Size: %lld > Max supported:%lld\n", length, BNXT_RE_MAX_MR_SIZE); return ERR_PTR(-ENOMEM); }