From patchwork Mon Mar 25 15:50:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10869527 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C5D01390 for ; Mon, 25 Mar 2019 15:51:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 339D029426 for ; Mon, 25 Mar 2019 15:51:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 276A329432; Mon, 25 Mar 2019 15:51:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ACDBD29426 for ; Mon, 25 Mar 2019 15:51:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=f2PbZjpBumcQDXl/lYp9exstpSbpmva5HvhtdbYuzbQ=; b=Mo98Uzz5EwlbWf zJsl5lLGkj0CczyroQsvCoLrK9E8TmDBZ+AqFG9rKrGKRKUp7fpg2E2TpCASv8w8innWeFDOPzC4r 2D91+i5TzB0ox7rLXUa6kicsFqD3U5v6WGPThT/gL2vKVTJhPCqnD8WU01YjRvnkp9+6vdzlwUwev BEgSZbDrjEN+YLHWQfgVb3g2W+6djhQEK6JGRGF3DiAjyzY4DbQa/sRFW9QSqYavwnDREa/QhwRAi 1m8dQz0vzuIVeZYL/lXPVtTfs6jzkrT+rTvQKw5rSdeMaz5cIS2aJ3nrt6AU3ThaON/b1+zdwiY93 ikS1/YlDSNIuU0M0WGlw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Rt1-00017Z-75; Mon, 25 Mar 2019 15:51:43 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Rsr-000114-T5 for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2019 15:51:40 +0000 Received: from wuerfel.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MTzjI-1hZIRP1azK-00R4M0; Mon, 25 Mar 2019 16:51:29 +0100 From: Arnd Bergmann To: Subject: [PATCH 2/2] ARM: iop: don't use using 64-bit DMA masks Date: Mon, 25 Mar 2019 16:50:43 +0100 Message-Id: <20190325155101.3544731-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190325155101.3544731-1-arnd@arndb.de> References: <20190325155101.3544731-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Hv3LTYYLlNBnUJVUFqJpGCxxG4jl6evNSCupUx46HycKGBxmm7w MXPSMJfuEagKHZyuZ+35E29j2Zez4il1iWh8qxMH8zNMiMYAQXuDwRT43We+EOYj0HL+c74 n5Yg/h2MqoXjzZhF3D/+G9cNXkTjVh5NYCY7u7moY2+mhbFOAy9ksSpEgLGeGK5JGDR0nff ehFv4ZyWZFo3FIdBRqLTA== X-UI-Out-Filterresults: notjunk:1;V03:K0:fhkbTZq//L8=:EW4G0364E4EzR8fmxAy6iI 6n/KFiS0AZRP4gPKYbSvGpVM/e8lmFemCFlfExxCdv5kPiA0iCb7seHOIV7YCIDPjkuJnG4R9 sJ0MjU0ZI6UfBFge+yIfJsBDXSk9BtdYz3xQhEx22IwbJFIQ8VX9zsvk9V4ZAq8PBlqurUVoO mw2BNUNLgMkLvomLBH4UfuyktxW/tFhoYDkx72DRHQX43kGvBBGVO2oBAhuWAPLmdjVyrYfAv cPsJW4Zg+dW1cdMUbnCAEx9N02YZv34bNNqpaewoRrnwOEIIkhgQhlYBcFuxqAbc/ej9uv/HJ h5PYTpQJHMzlP8ffC9l+H6oG/JEtOWwGMlCaSVsoHj+YorLob85aBhS7Tpw5Xwdb4Qw+tQBzY fWiBBCBpxu71XP5qaOouaeLTp7Lm/UU+EfaSrcExh/X/HrXlUxlWLgPWGXTuzDAqBch2qAOI3 r7qYAEmJ13NPR2WS+EAbcx27Bq0oQEkMRcsn/UNqToVp2XtM6yzSJvdV0IwT29y8eL7WAcrjU lOWQmW2xrPInp2fuceaSrXc6HM46mml8Dj1V9U+etW8px5l89TSjISoQ+eyqhjza/JTS/M4he eT5J7H+JDurXWswJZo7nyVir4AkfrIOx9dsq28u95MUrozegE2z52uOBI04dD53DkkE4hl2x/ lp/ZCFLFkMEpQUDSzV7hMfnh1hTZXwdjHwit2C486uVGC6Yf79yVvmAPoiqPMVHLBkzaBLz9T z90UbpKk5unXIxQrsdgZPt+BAxILkG3jc6BGRA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_085135_891556_776705C6 X-CRM114-Status: GOOD ( 13.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Nick Desaulniers , Russell King , linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, arm@kernel.org, Nathan Chancellor , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP clang warns about statically defined DMA masks from the DMA_BIT_MASK macro with length 64: arch/arm/mach-iop13xx/setup.c:303:35: error: shift count >= width of type [-Werror,-Wshift-count-overflow] static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64); ^~~~~~~~~~~~~~~~ include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK' #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ ~~~ The ones in iop shouldn't really be 64 bit masks, so changing them to what the driver can support avoids the warning. Signed-off-by: Arnd Bergmann --- iop and orion appear to be the only platforms declaring 64 bit masks statically. When they are fixed, we don't need to change the macro. --- arch/arm/mach-iop13xx/setup.c | 8 ++++---- arch/arm/mach-iop13xx/tpmi.c | 10 +++++----- arch/arm/plat-iop/adma.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c index 53c316f7301e..fe4932fda01d 100644 --- a/arch/arm/mach-iop13xx/setup.c +++ b/arch/arm/mach-iop13xx/setup.c @@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = { } }; -static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64); +static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(32); static struct iop_adma_platform_data iop13xx_adma_0_data = { .hw_id = 0, .pool_size = PAGE_SIZE, @@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = { .resource = iop13xx_adma_0_resources, .dev = { .dma_mask = &iop13xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop13xx_adma_0_data, }, }; @@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = { .resource = iop13xx_adma_1_resources, .dev = { .dma_mask = &iop13xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop13xx_adma_1_data, }, }; @@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = { .resource = iop13xx_adma_2_resources, .dev = { .dma_mask = &iop13xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop13xx_adma_2_data, }, }; diff --git a/arch/arm/mach-iop13xx/tpmi.c b/arch/arm/mach-iop13xx/tpmi.c index db511ec2b1df..116feb6b261e 100644 --- a/arch/arm/mach-iop13xx/tpmi.c +++ b/arch/arm/mach-iop13xx/tpmi.c @@ -152,7 +152,7 @@ static struct resource iop13xx_tpmi_3_resources[] = { } }; -u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64); +u64 iop13xx_tpmi_mask = DMA_BIT_MASK(32); static struct platform_device iop13xx_tpmi_0_device = { .name = "iop-tpmi", .id = 0, @@ -160,7 +160,7 @@ static struct platform_device iop13xx_tpmi_0_device = { .resource = iop13xx_tpmi_0_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, }; @@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = { .resource = iop13xx_tpmi_1_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, }; @@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = { .resource = iop13xx_tpmi_2_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, }; @@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = { .resource = iop13xx_tpmi_3_resources, .dev = { .dma_mask = &iop13xx_tpmi_mask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), }, }; diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c index a4d1f8de3b5b..d9612221e484 100644 --- a/arch/arm/plat-iop/adma.c +++ b/arch/arm/plat-iop/adma.c @@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = { .resource = iop3xx_dma_0_resources, .dev = { .dma_mask = &iop3xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop3xx_dma_0_data, }, }; @@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = { .resource = iop3xx_dma_1_resources, .dev = { .dma_mask = &iop3xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop3xx_dma_1_data, }, }; @@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = { .resource = iop3xx_aau_resources, .dev = { .dma_mask = &iop3xx_adma_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(64), + .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *) &iop3xx_aau_data, }, };