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

Commit 78352f18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_fixes_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips 

Pull MIPS fixes from James Hogan:
 "A few fixes for outstanding MIPS issues:

   - an __init section mismatch warning when brcmstb_pm is enabled

   - a regression handling multiple mem=X@Y arguments (4.11)

   - a USB Kconfig select warning, and related sparc cleanup (4.16)"

* tag 'mips_fixes_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
  sparc,leon: Select USB_UHCI_BIG_ENDIAN_{MMIO,DESC}
  usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT
  MIPS: Fix incorrect mem=X@Y handling
  MIPS: BMIPS: Fix section mismatch warning
parents da370f1d 5efad9ee

arch/mips/kernel/setup.c

+12 −4
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ static void __init bootmem_init(void) 
	unsigned long reserved_end;

	unsigned long mapstart = ~0UL;

	unsigned long bootmap_size;

	phys_addr_t ramstart = (phys_addr_t)ULLONG_MAX;

	bool bootmap_valid = false;

	int i;
@@ -395,7 +396,8 @@ static void __init bootmem_init(void) 
	max_low_pfn = 0;



	/*

	 * Find the highest page frame number we have available.

	 * Find the highest page frame number we have available

	 * and the lowest used RAM address

	 */

	for (i = 0; i < boot_mem_map.nr_map; i++) {

		unsigned long start, end;
@@ -407,6 +409,8 @@ static void __init bootmem_init(void) 
		end = PFN_DOWN(boot_mem_map.map[i].addr

				+ boot_mem_map.map[i].size);



		ramstart = min(ramstart, boot_mem_map.map[i].addr);



#ifndef CONFIG_HIGHMEM

		/*

		 * Skip highmem here so we get an accurate max_low_pfn if low
@@ -436,6 +440,13 @@ static void __init bootmem_init(void) 
		mapstart = max(reserved_end, start);

	}



	/*

	 * Reserve any memory between the start of RAM and PHYS_OFFSET

	 */

	if (ramstart > PHYS_OFFSET)

		add_memory_region(PHYS_OFFSET, ramstart - PHYS_OFFSET,

				  BOOT_MEM_RESERVED);



	if (min_low_pfn >= max_low_pfn)

		panic("Incorrect memory mapping !!!");

	if (min_low_pfn > ARCH_PFN_OFFSET) {
@@ -664,9 +675,6 @@ static int __init early_parse_mem(char *p) 


	add_memory_region(start, size, BOOT_MEM_RAM);



	if (start && start > PHYS_OFFSET)

		add_memory_region(PHYS_OFFSET, start - PHYS_OFFSET,

				BOOT_MEM_RESERVED);

	return 0;

}

early_param("mem", early_parse_mem);

arch/mips/kernel/smp-bmips.c

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ asmlinkage void __weak plat_wired_tlb_setup(void) 
	 */

}



void __init bmips_cpu_setup(void)

void bmips_cpu_setup(void)

{

	void __iomem __maybe_unused *cbr = BMIPS_GET_CBR();

	u32 __maybe_unused cfg;

arch/sparc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -430,6 +430,8 @@ config SPARC_LEON 
	depends on SPARC32

	select USB_EHCI_BIG_ENDIAN_MMIO

	select USB_EHCI_BIG_ENDIAN_DESC

	select USB_UHCI_BIG_ENDIAN_MMIO

	select USB_UHCI_BIG_ENDIAN_DESC

	---help---

	  If you say Y here if you are running on a SPARC-LEON processor.

	  The LEON processor is a synthesizable VHDL model of the

drivers/usb/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ config USB_EHCI_BIG_ENDIAN_MMIO 
config USB_EHCI_BIG_ENDIAN_DESC

	bool



config USB_UHCI_BIG_ENDIAN_MMIO

	bool



config USB_UHCI_BIG_ENDIAN_DESC

	bool



menuconfig USB_SUPPORT

	bool "USB support"

	depends on HAS_IOMEM

drivers/usb/host/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -633,14 +633,6 @@ config USB_UHCI_ASPEED 
       bool

       default y if ARCH_ASPEED



config USB_UHCI_BIG_ENDIAN_MMIO

	bool

	default y if SPARC_LEON



config USB_UHCI_BIG_ENDIAN_DESC

	bool

	default y if SPARC_LEON



config USB_FHCI_HCD

	tristate "Freescale QE USB Host Controller support"

	depends on OF_GPIO && QE_GPIO && QUICC_ENGINE