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

Commit e0bc833d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_fixes_4.18_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Paul Burton:
 "A few MIPS fixes for 4.18:

   - a GPIO device name fix for a regression in v4.15-rc1.

   - an errata workaround for the BCM5300X platform.

   - a fix to ftrace function graph tracing, broken for a long time with
     the fix applying cleanly back as far as v3.17.

   - addition of read barriers to in{b,w,l,q}() functions, matching
     behavior of other architectures & mirroring the equivalent addition
     to read{b,w,l,q} in v4.17-rc2.

  Plus changes to wire up new syscalls introduced in the 4.18 cycle:

   - Restartable sequences support is added, including MIPS support in
     the selftests.

   - io_pgetevents is wired up"

* tag 'mips_fixes_4.18_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Wire up io_pgetevents syscall
  rseq/selftests: Implement MIPS support
  MIPS: Wire up the restartable sequences (rseq) syscall
  MIPS: Add syscall detection for restartable sequences
  MIPS: Add support for restartable sequences
  MIPS: io: Add barrier after register read in inX()
  mips: ftrace: fix static function graph tracing
  MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum
  MIPS: pb44: Fix i2c-gpio GPIO descriptor table
parents 77072ca5 4337aac1

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ config MIPS 
	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RSEQ

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP

arch/mips/ath79/mach-pb44.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#define PB44_KEYS_DEBOUNCE_INTERVAL	(3 * PB44_KEYS_POLL_INTERVAL)



static struct gpiod_lookup_table pb44_i2c_gpiod_table = {

	.dev_id = "i2c-gpio",

	.dev_id = "i2c-gpio.0",

	.table = {

		GPIO_LOOKUP_IDX("ath79-gpio", PB44_GPIO_I2C_SDA,

				NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

arch/mips/bcm47xx/setup.c

+6 −0
Original line number Diff line number Diff line
@@ -212,6 +212,12 @@ static int __init bcm47xx_cpu_fixes(void) 
		 */

		if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)

			cpu_wait = NULL;



		/*

		 * BCM47XX Erratum "R10: PCIe Transactions Periodically Fail"

		 * Enable ExternalSync for sync instruction to take effect

		 */

		set_c0_config7(MIPS_CONF7_ES);

		break;

#endif

	}

arch/mips/include/asm/io.h

+2 −0
Original line number Diff line number Diff line
@@ -414,6 +414,8 @@ static inline type pfx##in##bwlq##p(unsigned long port) \ 
	__val = *__addr;						\

	slow;								\

									\

	/* prevent prefetching of coherent DMA data prematurely */	\

	rmb();								\

	return pfx##ioswab##bwlq(__addr, __val);			\

}

arch/mips/include/asm/mipsregs.h

+3 −0
Original line number Diff line number Diff line
@@ -681,6 +681,8 @@ 
#define MIPS_CONF7_WII		(_ULCAST_(1) << 31)



#define MIPS_CONF7_RPS		(_ULCAST_(1) << 2)

/* ExternalSync */

#define MIPS_CONF7_ES		(_ULCAST_(1) << 8)



#define MIPS_CONF7_IAR		(_ULCAST_(1) << 10)

#define MIPS_CONF7_AR		(_ULCAST_(1) << 16)
@@ -2765,6 +2767,7 @@ __BUILD_SET_C0(status) 
__BUILD_SET_C0(cause)

__BUILD_SET_C0(config)

__BUILD_SET_C0(config5)

__BUILD_SET_C0(config7)

__BUILD_SET_C0(intcontrol)

__BUILD_SET_C0(intctl)

__BUILD_SET_C0(srsmap)