Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 889ce12b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

raid: remove tile specific raid6 implementation



The Tile architecture is getting removed, so we no longer need this either.

Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent d98983fb
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ extern const struct raid6_calls raid6_avx2x4;
extern const struct raid6_calls raid6_avx512x1;
extern const struct raid6_calls raid6_avx512x2;
extern const struct raid6_calls raid6_avx512x4;
extern const struct raid6_calls raid6_tilegx8;
extern const struct raid6_calls raid6_s390vx8;

struct raid6_recov_calls {
+0 −6
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ raid6_pq-y += algos.o recov.o tables.o int1.o int2.o int4.o \
raid6_pq-$(CONFIG_X86) += recov_ssse3.o recov_avx2.o mmx.o sse1.o sse2.o avx2.o avx512.o recov_avx512.o
raid6_pq-$(CONFIG_ALTIVEC) += altivec1.o altivec2.o altivec4.o altivec8.o
raid6_pq-$(CONFIG_KERNEL_MODE_NEON) += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o
raid6_pq-$(CONFIG_TILEGX) += tilegx8.o
raid6_pq-$(CONFIG_S390) += s390vx8.o recov_s390xc.o

hostprogs-y	+= mktables
@@ -115,11 +114,6 @@ $(obj)/neon8.c: UNROLL := 8
$(obj)/neon8.c:   $(src)/neon.uc $(src)/unroll.awk FORCE
	$(call if_changed,unroll)

targets += tilegx8.c
$(obj)/tilegx8.c:   UNROLL := 8
$(obj)/tilegx8.c:   $(src)/tilegx.uc $(src)/unroll.awk FORCE
	$(call if_changed,unroll)

targets += s390vx8.c
$(obj)/s390vx8.c:   UNROLL := 8
$(obj)/s390vx8.c:   $(src)/s390vx.uc $(src)/unroll.awk FORCE
+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ const struct raid6_calls * const raid6_algos[] = {
	&raid6_altivec4,
	&raid6_altivec8,
#endif
#if defined(CONFIG_TILEGX)
	&raid6_tilegx8,
#endif
#if defined(CONFIG_S390)
	&raid6_s390vx8,
#endif
+0 −7
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ else
                OBJS += altivec1.o altivec2.o altivec4.o altivec8.o
        endif
endif
ifeq ($(ARCH),tilegx)
OBJS += tilegx8.o
endif

.c.o:
	$(CC) $(CFLAGS) -c -o $@ $<
@@ -116,15 +113,11 @@ int16.c: int.uc ../unroll.awk
int32.c: int.uc ../unroll.awk
	$(AWK) ../unroll.awk -vN=32 < int.uc > $@

tilegx8.c: tilegx.uc ../unroll.awk
	$(AWK) ../unroll.awk -vN=8 < tilegx.uc > $@

tables.c: mktables
	./mktables > tables.c

clean:
	rm -f *.o *.a mktables mktables.c *.uc int*.c altivec*.c neon*.c tables.c raid6test
	rm -f tilegx*.c

spotless: clean
	rm -f *~

lib/raid6/tilegx.uc

deleted100644 → 0
+0 −87
Original line number Diff line number Diff line
/* -*- linux-c -*- ------------------------------------------------------- *
 *
 *   Copyright 2002 H. Peter Anvin - All Rights Reserved
 *   Copyright 2012 Tilera Corporation - All Rights Reserved
 *
 *   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, Inc., 53 Temple Place Ste 330,
 *   Boston MA 02111-1307, USA; either version 2 of the License, or
 *   (at your option) any later version; incorporated herein by reference.
 *
 * ----------------------------------------------------------------------- */

/*
 * tilegx$#.c
 *
 * $#-way unrolled TILE-Gx SIMD for RAID-6 math.
 *
 * This file is postprocessed using unroll.awk.
 *
 */

#include <linux/raid/pq.h>

/* Create 8 byte copies of constant byte */
# define NBYTES(x) (__insn_v1addi(0, x))
# define NSIZE  8

/*
 * The SHLBYTE() operation shifts each byte left by 1, *not*
 * rolling over into the next byte
 */
static inline __attribute_const__ u64 SHLBYTE(u64 v)
{
	/* Vector One Byte Shift Left Immediate. */
	return __insn_v1shli(v, 1);
}

/*
 * The MASK() operation returns 0xFF in any byte for which the high
 * bit is 1, 0x00 for any byte for which the high bit is 0.
 */
static inline __attribute_const__ u64 MASK(u64 v)
{
	/* Vector One Byte Shift Right Signed Immediate. */
	return __insn_v1shrsi(v, 7);
}


void raid6_tilegx$#_gen_syndrome(int disks, size_t bytes, void **ptrs)
{
	u8 **dptr = (u8 **)ptrs;
	u64 *p, *q;
	int d, z, z0;

	u64 wd$$, wq$$, wp$$, w1$$, w2$$;
	u64 x1d = NBYTES(0x1d);
	u64 * z0ptr;

	z0 = disks - 3;			/* Highest data disk */
	p = (u64 *)dptr[z0+1];	/* XOR parity */
	q = (u64 *)dptr[z0+2];	/* RS syndrome */

	z0ptr = (u64 *)&dptr[z0][0];
	for ( d = 0 ; d < bytes ; d += NSIZE*$# ) {
		wq$$ = wp$$ = *z0ptr++;
		for ( z = z0-1 ; z >= 0 ; z-- ) {
			wd$$ = *(u64 *)&dptr[z][d+$$*NSIZE];
			wp$$ = wp$$ ^ wd$$;
			w2$$ = MASK(wq$$);
			w1$$ = SHLBYTE(wq$$);
			w2$$ = w2$$ & x1d;
			w1$$ = w1$$ ^ w2$$;
			wq$$ = w1$$ ^ wd$$;
		}
		*p++ = wp$$;
		*q++ = wq$$;
	}
}

const struct raid6_calls raid6_tilegx$# = {
	raid6_tilegx$#_gen_syndrome,
	NULL,			/* XOR not yet implemented */
	NULL,
	"tilegx$#",
	0
};