Merge tag 'mips_5.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

+1 -1

arch/mips/Kbuild.platforms

··· 37 37 platform-$(CONFIG_MACH_VR41XX) += vr41xx/ 38 38 39 39 # include the platform specific files 40 - include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platform-y)) 40 + include $(patsubst %/, $(srctree)/arch/mips/%/Platform, $(platform-y))

+5

arch/mips/Kconfig

··· 292 292 select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN 293 293 select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN 294 294 select HARDIRQS_SW_RESEND 295 + select HAVE_PCI 296 + select PCI_DRIVERS_GENERIC 295 297 help 296 298 Build a generic DT-based kernel image that boots on select 297 299 BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top ··· 335 333 select SYS_SUPPORTS_32BIT_KERNEL 336 334 select SYS_SUPPORTS_BIG_ENDIAN 337 335 select SYS_HAS_EARLY_PRINTK 336 + select SYS_HAS_CPU_BMIPS32_3300 337 + select SYS_HAS_CPU_BMIPS4350 338 + select SYS_HAS_CPU_BMIPS4380 338 339 select SWAP_IO_SPACE 339 340 select GPIOLIB 340 341 select MIPS_L1_CACHE_SHIFT_4

+2

arch/mips/Makefile

··· 253 253 # 254 254 # Board-dependent options and extra files 255 255 # 256 + ifdef need-compiler 256 257 include $(srctree)/arch/mips/Kbuild.platforms 258 + endif 257 259 258 260 ifdef CONFIG_PHYSICAL_START 259 261 load-y = $(CONFIG_PHYSICAL_START)

-3

arch/mips/boot/compressed/.gitignore

··· 1 - # SPDX-License-Identifier: GPL-2.0-only 2 - ashldi3.c 3 - bswapsi.c

+1 -11

arch/mips/boot/compressed/Makefile

··· 50 50 vmlinuzobjs-$(CONFIG_ATH79) += $(obj)/uart-ath79.o 51 51 endif 52 52 53 - extra-y += uart-ath79.c 54 - $(obj)/uart-ath79.c: $(srctree)/arch/mips/ath79/early_printk.c 55 - $(call cmd,shipped) 56 - 57 53 vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o 58 54 59 - extra-y += ashldi3.c 60 - $(obj)/ashldi3.c: $(obj)/%.c: $(srctree)/lib/%.c FORCE 61 - $(call if_changed,shipped) 62 - 63 - extra-y += bswapsi.c 64 - $(obj)/bswapsi.c: $(obj)/%.c: $(srctree)/arch/mips/lib/%.c FORCE 65 - $(call if_changed,shipped) 55 + vmlinuzobjs-$(CONFIG_KERNEL_ZSTD) += $(obj)/bswapdi.o 66 56 67 57 targets := $(notdir $(vmlinuzobjs-y)) 68 58

+2

arch/mips/boot/compressed/ashldi3.c

··· 1 + // SPDX-License-Identifier: GPL-2.0-only 2 + #include "../../../../lib/ashldi3.c"

+2

arch/mips/boot/compressed/bswapdi.c

··· 1 + // SPDX-License-Identifier: GPL-2.0-only 2 + #include "../../lib/bswapdi.c"

+2

arch/mips/boot/compressed/bswapsi.c

··· 1 + // SPDX-License-Identifier: GPL-2.0-only 2 + #include "../../lib/bswapsi.c"

+2

arch/mips/boot/compressed/uart-ath79.c

··· 1 + // SPDX-License-Identifier: GPL-2.0-only 2 + #include "../../ath79/early_printk.c"

+149 -10

arch/mips/configs/bmips_stb_defconfig

