* [patch V4 00/31] bitops: add parity functions
@ 2016-05-11 8:25 zengzhaoxiu
2016-05-11 9:18 ` [patch V4 13/31] media: use parity8 in vivid-vbi-gen.c zengzhaoxiu
2016-05-11 9:19 ` [patch V4 14/31] media: use parity functions in saa7115 zengzhaoxiu
0 siblings, 2 replies; 4+ messages in thread
From: zengzhaoxiu @ 2016-05-11 8:25 UTC (permalink / raw)
To: akpm, linux, bp, ulrik.debie-os, sam, davem, ddaney.cavm, joe,
computersforpeace
Cc: linux-kernel, linux-arch, linux-alpha, adi-buildroot-devel,
linux-ia64, linux-mips, linux-am33-list, linuxppc-dev,
sparclinux, qat-linux, linux-crypto, linux-edac, linux-media,
linux-mtd, netdev, linux-scsi, linux-nfs, linux-mediatek,
Zhaoxiu Zeng
From: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com>
When I do "grep parity -r linux", I found many parity calculations
distributed in many drivers.
This patch series does:
1. provide generic and architecture-specific parity calculations
2. remove drivers' local parity calculations, use bitops' parity
functions instead
3. replace "hweightN(x) & 1" with "parityN(x)" to improve readability,
and improve performance on some CPUs that without popcount support
I did not use GCC's __builtin_parity* functions, based on the following reasons:
1. I don't know where to identify which version of GCC from the beginning
supported __builtin_parity for the architecture.
2. For the architecture that doesn't has popcount instruction, GCC instead use
"call __paritysi2" (__paritydi2 for 64-bits). So if use __builtin_parity, we must
provide __paritysi2 and __paritydi2 functions for these architectures.
Additionally, parity4,8,16 might be "__builtin_parity(x & mask)", but the "& mask"
operation is totally unnecessary.
3. For the architecture that has popcount instruction, we do the same things as GCC.
4. For powerpc, sparc, and x86, we do runtime patching to use popcount instruction
if the CPU support.
I have compiled successfully with x86_64_defconfig, i386_defconfig, pseries_defconfig
and sparc64_defconfig.
Changes to V3:
- Remove "odd" and "even" from documents. The function parityN returns whether an odd
or even number of bits are on in a N-bit word, does not involve the definition of
odd/even parity. Is it an odd or even parity checking, depends on the caller's context.
- Replace "hweightN(x) % 2" with "parityN(x)" in crypto/sahara.c and edac/amd64_edac.c
- Use PARITY_MAGIC instead of 0x6996 in powerpc's parity_64.S
- Use PARITY_MAGIC instead of 0x6996 in sparc's parity.S
- Pick up ACKs
Changes to v2:
- X86, remove custom calling convention, use inline asm
- Add constant PARITY_MAGIC (proposals by Sam Ravnborg)
- Add include/asm-generic/bitops/popc-parity.h (proposals by Chris Metcalf)
- Tile uses popc-parity.h directly
- Mips uses popc-parity.h if has usable __builtin_popcount
- Add few comments in powerpc's and sparc's parity.S
Changes to v1:
- Add runtime patching for powerpc, sparc, and x86
- Avr32 use grenric parity too
- Fix error in ssfdc's patch, and add commit message
- Don't change the original code composition of adxrs450.c
- Directly assignement to phy_cap.parity in drivers/scsi/isci/phy.c
Regards,
=== diffstat ===
Zhaoxiu Zeng (31):
bitops: add parity functions
bitops: Include generic parity.h in some architectures' bitops.h
bitops: Add alpha-specific parity functions
bitops: Add blackfin-specific parity functions
bitops: Add ia-specific parity functions
bitops: Tile and MIPS (if has usable __builtin_popcount) use popcount
parity functions
bitops: Add powerpc-specific parity functions
bitops: Add sparc-specific parity functions
bitops: Add x86-specific parity functions
sunrpc: use parity8
mips: use parity functions in cerr-sb1.c
lib: bch: use parity32
media: use parity8 in vivid-vbi-gen.c
media: use parity functions in saa7115
input: use parity32 in grip_mp
input: use parity64 in sidewinder
input: use parity16 in ams_delta_serio
scsi: use parity32 in isci's phy
mtd: use parity16 in ssfdc
mtd: use parity functions in inftlcore
crypto: use parity functions in qat_hal
mtd: use parity16 in sm_ftl
ethernet: use parity8 in sun/niu.c
input: use parity8 in pcips2
input: use parity8 in sa1111ps2
iio: use parity32 in adxrs450
serial: use parity32 in max3100
input: use parity8 in elantech
ethernet: use parity8 in broadcom/tg3.c
crypto: use parity_long is sahara.c
edac: use parity8 in amd64_edac.c
arch/alpha/include/asm/bitops.h | 27 +++++
arch/arc/include/asm/bitops.h | 1 +
arch/arm/include/asm/bitops.h | 1 +
arch/arm64/include/asm/bitops.h | 1 +
arch/avr32/include/asm/bitops.h | 1 +
arch/blackfin/include/asm/bitops.h | 31 ++++++
arch/c6x/include/asm/bitops.h | 1 +
arch/cris/include/asm/bitops.h | 1 +
arch/frv/include/asm/bitops.h | 1 +
arch/h8300/include/asm/bitops.h | 1 +
arch/hexagon/include/asm/bitops.h | 1 +
arch/ia64/include/asm/bitops.h | 31 ++++++
arch/m32r/include/asm/bitops.h | 1 +
arch/m68k/include/asm/bitops.h | 1 +
arch/metag/include/asm/bitops.h | 1 +
arch/mips/include/asm/bitops.h | 7 ++
arch/mips/mm/cerr-sb1.c | 67 ++++---------
arch/mn10300/include/asm/bitops.h | 1 +
arch/openrisc/include/asm/bitops.h | 1 +
arch/parisc/include/asm/bitops.h | 1 +
arch/powerpc/include/asm/bitops.h | 11 +++
arch/powerpc/lib/Makefile | 2 +-
arch/powerpc/lib/parity_64.S | 143 +++++++++++++++++++++++++++
arch/powerpc/lib/ppc_ksyms.c | 5 +
arch/s390/include/asm/bitops.h | 1 +
arch/sh/include/asm/bitops.h | 1 +
arch/sparc/include/asm/bitops_32.h | 1 +
arch/sparc/include/asm/bitops_64.h | 18 ++++
arch/sparc/kernel/sparc_ksyms_64.c | 6 ++
arch/sparc/lib/Makefile | 2 +-
arch/sparc/lib/parity.S | 129 ++++++++++++++++++++++++
arch/tile/include/asm/bitops.h | 2 +
arch/x86/include/asm/arch_hweight.h | 5 +
arch/x86/include/asm/arch_parity.h | 117 ++++++++++++++++++++++
arch/x86/include/asm/bitops.h | 4 +-
arch/xtensa/include/asm/bitops.h | 1 +
drivers/crypto/qat/qat_common/qat_hal.c | 32 ++----
drivers/crypto/sahara.c | 2 +-
drivers/edac/amd64_edac.c | 2 +-
drivers/iio/gyro/adxrs450.c | 4 +-
drivers/input/joystick/grip_mp.c | 16 +--
drivers/input/joystick/sidewinder.c | 24 +----
drivers/input/mouse/elantech.c | 10 +-
drivers/input/mouse/elantech.h | 1 -
drivers/input/serio/ams_delta_serio.c | 8 +-
drivers/input/serio/pcips2.c | 2 +-
drivers/input/serio/sa1111ps2.c | 2 +-
drivers/media/i2c/saa7115.c | 17 +---
drivers/media/platform/vivid/vivid-vbi-gen.c | 9 +-
drivers/mtd/inftlcore.c | 17 +---
drivers/mtd/sm_ftl.c | 5 +-
drivers/mtd/ssfdc.c | 31 ++----
drivers/net/ethernet/broadcom/tg3.c | 6 +-
drivers/net/ethernet/sun/niu.c | 10 +-
drivers/scsi/isci/phy.c | 15 +--
drivers/tty/serial/max3100.c | 2 +-
include/asm-generic/bitops.h | 1 +
include/asm-generic/bitops/arch_parity.h | 39 ++++++++
include/asm-generic/bitops/const_parity.h | 36 +++++++
include/asm-generic/bitops/parity.h | 7 ++
include/asm-generic/bitops/popc-parity.h | 32 ++++++
include/linux/bitops.h | 10 ++
lib/bch.c | 14 +--
net/sunrpc/auth_gss/gss_krb5_keys.c | 6 +-
64 files changed, 749 insertions(+), 237 deletions(-)
create mode 100644 arch/powerpc/lib/parity_64.S
create mode 100644 arch/sparc/lib/parity.S
create mode 100644 arch/x86/include/asm/arch_parity.h
create mode 100644 include/asm-generic/bitops/arch_parity.h
create mode 100644 include/asm-generic/bitops/const_parity.h
create mode 100644 include/asm-generic/bitops/parity.h
create mode 100644 include/asm-generic/bitops/popc-parity.h
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [patch V4 13/31] media: use parity8 in vivid-vbi-gen.c
2016-05-11 8:25 [patch V4 00/31] bitops: add parity functions zengzhaoxiu
@ 2016-05-11 9:18 ` zengzhaoxiu
2016-05-11 9:19 ` [patch V4 14/31] media: use parity functions in saa7115 zengzhaoxiu
1 sibling, 0 replies; 4+ messages in thread
From: zengzhaoxiu @ 2016-05-11 9:18 UTC (permalink / raw)
To: linux-kernel
Cc: Zhaoxiu Zeng, Hans Verkuil, Mauro Carvalho Chehab, linux-media
From: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com>
Signed-off-by: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com>
---
drivers/media/platform/vivid/vivid-vbi-gen.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/vivid/vivid-vbi-gen.c b/drivers/media/platform/vivid/vivid-vbi-gen.c
index a2159de..d5ba0fc 100644
--- a/drivers/media/platform/vivid/vivid-vbi-gen.c
+++ b/drivers/media/platform/vivid/vivid-vbi-gen.c
@@ -175,14 +175,9 @@ static const u8 vivid_cc_sequence2[30] = {
0x14, 0x2f, /* End of Caption */
};
-static u8 calc_parity(u8 val)
+static inline u8 calc_parity(u8 val)
{
- unsigned i;
- unsigned tot = 0;
-
- for (i = 0; i < 7; i++)
- tot += (val & (1 << i)) ? 1 : 0;
- return val | ((tot & 1) ? 0 : 0x80);
+ return (!parity8(val) << 7) | val;
}
static void vivid_vbi_gen_set_time_of_day(u8 *packet)
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [patch V4 14/31] media: use parity functions in saa7115
2016-05-11 8:25 [patch V4 00/31] bitops: add parity functions zengzhaoxiu
2016-05-11 9:18 ` [patch V4 13/31] media: use parity8 in vivid-vbi-gen.c zengzhaoxiu
@ 2016-05-11 9:19 ` zengzhaoxiu
2016-07-01 11:53 ` Hans Verkuil
1 sibling, 1 reply; 4+ messages in thread
From: zengzhaoxiu @ 2016-05-11 9:19 UTC (permalink / raw)
To: linux-kernel
Cc: Zhaoxiu Zeng, Mauro Carvalho Chehab, Krzysztof Kozlowski,
Arnd Bergmann, linux-media
From: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com>
Signed-off-by: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com>
---
drivers/media/i2c/saa7115.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
index d2a1ce2..4c22df8 100644
--- a/drivers/media/i2c/saa7115.c
+++ b/drivers/media/i2c/saa7115.c
@@ -672,15 +672,6 @@ static const unsigned char saa7115_init_misc[] = {
0x00, 0x00
};
-static int saa711x_odd_parity(u8 c)
-{
- c ^= (c >> 4);
- c ^= (c >> 2);
- c ^= (c >> 1);
-
- return c & 1;
-}
-
static int saa711x_decode_vps(u8 *dst, u8 *p)
{
static const u8 biphase_tbl[] = {
@@ -733,7 +724,6 @@ static int saa711x_decode_wss(u8 *p)
static const int wss_bits[8] = {
0, 0, 0, 1, 0, 1, 1, 1
};
- unsigned char parity;
int wss = 0;
int i;
@@ -745,11 +735,8 @@ static int saa711x_decode_wss(u8 *p)
return -1;
wss |= b2 << i;
}
- parity = wss & 15;
- parity ^= parity >> 2;
- parity ^= parity >> 1;
- if (!(parity & 1))
+ if (!parity4(wss))
return -1;
return wss;
@@ -1235,7 +1222,7 @@ static int saa711x_decode_vbi_line(struct v4l2_subdev *sd, struct v4l2_decode_vb
vbi->type = V4L2_SLICED_TELETEXT_B;
break;
case 4:
- if (!saa711x_odd_parity(p[0]) || !saa711x_odd_parity(p[1]))
+ if (!parity8(p[0]) || !parity8(p[1]))
return 0;
vbi->type = V4L2_SLICED_CAPTION_525;
break;
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch V4 14/31] media: use parity functions in saa7115
2016-05-11 9:19 ` [patch V4 14/31] media: use parity functions in saa7115 zengzhaoxiu
@ 2016-07-01 11:53 ` Hans Verkuil
0 siblings, 0 replies; 4+ messages in thread
From: Hans Verkuil @ 2016-07-01 11:53 UTC (permalink / raw)
To: zengzhaoxiu, linux-kernel
Cc: Zhaoxiu Zeng, Mauro Carvalho Chehab, Krzysztof Kozlowski,
Arnd Bergmann, linux-media
On 05/11/2016 11:19 AM, zengzhaoxiu@163.com wrote:
> From: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com>
>
> Signed-off-by: Zhaoxiu Zeng <zhaoxiu.zeng@gmail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Thanks,
Hans
> ---
> drivers/media/i2c/saa7115.c | 17 ++---------------
> 1 file changed, 2 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
> index d2a1ce2..4c22df8 100644
> --- a/drivers/media/i2c/saa7115.c
> +++ b/drivers/media/i2c/saa7115.c
> @@ -672,15 +672,6 @@ static const unsigned char saa7115_init_misc[] = {
> 0x00, 0x00
> };
>
> -static int saa711x_odd_parity(u8 c)
> -{
> - c ^= (c >> 4);
> - c ^= (c >> 2);
> - c ^= (c >> 1);
> -
> - return c & 1;
> -}
> -
> static int saa711x_decode_vps(u8 *dst, u8 *p)
> {
> static const u8 biphase_tbl[] = {
> @@ -733,7 +724,6 @@ static int saa711x_decode_wss(u8 *p)
> static const int wss_bits[8] = {
> 0, 0, 0, 1, 0, 1, 1, 1
> };
> - unsigned char parity;
> int wss = 0;
> int i;
>
> @@ -745,11 +735,8 @@ static int saa711x_decode_wss(u8 *p)
> return -1;
> wss |= b2 << i;
> }
> - parity = wss & 15;
> - parity ^= parity >> 2;
> - parity ^= parity >> 1;
>
> - if (!(parity & 1))
> + if (!parity4(wss))
> return -1;
>
> return wss;
> @@ -1235,7 +1222,7 @@ static int saa711x_decode_vbi_line(struct v4l2_subdev *sd, struct v4l2_decode_vb
> vbi->type = V4L2_SLICED_TELETEXT_B;
> break;
> case 4:
> - if (!saa711x_odd_parity(p[0]) || !saa711x_odd_parity(p[1]))
> + if (!parity8(p[0]) || !parity8(p[1]))
> return 0;
> vbi->type = V4L2_SLICED_CAPTION_525;
> break;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-07-01 11:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-11 8:25 [patch V4 00/31] bitops: add parity functions zengzhaoxiu
2016-05-11 9:18 ` [patch V4 13/31] media: use parity8 in vivid-vbi-gen.c zengzhaoxiu
2016-05-11 9:19 ` [patch V4 14/31] media: use parity functions in saa7115 zengzhaoxiu
2016-07-01 11:53 ` Hans Verkuil
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).