Commit 5b8d6e85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20230716' of https://github.com/jcmvbkbc/linux-xtensa 

Pull xtensa fixes from Max Filippov:

 - fix interaction between unaligned exception handler and load/store
   exception handler

 - fix parsing ISS network interface specification string

 - add comment about etherdev freeing to ISS network driver

* tag 'xtensa-20230716' of https://github.com/jcmvbkbc/linux-xtensa:
  xtensa: fix unaligned and load/store configuration interaction
  xtensa: ISS: fix call to split_if_spec
  xtensa: ISS: add comment about etherdev freeing
parents 1667e630 a160e941

arch/xtensa/kernel/align.S

+14 −20
Original line number Diff line number Diff line 
/*

 * arch/xtensa/kernel/align.S

 *

 * Handle unalignment exceptions in kernel space.

 * Handle unalignment and load/store exceptions.

 *

 * This file is subject to the terms and conditions of the GNU General

 * Public License.  See the file "COPYING" in the main directory of
@@ -26,20 +26,18 @@ 
#define LOAD_EXCEPTION_HANDLER

#endif



#if XCHAL_UNALIGNED_STORE_EXCEPTION || defined LOAD_EXCEPTION_HANDLER

#if XCHAL_UNALIGNED_STORE_EXCEPTION || defined CONFIG_XTENSA_LOAD_STORE

#define STORE_EXCEPTION_HANDLER

#endif



#if defined LOAD_EXCEPTION_HANDLER || defined STORE_EXCEPTION_HANDLER

#define ANY_EXCEPTION_HANDLER

#endif



#if XCHAL_HAVE_WINDOWED

#if XCHAL_HAVE_WINDOWED && defined CONFIG_MMU

#define UNALIGNED_USER_EXCEPTION

#endif



/*  First-level exception handler for unaligned exceptions.

 *

 *  Note: This handler works only for kernel exceptions.  Unaligned user

 *        access should get a seg fault.

 */



/* Big and little endian 16-bit values are located in

 * different halves of a register.  HWORD_START helps to

 * abstract the notion of extracting a 16-bit value from a
@@ -228,8 +226,6 @@ ENDPROC(fast_load_store) 
#ifdef ANY_EXCEPTION_HANDLER

ENTRY(fast_unaligned)



#if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION



	call0	.Lsave_and_load_instruction



	/* Analyze the instruction (load or store?). */
@@ -244,8 +240,7 @@ ENTRY(fast_unaligned) 
	/* 'store indicator bit' not set, jump */

	_bbci.l	a4, OP1_SI_BIT + INSN_OP1, .Lload



#endif

#if XCHAL_UNALIGNED_STORE_EXCEPTION

#ifdef STORE_EXCEPTION_HANDLER



	/* Store: Jump to table entry to get the value in the source register.*/
@@ -254,7 +249,7 @@ ENTRY(fast_unaligned) 
	addx8	a5, a6, a5

	jx	a5			# jump into table

#endif

#if XCHAL_UNALIGNED_LOAD_EXCEPTION

#ifdef LOAD_EXCEPTION_HANDLER



	/* Load: Load memory address. */
@@ -328,7 +323,7 @@ ENTRY(fast_unaligned) 
	mov	a14, a3		;	_j .Lexit;	.align 8

	mov	a15, a3		;	_j .Lexit;	.align 8

#endif

#if XCHAL_UNALIGNED_STORE_EXCEPTION

#ifdef STORE_EXCEPTION_HANDLER

.Lstore_table:

	l32i	a3, a2, PT_AREG0;	_j .Lstore_w;	.align 8

	mov	a3, a1;			_j .Lstore_w;	.align 8	# fishy??
@@ -348,7 +343,6 @@ ENTRY(fast_unaligned) 
	mov	a3, a15		;	_j .Lstore_w;	.align 8

#endif



#ifdef ANY_EXCEPTION_HANDLER

	/* We cannot handle this exception. */



	.extern _kernel_exception
@@ -377,8 +371,8 @@ ENTRY(fast_unaligned) 


2:	movi	a0, _user_exception

	jx	a0

#endif

#if XCHAL_UNALIGNED_STORE_EXCEPTION



#ifdef STORE_EXCEPTION_HANDLER



	# a7: instruction pointer, a4: instruction, a3: value

.Lstore_w:
@@ -444,7 +438,7 @@ ENTRY(fast_unaligned) 
	s32i	a6, a4, 4

#endif

#endif

#ifdef ANY_EXCEPTION_HANDLER



.Lexit:

#if XCHAL_HAVE_LOOPS

	rsr	a4, lend		# check if we reached LEND
@@ -539,7 +533,7 @@ ENTRY(fast_unaligned) 
	__src_b	a4, a4, a5	# a4 has the instruction



	ret

#endif



ENDPROC(fast_unaligned)



ENTRY(fast_unaligned_fixup)

arch/xtensa/kernel/traps.c

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ static dispatch_init_table_t __initdata dispatch_init_table[] = { 
#endif

{ EXCCAUSE_INTEGER_DIVIDE_BY_ZERO, 0,	   do_div0 },

/* EXCCAUSE_PRIVILEGED unhandled */

#if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION

#if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION || \

		IS_ENABLED(CONFIG_XTENSA_LOAD_STORE)

#ifdef CONFIG_XTENSA_UNALIGNED_USER

{ EXCCAUSE_UNALIGNED,		USER,	   fast_unaligned },

#endif

arch/xtensa/platforms/iss/network.c

+2 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static int tuntap_probe(struct iss_net_private *lp, int index, char *init) 


	init += sizeof(TRANSPORT_TUNTAP_NAME) - 1;

	if (*init == ',') {

		rem = split_if_spec(init + 1, &mac_str, &dev_name);

		rem = split_if_spec(init + 1, &mac_str, &dev_name, NULL);

		if (rem != NULL) {

			pr_err("%s: extra garbage on specification : '%s'\n",

			       dev->name, rem);
@@ -540,6 +540,7 @@ static void iss_net_configure(int index, char *init) 
		rtnl_unlock();

		pr_err("%s: error registering net device!\n", dev->name);

		platform_device_unregister(&lp->pdev);

		/* dev is freed by the iss_net_pdev_release callback */

		return;

	}

	rtnl_unlock();