··· 1 1 # CONFIG_LOCALVERSION_AUTO is not set 2 2 # CONFIG_SWAP is not set 3 3 CONFIG_NO_HZ=y 4 + CONFIG_HZ=1000 4 5 CONFIG_BLK_DEV_INITRD=y 5 6 CONFIG_EXPERT=y 6 7 # CONFIG_VM_EVENT_COUNTERS is not set ··· 9 8 CONFIG_BMIPS_GENERIC=y 10 9 CONFIG_CPU_LITTLE_ENDIAN=y 11 10 CONFIG_HIGHMEM=y 11 + CONFIG_HIGH_RES_TIMERS=y 12 12 CONFIG_SMP=y 13 13 CONFIG_NR_CPUS=4 14 + CONFIG_CC_STACKPROTECTOR_STRONG=y 14 15 # CONFIG_SECCOMP is not set 15 16 CONFIG_MIPS_O32_FP64_SUPPORT=y 17 + # CONFIG_RD_GZIP is not set 18 + # CONFIG_RD_BZIP2 is not set 19 + # CONFIG_RD_LZMA is not set 20 + CONFIG_RD_XZ=y 21 + # CONFIG_RD_LZO is not set 22 + # CONFIG_RD_LZ4 is not set 23 + # CONFIG_IOSCHED_DEADLINE is not set 24 + # CONFIG_IOSCHED_CFQ is not set 25 + CONFIG_PCI=y 26 + CONFIG_PCI_MSI=y 27 + CONFIG_PCIEASPM_POWERSAVE=y 28 + CONFIG_PCIEPORTBUS=y 29 + CONFIG_PCIE_BRCMSTB=y 16 30 CONFIG_CPU_FREQ=y 17 31 CONFIG_CPU_FREQ_STAT=y 32 + CONFIG_CPU_FREQ_STAT_DETAILS=y 33 + CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y 34 + CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 18 35 CONFIG_CPU_FREQ_GOV_POWERSAVE=y 19 36 CONFIG_CPU_FREQ_GOV_USERSPACE=y 20 37 CONFIG_CPU_FREQ_GOV_ONDEMAND=y 21 38 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 22 - CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y 23 39 CONFIG_BMIPS_CPUFREQ=y 24 40 # CONFIG_BLK_DEV_BSG is not set 25 41 CONFIG_NET=y ··· 50 32 # CONFIG_INET_DIAG is not set 51 33 CONFIG_CFG80211=y 52 34 CONFIG_NL80211_TESTMODE=y 35 + CONFIG_WIRELESS=y 53 36 CONFIG_MAC80211=y 37 + CONFIG_NL80211=y 54 38 CONFIG_DEVTMPFS=y 55 39 CONFIG_DEVTMPFS_MOUNT=y 56 40 # CONFIG_STANDALONE is not set 57 41 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 42 + CONFIG_BRCMSTB_GISB_ARB=y 43 + CONFIG_MODULES=y 44 + CONFIG_MODULE_FORCE_LOAD=y 45 + CONFIG_MODULE_UNLOAD=y 46 + CONFIG_MODVERSIONS=y 47 + CONFIG_IP_MULTICAST=y 48 + CONFIG_IP_PNP=y 49 + CONFIG_IP_PNP_DHCP=y 50 + CONFIG_IP_PNP_BOOTP=y 51 + CONFIG_IP_PNP_RARP=y 52 + CONFIG_IP_MROUTE=y 53 + CONFIG_IP_PIMSM_V1=y 54 + CONFIG_IP_PIMSM_V2=y 55 + # CONFIG_INET_XFRM_MODE_TRANSPORT is not set 56 + # CONFIG_INET_XFRM_MODE_TUNNEL is not set 57 + # CONFIG_INET_XFRM_MODE_BEET is not set 58 + # CONFIG_INET_LRO is not set 59 + CONFIG_INET_UDP_DIAG=y 60 + CONFIG_TCP_CONG_ADVANCED=y 61 + CONFIG_TCP_CONG_BIC=y 62 + # CONFIG_TCP_CONG_WESTWOOD is not set 63 + # CONFIG_TCP_CONG_HTCP is not set 64 + # CONFIG_IPV6 is not set 65 + CONFIG_IP_NF_IPTABLES=y 66 + CONFIG_IP_NF_FILTER=y 67 + CONFIG_NETFILTER=y 68 + CONFIG_NETFILTER_XTABLES=y 69 + CONFIG_BRIDGE=y 70 + CONFIG_BRIDGE_NETFILTER=m 71 + CONFIG_BRIDGE_NF_EBTABLES=m 72 + CONFIG_BRIDGE_EBT_BROUTE=m 73 + CONFIG_NET_DSA=y 74 + CONFIG_NET_SWITCHDEV=y 75 + CONFIG_DMA_CMA=y 76 + CONFIG_CMA_ALIGNMENT=12 77 + CONFIG_SPI=y 78 + CONFIG_SPI_BRCMSTB=y 58 79 CONFIG_MTD=y 80 + CONFIG_MTD_CMDLINE_PARTS=y 81 + CONFIG_MTD_BLOCK=y 59 82 CONFIG_MTD_CFI=y 83 + CONFIG_MTD_JEDECPROBE=y 60 84 CONFIG_MTD_CFI_INTELEXT=y 61 85 CONFIG_MTD_CFI_AMDSTD=y 62 - CONFIG_MTD_PHYSMAP=y 86 + CONFIG_MTD_CFI_STAA=y 87 + CONFIG_MTD_ROM=y 88 + CONFIG_MTD_ABSENT=y 89 + CONFIG_MTD_PHYSMAP_OF=y 90 + CONFIG_MTD_M25P80=y 91 + CONFIG_MTD_NAND=y 92 + CONFIG_MTD_NAND_BRCMNAND=y 93 + CONFIG_MTD_SPI_NOR=y 94 + # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set 95 + CONFIG_MTD_UBI=y 96 + CONFIG_MTD_UBI_GLUEBI=y 97 + CONFIG_PROC_DEVICETREE=y 98 + CONFIG_BLK_DEV_LOOP=y 99 + CONFIG_BLK_DEV_RAM=y 100 + CONFIG_BLK_DEV_RAM_SIZE=8192 63 101 # CONFIG_BLK_DEV is not set 64 102 CONFIG_SCSI=y 65 103 CONFIG_BLK_DEV_SD=y 104 + CONFIG_CHR_DEV_SG=y 105 + CONFIG_SCSI_MULTI_LUN=y 66 106 # CONFIG_SCSI_LOWLEVEL is not set 67 107 CONFIG_NETDEVICES=y 108 + CONFIG_VLAN_8021Q=y 109 + CONFIG_MACVLAN=y 68 110 CONFIG_BCMGENET=y 69 111 CONFIG_USB_USBNET=y 70 - # CONFIG_INPUT is not set 112 + CONFIG_INPUT_EVDEV=y 113 + # CONFIG_INPUT_KEYBOARD is not set 114 + # CONFIG_INPUT_MOUSE is not set 115 + CONFIG_INPUT_MISC=y 116 + CONFIG_INPUT_UINPUT=y 71 117 # CONFIG_SERIO is not set 72 - # CONFIG_VT is not set 118 + CONFIG_VT=y 119 + CONFIG_VT_HW_CONSOLE_BINDING=y 120 + # CONFIG_DEVKMEM is not set 73 121 CONFIG_SERIAL_8250=y 74 122 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set 75 123 CONFIG_SERIAL_8250_CONSOLE=y 76 124 CONFIG_SERIAL_OF_PLATFORM=y 77 125 # CONFIG_HW_RANDOM is not set 78 126 CONFIG_POWER_RESET=y 127 + CONFIG_POWER_RESET_BRCMSTB=y 79 128 CONFIG_POWER_RESET_SYSCON=y 80 129 CONFIG_POWER_SUPPLY=y 81 130 # CONFIG_HWMON is not set ··· 154 69 CONFIG_USB_OHCI_HCD_PLATFORM=y 155 70 CONFIG_USB_STORAGE=y 156 71 CONFIG_SOC_BRCMSTB=y 72 + CONFIG_MMC=y 73 + CONFIG_MMC_BLOCK_MINORS=16 74 + CONFIG_MMC_SDHCI=y 75 + CONFIG_MMC_SDHCI_PLTFM=y 157 76 CONFIG_EXT4_FS=y 158 77 CONFIG_EXT4_FS_POSIX_ACL=y 159 78 CONFIG_EXT4_FS_SECURITY=y 160 79 # CONFIG_DNOTIFY is not set 161 - CONFIG_FUSE_FS=y 162 - CONFIG_VFAT_FS=y 163 80 CONFIG_PROC_KCORE=y 164 - CONFIG_TMPFS=y 165 - CONFIG_NFS_FS=y 166 81 CONFIG_CIFS=y 82 + CONFIG_JBD2_DEBUG=y 83 + CONFIG_FUSE_FS=y 84 + CONFIG_FHANDLE=y 85 + CONFIG_CGROUPS=y 86 + CONFIG_CUSE=y 87 + CONFIG_ISO9660_FS=y 88 + CONFIG_JOLIET=y 89 + CONFIG_ZISOFS=y 90 + CONFIG_UDF_FS=y 91 + CONFIG_MSDOS_FS=y 92 + CONFIG_VFAT_FS=y 93 + CONFIG_TMPFS=y 94 + CONFIG_JFFS2_FS=y 95 + CONFIG_UBIFS_FS=y 96 + CONFIG_SQUASHFS=y 97 + CONFIG_SQUASHFS_LZO=y 98 + CONFIG_SQUASHFS_XZ=y 99 + CONFIG_NFS_FS=y 100 + CONFIG_NFS_V3_ACL=y 101 + CONFIG_NFS_V4=y 102 + CONFIG_NFS_V4_1=y 103 + CONFIG_NFS_V4_2=y 104 + CONFIG_ROOT_NFS=y 167 105 CONFIG_NLS_CODEPAGE_437=y 168 - CONFIG_NLS_ASCII=y 169 106 CONFIG_NLS_ISO8859_1=y 170 - # CONFIG_CRYPTO_HW is not set 171 107 CONFIG_PRINTK_TIME=y 108 + CONFIG_DYNAMIC_DEBUG=y 109 + # CONFIG_DEBUG_INFO is not set 110 + # CONFIG_DEBUG_INFO_REDUCED is not set 172 111 CONFIG_DEBUG_FS=y 173 112 CONFIG_MAGIC_SYSRQ=y 113 + CONFIG_LOCKUP_DETECTOR=y 114 + CONFIG_DEBUG_USER=y 174 115 CONFIG_CMDLINE_BOOL=y 175 116 CONFIG_CMDLINE="earlycon" 117 + # CONFIG_MIPS_CMDLINE_FROM_DTB is not set 118 + CONFIG_MIPS_CMDLINE_DTB_EXTEND=y 119 + # CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set 120 + # CONFIG_CRYPTO_HW is not set 121 + CONFIG_DT_BCM974XX=y 122 + CONFIG_FW_CFE=y 123 + CONFIG_ATA=y 124 + CONFIG_SATA_AHCI_PLATFORM=y 125 + CONFIG_AHCI_BRCMSTB=y 126 + CONFIG_GENERIC_PHY=y 127 + CONFIG_GPIOLIB=y 128 + CONFIG_GPIO_SYSFS=y 129 + CONFIG_PHY_BRCM_USB=y 130 + CONFIG_PHY_BRCM_SATA=y 131 + CONFIG_PM_RUNTIME=y 132 + CONFIG_PM_DEBUG=y 133 + CONFIG_SYSVIPC=y 134 + CONFIG_FUNCTION_GRAPH_TRACER=y 135 + CONFIG_DYNAMIC_FTRACE=y 136 + CONFIG_FUNCTION_TRACER=y 137 + CONFIG_FUNCTION_PROFILER=y 138 + CONFIG_IRQSOFF_TRACER=y 139 + CONFIG_SCHED_TRACER=y 140 + CONFIG_BLK_DEV_IO_TRACE=y 141 + CONFIG_FTRACE_SYSCALLS=y 142 + CONFIG_TRACER_SNAPSHOT=y 143 + CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y 144 + CONFIG_STACK_TRACER=y

