From: "Alex G." <mr.nuke.me@gmail.com>
To: Simon Glass <sjg@chromium.org>,
U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Andre Przywara <andre.przywara@arm.com>,
Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
Robert Marko <robert.marko@sartura.hr>,
Masahiro Yamada <masahiroy@kernel.org>,
Tom Rini <trini@konsulko.com>,
Joe Hershberger <joe.hershberger@ni.com>
Subject: Re: [PATCH v5 06/29] hash: Drop some #ifdefs in hash.c
Date: Tue, 5 Oct 2021 13:24:59 -0500 [thread overview]
Message-ID: <460af1dd-9d9a-c8e9-2a39-fffcfbee1a03@gmail.com> (raw)
In-Reply-To: <20210926014342.127913-5-sjg@chromium.org>
On 9/25/21 8:43 PM, Simon Glass wrote:
> We can use the __maybe_unused attribute to avoid some of the #ifdefs in
> this file. Update the functions accordingly.
>
> Note: The actual hashing interface is still a mess, with four separate
> combinations and lots of #ifdefs. This should really use a driver
> approach, e.g. as is done with partition drivers.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
I'm not too excited about a qualifier that maybe tells me something
about the function.
Assuming we move these to linker lists in the near (not far) future,
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
> Changes in v5:
> - Rebase to next
>
> common/hash.c | 54 ++++++++++++++++++++++++---------------------------
> 1 file changed, 25 insertions(+), 29 deletions(-)
>
> diff --git a/common/hash.c b/common/hash.c
> index 0fe65c959d0..e92f9a9594f 100644
> --- a/common/hash.c
> +++ b/common/hash.c
> @@ -24,6 +24,7 @@
> #include <u-boot/crc.h>
> #else
> #include "mkimage.h"
> +#include <linux/compiler_attributes.h>
> #include <time.h>
> #include <linux/kconfig.h>
> #endif /* !USE_HOSTCC*/
> @@ -42,8 +43,7 @@ DECLARE_GLOBAL_DATA_PTR;
>
> static void reloc_update(void);
>
> -#if CONFIG_IS_ENABLED(SHA1) && !CONFIG_IS_ENABLED(SHA_PROG_HW_ACCEL)
> -static int hash_init_sha1(struct hash_algo *algo, void **ctxp)
> +static int __maybe_unused hash_init_sha1(struct hash_algo *algo, void **ctxp)
> {
> sha1_context *ctx = malloc(sizeof(sha1_context));
> sha1_starts(ctx);
> @@ -51,15 +51,16 @@ static int hash_init_sha1(struct hash_algo *algo, void **ctxp)
> return 0;
> }
>
> -static int hash_update_sha1(struct hash_algo *algo, void *ctx, const void *buf,
> - unsigned int size, int is_last)
> +static int __maybe_unused hash_update_sha1(struct hash_algo *algo, void *ctx,
> + const void *buf, unsigned int size,
> + int is_last)
> {
> sha1_update((sha1_context *)ctx, buf, size);
> return 0;
> }
>
> -static int hash_finish_sha1(struct hash_algo *algo, void *ctx, void *dest_buf,
> - int size)
> +static int __maybe_unused hash_finish_sha1(struct hash_algo *algo, void *ctx,
> + void *dest_buf, int size)
> {
> if (size < algo->digest_size)
> return -1;
> @@ -68,10 +69,8 @@ static int hash_finish_sha1(struct hash_algo *algo, void *ctx, void *dest_buf,
> free(ctx);
> return 0;
> }
> -#endif
>
> -#if CONFIG_IS_ENABLED(SHA256) && !CONFIG_IS_ENABLED(SHA_PROG_HW_ACCEL)
> -static int hash_init_sha256(struct hash_algo *algo, void **ctxp)
> +static int __maybe_unused hash_init_sha256(struct hash_algo *algo, void **ctxp)
> {
> sha256_context *ctx = malloc(sizeof(sha256_context));
> sha256_starts(ctx);
> @@ -79,15 +78,16 @@ static int hash_init_sha256(struct hash_algo *algo, void **ctxp)
> return 0;
> }
>
> -static int hash_update_sha256(struct hash_algo *algo, void *ctx,
> - const void *buf, unsigned int size, int is_last)
> +static int __maybe_unused hash_update_sha256(struct hash_algo *algo, void *ctx,
> + const void *buf, uint size,
> + int is_last)
> {
> sha256_update((sha256_context *)ctx, buf, size);
> return 0;
> }
>
> -static int hash_finish_sha256(struct hash_algo *algo, void *ctx, void
> - *dest_buf, int size)
> +static int __maybe_unused hash_finish_sha256(struct hash_algo *algo, void *ctx,
> + void *dest_buf, int size)
> {
> if (size < algo->digest_size)
> return -1;
> @@ -96,10 +96,8 @@ static int hash_finish_sha256(struct hash_algo *algo, void *ctx, void
> free(ctx);
> return 0;
> }
> -#endif
>
> -#if CONFIG_IS_ENABLED(SHA384) && !CONFIG_IS_ENABLED(SHA_PROG_HW_ACCEL)
> -static int hash_init_sha384(struct hash_algo *algo, void **ctxp)
> +static int __maybe_unused hash_init_sha384(struct hash_algo *algo, void **ctxp)
> {
> sha512_context *ctx = malloc(sizeof(sha512_context));
> sha384_starts(ctx);
> @@ -107,15 +105,16 @@ static int hash_init_sha384(struct hash_algo *algo, void **ctxp)
> return 0;
> }
>
> -static int hash_update_sha384(struct hash_algo *algo, void *ctx,
> - const void *buf, unsigned int size, int is_last)
> +static int __maybe_unused hash_update_sha384(struct hash_algo *algo, void *ctx,
> + const void *buf, uint size,
> + int is_last)
> {
> sha384_update((sha512_context *)ctx, buf, size);
> return 0;
> }
>
> -static int hash_finish_sha384(struct hash_algo *algo, void *ctx, void
> - *dest_buf, int size)
> +static int __maybe_unused hash_finish_sha384(struct hash_algo *algo, void *ctx,
> + void *dest_buf, int size)
> {
> if (size < algo->digest_size)
> return -1;
> @@ -124,10 +123,8 @@ static int hash_finish_sha384(struct hash_algo *algo, void *ctx, void
> free(ctx);
> return 0;
> }
> -#endif
>
> -#if CONFIG_IS_ENABLED(SHA512) && !CONFIG_IS_ENABLED(SHA_PROG_HW_ACCEL)
> -static int hash_init_sha512(struct hash_algo *algo, void **ctxp)
> +static int __maybe_unused hash_init_sha512(struct hash_algo *algo, void **ctxp)
> {
> sha512_context *ctx = malloc(sizeof(sha512_context));
> sha512_starts(ctx);
> @@ -135,15 +132,16 @@ static int hash_init_sha512(struct hash_algo *algo, void **ctxp)
> return 0;
> }
>
> -static int hash_update_sha512(struct hash_algo *algo, void *ctx,
> - const void *buf, unsigned int size, int is_last)
> +static int __maybe_unused hash_update_sha512(struct hash_algo *algo, void *ctx,
> + const void *buf, uint size,
> + int is_last)
> {
> sha512_update((sha512_context *)ctx, buf, size);
> return 0;
> }
>
> -static int hash_finish_sha512(struct hash_algo *algo, void *ctx, void
> - *dest_buf, int size)
> +static int __maybe_unused hash_finish_sha512(struct hash_algo *algo, void *ctx,
> + void *dest_buf, int size)
> {
> if (size < algo->digest_size)
> return -1;
> @@ -152,8 +150,6 @@ static int hash_finish_sha512(struct hash_algo *algo, void *ctx, void
> free(ctx);
> return 0;
> }
> -#endif
> -
>
> static int hash_init_crc16_ccitt(struct hash_algo *algo, void **ctxp)
> {
>
next prev parent reply other threads:[~2021-10-05 18:25 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-26 1:43 [PATCH v5 00/29] image: Reduce #ifdefs and ad-hoc defines in image code (Part B) Simon Glass
2021-09-26 1:43 ` [PATCH v5 01/29] compiler: Rename host_build() to tools_build() Simon Glass
2021-10-05 18:09 ` Alex G.
2021-10-09 1:39 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 02/29] kconfig: Add tools support to CONFIG_IS_ENABLED() Simon Glass
2021-09-27 16:11 ` Alex G.
2021-09-27 16:50 ` Masahiro Yamada
2021-09-27 20:17 ` Simon Glass
2021-09-27 20:17 ` Simon Glass
2021-10-05 18:11 ` Alex G.
2021-10-07 0:26 ` Tom Rini
2021-10-07 2:49 ` Simon Glass
2021-10-07 2:52 ` Tom Rini
2021-10-07 13:32 ` Simon Glass
2021-10-07 13:42 ` Tom Rini
2021-10-07 18:02 ` Simon Glass
2021-10-07 18:30 ` Tom Rini
2021-10-07 18:50 ` Simon Glass
2021-10-07 19:32 ` Alex G.
2021-10-07 19:39 ` Tom Rini
2021-10-07 20:33 ` Alex G.
2021-10-07 21:04 ` Tom Rini
2021-10-07 21:15 ` Alex G.
2021-10-09 1:39 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 03/29] image: Add Kconfig options for FIT in the tools build Simon Glass
2021-10-05 18:17 ` Alex G.
2021-10-05 18:17 ` Alex G.
2021-10-09 1:39 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 04/29] spl: cypto: Bring back SPL_ versions of SHA Simon Glass
2021-10-05 18:19 ` Alex G.
2021-10-09 1:39 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 05/29] hash: Use Kconfig to enable hashing in host tools and SPL Simon Glass
2021-09-27 15:53 ` Alex G.
2021-09-27 16:06 ` Simon Glass
2021-09-27 16:12 ` Alex G.
2021-10-05 18:21 ` Alex G.
2021-10-09 1:39 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 06/29] hash: Drop some #ifdefs in hash.c Simon Glass
2021-10-05 18:24 ` Alex G. [this message]
2021-10-09 1:39 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 07/29] image: Drop IMAGE_ENABLE_FIT Simon Glass
2021-10-05 18:26 ` Alex G.
2021-10-09 1:39 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 08/29] image: Drop IMAGE_ENABLE_OF_LIBFDT Simon Glass
2021-10-05 18:27 ` Alex G.
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 09/29] image: Use Kconfig to enable CONFIG_FIT_VERBOSE on host Simon Glass
2021-10-05 18:29 ` Alex G.
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 10/29] image: Use Kconfig to enable FIT_RSASSA_PSS " Simon Glass
2021-10-05 18:32 ` Alex G.
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 11/29] image: Use the correct checks for CRC32 Simon Glass
2021-10-05 18:34 ` Alex G.
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 12/29] image: Drop IMAGE_BOOT_GET_CMDLINE Simon Glass
2021-10-05 18:36 ` Alex G.
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 13/29] image: Drop IMAGE_OF_BOARD_SETUP Simon Glass
2021-10-05 18:57 ` Alex G.
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 14/29] image: Drop IMAGE_OF_SYSTEM_SETUP Simon Glass
2021-10-05 18:58 ` Alex G.
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 15/29] image: Drop IMAGE_ENABLE_IGNORE Simon Glass
2021-10-05 18:58 ` Alex G.
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 16/29] efi: Correct dependency on FIT_SIGNATURE Simon Glass
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 19/29] image: Tidy up fit_unsupported_reset() Simon Glass
2021-10-09 1:40 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 20/29] image: Drop unnecessary #ifdefs from image.h Simon Glass
2021-10-09 1:41 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 21/29] image: Drop #ifdefs for fit_print_contents() Simon Glass
2021-10-09 1:41 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 22/29] image: Drop most #ifdefs in image-board.c Simon Glass
2021-10-09 1:41 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 23/29] image: Reduce variable scope in boot_get_ramdisk() Simon Glass
2021-10-09 1:41 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 24/29] image: Split up boot_get_ramdisk() Simon Glass
2021-10-09 1:41 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 25/29] image: Remove #ifdefs from select_ramdisk() Simon Glass
2021-10-09 1:41 ` Tom Rini
2021-12-17 17:40 ` Neil Armstrong
2021-09-26 1:43 ` [PATCH v5 26/29] image: Remove some #ifdefs from image-fit and image-fit-sig Simon Glass
2021-10-09 1:41 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 27/29] image: Reduce variable scope in boot_get_fdt() Simon Glass
2021-10-09 1:41 ` Tom Rini
2021-09-26 1:43 ` [PATCH v5 28/29] image: Split up boot_get_fdt() Simon Glass
2021-10-09 1:41 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=460af1dd-9d9a-c8e9-2a39-fffcfbee1a03@gmail.com \
--to=mr.nuke.me@gmail.com \
--cc=andre.przywara@arm.com \
--cc=joe.hershberger@ni.com \
--cc=masahiroy@kernel.org \
--cc=rasmus.villemoes@prevas.dk \
--cc=robert.marko@sartura.hr \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox