Commit 7142eaa5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_fixes_5.1_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Paul Burton:
 "A couple more MIPS fixes:

   - Fix indirect syscall tracing & seccomp filtering for big endian
     MIPS64 kernels, which previously loaded the syscall number
     incorrectly & would always use zero.

   - Fix performance counter IRQ setup for Atheros/ath79 SoCs, allowing
     perf to function on those systems.

  And not really a fix, but a useful addition:

   - Add a Broadcom mailing list to the MAINTAINERS entry for BMIPS
     systems to allow relevant engineers to track patch submissions"

* tag 'mips_fixes_5.1_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: perf: ath79: Fix perfcount IRQ assignment
  MIPS: scall64-o32: Fix indirect syscall number load
  MAINTAINERS: BMIPS: Add internal Broadcom mailing list
parents 085b7755 a1e8783d

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3121,6 +3121,7 @@ F: drivers/cpufreq/bmips-cpufreq.c 
BROADCOM BMIPS MIPS ARCHITECTURE

M:	Kevin Cernekee <cernekee@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	bcm-kernel-feedback-list@broadcom.com

L:	linux-mips@vger.kernel.org

T:	git git://github.com/broadcom/stblinux.git

S:	Maintained

arch/mips/ath79/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -210,12 +210,6 @@ const char *get_system_type(void) 
	return ath79_sys_type;

}



int get_c0_perfcount_int(void)

{

	return ATH79_MISC_IRQ(5);

}

EXPORT_SYMBOL_GPL(get_c0_perfcount_int);



unsigned int get_c0_compare_int(void)

{

	return CP0_LEGACY_COMPARE_IRQ;

arch/mips/kernel/scall64-o32.S

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ trace_a_syscall: 
	subu	t1, v0,  __NR_O32_Linux

	move	a1, v0

	bnez	t1, 1f /* __NR_syscall at offset 0 */

	lw	a1, PT_R4(sp) /* Arg1 for __NR_syscall case */

	ld	a1, PT_R4(sp) /* Arg1 for __NR_syscall case */

	.set	pop



1:	jal	syscall_trace_enter

drivers/irqchip/irq-ath79-misc.c

+11 −0
Original line number Diff line number Diff line
@@ -22,6 +22,15 @@ 
#define AR71XX_RESET_REG_MISC_INT_ENABLE	4



#define ATH79_MISC_IRQ_COUNT			32

#define ATH79_MISC_PERF_IRQ			5



static int ath79_perfcount_irq;



int get_c0_perfcount_int(void)

{

	return ath79_perfcount_irq;

}

EXPORT_SYMBOL_GPL(get_c0_perfcount_int);



static void ath79_misc_irq_handler(struct irq_desc *desc)

{
@@ -113,6 +122,8 @@ static void __init ath79_misc_intc_domain_init( 
{

	void __iomem *base = domain->host_data;



	ath79_perfcount_irq = irq_create_mapping(domain, ATH79_MISC_PERF_IRQ);



	/* Disable and clear all interrupts */

	__raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_ENABLE);

	__raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_STATUS);

CRA Git | Maintained and supported by SUSTech CRA and CCSE