Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+21
-13
+12
-4
arch/mips/kernel/setup.c
+12
-4
arch/mips/kernel/setup.c
···
375
375
unsigned long reserved_end;
376
376
unsigned long mapstart = ~0UL;
377
377
unsigned long bootmap_size;
378
+
phys_addr_t ramstart = (phys_addr_t)ULLONG_MAX;
378
379
bool bootmap_valid = false;
379
380
int i;
380
381
···
396
395
max_low_pfn = 0;
397
396
398
397
/*
399
-
* Find the highest page frame number we have available.
398
+
* Find the highest page frame number we have available
399
+
* and the lowest used RAM address
400
400
*/
401
401
for (i = 0; i < boot_mem_map.nr_map; i++) {
402
402
unsigned long start, end;
···
408
406
start = PFN_UP(boot_mem_map.map[i].addr);
409
407
end = PFN_DOWN(boot_mem_map.map[i].addr
410
408
+ boot_mem_map.map[i].size);
409
+
410
+
ramstart = min(ramstart, boot_mem_map.map[i].addr);
411
411
412
412
#ifndef CONFIG_HIGHMEM
413
413
/*
···
439
435
continue;
440
436
mapstart = max(reserved_end, start);
441
437
}
438
+
439
+
/*
440
+
* Reserve any memory between the start of RAM and PHYS_OFFSET
441
+
*/
442
+
if (ramstart > PHYS_OFFSET)
443
+
add_memory_region(PHYS_OFFSET, ramstart - PHYS_OFFSET,
444
+
BOOT_MEM_RESERVED);
442
445
443
446
if (min_low_pfn >= max_low_pfn)
444
447
panic("Incorrect memory mapping !!!");
···
675
664
676
665
add_memory_region(start, size, BOOT_MEM_RAM);
677
666
678
-
if (start && start > PHYS_OFFSET)
679
-
add_memory_region(PHYS_OFFSET, start - PHYS_OFFSET,
680
-
BOOT_MEM_RESERVED);
681
667
return 0;
682
668
}
683
669
early_param("mem", early_parse_mem);
+1
-1
arch/mips/kernel/smp-bmips.c
+1
-1
arch/mips/kernel/smp-bmips.c
+2
arch/sparc/Kconfig
+2
arch/sparc/Kconfig
···
430
430
depends on SPARC32
431
431
select USB_EHCI_BIG_ENDIAN_MMIO
432
432
select USB_EHCI_BIG_ENDIAN_DESC
433
+
select USB_UHCI_BIG_ENDIAN_MMIO
434
+
select USB_UHCI_BIG_ENDIAN_DESC
433
435
---help---
434
436
If you say Y here if you are running on a SPARC-LEON processor.
435
437
The LEON processor is a synthesizable VHDL model of the
+6
drivers/usb/Kconfig
+6
drivers/usb/Kconfig
-8
drivers/usb/host/Kconfig
-8
drivers/usb/host/Kconfig
···
633
633
bool
634
634
default y if ARCH_ASPEED
635
635
636
-
config USB_UHCI_BIG_ENDIAN_MMIO
637
-
bool
638
-
default y if SPARC_LEON
639
-
640
-
config USB_UHCI_BIG_ENDIAN_DESC
641
-
bool
642
-
default y if SPARC_LEON
643
-
644
636
config USB_FHCI_HCD
645
637
tristate "Freescale QE USB Host Controller support"
646
638
depends on OF_GPIO && QE_GPIO && QUICC_ENGINE