+3 -3

arch/mips/dec/setup.c

··· 117 117 { 118 118 switch (mips_machtype) { 119 119 case MACH_DS23100: /* DS2100/DS3100 Pmin/Pmax */ 120 - board_be_handler = dec_kn01_be_handler; 120 + mips_set_be_handler(dec_kn01_be_handler); 121 121 busirq_handler = dec_kn01_be_interrupt; 122 122 busirq_flags |= IRQF_SHARED; 123 123 dec_kn01_be_init(); 124 124 break; 125 125 case MACH_DS5000_1XX: /* DS5000/1xx 3min */ 126 126 case MACH_DS5000_XX: /* DS5000/xx Maxine */ 127 - board_be_handler = dec_kn02xa_be_handler; 127 + mips_set_be_handler(dec_kn02xa_be_handler); 128 128 busirq_handler = dec_kn02xa_be_interrupt; 129 129 dec_kn02xa_be_init(); 130 130 break; 131 131 case MACH_DS5000_200: /* DS5000/200 3max */ 132 132 case MACH_DS5000_2X0: /* DS5000/240 3max+ */ 133 133 case MACH_DS5900: /* DS5900 bigmax */ 134 - board_be_handler = dec_ecc_be_handler; 134 + mips_set_be_handler(dec_ecc_be_handler); 135 135 busirq_handler = dec_ecc_be_interrupt; 136 136 dec_ecc_be_init(); 137 137 break;

+1 -1

arch/mips/include/asm/traps.h

··· 15 15 #define MIPS_BE_FATAL 2 /* treat as an unrecoverable error */ 16 16 17 17 extern void (*board_be_init)(void); 18 - extern int (*board_be_handler)(struct pt_regs *regs, int is_fixup); 18 + void mips_set_be_handler(int (*handler)(struct pt_regs *reg, int is_fixup)); 19 19 20 20 extern void (*board_nmi_handler_setup)(void); 21 21 extern void (*board_ejtag_handler_setup)(void);

+7 -1

arch/mips/kernel/traps.c

··· 103 103 extern void tlb_do_page_fault_0(void); 104 104 105 105 void (*board_be_init)(void); 106 - int (*board_be_handler)(struct pt_regs *regs, int is_fixup); 106 + static int (*board_be_handler)(struct pt_regs *regs, int is_fixup); 107 107 void (*board_nmi_handler_setup)(void); 108 108 void (*board_ejtag_handler_setup)(void); 109 109 void (*board_bind_eic_interrupt)(int irq, int regset); 110 110 void (*board_ebase_setup)(void); 111 111 void(*board_cache_error_setup)(void); 112 + 113 + void mips_set_be_handler(int (*handler)(struct pt_regs *regs, int is_fixup)) 114 + { 115 + board_be_handler = handler; 116 + } 117 + EXPORT_SYMBOL_GPL(mips_set_be_handler); 112 118 113 119 static void show_raw_backtrace(unsigned long reg29, const char *loglvl, 114 120 bool user)

+1 -1

arch/mips/sgi-ip22/ip22-berr.c

··· 112 112 113 113 void __init ip22_be_init(void) 114 114 { 115 - board_be_handler = ip22_be_handler; 115 + mips_set_be_handler(ip22_be_handler); 116 116 }

+1 -1

arch/mips/sgi-ip22/ip28-berr.c

··· 468 468 469 469 void __init ip22_be_init(void) 470 470 { 471 - board_be_handler = ip28_be_handler; 471 + mips_set_be_handler(ip28_be_handler); 472 472 } 473 473 474 474 int ip28_show_be_info(struct seq_file *m)

+1 -1

arch/mips/sgi-ip27/ip27-berr.c

··· 85 85 int cpu = LOCAL_HUB_L(PI_CPU_NUM); 86 86 int cpuoff = cpu << 8; 87 87 88 - board_be_handler = ip27_be_handler; 88 + mips_set_be_handler(ip27_be_handler); 89 89 90 90 LOCAL_HUB_S(PI_ERR_INT_PEND, 91 91 cpu ? PI_ERR_CLEAR_ALL_B : PI_ERR_CLEAR_ALL_A);

+1 -1

arch/mips/sgi-ip32/ip32-berr.c

··· 34 34 35 35 void __init ip32_be_init(void) 36 36 { 37 - board_be_handler = ip32_be_handler; 37 + mips_set_be_handler(ip32_be_handler); 38 38 }

+1 -1

arch/mips/sibyte/swarm/setup.c

··· 122 122 #error invalid SiByte board configuration 123 123 #endif 124 124 125 - board_be_handler = swarm_be_handler; 125 + mips_set_be_handler(swarm_be_handler); 126 126 127 127 if (xicor_probe()) 128 128 swarm_rtc_type = RTC_XICOR;

+1 -1

arch/mips/txx9/generic/setup_tx4927.c

··· 80 80 } 81 81 static void __init tx4927_be_init(void) 82 82 { 83 - board_be_handler = tx4927_be_handler; 83 + mips_set_be_handler(tx4927_be_handler); 84 84 } 85 85 86 86 static struct resource tx4927_sdram_resource[4];

+1 -1

arch/mips/txx9/generic/setup_tx4938.c

··· 82 82 } 83 83 static void __init tx4938_be_init(void) 84 84 { 85 - board_be_handler = tx4938_be_handler; 85 + mips_set_be_handler(tx4938_be_handler); 86 86 } 87 87 88 88 static struct resource tx4938_sdram_resource[4];

