Commit 3ae86f1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS fixes from Ralf Baechle:

 - Fix bitrot in __get_user_unaligned()
 - EVA userspace accessor bug fixes.
 - Fix for build issues with certain toolchains.
 - Fix build error for VDSO with particular toolchain versions.
 - Fix build error due to a variable that should have been removed by an
   earlier patch

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix bitrot in __get_user_unaligned()
  MIPS: Fix build error due to unused variables.
  MIPS: VDSO: Fix build error
  MIPS: CPS: drop .set mips64r2 directives
  MIPS: uaccess: Take EVA into account in [__]clear_user
  MIPS: uaccess: Take EVA into account in __copy_from_user()
  MIPS: uaccess: Fix strlen_user with EVA
parents db066501 930c0f70

arch/mips/include/asm/uaccess.h

+35 −17
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ extern void __put_user_unknown(void); 
 * On error, the variable @x is set to zero.

 */

#define __get_user_unaligned(x,ptr) \

	__get_user__unalignednocheck((x),(ptr),sizeof(*(ptr)))

	__get_user_unaligned_nocheck((x),(ptr),sizeof(*(ptr)))



/*

 * Yuck.  We need two variants, one for 64bit operation and one
@@ -620,8 +620,8 @@ extern void __get_user_unaligned_unknown(void); 
do {									\

	switch (size) {							\

	case 1: __get_data_asm(val, "lb", ptr); break;			\

	case 2: __get_user_unaligned_asm(val, "ulh", ptr); break;	\

	case 4: __get_user_unaligned_asm(val, "ulw", ptr); break;	\

	case 2: __get_data_unaligned_asm(val, "ulh", ptr); break;	\

	case 4: __get_data_unaligned_asm(val, "ulw", ptr); break;	\

	case 8: __GET_USER_UNALIGNED_DW(val, ptr); break;		\

	default: __get_user_unaligned_unknown(); break;			\

	}								\
@@ -1122,9 +1122,15 @@ extern size_t __copy_in_user_eva(void *__to, const void *__from, size_t __n); 
	__cu_to = (to);							\

	__cu_from = (from);						\

	__cu_len = (n);							\

	if (eva_kernel_access()) {					\

		__cu_len = __invoke_copy_from_kernel(__cu_to,		\

						     __cu_from,		\

						     __cu_len);		\

	} else {							\

		might_fault();						\

		__cu_len = __invoke_copy_from_user(__cu_to, __cu_from,	\

						   __cu_len);		\

	}								\

	__cu_len;							\

})
@@ -1229,6 +1235,17 @@ __clear_user(void __user *addr, __kernel_size_t size) 
{

	__kernel_size_t res;



	if (eva_kernel_access()) {

		__asm__ __volatile__(

			"move\t$4, %1\n\t"

			"move\t$5, $0\n\t"

			"move\t$6, %2\n\t"

			__MODULE_JAL(__bzero_kernel)

			"move\t%0, $6"

			: "=r" (res)

			: "r" (addr), "r" (size)

			: "$4", "$5", "$6", __UA_t0, __UA_t1, "$31");

	} else {

		might_fault();

		__asm__ __volatile__(

			"move\t$4, %1\n\t"
@@ -1239,6 +1256,7 @@ __clear_user(void __user *addr, __kernel_size_t size) 
			: "=r" (res)

			: "r" (addr), "r" (size)

			: "$4", "$5", "$6", __UA_t0, __UA_t1, "$31");

	}



	return res;

}
@@ -1384,7 +1402,7 @@ static inline long strlen_user(const char __user *s) 
		might_fault();

		__asm__ __volatile__(

			"move\t$4, %1\n\t"

			__MODULE_JAL(__strlen_kernel_asm)

			__MODULE_JAL(__strlen_user_asm)

			"move\t%0, $2"

			: "=r" (res)

			: "r" (s)

arch/mips/kernel/cps-vec.S

+0 −2
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ LEAF(mips_cps_core_init) 
	has_mt	t0, 3f



	.set	push

	.set	mips64r2

	.set	mt



	/* Only allow 1 TC per VPE to execute... */
@@ -376,7 +375,6 @@ LEAF(mips_cps_boot_vpes) 
	 nop



	.set	push

	.set	mips64r2

	.set	mt



1:	/* Enter VPE configuration state */

arch/mips/kernel/mips_ksyms.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <asm/fpu.h>

#include <asm/msa.h>



extern void *__bzero_kernel(void *__s, size_t __count);

extern void *__bzero(void *__s, size_t __count);

extern long __strncpy_from_kernel_nocheck_asm(char *__to,

					      const char *__from, long __len);
@@ -64,6 +65,7 @@ EXPORT_SYMBOL(__copy_from_user_eva); 
EXPORT_SYMBOL(__copy_in_user_eva);

EXPORT_SYMBOL(__copy_to_user_eva);

EXPORT_SYMBOL(__copy_user_inatomic_eva);

EXPORT_SYMBOL(__bzero_kernel);

#endif

EXPORT_SYMBOL(__bzero);

EXPORT_SYMBOL(__strncpy_from_kernel_nocheck_asm);

arch/mips/lib/memset.S

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ LEAF(memset) 
1:

#ifndef CONFIG_EVA

FEXPORT(__bzero)

#else

FEXPORT(__bzero_kernel)

#endif

	__BUILD_BZERO LEGACY_MODE

arch/mips/pci/pci-rt2880.c

+0 −1
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
static int rt288x_pci_probe(struct platform_device *pdev)

{

	void __iomem *io_map_base;

	int i;



	rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE