Message ID | 1363337537-2941-4-git-send-email-akshay.s@samsung.com |
---|---|
State | Changes Requested |
Delegated to: | Minkyu Kang |
Headers | show |
Hi Akshay, On Fri, Mar 15, 2013 at 1:52 AM, Akshay Saraswat <akshay.s@samsung.com> wrote: > Adding H/W acceleration support to hash which can be used > to test SHA 256 hash algorithm. > > Signed-off-by: ARUN MANKUZHI <arun.m@samsung.com> > Signed-off-by: Akshay Saraswat <akshay.s@samsung.com> > --- > Changes since v1: > - Added sha256 support to "hash" command instead of new sha256 command. > > Changes sice v2: > - Added new nodes for SHA1 and SHA256 in struct hash_algo for the case when ACE is enabled. > - Added new declaration for function pointer hash_func_ws with different return type. > > Changes sice v3: > - Changed command names to lower case in algo struct. > - Added generic ace_sha config. > > Changes sice v4: > - Changed function names in struct algo. > - Replaced ACE_SHA_TYPE to CHUNSZ in struct algo. > > Changes sice v5: > - Added file hw_sha.h. > - Changed CONFIG_ACE_SHA to CONFIG_SHA_HW_ACCEL. > - Renamed function names ace_sha1 and ace_sha256 to hw_sha1 and hw_sha256 respectively. > > common/hash.c | 14 ++++++++++++++ > include/hw_sha.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 64 insertions(+) > create mode 100644 include/hw_sha.h > > diff --git a/common/hash.c b/common/hash.c > index e3a6e43..23b1334 100644 > --- a/common/hash.c > +++ b/common/hash.c > @@ -28,12 +28,26 @@ > #include <hash.h> > #include <sha1.h> > #include <sha256.h> > +#include <hw_sha.h> Put this immediate above hash.h (alpha order) > > /* > * These are the hash algorithms we support. Chips which support accelerated > * crypto could perhaps add named version of these algorithms here. > */ > static struct hash_algo hash_algo[] = { You need to rebase this patch to mainline. Other than these two things it looks good. > +#ifdef CONFIG_SHA_HW_ACCEL > + { > + "sha1", > + SHA1_SUM_LEN, > + hw_sha1, > + CHUNKSZ_SHA1, > + }, { > + "sha256", > + SHA256_SUM_LEN, > + hw_sha256, > + CHUNKSZ_SHA256, > + }, > +#endif > #ifdef CONFIG_SHA1 > { > "SHA1", > diff --git a/include/hw_sha.h b/include/hw_sha.h > new file mode 100644 > index 0000000..565e5a0 > --- /dev/null > +++ b/include/hw_sha.h > @@ -0,0 +1,50 @@ > +/* > + * Header file for SHA hardware acceleration > + * > + * Copyright (c) 2012 Samsung Electronics > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > + * > + */ > +#ifndef __HW_SHA_H > +#define __HW_SHA_H > + > + > +/** > + * Computes hash value of input pbuf using h/w acceleration > + * > + * @param in_addr A pointer to the input buffer > + * @param bufleni Byte length of input buffer > + * @param out_addr A pointer to the output buffer. When complete > + * 32 bytes are copied to pout[0]...pout[31]. Thus, a user > + * should allocate at least 32 bytes at pOut in advance. > + * @param chunk_size chunk size for sha256 > + */ > +void hw_sha256(const uchar *in_addr, uint buflen, > + uchar *out_addr, uint chunk_size); > + > +/** > + * Computes hash value of input pbuf using h/w acceleration > + * > + * @param in_addr A pointer to the input buffer > + * @param bufleni Byte length of input buffer > + * @param out_addr A pointer to the output buffer. When complete > + * 32 bytes are copied to pout[0]...pout[31]. Thus, a user > + * should allocate at least 32 bytes at pOut in advance. > + * @param chunk_size chunk_size for sha1 > + */ > +void hw_sha1(const uchar *in_addr, uint buflen, > + uchar *out_addr, uint chunk_size); > +#endif > -- > 1.8.0 > Regards, Simon
diff --git a/common/hash.c b/common/hash.c index e3a6e43..23b1334 100644 --- a/common/hash.c +++ b/common/hash.c @@ -28,12 +28,26 @@ #include <hash.h> #include <sha1.h> #include <sha256.h> +#include <hw_sha.h> /* * These are the hash algorithms we support. Chips which support accelerated * crypto could perhaps add named version of these algorithms here. */ static struct hash_algo hash_algo[] = { +#ifdef CONFIG_SHA_HW_ACCEL + { + "sha1", + SHA1_SUM_LEN, + hw_sha1, + CHUNKSZ_SHA1, + }, { + "sha256", + SHA256_SUM_LEN, + hw_sha256, + CHUNKSZ_SHA256, + }, +#endif #ifdef CONFIG_SHA1 { "SHA1", diff --git a/include/hw_sha.h b/include/hw_sha.h new file mode 100644 index 0000000..565e5a0 --- /dev/null +++ b/include/hw_sha.h @@ -0,0 +1,50 @@ +/* + * Header file for SHA hardware acceleration + * + * Copyright (c) 2012 Samsung Electronics + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +#ifndef __HW_SHA_H +#define __HW_SHA_H + + +/** + * Computes hash value of input pbuf using h/w acceleration + * + * @param in_addr A pointer to the input buffer + * @param bufleni Byte length of input buffer + * @param out_addr A pointer to the output buffer. When complete + * 32 bytes are copied to pout[0]...pout[31]. Thus, a user + * should allocate at least 32 bytes at pOut in advance. + * @param chunk_size chunk size for sha256 + */ +void hw_sha256(const uchar *in_addr, uint buflen, + uchar *out_addr, uint chunk_size); + +/** + * Computes hash value of input pbuf using h/w acceleration + * + * @param in_addr A pointer to the input buffer + * @param bufleni Byte length of input buffer + * @param out_addr A pointer to the output buffer. When complete + * 32 bytes are copied to pout[0]...pout[31]. Thus, a user + * should allocate at least 32 bytes at pOut in advance. + * @param chunk_size chunk_size for sha1 + */ +void hw_sha1(const uchar *in_addr, uint buflen, + uchar *out_addr, uint chunk_size); +#endif