+1 -1

arch/mips/txx9/generic/setup_tx4939.c

··· 86 86 } 87 87 static void __init tx4939_be_init(void) 88 88 { 89 - board_be_handler = tx4939_be_handler; 89 + mips_set_be_handler(tx4939_be_handler); 90 90 } 91 91 92 92 static struct resource tx4939_sdram_resource[4];

+1 -1

arch/mips/vdso/Makefile

··· 57 57 58 58 # VDSO linker flags. 59 59 ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ 60 - $(filter -E%,$(KBUILD_CFLAGS)) -nostdlib -shared \ 60 + $(filter -E%,$(KBUILD_CFLAGS)) -shared \ 61 61 -G 0 --eh-frame-hdr --hash-style=sysv --build-id=sha1 -T 62 62 63 63 CFLAGS_REMOVE_vdso.o = $(CC_FLAGS_FTRACE)

+1 -1

drivers/bus/brcmstb_gisb.c

··· 485 485 list_add_tail(&gdev->next, &brcmstb_gisb_arb_device_list); 486 486 487 487 #ifdef CONFIG_MIPS 488 - board_be_handler = brcmstb_bus_error_handler; 488 + mips_set_be_handler(brcmstb_bus_error_handler); 489 489 #endif 490 490 491 491 if (list_is_singular(&brcmstb_gisb_arb_device_list)) {

+2 -1

drivers/pci/controller/Kconfig

··· 270 270 271 271 config PCIE_BRCMSTB 272 272 tristate "Broadcom Brcmstb PCIe host controller" 273 - depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM4908 || COMPILE_TEST 273 + depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM4908 || \ 274 + BMIPS_GENERIC || COMPILE_TEST 274 275 depends on OF 275 276 depends on PCI_MSI_IRQ_DOMAIN 276 277 default ARCH_BRCMSTB

+5

scripts/remove-stale-files

··· 28 28 do 29 29 rm -f arch/arm/boot/compressed/${f} 30 30 done 31 + 32 + for f in uart-ath79.c ashldi3.c bswapdi.c bswapsi.c 33 + do 34 + rm -f arch/mips/boot/compressed/${f} 35 + done 31 36 fi