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

Commit 3604b451 authored by Álvaro Fernández Rojas's avatar Álvaro Fernández Rojas Committed by Ralf Baechle
Browse files

MIPS: BMIPS: Add BCM6358 support 



BCM6358 has a shared TLB which conflicts with current SMP support, so it must
be disabled for now.
BCM6358 uses >= 0xfffe0000 addresses for internal registers, which need to be
remapped (by using a simplified version of BRCM63xx ioremap.h).
However, 0xfff80000 is a better address, since it also covers BCM3368, leaving
the possibility to add it in the future.

Signed-off-by: default avatarÁlvaro Fernández Rojas <noltari@gmail.com>
Cc: f.fainelli@gmail.com
Cc: jogo@openwrt.org
Cc: cernekee@gmail.com
Cc: robh@kernel.org
Cc: simon@fire.lp0.eu
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13040/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 65b2849a

arch/mips/bmips/setup.c

+10 −0
Original line number Diff line number Diff line
@@ -95,6 +95,15 @@ static void bcm6328_quirks(void) 
		bcm63xx_fixup_cpu1();

}



static void bcm6358_quirks(void)

{

	/*

	 * BCM6358 needs special handling for its shared TLB, so

	 * disable SMP for now

	 */

	bmips_smp_enabled = 0;

}



static void bcm6368_quirks(void)

{

	bcm63xx_fixup_cpu1();
@@ -104,6 +113,7 @@ static const struct bmips_quirk bmips_quirk_list[] = { 
	{ "brcm,bcm3384-viper",		&bcm3384_viper_quirks		},

	{ "brcm,bcm33843-viper",	&bcm3384_viper_quirks		},

	{ "brcm,bcm6328",		&bcm6328_quirks			},

	{ "brcm,bcm6358",		&bcm6358_quirks			},

	{ "brcm,bcm6368",		&bcm6368_quirks			},

	{ "brcm,bcm63168",		&bcm6368_quirks			},

	{ },

arch/mips/include/asm/mach-bmips/ioremap.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_BMIPS_IOREMAP_H

#define __ASM_MACH_BMIPS_IOREMAP_H



#include <linux/types.h>



static inline phys_addr_t fixup_bigphys_addr(phys_addr_t phys_addr, phys_addr_t size)

{

	return phys_addr;

}



static inline int is_bmips_internal_registers(phys_addr_t offset)

{

	if (offset >= 0xfff80000)

		return 1;



	return 0;

}



static inline void __iomem *plat_ioremap(phys_addr_t offset, unsigned long size,

					 unsigned long flags)

{

	if (is_bmips_internal_registers(offset))

		return (void __iomem *)offset;



	return NULL;

}



static inline int plat_iounmap(const volatile void __iomem *addr)

{

	return is_bmips_internal_registers((unsigned long)addr);

}



#endif /* __ASM_MACH_BMIPS_IOREMAP_H */