* [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
@ 2020-06-29 12:30 ` Lee Jones
0 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2020-06-29 12:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-arm-kernel, linux-kernel, Linus Walleij, Herbert Xu,
David S . Miller, linux-crypto
A recent change to the Regulator consumer API (which this driver
utilises) add prototypes for the some suspend functions. These
functions require including header file include/linux/suspend.h.
The following tree of includes affecting this driver will be
present:
In file included from include/linux/elevator.h:6,
from include/linux/blkdev.h:288,
from include/linux/blk-cgroup.h:23,
from include/linux/writeback.h:14,
from include/linux/memcontrol.h:22,
from include/linux/swap.h:9,
from include/linux/suspend.h:5,
from include/linux/regulator/consumer.h:35,
from drivers/crypto/ux500/hash/hash_core.c:28:
include/linux/elevator.h pulls in include/linux/hashtable.h which
contains its own version of hash_init(). This confuses the build
system and results in the following error (amongst others):
drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
1362 | return hash_init(req);
Fix this by namespacing the local hash_init() such that the
source of confusion is removed.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David S. Miller <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
Ideally this should go into v5.8's -rcs else it runs the risk of
breaking when Linus pulls everything in for v5.9-rc1.
drivers/crypto/ux500/hash/hash_core.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index c24f2db8d5e83..a5ee8c2fb4e0b 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -545,7 +545,7 @@ static bool hash_dma_valid_data(struct scatterlist *sg, int datasize)
*
* Initialize structures.
*/
-static int hash_init(struct ahash_request *req)
+static int ux500_hash_init(struct ahash_request *req)
{
struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
struct hash_ctx *ctx = crypto_ahash_ctx(tfm);
@@ -1359,7 +1359,7 @@ static int ahash_sha1_init(struct ahash_request *req)
ctx->config.oper_mode = HASH_OPER_MODE_HASH;
ctx->digestsize = SHA1_DIGEST_SIZE;
- return hash_init(req);
+ return ux500_hash_init(req);
}
static int ahash_sha256_init(struct ahash_request *req)
@@ -1372,7 +1372,7 @@ static int ahash_sha256_init(struct ahash_request *req)
ctx->config.oper_mode = HASH_OPER_MODE_HASH;
ctx->digestsize = SHA256_DIGEST_SIZE;
- return hash_init(req);
+ return ux500_hash_init(req);
}
static int ahash_sha1_digest(struct ahash_request *req)
@@ -1425,7 +1425,7 @@ static int hmac_sha1_init(struct ahash_request *req)
ctx->config.oper_mode = HASH_OPER_MODE_HMAC;
ctx->digestsize = SHA1_DIGEST_SIZE;
- return hash_init(req);
+ return ux500_hash_init(req);
}
static int hmac_sha256_init(struct ahash_request *req)
@@ -1438,7 +1438,7 @@ static int hmac_sha256_init(struct ahash_request *req)
ctx->config.oper_mode = HASH_OPER_MODE_HMAC;
ctx->digestsize = SHA256_DIGEST_SIZE;
- return hash_init(req);
+ return ux500_hash_init(req);
}
static int hmac_sha1_digest(struct ahash_request *req)
@@ -1515,7 +1515,7 @@ static struct hash_algo_template hash_algs[] = {
.conf.algorithm = HASH_ALGO_SHA1,
.conf.oper_mode = HASH_OPER_MODE_HASH,
.hash = {
- .init = hash_init,
+ .init = ux500_hash_init,
.update = ahash_update,
.final = ahash_final,
.digest = ahash_sha1_digest,
@@ -1538,7 +1538,7 @@ static struct hash_algo_template hash_algs[] = {
.conf.algorithm = HASH_ALGO_SHA256,
.conf.oper_mode = HASH_OPER_MODE_HASH,
.hash = {
- .init = hash_init,
+ .init = ux500_hash_init,
.update = ahash_update,
.final = ahash_final,
.digest = ahash_sha256_digest,
@@ -1561,7 +1561,7 @@ static struct hash_algo_template hash_algs[] = {
.conf.algorithm = HASH_ALGO_SHA1,
.conf.oper_mode = HASH_OPER_MODE_HMAC,
.hash = {
- .init = hash_init,
+ .init = ux500_hash_init,
.update = ahash_update,
.final = ahash_final,
.digest = hmac_sha1_digest,
@@ -1585,7 +1585,7 @@ static struct hash_algo_template hash_algs[] = {
.conf.algorithm = HASH_ALGO_SHA256,
.conf.oper_mode = HASH_OPER_MODE_HMAC,
.hash = {
- .init = hash_init,
+ .init = ux500_hash_init,
.update = ahash_update,
.final = ahash_final,
.digest = hmac_sha256_digest,
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
@ 2020-06-29 12:30 ` Lee Jones
0 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2020-06-29 12:30 UTC (permalink / raw)
To: lee.jones
Cc: Herbert Xu, Linus Walleij, linux-kernel, linux-crypto,
David S . Miller, linux-arm-kernel
A recent change to the Regulator consumer API (which this driver
utilises) add prototypes for the some suspend functions. These
functions require including header file include/linux/suspend.h.
The following tree of includes affecting this driver will be
present:
In file included from include/linux/elevator.h:6,
from include/linux/blkdev.h:288,
from include/linux/blk-cgroup.h:23,
from include/linux/writeback.h:14,
from include/linux/memcontrol.h:22,
from include/linux/swap.h:9,
from include/linux/suspend.h:5,
from include/linux/regulator/consumer.h:35,
from drivers/crypto/ux500/hash/hash_core.c:28:
include/linux/elevator.h pulls in include/linux/hashtable.h which
contains its own version of hash_init(). This confuses the build
system and results in the following error (amongst others):
drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
1362 | return hash_init(req);
Fix this by namespacing the local hash_init() such that the
source of confusion is removed.
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David S. Miller <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
Ideally this should go into v5.8's -rcs else it runs the risk of
breaking when Linus pulls everything in for v5.9-rc1.
drivers/crypto/ux500/hash/hash_core.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index c24f2db8d5e83..a5ee8c2fb4e0b 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -545,7 +545,7 @@ static bool hash_dma_valid_data(struct scatterlist *sg, int datasize)
*
* Initialize structures.
*/
-static int hash_init(struct ahash_request *req)
+static int ux500_hash_init(struct ahash_request *req)
{
struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
struct hash_ctx *ctx = crypto_ahash_ctx(tfm);
@@ -1359,7 +1359,7 @@ static int ahash_sha1_init(struct ahash_request *req)
ctx->config.oper_mode = HASH_OPER_MODE_HASH;
ctx->digestsize = SHA1_DIGEST_SIZE;
- return hash_init(req);
+ return ux500_hash_init(req);
}
static int ahash_sha256_init(struct ahash_request *req)
@@ -1372,7 +1372,7 @@ static int ahash_sha256_init(struct ahash_request *req)
ctx->config.oper_mode = HASH_OPER_MODE_HASH;
ctx->digestsize = SHA256_DIGEST_SIZE;
- return hash_init(req);
+ return ux500_hash_init(req);
}
static int ahash_sha1_digest(struct ahash_request *req)
@@ -1425,7 +1425,7 @@ static int hmac_sha1_init(struct ahash_request *req)
ctx->config.oper_mode = HASH_OPER_MODE_HMAC;
ctx->digestsize = SHA1_DIGEST_SIZE;
- return hash_init(req);
+ return ux500_hash_init(req);
}
static int hmac_sha256_init(struct ahash_request *req)
@@ -1438,7 +1438,7 @@ static int hmac_sha256_init(struct ahash_request *req)
ctx->config.oper_mode = HASH_OPER_MODE_HMAC;
ctx->digestsize = SHA256_DIGEST_SIZE;
- return hash_init(req);
+ return ux500_hash_init(req);
}
static int hmac_sha1_digest(struct ahash_request *req)
@@ -1515,7 +1515,7 @@ static struct hash_algo_template hash_algs[] = {
.conf.algorithm = HASH_ALGO_SHA1,
.conf.oper_mode = HASH_OPER_MODE_HASH,
.hash = {
- .init = hash_init,
+ .init = ux500_hash_init,
.update = ahash_update,
.final = ahash_final,
.digest = ahash_sha1_digest,
@@ -1538,7 +1538,7 @@ static struct hash_algo_template hash_algs[] = {
.conf.algorithm = HASH_ALGO_SHA256,
.conf.oper_mode = HASH_OPER_MODE_HASH,
.hash = {
- .init = hash_init,
+ .init = ux500_hash_init,
.update = ahash_update,
.final = ahash_final,
.digest = ahash_sha256_digest,
@@ -1561,7 +1561,7 @@ static struct hash_algo_template hash_algs[] = {
.conf.algorithm = HASH_ALGO_SHA1,
.conf.oper_mode = HASH_OPER_MODE_HMAC,
.hash = {
- .init = hash_init,
+ .init = ux500_hash_init,
.update = ahash_update,
.final = ahash_final,
.digest = hmac_sha1_digest,
@@ -1585,7 +1585,7 @@ static struct hash_algo_template hash_algs[] = {
.conf.algorithm = HASH_ALGO_SHA256,
.conf.oper_mode = HASH_OPER_MODE_HMAC,
.hash = {
- .init = hash_init,
+ .init = ux500_hash_init,
.update = ahash_update,
.final = ahash_final,
.digest = hmac_sha256_digest,
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
2020-06-29 12:30 ` Lee Jones
@ 2020-06-29 13:58 ` Linus Walleij
-1 siblings, 0 replies; 12+ messages in thread
From: Linus Walleij @ 2020-06-29 13:58 UTC (permalink / raw)
To: Lee Jones
Cc: Linux ARM, linux-kernel, Herbert Xu, David S . Miller, linux-crypto
On Mon, Jun 29, 2020 at 2:30 PM Lee Jones <lee.jones@linaro.org> wrote:
> A recent change to the Regulator consumer API (which this driver
> utilises) add prototypes for the some suspend functions. These
> functions require including header file include/linux/suspend.h.
>
> The following tree of includes affecting this driver will be
> present:
>
> In file included from include/linux/elevator.h:6,
> from include/linux/blkdev.h:288,
> from include/linux/blk-cgroup.h:23,
> from include/linux/writeback.h:14,
> from include/linux/memcontrol.h:22,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from drivers/crypto/ux500/hash/hash_core.c:28:
>
> include/linux/elevator.h pulls in include/linux/hashtable.h which
> contains its own version of hash_init(). This confuses the build
> system and results in the following error (amongst others):
>
> drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> 1362 | return hash_init(req);
>
> Fix this by namespacing the local hash_init() such that the
> source of confusion is removed.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
This looks reasonable.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
@ 2020-06-29 13:58 ` Linus Walleij
0 siblings, 0 replies; 12+ messages in thread
From: Linus Walleij @ 2020-06-29 13:58 UTC (permalink / raw)
To: Lee Jones
Cc: linux-crypto, David S . Miller, linux-kernel, Linux ARM, Herbert Xu
On Mon, Jun 29, 2020 at 2:30 PM Lee Jones <lee.jones@linaro.org> wrote:
> A recent change to the Regulator consumer API (which this driver
> utilises) add prototypes for the some suspend functions. These
> functions require including header file include/linux/suspend.h.
>
> The following tree of includes affecting this driver will be
> present:
>
> In file included from include/linux/elevator.h:6,
> from include/linux/blkdev.h:288,
> from include/linux/blk-cgroup.h:23,
> from include/linux/writeback.h:14,
> from include/linux/memcontrol.h:22,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from drivers/crypto/ux500/hash/hash_core.c:28:
>
> include/linux/elevator.h pulls in include/linux/hashtable.h which
> contains its own version of hash_init(). This confuses the build
> system and results in the following error (amongst others):
>
> drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> 1362 | return hash_init(req);
>
> Fix this by namespacing the local hash_init() such that the
> source of confusion is removed.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
This looks reasonable.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
2020-06-29 12:30 ` Lee Jones
@ 2020-06-30 4:10 ` Herbert Xu
-1 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2020-06-30 4:10 UTC (permalink / raw)
To: Lee Jones
Cc: linux-arm-kernel, linux-kernel, Linus Walleij, David S . Miller,
linux-crypto
On Mon, Jun 29, 2020 at 01:30:03PM +0100, Lee Jones wrote:
> A recent change to the Regulator consumer API (which this driver
> utilises) add prototypes for the some suspend functions. These
> functions require including header file include/linux/suspend.h.
>
> The following tree of includes affecting this driver will be
> present:
>
> In file included from include/linux/elevator.h:6,
> from include/linux/blkdev.h:288,
> from include/linux/blk-cgroup.h:23,
> from include/linux/writeback.h:14,
> from include/linux/memcontrol.h:22,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from drivers/crypto/ux500/hash/hash_core.c:28:
>
> include/linux/elevator.h pulls in include/linux/hashtable.h which
> contains its own version of hash_init(). This confuses the build
> system and results in the following error (amongst others):
>
> drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> 1362 | return hash_init(req);
>
> Fix this by namespacing the local hash_init() such that the
> source of confusion is removed.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>
> Ideally this should go into v5.8's -rcs else it runs the risk of
> breaking when Linus pulls everything in for v5.9-rc1.
I have no objections to this patch. However, I'd rather put
it on a topic branch which you could pull rather than pushing
it into 5.8 straight away.
I also dislike pulling in the kitchen sink when all you need in
consumer.h is the definition of suspend_state_t. A better solution
would be to move the definition of suspend_state_t into linux/types.h
and including that instead of suspend.h in consumer.h.
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
@ 2020-06-30 4:10 ` Herbert Xu
0 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2020-06-30 4:10 UTC (permalink / raw)
To: Lee Jones
Cc: linux-crypto, Linus Walleij, linux-kernel, linux-arm-kernel,
David S . Miller
On Mon, Jun 29, 2020 at 01:30:03PM +0100, Lee Jones wrote:
> A recent change to the Regulator consumer API (which this driver
> utilises) add prototypes for the some suspend functions. These
> functions require including header file include/linux/suspend.h.
>
> The following tree of includes affecting this driver will be
> present:
>
> In file included from include/linux/elevator.h:6,
> from include/linux/blkdev.h:288,
> from include/linux/blk-cgroup.h:23,
> from include/linux/writeback.h:14,
> from include/linux/memcontrol.h:22,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from drivers/crypto/ux500/hash/hash_core.c:28:
>
> include/linux/elevator.h pulls in include/linux/hashtable.h which
> contains its own version of hash_init(). This confuses the build
> system and results in the following error (amongst others):
>
> drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> 1362 | return hash_init(req);
>
> Fix this by namespacing the local hash_init() such that the
> source of confusion is removed.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>
> Ideally this should go into v5.8's -rcs else it runs the risk of
> breaking when Linus pulls everything in for v5.9-rc1.
I have no objections to this patch. However, I'd rather put
it on a topic branch which you could pull rather than pushing
it into 5.8 straight away.
I also dislike pulling in the kitchen sink when all you need in
consumer.h is the definition of suspend_state_t. A better solution
would be to move the definition of suspend_state_t into linux/types.h
and including that instead of suspend.h in consumer.h.
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
2020-06-30 4:10 ` Herbert Xu
@ 2020-06-30 7:07 ` Lee Jones
-1 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2020-06-30 7:07 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-arm-kernel, linux-kernel, Linus Walleij, David S . Miller,
linux-crypto
On Tue, 30 Jun 2020, Herbert Xu wrote:
> On Mon, Jun 29, 2020 at 01:30:03PM +0100, Lee Jones wrote:
> > A recent change to the Regulator consumer API (which this driver
> > utilises) add prototypes for the some suspend functions. These
> > functions require including header file include/linux/suspend.h.
> >
> > The following tree of includes affecting this driver will be
> > present:
> >
> > In file included from include/linux/elevator.h:6,
> > from include/linux/blkdev.h:288,
> > from include/linux/blk-cgroup.h:23,
> > from include/linux/writeback.h:14,
> > from include/linux/memcontrol.h:22,
> > from include/linux/swap.h:9,
> > from include/linux/suspend.h:5,
> > from include/linux/regulator/consumer.h:35,
> > from drivers/crypto/ux500/hash/hash_core.c:28:
> >
> > include/linux/elevator.h pulls in include/linux/hashtable.h which
> > contains its own version of hash_init(). This confuses the build
> > system and results in the following error (amongst others):
> >
> > drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> > 1362 | return hash_init(req);
> >
> > Fix this by namespacing the local hash_init() such that the
> > source of confusion is removed.
> >
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Cc: Herbert Xu <herbert@gondor.apana.org.au>
> > Cc: David S. Miller <davem@davemloft.net>
> > Cc: linux-crypto@vger.kernel.org
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> >
> > Ideally this should go into v5.8's -rcs else it runs the risk of
> > breaking when Linus pulls everything in for v5.9-rc1.
[...]
> I also dislike pulling in the kitchen sink when all you need in
> consumer.h is the definition of suspend_state_t. A better solution
> would be to move the definition of suspend_state_t into linux/types.h
> and including that instead of suspend.h in consumer.h.
IMHO, including (whole) headers into source/header files is the norm.
Even if only a small portion is actually referenced. Very seldom do
consumers of an API use more than a fraction of what is available.
Whether it's a couple of function calls, a struct or a type.
Pulling headers apart and placing items in more convenient places
i.e. into headers which are more commonly included, messes with the
compartmentalisation of subsystems and sounds like more of a hack than
simply saying "to enable suspend functions we need to reference the
suspend API" like we are here.
> I have no objections to this patch. However, I'd rather put
> it on a topic branch which you could pull rather than pushing
> it into 5.8 straight away.
An immutable branch sounds like a sensible solution. Thanks.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
@ 2020-06-30 7:07 ` Lee Jones
0 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2020-06-30 7:07 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-crypto, Linus Walleij, linux-kernel, linux-arm-kernel,
David S . Miller
On Tue, 30 Jun 2020, Herbert Xu wrote:
> On Mon, Jun 29, 2020 at 01:30:03PM +0100, Lee Jones wrote:
> > A recent change to the Regulator consumer API (which this driver
> > utilises) add prototypes for the some suspend functions. These
> > functions require including header file include/linux/suspend.h.
> >
> > The following tree of includes affecting this driver will be
> > present:
> >
> > In file included from include/linux/elevator.h:6,
> > from include/linux/blkdev.h:288,
> > from include/linux/blk-cgroup.h:23,
> > from include/linux/writeback.h:14,
> > from include/linux/memcontrol.h:22,
> > from include/linux/swap.h:9,
> > from include/linux/suspend.h:5,
> > from include/linux/regulator/consumer.h:35,
> > from drivers/crypto/ux500/hash/hash_core.c:28:
> >
> > include/linux/elevator.h pulls in include/linux/hashtable.h which
> > contains its own version of hash_init(). This confuses the build
> > system and results in the following error (amongst others):
> >
> > drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> > 1362 | return hash_init(req);
> >
> > Fix this by namespacing the local hash_init() such that the
> > source of confusion is removed.
> >
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Cc: Herbert Xu <herbert@gondor.apana.org.au>
> > Cc: David S. Miller <davem@davemloft.net>
> > Cc: linux-crypto@vger.kernel.org
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> >
> > Ideally this should go into v5.8's -rcs else it runs the risk of
> > breaking when Linus pulls everything in for v5.9-rc1.
[...]
> I also dislike pulling in the kitchen sink when all you need in
> consumer.h is the definition of suspend_state_t. A better solution
> would be to move the definition of suspend_state_t into linux/types.h
> and including that instead of suspend.h in consumer.h.
IMHO, including (whole) headers into source/header files is the norm.
Even if only a small portion is actually referenced. Very seldom do
consumers of an API use more than a fraction of what is available.
Whether it's a couple of function calls, a struct or a type.
Pulling headers apart and placing items in more convenient places
i.e. into headers which are more commonly included, messes with the
compartmentalisation of subsystems and sounds like more of a hack than
simply saying "to enable suspend functions we need to reference the
suspend API" like we are here.
> I have no objections to this patch. However, I'd rather put
> it on a topic branch which you could pull rather than pushing
> it into 5.8 straight away.
An immutable branch sounds like a sensible solution. Thanks.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
2020-06-30 7:07 ` Lee Jones
@ 2020-07-07 8:26 ` Lee Jones
-1 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2020-07-07 8:26 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-arm-kernel, linux-kernel, Linus Walleij, David S . Miller,
linux-crypto
On Tue, 30 Jun 2020, Lee Jones wrote:
> On Tue, 30 Jun 2020, Herbert Xu wrote:
> > On Mon, Jun 29, 2020 at 01:30:03PM +0100, Lee Jones wrote:
> > > A recent change to the Regulator consumer API (which this driver
> > > utilises) add prototypes for the some suspend functions. These
> > > functions require including header file include/linux/suspend.h.
> > >
> > > The following tree of includes affecting this driver will be
> > > present:
> > >
> > > In file included from include/linux/elevator.h:6,
> > > from include/linux/blkdev.h:288,
> > > from include/linux/blk-cgroup.h:23,
> > > from include/linux/writeback.h:14,
> > > from include/linux/memcontrol.h:22,
> > > from include/linux/swap.h:9,
> > > from include/linux/suspend.h:5,
> > > from include/linux/regulator/consumer.h:35,
> > > from drivers/crypto/ux500/hash/hash_core.c:28:
> > >
> > > include/linux/elevator.h pulls in include/linux/hashtable.h which
> > > contains its own version of hash_init(). This confuses the build
> > > system and results in the following error (amongst others):
> > >
> > > drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> > > 1362 | return hash_init(req);
> > >
> > > Fix this by namespacing the local hash_init() such that the
> > > source of confusion is removed.
> > >
> > > Cc: Linus Walleij <linus.walleij@linaro.org>
> > > Cc: Herbert Xu <herbert@gondor.apana.org.au>
> > > Cc: David S. Miller <davem@davemloft.net>
> > > Cc: linux-crypto@vger.kernel.org
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > ---
> > >
> > > Ideally this should go into v5.8's -rcs else it runs the risk of
> > > breaking when Linus pulls everything in for v5.9-rc1.
>
> [...]
>
> > I have no objections to this patch. However, I'd rather put
> > it on a topic branch which you could pull rather than pushing
> > it into 5.8 straight away.
>
> An immutable branch sounds like a sensible solution. Thanks.
Any movement on this Herbert?
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
@ 2020-07-07 8:26 ` Lee Jones
0 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2020-07-07 8:26 UTC (permalink / raw)
To: Herbert Xu
Cc: linux-crypto, Linus Walleij, linux-kernel, linux-arm-kernel,
David S . Miller
On Tue, 30 Jun 2020, Lee Jones wrote:
> On Tue, 30 Jun 2020, Herbert Xu wrote:
> > On Mon, Jun 29, 2020 at 01:30:03PM +0100, Lee Jones wrote:
> > > A recent change to the Regulator consumer API (which this driver
> > > utilises) add prototypes for the some suspend functions. These
> > > functions require including header file include/linux/suspend.h.
> > >
> > > The following tree of includes affecting this driver will be
> > > present:
> > >
> > > In file included from include/linux/elevator.h:6,
> > > from include/linux/blkdev.h:288,
> > > from include/linux/blk-cgroup.h:23,
> > > from include/linux/writeback.h:14,
> > > from include/linux/memcontrol.h:22,
> > > from include/linux/swap.h:9,
> > > from include/linux/suspend.h:5,
> > > from include/linux/regulator/consumer.h:35,
> > > from drivers/crypto/ux500/hash/hash_core.c:28:
> > >
> > > include/linux/elevator.h pulls in include/linux/hashtable.h which
> > > contains its own version of hash_init(). This confuses the build
> > > system and results in the following error (amongst others):
> > >
> > > drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> > > 1362 | return hash_init(req);
> > >
> > > Fix this by namespacing the local hash_init() such that the
> > > source of confusion is removed.
> > >
> > > Cc: Linus Walleij <linus.walleij@linaro.org>
> > > Cc: Herbert Xu <herbert@gondor.apana.org.au>
> > > Cc: David S. Miller <davem@davemloft.net>
> > > Cc: linux-crypto@vger.kernel.org
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > ---
> > >
> > > Ideally this should go into v5.8's -rcs else it runs the risk of
> > > breaking when Linus pulls everything in for v5.9-rc1.
>
> [...]
>
> > I have no objections to this patch. However, I'd rather put
> > it on a topic branch which you could pull rather than pushing
> > it into 5.8 straight away.
>
> An immutable branch sounds like a sensible solution. Thanks.
Any movement on this Herbert?
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
2020-06-29 12:30 ` Lee Jones
@ 2020-07-09 12:53 ` Herbert Xu
-1 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2020-07-09 12:53 UTC (permalink / raw)
To: Lee Jones
Cc: linux-arm-kernel, linux-kernel, Linus Walleij, David S . Miller,
linux-crypto
On Mon, Jun 29, 2020 at 01:30:03PM +0100, Lee Jones wrote:
> A recent change to the Regulator consumer API (which this driver
> utilises) add prototypes for the some suspend functions. These
> functions require including header file include/linux/suspend.h.
>
> The following tree of includes affecting this driver will be
> present:
>
> In file included from include/linux/elevator.h:6,
> from include/linux/blkdev.h:288,
> from include/linux/blk-cgroup.h:23,
> from include/linux/writeback.h:14,
> from include/linux/memcontrol.h:22,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from drivers/crypto/ux500/hash/hash_core.c:28:
>
> include/linux/elevator.h pulls in include/linux/hashtable.h which
> contains its own version of hash_init(). This confuses the build
> system and results in the following error (amongst others):
>
> drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> 1362 | return hash_init(req);
>
> Fix this by namespacing the local hash_init() such that the
> source of confusion is removed.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>
> Ideally this should go into v5.8's -rcs else it runs the risk of
> breaking when Linus pulls everything in for v5.9-rc1.
>
> drivers/crypto/ux500/hash/hash_core.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
Patch applied to ux500 branch. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init()
@ 2020-07-09 12:53 ` Herbert Xu
0 siblings, 0 replies; 12+ messages in thread
From: Herbert Xu @ 2020-07-09 12:53 UTC (permalink / raw)
To: Lee Jones
Cc: linux-crypto, Linus Walleij, linux-kernel, linux-arm-kernel,
David S . Miller
On Mon, Jun 29, 2020 at 01:30:03PM +0100, Lee Jones wrote:
> A recent change to the Regulator consumer API (which this driver
> utilises) add prototypes for the some suspend functions. These
> functions require including header file include/linux/suspend.h.
>
> The following tree of includes affecting this driver will be
> present:
>
> In file included from include/linux/elevator.h:6,
> from include/linux/blkdev.h:288,
> from include/linux/blk-cgroup.h:23,
> from include/linux/writeback.h:14,
> from include/linux/memcontrol.h:22,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from drivers/crypto/ux500/hash/hash_core.c:28:
>
> include/linux/elevator.h pulls in include/linux/hashtable.h which
> contains its own version of hash_init(). This confuses the build
> system and results in the following error (amongst others):
>
> drivers/crypto/ux500/hash/hash_core.c:1362:19: error: passing argument 1 of '__hash_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
> 1362 | return hash_init(req);
>
> Fix this by namespacing the local hash_init() such that the
> source of confusion is removed.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>
> Ideally this should go into v5.8's -rcs else it runs the risk of
> breaking when Linus pulls everything in for v5.9-rc1.
>
> drivers/crypto/ux500/hash/hash_core.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
Patch applied to ux500 branch. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-07-09 12:55 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-29 12:30 [PATCH 1/1] crypto: ux500: hash: Add namespacing to hash_init() Lee Jones
2020-06-29 12:30 ` Lee Jones
2020-06-29 13:58 ` Linus Walleij
2020-06-29 13:58 ` Linus Walleij
2020-06-30 4:10 ` Herbert Xu
2020-06-30 4:10 ` Herbert Xu
2020-06-30 7:07 ` Lee Jones
2020-06-30 7:07 ` Lee Jones
2020-07-07 8:26 ` Lee Jones
2020-07-07 8:26 ` Lee Jones
2020-07-09 12:53 ` Herbert Xu
2020-07-09 12:53 ` Herbert Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.