linux-next: build warnings after merge of the crypto tree
Hi all, After merging the crypto tree, today's linux-next build (arm multi_v7_defconfig) produced this warning: scripts/Makefile.asm-generic:25: redundant generic-y found in arch/arm/include/asm/Kbuild: simd.h Introduced by commit 82cb54856874 ("asm-generic: make simd.h a mandatory include/asm header") Also the powerpc ppc64_defconfig build produced this warning: scripts/Makefile.asm-generic:25: redundant generic-y found in arch/powerpc/include/asm/Kbuild: simd.h -- Cheers, Stephen Rothwell pgpw93OhtFD58.pgp Description: OpenPGP digital signature
Re: linux-next: build warnings after merge of the crypto tree
Hi Herbert, On Sat, 11 Feb 2017 18:56:21 +0800 Herbert Xuwrote: > > On Fri, Feb 10, 2017 at 02:12:51PM +1100, Stephen Rothwell wrote: > > > > I am still getting these warnings ... I have seen no updates to the > > crypot tree since Feb 2. > > Sorry Stephen. I have now applied Arnd's fixes for this problem > and it should be pushed out. Thanks, its much cleaner now. :-) -- Cheers, Stephen Rothwell
Re: linux-next: build warnings after merge of the crypto tree
Hi Herbert, On Sat, 11 Feb 2017 18:56:21 +0800 Herbert Xu wrote: > > On Fri, Feb 10, 2017 at 02:12:51PM +1100, Stephen Rothwell wrote: > > > > I am still getting these warnings ... I have seen no updates to the > > crypot tree since Feb 2. > > Sorry Stephen. I have now applied Arnd's fixes for this problem > and it should be pushed out. Thanks, its much cleaner now. :-) -- Cheers, Stephen Rothwell
Re: linux-next: build warnings after merge of the crypto tree
On Fri, Feb 10, 2017 at 02:12:51PM +1100, Stephen Rothwell wrote: > > I am still getting these warnings ... I have seen no updates to the > crypot tree since Feb 2. Sorry Stephen. I have now applied Arnd's fixes for this problem and it should be pushed out. Cheers, -- Email: Herbert XuHome Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Re: linux-next: build warnings after merge of the crypto tree
On Fri, Feb 10, 2017 at 02:12:51PM +1100, Stephen Rothwell wrote: > > I am still getting these warnings ... I have seen no updates to the > crypot tree since Feb 2. Sorry Stephen. I have now applied Arnd's fixes for this problem and it should be pushed out. Cheers, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Re: linux-next: build warnings after merge of the crypto tree
Hi Herbert, On Mon, 6 Feb 2017 17:03:40 +0800 Herbert Xuwrote: > > On Mon, Feb 06, 2017 at 12:28:37PM +1100, Stephen Rothwell wrote: > > > > After merging the crypto tree, today's linux-next build (x86_64 > > allmodconfig) produced these warnings: > > > > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > > > > Introduced by commit > > > > 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), > > Y(aes)) modes") > > > > In file included from include/linux/printk.h:329:0, > > from include/linux/kernel.h:13, > > from drivers/crypto/atmel-sha.c:17: > > This patch should fix both issues. Thanks, I am still getting these warnings ... I have seen no updates to the crypot tree since Feb 2. -- Cheers, Stephen Rothwell
Re: linux-next: build warnings after merge of the crypto tree
Hi Herbert, On Mon, 6 Feb 2017 17:03:40 +0800 Herbert Xu wrote: > > On Mon, Feb 06, 2017 at 12:28:37PM +1100, Stephen Rothwell wrote: > > > > After merging the crypto tree, today's linux-next build (x86_64 > > allmodconfig) produced these warnings: > > > > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > > > > Introduced by commit > > > > 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), > > Y(aes)) modes") > > > > In file included from include/linux/printk.h:329:0, > > from include/linux/kernel.h:13, > > from drivers/crypto/atmel-sha.c:17: > > This patch should fix both issues. Thanks, I am still getting these warnings ... I have seen no updates to the crypot tree since Feb 2. -- Cheers, Stephen Rothwell
Re: linux-next: build warnings after merge of the crypto tree
Hi all, Le 06/02/2017 à 02:28, Stephen Rothwell a écrit : > Hi Herbert, > > After merging the crypto tree, today's linux-next build (x86_64 > allmodconfig) produced these warnings: > > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > > Introduced by commit > > 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), > Y(aes)) modes") > > In file included from include/linux/printk.h:329:0, > from include/linux/kernel.h:13, > from drivers/crypto/atmel-sha.c:17: > drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_cpu': > drivers/crypto/atmel-sha.c:571:19: warning: format '%d' expects argument of > type 'int', but argument 6 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:571:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", > ^ > drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_pdc': > drivers/crypto/atmel-sha.c:600:19: warning: format '%d' expects argument of > type 'int', but argument 6 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:600:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", > ^ > drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma': > drivers/crypto/atmel-sha.c:647:19: warning: format '%d' expects argument of > type 'int', but argument 6 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:647:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", > ^ > drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma_map': > drivers/crypto/atmel-sha.c:726:20: warning: format '%u' expects argument of > type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' > [-Wformat=] >dev_err(dd->dev, "dma %u bytes error\n", ctx->buflen + > ^ > In file included from include/linux/printk.h:329:0, > from include/linux/kernel.h:13, > from drivers/crypto/atmel-sha.c:17: > drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_slow': > drivers/crypto/atmel-sha.c:747:19: warning: format '%u' expects argument of > type 'unsigned int', but argument 4 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:747:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", > ^ > drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_start': > drivers/crypto/atmel-sha.c:775:19: warning: format '%u' expects argument of > type 'unsigned int', but argument 6 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:775:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", > ^ > drivers/crypto/atmel-sha.c:817:21: warning: format '%u' expects argument of > type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_err(dd->dev, "dma %u bytes error\n", > ^ > In file included from include/linux/printk.h:329:0, > from include/linux/kernel.h:13, > from drivers/crypto/atmel-sha.c:17: >
Re: linux-next: build warnings after merge of the crypto tree
Hi all, Le 06/02/2017 à 02:28, Stephen Rothwell a écrit : > Hi Herbert, > > After merging the crypto tree, today's linux-next build (x86_64 > allmodconfig) produced these warnings: > > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > > Introduced by commit > > 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), > Y(aes)) modes") > > In file included from include/linux/printk.h:329:0, > from include/linux/kernel.h:13, > from drivers/crypto/atmel-sha.c:17: > drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_cpu': > drivers/crypto/atmel-sha.c:571:19: warning: format '%d' expects argument of > type 'int', but argument 6 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:571:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", > ^ > drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_pdc': > drivers/crypto/atmel-sha.c:600:19: warning: format '%d' expects argument of > type 'int', but argument 6 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:600:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", > ^ > drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma': > drivers/crypto/atmel-sha.c:647:19: warning: format '%d' expects argument of > type 'int', but argument 6 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:647:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", > ^ > drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma_map': > drivers/crypto/atmel-sha.c:726:20: warning: format '%u' expects argument of > type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' > [-Wformat=] >dev_err(dd->dev, "dma %u bytes error\n", ctx->buflen + > ^ > In file included from include/linux/printk.h:329:0, > from include/linux/kernel.h:13, > from drivers/crypto/atmel-sha.c:17: > drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_slow': > drivers/crypto/atmel-sha.c:747:19: warning: format '%u' expects argument of > type 'unsigned int', but argument 4 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:747:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", > ^ > drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_start': > drivers/crypto/atmel-sha.c:775:19: warning: format '%u' expects argument of > type 'unsigned int', but argument 6 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", >^ > include/linux/dynamic_debug.h:134:39: note: in definition of macro > 'dynamic_dev_dbg' >__dynamic_dev_dbg(, dev, fmt, \ >^ > drivers/crypto/atmel-sha.c:775:2: note: in expansion of macro 'dev_dbg' > dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", > ^ > drivers/crypto/atmel-sha.c:817:21: warning: format '%u' expects argument of > type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' > [-Wformat=] > dev_err(dd->dev, "dma %u bytes error\n", > ^ > In file included from include/linux/printk.h:329:0, > from include/linux/kernel.h:13, > from drivers/crypto/atmel-sha.c:17: >
Re: linux-next: build warnings after merge of the crypto tree
Hi Stephen: On Mon, Feb 06, 2017 at 12:28:37PM +1100, Stephen Rothwell wrote: > > After merging the crypto tree, today's linux-next build (x86_64 > allmodconfig) produced these warnings: > > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > > Introduced by commit > > 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), > Y(aes)) modes") > > In file included from include/linux/printk.h:329:0, > from include/linux/kernel.h:13, > from drivers/crypto/atmel-sha.c:17: This patch should fix both issues. Thanks, ---8<--- Subject: crypto: atmel - Fix authenc compile test warnings The authenc code depends on the sha code so in order to allow compile testing on the former we must allow it on sha as well. This patch enables compile testing on sha as well as tdes and fixes the few x86-64 warnings that arise in the sha code. Reported-by: Stephen RothwellSigned-off-by: Herbert Xu diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 7482461..9b7e19e 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -444,7 +444,7 @@ config CRYPTO_DEV_ATMEL_AES config CRYPTO_DEV_ATMEL_TDES tristate "Support for Atmel DES/TDES hw accelerator" - depends on ARCH_AT91 + depends on ARCH_AT91 || COMPILE_TEST select CRYPTO_DES select CRYPTO_BLKCIPHER help @@ -457,7 +457,7 @@ config CRYPTO_DEV_ATMEL_TDES config CRYPTO_DEV_ATMEL_SHA tristate "Support for Atmel SHA hw accelerator" - depends on ARCH_AT91 + depends on ARCH_AT91 || COMPILE_TEST select CRYPTO_HASH help Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512 diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c index 22d0c0c..b081e78 100644 --- a/drivers/crypto/atmel-sha.c +++ b/drivers/crypto/atmel-sha.c @@ -568,7 +568,7 @@ static int atmel_sha_xmit_cpu(struct atmel_sha_dev *dd, const u8 *buf, int count, len32; const u32 *buffer = (const u32 *)buf; - dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", + dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %zu, final: %d\n", ctx->digcnt[1], ctx->digcnt[0], length, final); atmel_sha_write_ctrl(dd, 0); @@ -597,7 +597,7 @@ static int atmel_sha_xmit_pdc(struct atmel_sha_dev *dd, dma_addr_t dma_addr1, struct atmel_sha_reqctx *ctx = ahash_request_ctx(dd->req); int len32; - dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", + dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %zu, final: %d\n", ctx->digcnt[1], ctx->digcnt[0], length1, final); len32 = DIV_ROUND_UP(length1, sizeof(u32)); @@ -644,7 +644,7 @@ static int atmel_sha_xmit_dma(struct atmel_sha_dev *dd, dma_addr_t dma_addr1, struct dma_async_tx_descriptor *in_desc; struct scatterlist sg[2]; - dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", + dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %zu, final: %d\n", ctx->digcnt[1], ctx->digcnt[0], length1, final); dd->dma_lch_in.dma_conf.src_maxburst = 16; @@ -723,7 +723,7 @@ static int atmel_sha_xmit_dma_map(struct atmel_sha_dev *dd, ctx->dma_addr = dma_map_single(dd->dev, ctx->buffer, ctx->buflen + ctx->block_size, DMA_TO_DEVICE); if (dma_mapping_error(dd->dev, ctx->dma_addr)) { - dev_err(dd->dev, "dma %u bytes error\n", ctx->buflen + + dev_err(dd->dev, "dma %zu bytes error\n", ctx->buflen + ctx->block_size); atmel_sha_complete(dd, -EINVAL); } @@ -744,7 +744,7 @@ static int atmel_sha_update_dma_slow(struct atmel_sha_dev *dd) final = (ctx->flags & SHA_FLAGS_FINUP) && !ctx->total; - dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", + dev_dbg(dd->dev, "slow: bufcnt: %zu, digcnt: 0x%llx 0x%llx, final: %d\n", ctx->bufcnt, ctx->digcnt[1], ctx->digcnt[0], final); if (final) @@ -772,7 +772,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) if (ctx->bufcnt || ctx->offset) return atmel_sha_update_dma_slow(dd); - dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", + dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %zu, total: %u\n", ctx->digcnt[1], ctx->digcnt[0], ctx->bufcnt, ctx->total); sg = ctx->sg; @@ -814,7 +814,7 @@ static int atmel_sha_update_dma_start(struct
Re: linux-next: build warnings after merge of the crypto tree
Hi Stephen: On Mon, Feb 06, 2017 at 12:28:37PM +1100, Stephen Rothwell wrote: > > After merging the crypto tree, today's linux-next build (x86_64 > allmodconfig) produced these warnings: > > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has > unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) > > Introduced by commit > > 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), > Y(aes)) modes") > > In file included from include/linux/printk.h:329:0, > from include/linux/kernel.h:13, > from drivers/crypto/atmel-sha.c:17: This patch should fix both issues. Thanks, ---8<--- Subject: crypto: atmel - Fix authenc compile test warnings The authenc code depends on the sha code so in order to allow compile testing on the former we must allow it on sha as well. This patch enables compile testing on sha as well as tdes and fixes the few x86-64 warnings that arise in the sha code. Reported-by: Stephen Rothwell Signed-off-by: Herbert Xu diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 7482461..9b7e19e 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -444,7 +444,7 @@ config CRYPTO_DEV_ATMEL_AES config CRYPTO_DEV_ATMEL_TDES tristate "Support for Atmel DES/TDES hw accelerator" - depends on ARCH_AT91 + depends on ARCH_AT91 || COMPILE_TEST select CRYPTO_DES select CRYPTO_BLKCIPHER help @@ -457,7 +457,7 @@ config CRYPTO_DEV_ATMEL_TDES config CRYPTO_DEV_ATMEL_SHA tristate "Support for Atmel SHA hw accelerator" - depends on ARCH_AT91 + depends on ARCH_AT91 || COMPILE_TEST select CRYPTO_HASH help Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512 diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c index 22d0c0c..b081e78 100644 --- a/drivers/crypto/atmel-sha.c +++ b/drivers/crypto/atmel-sha.c @@ -568,7 +568,7 @@ static int atmel_sha_xmit_cpu(struct atmel_sha_dev *dd, const u8 *buf, int count, len32; const u32 *buffer = (const u32 *)buf; - dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", + dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %zu, final: %d\n", ctx->digcnt[1], ctx->digcnt[0], length, final); atmel_sha_write_ctrl(dd, 0); @@ -597,7 +597,7 @@ static int atmel_sha_xmit_pdc(struct atmel_sha_dev *dd, dma_addr_t dma_addr1, struct atmel_sha_reqctx *ctx = ahash_request_ctx(dd->req); int len32; - dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", + dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %zu, final: %d\n", ctx->digcnt[1], ctx->digcnt[0], length1, final); len32 = DIV_ROUND_UP(length1, sizeof(u32)); @@ -644,7 +644,7 @@ static int atmel_sha_xmit_dma(struct atmel_sha_dev *dd, dma_addr_t dma_addr1, struct dma_async_tx_descriptor *in_desc; struct scatterlist sg[2]; - dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", + dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %zu, final: %d\n", ctx->digcnt[1], ctx->digcnt[0], length1, final); dd->dma_lch_in.dma_conf.src_maxburst = 16; @@ -723,7 +723,7 @@ static int atmel_sha_xmit_dma_map(struct atmel_sha_dev *dd, ctx->dma_addr = dma_map_single(dd->dev, ctx->buffer, ctx->buflen + ctx->block_size, DMA_TO_DEVICE); if (dma_mapping_error(dd->dev, ctx->dma_addr)) { - dev_err(dd->dev, "dma %u bytes error\n", ctx->buflen + + dev_err(dd->dev, "dma %zu bytes error\n", ctx->buflen + ctx->block_size); atmel_sha_complete(dd, -EINVAL); } @@ -744,7 +744,7 @@ static int atmel_sha_update_dma_slow(struct atmel_sha_dev *dd) final = (ctx->flags & SHA_FLAGS_FINUP) && !ctx->total; - dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", + dev_dbg(dd->dev, "slow: bufcnt: %zu, digcnt: 0x%llx 0x%llx, final: %d\n", ctx->bufcnt, ctx->digcnt[1], ctx->digcnt[0], final); if (final) @@ -772,7 +772,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) if (ctx->bufcnt || ctx->offset) return atmel_sha_update_dma_slow(dd); - dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", + dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %zu, total: %u\n", ctx->digcnt[1], ctx->digcnt[0], ctx->bufcnt, ctx->total); sg = ctx->sg; @@ -814,7 +814,7 @@ static int atmel_sha_update_dma_start(struct atmel_sha_dev *dd) ctx->dma_addr =
linux-next: build warnings after merge of the crypto tree
Hi Herbert, After merging the crypto tree, today's linux-next build (x86_64 allmodconfig) produced these warnings: warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) Introduced by commit 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), Y(aes)) modes") In file included from include/linux/printk.h:329:0, from include/linux/kernel.h:13, from drivers/crypto/atmel-sha.c:17: drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_cpu': drivers/crypto/atmel-sha.c:571:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:571:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_pdc': drivers/crypto/atmel-sha.c:600:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:600:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma': drivers/crypto/atmel-sha.c:647:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:647:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma_map': drivers/crypto/atmel-sha.c:726:20: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_err(dd->dev, "dma %u bytes error\n", ctx->buflen + ^ In file included from include/linux/printk.h:329:0, from include/linux/kernel.h:13, from drivers/crypto/atmel-sha.c:17: drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_slow': drivers/crypto/atmel-sha.c:747:19: warning: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:747:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", ^ drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_start': drivers/crypto/atmel-sha.c:775:19: warning: format '%u' expects argument of type 'unsigned int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:775:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", ^ drivers/crypto/atmel-sha.c:817:21: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_err(dd->dev, "dma %u bytes error\n", ^ In file included from include/linux/printk.h:329:0, from include/linux/kernel.h:13, from drivers/crypto/atmel-sha.c:17: drivers/crypto/atmel-sha.c: In function 'atmel_sha_finish': drivers/crypto/atmel-sha.c:997:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "digcnt: 0x%llx 0x%llx, bufcnt:
linux-next: build warnings after merge of the crypto tree
Hi Herbert, After merging the crypto tree, today's linux-next build (x86_64 allmodconfig) produced these warnings: warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) warning: (CRYPTO_DEV_ATMEL_AUTHENC) selects CRYPTO_DEV_ATMEL_SHA which has unmet direct dependencies (CRYPTO && CRYPTO_HW && ARCH_AT91) Introduced by commit 89a82ef87e01 ("crypto: atmel-authenc - add support to authenc(hmac(shaX), Y(aes)) modes") In file included from include/linux/printk.h:329:0, from include/linux/kernel.h:13, from drivers/crypto/atmel-sha.c:17: drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_cpu': drivers/crypto/atmel-sha.c:571:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:571:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "xmit_cpu: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_pdc': drivers/crypto/atmel-sha.c:600:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:600:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "xmit_pdc: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma': drivers/crypto/atmel-sha.c:647:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:647:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "xmit_dma: digcnt: 0x%llx 0x%llx, length: %d, final: %d\n", ^ drivers/crypto/atmel-sha.c: In function 'atmel_sha_xmit_dma_map': drivers/crypto/atmel-sha.c:726:20: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_err(dd->dev, "dma %u bytes error\n", ctx->buflen + ^ In file included from include/linux/printk.h:329:0, from include/linux/kernel.h:13, from drivers/crypto/atmel-sha.c:17: drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_slow': drivers/crypto/atmel-sha.c:747:19: warning: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:747:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "slow: bufcnt: %u, digcnt: 0x%llx 0x%llx, final: %d\n", ^ drivers/crypto/atmel-sha.c: In function 'atmel_sha_update_dma_start': drivers/crypto/atmel-sha.c:775:19: warning: format '%u' expects argument of type 'unsigned int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", ^ include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg' __dynamic_dev_dbg(, dev, fmt, \ ^ drivers/crypto/atmel-sha.c:775:2: note: in expansion of macro 'dev_dbg' dev_dbg(dd->dev, "fast: digcnt: 0x%llx 0x%llx, bufcnt: %u, total: %u\n", ^ drivers/crypto/atmel-sha.c:817:21: warning: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_err(dd->dev, "dma %u bytes error\n", ^ In file included from include/linux/printk.h:329:0, from include/linux/kernel.h:13, from drivers/crypto/atmel-sha.c:17: drivers/crypto/atmel-sha.c: In function 'atmel_sha_finish': drivers/crypto/atmel-sha.c:997:19: warning: format '%d' expects argument of type 'int', but argument 6 has type 'size_t {aka long unsigned int}' [-Wformat=] dev_dbg(dd->dev, "digcnt: 0x%llx 0x%llx, bufcnt:
Re: linux-next: build warnings after merge of the crypto tree
On Tue, Mar 10, 2015 at 07:00:26PM -0700, Tadeusz Struk wrote: > On 03/09/2015 11:03 PM, Herbert Xu wrote: > > This is a bit of a bummer. What happened is that net-next has > > killed the kiocb argument to sendmsg/recvmsg. However, this > > change is obviously not part of the crypto tree and algif_aead > > only exists in the crypto tree. > > > > So Stephen could you fix this by hand until one of them is merged > > upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? > > So does it mean that aio operations will not be supported on sockets? Indeed. If you want to have this ability you'll need to take the discussion over to netdev. Cheers, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
On 03/09/2015 11:03 PM, Herbert Xu wrote: > This is a bit of a bummer. What happened is that net-next has > killed the kiocb argument to sendmsg/recvmsg. However, this > change is obviously not part of the crypto tree and algif_aead > only exists in the crypto tree. > > So Stephen could you fix this by hand until one of them is merged > upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? So does it mean that aio operations will not be supported on sockets? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
On Wed, Mar 11, 2015 at 11:56:37AM +1100, Stephen Rothwell wrote: > > This is what I applied: > > From: Stephen Rothwell > Date: Wed, 11 Mar 2015 11:51:30 +1100 > Subject: [PATCH] crypto: fix for sendmsg/recvmsg API change > > Signed-off-by: Stephen Rothwell Looks good to me. Thanks Stephen! -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
Hi all, On Tue, 10 Mar 2015 17:44:54 +1100 Stephen Rothwell wrote: > > On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu > wrote: > > > > On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote: > > > > > > After merging the crypto tree, today's (and the past few days) > > > linux-next build (powerpc allyesconfig) produced these warnings: > > > > > > crypto/algif_aead.c:561:2: warning: initialization from incompatible > > > pointer type > > > .sendmsg = aead_sendmsg, > > > ^ > > > crypto/algif_aead.c:561:2: warning: (near initialization for > > > 'algif_aead_ops.sendmsg') > > > crypto/algif_aead.c:563:2: warning: initialization from incompatible > > > pointer type > > > .recvmsg = aead_recvmsg, > > > ^ > > > crypto/algif_aead.c:563:2: warning: (near initialization for > > > 'algif_aead_ops.recvmsg') > > > > > > Introduced by commit 400c40cf78da ("crypto: algif - add AEAD support"). > > > > This is a bit of a bummer. What happened is that net-next has > > killed the kiocb argument to sendmsg/recvmsg. However, this > > change is obviously not part of the crypto tree and algif_aead > > only exists in the crypto tree. > > > > So Stephen could you fix this by hand until one of them is merged > > upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? > > No worries, I will put a merge fix patch in from tomorrow (and send you > a copy just in case). This is what I applied: From: Stephen Rothwell Date: Wed, 11 Mar 2015 11:51:30 +1100 Subject: [PATCH] crypto: fix for sendmsg/recvmsg API change Signed-off-by: Stephen Rothwell --- crypto/algif_aead.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index 527d27b023ab..001d8b5ad056 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -163,7 +163,7 @@ static void aead_data_wakeup(struct sock *sk) rcu_read_unlock(); } -static int aead_sendmsg(struct kiocb *unused, struct socket *sock, +static int aead_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) { struct sock *sk = sock->sk; @@ -348,7 +348,7 @@ unlock: return err ?: size; } -static int aead_recvmsg(struct kiocb *unused, struct socket *sock, +static int aead_recvmsg(struct socket *sock, struct msghdr *msg, size_t ignored, int flags) { struct sock *sk = sock->sk; -- 2.1.4 -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpcRAOL2Lui1.pgp Description: OpenPGP digital signature
Re: linux-next: build warnings after merge of the crypto tree
Am Dienstag, 10. März 2015, 17:44:54 schrieb Stephen Rothwell: Hi Stephen, >Hi Herbert, > >On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu wrote: >> On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote: >> > After merging the crypto tree, today's (and the past few days) >> > linux-next build (powerpc allyesconfig) produced these warnings: >> > >> > crypto/algif_aead.c:561:2: warning: initialization from >> > incompatible pointer type> > >> > .sendmsg = aead_sendmsg, >> > ^ >> > >> > crypto/algif_aead.c:561:2: warning: (near initialization for >> > 'algif_aead_ops.sendmsg') crypto/algif_aead.c:563:2: warning: >> > initialization from incompatible pointer type> > >> > .recvmsg = aead_recvmsg, >> > ^ >> > >> > crypto/algif_aead.c:563:2: warning: (near initialization for >> > 'algif_aead_ops.recvmsg') >> > >> > Introduced by commit 400c40cf78da ("crypto: algif - add AEAD >> > support").> >> This is a bit of a bummer. What happened is that net-next has >> killed the kiocb argument to sendmsg/recvmsg. However, this >> change is obviously not part of the crypto tree and algif_aead >> only exists in the crypto tree. >> >> So Stephen could you fix this by hand until one of them is merged >> upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? > >No worries, I will put a merge fix patch in from tomorrow (and send you >a copy just in case). Thank you. Let me know if I should help. Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
Hi Herbert, On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu wrote: > > On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote: > > > > After merging the crypto tree, today's (and the past few days) > > linux-next build (powerpc allyesconfig) produced these warnings: > > > > crypto/algif_aead.c:561:2: warning: initialization from incompatible > > pointer type > > .sendmsg = aead_sendmsg, > > ^ > > crypto/algif_aead.c:561:2: warning: (near initialization for > > 'algif_aead_ops.sendmsg') > > crypto/algif_aead.c:563:2: warning: initialization from incompatible > > pointer type > > .recvmsg = aead_recvmsg, > > ^ > > crypto/algif_aead.c:563:2: warning: (near initialization for > > 'algif_aead_ops.recvmsg') > > > > Introduced by commit 400c40cf78da ("crypto: algif - add AEAD support"). > > This is a bit of a bummer. What happened is that net-next has > killed the kiocb argument to sendmsg/recvmsg. However, this > change is obviously not part of the crypto tree and algif_aead > only exists in the crypto tree. > > So Stephen could you fix this by hand until one of them is merged > upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? No worries, I will put a merge fix patch in from tomorrow (and send you a copy just in case). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpcMk9TyvCt4.pgp Description: OpenPGP digital signature
Re: linux-next: build warnings after merge of the crypto tree
On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote: > Hi Herbert, > > After merging the crypto tree, today's (and the past few days) > linux-next build (powerpc allyesconfig) produced these warnings: > > crypto/algif_aead.c:561:2: warning: initialization from incompatible pointer > type > .sendmsg = aead_sendmsg, > ^ > crypto/algif_aead.c:561:2: warning: (near initialization for > 'algif_aead_ops.sendmsg') > crypto/algif_aead.c:563:2: warning: initialization from incompatible pointer > type > .recvmsg = aead_recvmsg, > ^ > crypto/algif_aead.c:563:2: warning: (near initialization for > 'algif_aead_ops.recvmsg') > > Introduced by commit 400c40cf78da ("crypto: algif - add AEAD support"). This is a bit of a bummer. What happened is that net-next has killed the kiocb argument to sendmsg/recvmsg. However, this change is obviously not part of the crypto tree and algif_aead only exists in the crypto tree. So Stephen could you fix this by hand until one of them is merged upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? Thanks! -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote: Hi Herbert, After merging the crypto tree, today's (and the past few days) linux-next build (powerpc allyesconfig) produced these warnings: crypto/algif_aead.c:561:2: warning: initialization from incompatible pointer type .sendmsg = aead_sendmsg, ^ crypto/algif_aead.c:561:2: warning: (near initialization for 'algif_aead_ops.sendmsg') crypto/algif_aead.c:563:2: warning: initialization from incompatible pointer type .recvmsg = aead_recvmsg, ^ crypto/algif_aead.c:563:2: warning: (near initialization for 'algif_aead_ops.recvmsg') Introduced by commit 400c40cf78da (crypto: algif - add AEAD support). This is a bit of a bummer. What happened is that net-next has killed the kiocb argument to sendmsg/recvmsg. However, this change is obviously not part of the crypto tree and algif_aead only exists in the crypto tree. So Stephen could you fix this by hand until one of them is merged upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? Thanks! -- Email: Herbert Xu herb...@gondor.apana.org.au Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
On 03/09/2015 11:03 PM, Herbert Xu wrote: This is a bit of a bummer. What happened is that net-next has killed the kiocb argument to sendmsg/recvmsg. However, this change is obviously not part of the crypto tree and algif_aead only exists in the crypto tree. So Stephen could you fix this by hand until one of them is merged upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? So does it mean that aio operations will not be supported on sockets? -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
Hi all, On Tue, 10 Mar 2015 17:44:54 +1100 Stephen Rothwell s...@canb.auug.org.au wrote: On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu herb...@gondor.apana.org.au wrote: On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote: After merging the crypto tree, today's (and the past few days) linux-next build (powerpc allyesconfig) produced these warnings: crypto/algif_aead.c:561:2: warning: initialization from incompatible pointer type .sendmsg = aead_sendmsg, ^ crypto/algif_aead.c:561:2: warning: (near initialization for 'algif_aead_ops.sendmsg') crypto/algif_aead.c:563:2: warning: initialization from incompatible pointer type .recvmsg = aead_recvmsg, ^ crypto/algif_aead.c:563:2: warning: (near initialization for 'algif_aead_ops.recvmsg') Introduced by commit 400c40cf78da (crypto: algif - add AEAD support). This is a bit of a bummer. What happened is that net-next has killed the kiocb argument to sendmsg/recvmsg. However, this change is obviously not part of the crypto tree and algif_aead only exists in the crypto tree. So Stephen could you fix this by hand until one of them is merged upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? No worries, I will put a merge fix patch in from tomorrow (and send you a copy just in case). This is what I applied: From: Stephen Rothwell s...@canb.auug.org.au Date: Wed, 11 Mar 2015 11:51:30 +1100 Subject: [PATCH] crypto: fix for sendmsg/recvmsg API change Signed-off-by: Stephen Rothwell s...@canb.auug.org.au --- crypto/algif_aead.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index 527d27b023ab..001d8b5ad056 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -163,7 +163,7 @@ static void aead_data_wakeup(struct sock *sk) rcu_read_unlock(); } -static int aead_sendmsg(struct kiocb *unused, struct socket *sock, +static int aead_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) { struct sock *sk = sock-sk; @@ -348,7 +348,7 @@ unlock: return err ?: size; } -static int aead_recvmsg(struct kiocb *unused, struct socket *sock, +static int aead_recvmsg(struct socket *sock, struct msghdr *msg, size_t ignored, int flags) { struct sock *sk = sock-sk; -- 2.1.4 -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpcRAOL2Lui1.pgp Description: OpenPGP digital signature
Re: linux-next: build warnings after merge of the crypto tree
On Wed, Mar 11, 2015 at 11:56:37AM +1100, Stephen Rothwell wrote: This is what I applied: From: Stephen Rothwell s...@canb.auug.org.au Date: Wed, 11 Mar 2015 11:51:30 +1100 Subject: [PATCH] crypto: fix for sendmsg/recvmsg API change Signed-off-by: Stephen Rothwell s...@canb.auug.org.au Looks good to me. Thanks Stephen! -- Email: Herbert Xu herb...@gondor.apana.org.au Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
On Tue, Mar 10, 2015 at 07:00:26PM -0700, Tadeusz Struk wrote: On 03/09/2015 11:03 PM, Herbert Xu wrote: This is a bit of a bummer. What happened is that net-next has killed the kiocb argument to sendmsg/recvmsg. However, this change is obviously not part of the crypto tree and algif_aead only exists in the crypto tree. So Stephen could you fix this by hand until one of them is merged upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? So does it mean that aio operations will not be supported on sockets? Indeed. If you want to have this ability you'll need to take the discussion over to netdev. Cheers, -- Email: Herbert Xu herb...@gondor.apana.org.au Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
Hi Herbert, On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu herb...@gondor.apana.org.au wrote: On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote: After merging the crypto tree, today's (and the past few days) linux-next build (powerpc allyesconfig) produced these warnings: crypto/algif_aead.c:561:2: warning: initialization from incompatible pointer type .sendmsg = aead_sendmsg, ^ crypto/algif_aead.c:561:2: warning: (near initialization for 'algif_aead_ops.sendmsg') crypto/algif_aead.c:563:2: warning: initialization from incompatible pointer type .recvmsg = aead_recvmsg, ^ crypto/algif_aead.c:563:2: warning: (near initialization for 'algif_aead_ops.recvmsg') Introduced by commit 400c40cf78da (crypto: algif - add AEAD support). This is a bit of a bummer. What happened is that net-next has killed the kiocb argument to sendmsg/recvmsg. However, this change is obviously not part of the crypto tree and algif_aead only exists in the crypto tree. So Stephen could you fix this by hand until one of them is merged upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? No worries, I will put a merge fix patch in from tomorrow (and send you a copy just in case). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpcMk9TyvCt4.pgp Description: OpenPGP digital signature
Re: linux-next: build warnings after merge of the crypto tree
Am Dienstag, 10. März 2015, 17:44:54 schrieb Stephen Rothwell: Hi Stephen, Hi Herbert, On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu herb...@gondor.apana.org.au wrote: On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote: After merging the crypto tree, today's (and the past few days) linux-next build (powerpc allyesconfig) produced these warnings: crypto/algif_aead.c:561:2: warning: initialization from incompatible pointer type .sendmsg = aead_sendmsg, ^ crypto/algif_aead.c:561:2: warning: (near initialization for 'algif_aead_ops.sendmsg') crypto/algif_aead.c:563:2: warning: initialization from incompatible pointer type .recvmsg = aead_recvmsg, ^ crypto/algif_aead.c:563:2: warning: (near initialization for 'algif_aead_ops.recvmsg') Introduced by commit 400c40cf78da (crypto: algif - add AEAD support). This is a bit of a bummer. What happened is that net-next has killed the kiocb argument to sendmsg/recvmsg. However, this change is obviously not part of the crypto tree and algif_aead only exists in the crypto tree. So Stephen could you fix this by hand until one of them is merged upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? No worries, I will put a merge fix patch in from tomorrow (and send you a copy just in case). Thank you. Let me know if I should help. Ciao Stephan -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build warnings after merge of the crypto tree
Hi Herbert, After merging the crypto tree, today's (and the past few days) linux-next build (powerpc allyesconfig) produced these warnings: crypto/algif_aead.c:561:2: warning: initialization from incompatible pointer type .sendmsg = aead_sendmsg, ^ crypto/algif_aead.c:561:2: warning: (near initialization for 'algif_aead_ops.sendmsg') crypto/algif_aead.c:563:2: warning: initialization from incompatible pointer type .recvmsg = aead_recvmsg, ^ crypto/algif_aead.c:563:2: warning: (near initialization for 'algif_aead_ops.recvmsg') Introduced by commit 400c40cf78da ("crypto: algif - add AEAD support"). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpxM1aSo7Dv2.pgp Description: OpenPGP digital signature
linux-next: build warnings after merge of the crypto tree
Hi Herbert, After merging the crypto tree, today's (and the past few days) linux-next build (powerpc allyesconfig) produced these warnings: crypto/algif_aead.c:561:2: warning: initialization from incompatible pointer type .sendmsg = aead_sendmsg, ^ crypto/algif_aead.c:561:2: warning: (near initialization for 'algif_aead_ops.sendmsg') crypto/algif_aead.c:563:2: warning: initialization from incompatible pointer type .recvmsg = aead_recvmsg, ^ crypto/algif_aead.c:563:2: warning: (near initialization for 'algif_aead_ops.recvmsg') Introduced by commit 400c40cf78da (crypto: algif - add AEAD support). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpxM1aSo7Dv2.pgp Description: OpenPGP digital signature
Re: linux-next: build warnings after merge of the crypto tree
Am Dienstag, 26. August 2014, 14:38:12 schrieb Herbert Xu: Hi Herbert, >On Tue, Aug 26, 2014 at 04:14:56PM +1000, Stephen Rothwell wrote: >> Hi Herbert, >> >> After merging the crypto tree, today's linux-next build (powerpc >> ppc44x_defconfig, i386 defconfig and sparc defconfig) produced these >> warnings: >> >> In file included from crypto/testmgr.c:30:0: >> include/crypto/drbg.h: In function 'drbg_max_addtl': >> include/crypto/drbg.h:157:2: warning: left shift count >= width of >> type> >> return (1UL<<35); >> ^ >> >> include/crypto/drbg.h: In function 'drbg_max_requests': >> include/crypto/drbg.h:163:2: warning: left shift count >= width of >> type> >> return (1UL<<48); >> ^ >> >> Introduced by commit 05c81ccd9087 ("crypto: drbg - remove >> configuration of fixed values"). These are all 32 bit builds. > >Stephan, could you take a look at this? I am on it. Thanks. > >Thanks, Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
On Tue, Aug 26, 2014 at 04:14:56PM +1000, Stephen Rothwell wrote: > Hi Herbert, > > After merging the crypto tree, today's linux-next build (powerpc > ppc44x_defconfig, i386 defconfig and sparc defconfig) produced these > warnings: > > In file included from crypto/testmgr.c:30:0: > include/crypto/drbg.h: In function 'drbg_max_addtl': > include/crypto/drbg.h:157:2: warning: left shift count >= width of type > return (1UL<<35); > ^ > include/crypto/drbg.h: In function 'drbg_max_requests': > include/crypto/drbg.h:163:2: warning: left shift count >= width of type > return (1UL<<48); > ^ > > Introduced by commit 05c81ccd9087 ("crypto: drbg - remove configuration > of fixed values"). These are all 32 bit builds. Stephan, could you take a look at this? Thanks, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build warnings after merge of the crypto tree
Hi Herbert, After merging the crypto tree, today's linux-next build (powerpc ppc44x_defconfig, i386 defconfig and sparc defconfig) produced these warnings: In file included from crypto/testmgr.c:30:0: include/crypto/drbg.h: In function 'drbg_max_addtl': include/crypto/drbg.h:157:2: warning: left shift count >= width of type return (1UL<<35); ^ include/crypto/drbg.h: In function 'drbg_max_requests': include/crypto/drbg.h:163:2: warning: left shift count >= width of type return (1UL<<48); ^ Introduced by commit 05c81ccd9087 ("crypto: drbg - remove configuration of fixed values"). These are all 32 bit builds. -- Cheers, Stephen Rothwells...@canb.auug.org.au signature.asc Description: PGP signature
linux-next: build warnings after merge of the crypto tree
Hi Herbert, After merging the crypto tree, today's linux-next build (powerpc ppc44x_defconfig, i386 defconfig and sparc defconfig) produced these warnings: In file included from crypto/testmgr.c:30:0: include/crypto/drbg.h: In function 'drbg_max_addtl': include/crypto/drbg.h:157:2: warning: left shift count = width of type return (1UL35); ^ include/crypto/drbg.h: In function 'drbg_max_requests': include/crypto/drbg.h:163:2: warning: left shift count = width of type return (1UL48); ^ Introduced by commit 05c81ccd9087 (crypto: drbg - remove configuration of fixed values). These are all 32 bit builds. -- Cheers, Stephen Rothwells...@canb.auug.org.au signature.asc Description: PGP signature
Re: linux-next: build warnings after merge of the crypto tree
On Tue, Aug 26, 2014 at 04:14:56PM +1000, Stephen Rothwell wrote: Hi Herbert, After merging the crypto tree, today's linux-next build (powerpc ppc44x_defconfig, i386 defconfig and sparc defconfig) produced these warnings: In file included from crypto/testmgr.c:30:0: include/crypto/drbg.h: In function 'drbg_max_addtl': include/crypto/drbg.h:157:2: warning: left shift count = width of type return (1UL35); ^ include/crypto/drbg.h: In function 'drbg_max_requests': include/crypto/drbg.h:163:2: warning: left shift count = width of type return (1UL48); ^ Introduced by commit 05c81ccd9087 (crypto: drbg - remove configuration of fixed values). These are all 32 bit builds. Stephan, could you take a look at this? Thanks, -- Email: Herbert Xu herb...@gondor.apana.org.au Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build warnings after merge of the crypto tree
Am Dienstag, 26. August 2014, 14:38:12 schrieb Herbert Xu: Hi Herbert, On Tue, Aug 26, 2014 at 04:14:56PM +1000, Stephen Rothwell wrote: Hi Herbert, After merging the crypto tree, today's linux-next build (powerpc ppc44x_defconfig, i386 defconfig and sparc defconfig) produced these warnings: In file included from crypto/testmgr.c:30:0: include/crypto/drbg.h: In function 'drbg_max_addtl': include/crypto/drbg.h:157:2: warning: left shift count = width of type return (1UL35); ^ include/crypto/drbg.h: In function 'drbg_max_requests': include/crypto/drbg.h:163:2: warning: left shift count = width of type return (1UL48); ^ Introduced by commit 05c81ccd9087 (crypto: drbg - remove configuration of fixed values). These are all 32 bit builds. Stephan, could you take a look at this? I am on it. Thanks. Thanks, Ciao Stephan -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/