From: Chris Metcalf <cmetcalf@tilera.com>
To: Arnd Bergmann <arnd@arndb.de>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 5/6] arch/tile: break out the "csum a long" function to <asm/checksum.h>
Date: Sat, 28 Apr 2012 15:41:39 -0400 [thread overview]
Message-ID: <201204291859.q3TIxHBU007274@farm-0027.internal.tilera.com> (raw)
In-Reply-To: <201204291856.q3TIusXq007168@farm-0027.internal.tilera.com>
This makes it available to the tilegx network driver.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---
arch/tile/include/asm/checksum.h | 18 ++++++++++++++++++
arch/tile/lib/checksum.c | 15 +--------------
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/arch/tile/include/asm/checksum.h b/arch/tile/include/asm/checksum.h
index a120766..b21a2fd 100644
--- a/arch/tile/include/asm/checksum.h
+++ b/arch/tile/include/asm/checksum.h
@@ -21,4 +21,22 @@
__wsum do_csum(const unsigned char *buff, int len);
#define do_csum do_csum
+/*
+ * Return the sum of all the 16-bit subwords in a long.
+ * This sums two subwords on a 32-bit machine, and four on 64 bits.
+ * The implementation does two vector adds to capture any overflow.
+ */
+static inline unsigned int csum_long(unsigned long x)
+{
+ unsigned long ret;
+#ifdef __tilegx__
+ ret = __insn_v2sadu(x, 0);
+ ret = __insn_v2sadu(ret, 0);
+#else
+ ret = __insn_sadh_u(x, 0);
+ ret = __insn_sadh_u(ret, 0);
+#endif
+ return ret;
+}
+
#endif /* _ASM_TILE_CHECKSUM_H */
diff --git a/arch/tile/lib/checksum.c b/arch/tile/lib/checksum.c
index e4bab5b..c3ca3e6 100644
--- a/arch/tile/lib/checksum.c
+++ b/arch/tile/lib/checksum.c
@@ -16,19 +16,6 @@
#include <net/checksum.h>
#include <linux/module.h>
-static inline unsigned int longto16(unsigned long x)
-{
- unsigned long ret;
-#ifdef __tilegx__
- ret = __insn_v2sadu(x, 0);
- ret = __insn_v2sadu(ret, 0);
-#else
- ret = __insn_sadh_u(x, 0);
- ret = __insn_sadh_u(ret, 0);
-#endif
- return ret;
-}
-
__wsum do_csum(const unsigned char *buff, int len)
{
int odd, count;
@@ -94,7 +81,7 @@ __wsum do_csum(const unsigned char *buff, int len)
}
if (len & 1)
result += *buff;
- result = longto16(result);
+ result = csum_long(result);
if (odd)
result = swab16(result);
out:
--
1.6.5.2
next prev parent reply other threads:[~2012-04-29 18:59 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-04 20:39 [PATCH 0/6] arch/tile: provide tilegx networking support Chris Metcalf
2012-04-04 20:39 ` [PATCH 1/6] arch/tile: introduce GXIO IORPC framework for tilegx Chris Metcalf
2012-04-04 20:58 ` [PATCH 4/6] arch/tile: common DMA code for the GXIO IORPC subsystem Chris Metcalf
2012-04-06 17:41 ` [PATCH 2/6] arch/tile: fix set_pte() to properly handle kernel MMIO mappings Chris Metcalf
2012-04-06 17:52 ` [PATCH 3/6] arch/tile: support MMIO-based readb/writeb etc Chris Metcalf
2012-04-09 13:24 ` Arnd Bergmann
2012-04-09 20:53 ` Chris Metcalf
2012-04-06 20:38 ` [PATCH 5/6] arch/tile: provide kernel support for the tilegx mPIPE shim Chris Metcalf
2012-04-09 13:34 ` Arnd Bergmann
2012-04-09 21:04 ` Chris Metcalf
2012-04-06 20:42 ` [PATCH 6/6] tilegx network driver: initial support Chris Metcalf
2012-04-09 13:49 ` Arnd Bergmann
2012-04-09 21:30 ` Chris Metcalf
2012-04-10 10:42 ` Arnd Bergmann
2012-04-12 23:23 ` Chris Metcalf
2012-04-13 10:34 ` Arnd Bergmann
2012-04-28 22:07 ` Chris Metcalf
2012-04-04 20:39 ` [PATCH v2 0/6] arch/tile: networking support for tilegx Chris Metcalf
2012-04-04 20:39 ` [PATCH v2 1/6] arch/tile: introduce GXIO IORPC framework " Chris Metcalf
2012-04-04 20:58 ` [PATCH v2 3/6] arch/tile: common DMA code for the GXIO IORPC subsystem Chris Metcalf
2012-04-06 17:52 ` [PATCH v2 2/6] arch/tile: support MMIO-based readb/writeb etc Chris Metcalf
2012-04-06 20:38 ` [PATCH v2 4/6] arch/tile: provide kernel support for the tilegx mPIPE shim Chris Metcalf
2012-04-06 20:42 ` [PATCH v2 6/6] tilegx network driver: initial support Chris Metcalf
2012-04-30 14:35 ` Arnd Bergmann
2001-09-17 4:00 ` [PATCH v3] " Chris Metcalf
2012-05-03 5:41 ` David Miller
2012-05-03 15:45 ` Chris Metcalf
2012-05-03 17:07 ` David Miller
2012-05-03 17:25 ` Chris Metcalf
2012-05-03 16:41 ` [PATCH v4] " Chris Metcalf
2012-05-04 6:42 ` David Miller
2012-05-09 10:42 ` [PATCH v5] " Chris Metcalf
2012-05-11 13:54 ` Ben Hutchings
2012-05-20 4:42 ` [PATCH v6] " Chris Metcalf
2012-05-20 20:55 ` David Miller
2012-05-23 20:42 ` [PATCH v7] " Chris Metcalf
2012-05-24 4:31 ` David Miller
2012-05-25 14:42 ` [PATCH v8] " Chris Metcalf
2012-06-04 20:12 ` [PATCH v9] " Chris Metcalf
2012-06-06 16:41 ` David Miller
2012-06-06 17:31 ` Eric Dumazet
2012-06-06 17:40 ` Eric Dumazet
2012-06-06 18:36 ` Chris Metcalf
2012-06-06 18:54 ` David Miller
2001-09-17 4:00 ` [PATCH v10] " Chris Metcalf
2012-04-06 20:42 ` Chris Metcalf
2012-06-07 20:39 ` David Miller
2012-06-07 20:44 ` Chris Metcalf
2012-06-07 20:47 ` Chris Metcalf
2012-06-07 20:50 ` Ben Hutchings
2012-06-07 20:52 ` Joe Perches
2012-06-07 20:45 ` Chris Metcalf
2012-06-12 0:03 ` David Miller
2012-06-12 13:14 ` Chris Metcalf
2012-06-06 18:10 ` [PATCH v9] " Eric Dumazet
2012-06-06 18:17 ` David Miller
2012-06-06 18:19 ` Ben Hutchings
2012-05-20 16:35 ` [PATCH v5] " Chris Metcalf
2012-04-28 19:41 ` Chris Metcalf [this message]
2012-04-29 11:15 ` [PATCH 6/6] " Arnd Bergmann
2012-04-15 23:06 ` Chris Metcalf
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=201204291859.q3TIxHBU007274@farm-0027.internal.tilera.com \
--to=cmetcalf@tilera.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).