mirror of
https://github.com/torvalds/linux.git
synced 2025-11-04 02:30:34 +02:00
3de13550a2
The raid6 syndrome functions are generated for different sizes and have no generic prototype, while in the inner functions have a prototype in a header that cannot be included from the correct file. In both cases, the compiler warns about missing prototypes: lib/raid6/recov_neon_inner.c:27:6: warning: no previous prototype for '__raid6_2data_recov_neon' [-Wmissing-prototypes] lib/raid6/recov_neon_inner.c:77:6: warning: no previous prototype for '__raid6_datap_recov_neon' [-Wmissing-prototypes] lib/raid6/neon1.c:56:6: warning: no previous prototype for 'raid6_neon1_gen_syndrome_real' [-Wmissing-prototypes] lib/raid6/neon1.c:86:6: warning: no previous prototype for 'raid6_neon1_xor_syndrome_real' [-Wmissing-prototypes] lib/raid6/neon2.c:56:6: warning: no previous prototype for 'raid6_neon2_gen_syndrome_real' [-Wmissing-prototypes] lib/raid6/neon2.c:97:6: warning: no previous prototype for 'raid6_neon2_xor_syndrome_real' [-Wmissing-prototypes] lib/raid6/neon4.c:56:6: warning: no previous prototype for 'raid6_neon4_gen_syndrome_real' [-Wmissing-prototypes] lib/raid6/neon4.c:119:6: warning: no previous prototype for 'raid6_neon4_xor_syndrome_real' [-Wmissing-prototypes] lib/raid6/neon8.c:56:6: warning: no previous prototype for 'raid6_neon8_gen_syndrome_real' [-Wmissing-prototypes] lib/raid6/neon8.c:163:6: warning: no previous prototype for 'raid6_neon8_xor_syndrome_real' [-Wmissing-prototypes] Add a new header file that contains the prototypes for both to avoid the warnings. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Song Liu <song@kernel.org> Link: https://lore.kernel.org/r/20230517132220.937200-1-arnd@kernel.org
100 lines
2.3 KiB
C
100 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2012 Intel Corporation
|
|
* Copyright (C) 2017 Linaro Ltd. <ard.biesheuvel@linaro.org>
|
|
*/
|
|
|
|
#include <linux/raid/pq.h>
|
|
|
|
#ifdef __KERNEL__
|
|
#include <asm/neon.h>
|
|
#include "neon.h"
|
|
#else
|
|
#define kernel_neon_begin()
|
|
#define kernel_neon_end()
|
|
#define cpu_has_neon() (1)
|
|
#endif
|
|
|
|
static int raid6_has_neon(void)
|
|
{
|
|
return cpu_has_neon();
|
|
}
|
|
|
|
static void raid6_2data_recov_neon(int disks, size_t bytes, int faila,
|
|
int failb, void **ptrs)
|
|
{
|
|
u8 *p, *q, *dp, *dq;
|
|
const u8 *pbmul; /* P multiplier table for B data */
|
|
const u8 *qmul; /* Q multiplier table (for both) */
|
|
|
|
p = (u8 *)ptrs[disks - 2];
|
|
q = (u8 *)ptrs[disks - 1];
|
|
|
|
/*
|
|
* Compute syndrome with zero for the missing data pages
|
|
* Use the dead data pages as temporary storage for
|
|
* delta p and delta q
|
|
*/
|
|
dp = (u8 *)ptrs[faila];
|
|
ptrs[faila] = (void *)raid6_empty_zero_page;
|
|
ptrs[disks - 2] = dp;
|
|
dq = (u8 *)ptrs[failb];
|
|
ptrs[failb] = (void *)raid6_empty_zero_page;
|
|
ptrs[disks - 1] = dq;
|
|
|
|
raid6_call.gen_syndrome(disks, bytes, ptrs);
|
|
|
|
/* Restore pointer table */
|
|
ptrs[faila] = dp;
|
|
ptrs[failb] = dq;
|
|
ptrs[disks - 2] = p;
|
|
ptrs[disks - 1] = q;
|
|
|
|
/* Now, pick the proper data tables */
|
|
pbmul = raid6_vgfmul[raid6_gfexi[failb-faila]];
|
|
qmul = raid6_vgfmul[raid6_gfinv[raid6_gfexp[faila] ^
|
|
raid6_gfexp[failb]]];
|
|
|
|
kernel_neon_begin();
|
|
__raid6_2data_recov_neon(bytes, p, q, dp, dq, pbmul, qmul);
|
|
kernel_neon_end();
|
|
}
|
|
|
|
static void raid6_datap_recov_neon(int disks, size_t bytes, int faila,
|
|
void **ptrs)
|
|
{
|
|
u8 *p, *q, *dq;
|
|
const u8 *qmul; /* Q multiplier table */
|
|
|
|
p = (u8 *)ptrs[disks - 2];
|
|
q = (u8 *)ptrs[disks - 1];
|
|
|
|
/*
|
|
* Compute syndrome with zero for the missing data page
|
|
* Use the dead data page as temporary storage for delta q
|
|
*/
|
|
dq = (u8 *)ptrs[faila];
|
|
ptrs[faila] = (void *)raid6_empty_zero_page;
|
|
ptrs[disks - 1] = dq;
|
|
|
|
raid6_call.gen_syndrome(disks, bytes, ptrs);
|
|
|
|
/* Restore pointer table */
|
|
ptrs[faila] = dq;
|
|
ptrs[disks - 1] = q;
|
|
|
|
/* Now, pick the proper data tables */
|
|
qmul = raid6_vgfmul[raid6_gfinv[raid6_gfexp[faila]]];
|
|
|
|
kernel_neon_begin();
|
|
__raid6_datap_recov_neon(bytes, p, q, dq, qmul);
|
|
kernel_neon_end();
|
|
}
|
|
|
|
const struct raid6_recov_calls raid6_recov_neon = {
|
|
.data2 = raid6_2data_recov_neon,
|
|
.datap = raid6_datap_recov_neon,
|
|
.valid = raid6_has_neon,
|
|
.name = "neon",
|
|
.priority = 10,
|
|
};
|