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

Commit 30d1d92a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nds32-for-linux-5.2-rc3' of... 

Merge tag 'nds32-for-linux-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux

Pull nds32 fixes from Greentime Hu:

 - fix warning for math-emu

 - fix nds32 fpu exception handling

 - fix nds32 fpu emulation implementation

* tag 'nds32-for-linux-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux:
  nds32: add new emulations for floating point instruction
  nds32: Avoid IEX status being incorrectly modified
  math-emu: Use statement expressions to fix Wshift-count-overflow warning
parents 01e7a841 93229612

arch/nds32/include/asm/bitfield.h

+1 −1
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ 
#define FPCSR_mskDNIT           ( 0x1  << FPCSR_offDNIT )

#define FPCSR_mskRIT		( 0x1  << FPCSR_offRIT )

#define FPCSR_mskALL		(FPCSR_mskIVO | FPCSR_mskDBZ | FPCSR_mskOVF | FPCSR_mskUDF | FPCSR_mskIEX)

#define FPCSR_mskALLE_NO_UDFE	(FPCSR_mskIVOE | FPCSR_mskDBZE | FPCSR_mskOVFE | FPCSR_mskIEXE)

#define FPCSR_mskALLE_NO_UDF_IEXE (FPCSR_mskIVOE | FPCSR_mskDBZE | FPCSR_mskOVFE)

#define FPCSR_mskALLE		(FPCSR_mskIVOE | FPCSR_mskDBZE | FPCSR_mskOVFE | FPCSR_mskUDFE | FPCSR_mskIEXE)

#define FPCSR_mskALLT           (FPCSR_mskIVOT | FPCSR_mskDBZT | FPCSR_mskOVFT | FPCSR_mskUDFT | FPCSR_mskIEXT |FPCSR_mskDNIT | FPCSR_mskRIT)

arch/nds32/include/asm/fpu.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ extern int do_fpuemu(struct pt_regs *regs, struct fpu_struct *fpu); 
 * enabled by default and kerenl will re-execute it by fpu emulator

 * when getting underflow exception.

 */

#define FPCSR_INIT  FPCSR_mskUDFE

#define FPCSR_INIT  (FPCSR_mskUDFE | FPCSR_mskIEXE)

#else

#define FPCSR_INIT  0x0UL

#endif

arch/nds32/include/asm/fpuemu.h

+12 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ void fsubs(void *ft, void *fa, void *fb); 
void fmuls(void *ft, void *fa, void *fb);

void fdivs(void *ft, void *fa, void *fb);

void fs2d(void *ft, void *fa);

void fs2si(void *ft, void *fa);

void fs2si_z(void *ft, void *fa);

void fs2ui(void *ft, void *fa);

void fs2ui_z(void *ft, void *fa);

void fsi2s(void *ft, void *fa);

void fui2s(void *ft, void *fa);

void fsqrts(void *ft, void *fa);

void fnegs(void *ft, void *fa);

int fcmps(void *ft, void *fa, void *fb, int cop);
@@ -26,6 +32,12 @@ void fmuld(void *ft, void *fa, void *fb); 
void fdivd(void *ft, void *fa, void *fb);

void fsqrtd(void *ft, void *fa);

void fd2s(void *ft, void *fa);

void fd2si(void *ft, void *fa);

void fd2si_z(void *ft, void *fa);

void fd2ui(void *ft, void *fa);

void fd2ui_z(void *ft, void *fa);

void fsi2d(void *ft, void *fa);

void fui2d(void *ft, void *fa);

void fnegd(void *ft, void *fa);

int fcmpd(void *ft, void *fa, void *fb, int cop);

arch/nds32/include/asm/syscalls.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
asmlinkage long sys_cacheflush(unsigned long addr, unsigned long len, unsigned int op);

asmlinkage long sys_fadvise64_64_wrapper(int fd, int advice, loff_t offset, loff_t len);

asmlinkage long sys_rt_sigreturn_wrapper(void);

asmlinkage long sys_udftrap(int option);

asmlinkage long sys_fp_udfiex_crtl(int cmd, int act);



#include <asm-generic/syscalls.h>

arch/nds32/include/uapi/asm/fp_udfiex_crtl.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (C) 2005-2019 Andes Technology Corporation */

#ifndef	_FP_UDF_IEX_CRTL_H

#define	_FP_UDF_IEX_CRTL_H



/*

 * The cmd list of sys_fp_udfiex_crtl()

 */

/* Disable UDF or IEX trap based on the content of parameter act */

#define DISABLE_UDF_IEX_TRAP	0

/* Enable UDF or IEX trap based on the content of parameter act */

#define ENABLE_UDF_IEX_TRAP	1

/* Get current status of UDF and IEX trap */

#define GET_UDF_IEX_TRAP	2



#endif /* _FP_UDF_IEX_CRTL_H */