Merge remote-tracking branch 'iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup'

Merge remote-tracking branch 'kunit-next/kunit'

Merge remote-tracking branch 'cfi/cfi/next'

Merge remote-tracking branch 'kgdb/kgdb/for-next'

Merge remote-tracking branch 'hyperv/hyperv-next'

Merge remote-tracking branch 'nvmem/for-next'

Merge remote-tracking branch 'slimbus/for-next'

# Conflicts:
# drivers/nvmem/Kconfig
# drivers/nvmem/Makefile

Merge remote-tracking branch 'gnss/gnss-next'

Merge remote-tracking branch 'kspp/for-next/kspp'

Merge remote-tracking branch 'seccomp/for-next/seccomp'

Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'

Merge remote-tracking branch 'rtc/rtc-next'

Merge remote-tracking branch 'coresight/next'

Merge remote-tracking branch 'livepatching/for-next'

Merge remote-tracking branch 'kselftest/next'

Merge remote-tracking branch 'pwm/for-next'

Merge remote-tracking branch 'pinctrl/for-next'

Merge remote-tracking branch 'gpio-brgl/gpio/for-next'

Merge remote-tracking branch 'rpmsg/for-next'

Merge remote-tracking branch 'vhost/linux-next'

Merge remote-tracking branch 'scsi-mkp/for-next'

# Conflicts:
# drivers/target/iscsi/iscsi_target.c

Merge remote-tracking branch 'scsi/for-next'

Merge remote-tracking branch 'cgroup/for-next'

Merge remote-tracking branch 'dmaengine/next'

Merge remote-tracking branch 'icc/icc-next'

Merge remote-tracking branch 'staging/staging-next'

Merge remote-tracking branch 'vfio/next'

Merge remote-tracking branch 'phy-next/next'

Merge remote-tracking branch 'char-misc/char-misc-next'

# Conflicts:
# drivers/phy/qualcomm/phy-qcom-qmp.c

Merge remote-tracking branch 'tty/tty-next'

Merge remote-tracking branch 'usb-serial/usb-next'

Merge remote-tracking branch 'usb/usb-next'

Merge remote-tracking branch 'driver-core/driver-core-next'

# Conflicts:
# drivers/of/property.c

Merge remote-tracking branch 'ipmi/for-next'

Merge remote-tracking branch 'leds/for-next'

Merge remote-tracking branch 'chrome-platform/for-next'

Merge remote-tracking branch 'drivers-x86/for-next'

# Conflicts:
# MAINTAINERS
# drivers/platform/x86/thinkpad_acpi.c

Merge remote-tracking branch 'percpu/for-next'

Merge remote-tracking branch 'kvms390/next'

Merge remote-tracking branch 'kvm-arm/next'

Merge remote-tracking branch 'kvm/next'

# Conflicts:
# arch/x86/kvm/svm/nested.c

Merge remote-tracking branch 'rcu/rcu/next'

Merge remote-tracking branch 'ftrace/for-next'

# Conflicts:
# arch/x86/kernel/kprobes/ftrace.c

Merge remote-tracking branch 'irqchip/irq/irqchip-next'

# Conflicts:
# drivers/irqchip/Kconfig
# drivers/irqchip/Makefile

Merge remote-tracking branch 'edac/edac-for-next'

Merge remote-tracking branch 'tip/auto-latest'

Merge remote-tracking branch 'spi/for-next'

Merge remote-tracking branch 'mailbox/mailbox-for-next'

Merge remote-tracking branch 'devicetree/for-next'

# Conflicts:
# drivers/of/of_net.c

Merge remote-tracking branch 'audit/next'

Merge remote-tracking branch 'iommu/next'

Merge remote-tracking branch 'tpmdd/next'

Merge remote-tracking branch 'tomoyo/master'

Merge remote-tracking branch 'selinux/next'

Merge remote-tracking branch 'keys/keys-next'

# Conflicts:
# certs/system_keyring.c

Merge remote-tracking branch 'integrity/next-integrity'

Merge remote-tracking branch 'apparmor/apparmor-next'

Merge remote-tracking branch 'security/next-testing'

# Conflicts:
# arch/alpha/kernel/syscalls/syscall.tbl
# arch/arm/tools/syscall.tbl
# arch/arm64/include/asm/unistd.h
# arch/arm64/include/asm/unistd32.h
# arch/ia64/kernel/syscalls/syscall.tbl
# arch/m68k/kernel/syscalls/syscall.tbl
# arch/microblaze/kernel/syscalls/syscall.tbl
# arch/mips/kernel/syscalls/syscall_n32.tbl
# arch/mips/kernel/syscalls/syscall_n64.tbl
# arch/mips/kernel/syscalls/syscall_o32.tbl
# arch/parisc/kernel/syscalls/syscall.tbl
# arch/powerpc/kernel/syscalls/syscall.tbl
# arch/s390/kernel/syscalls/syscall.tbl
# arch/sh/kernel/syscalls/syscall.tbl
# arch/sparc/kernel/syscalls/syscall.tbl
# arch/x86/entry/syscalls/syscall_32.tbl
# arch/x86/entry/syscalls/syscall_64.tbl
# arch/xtensa/kernel/syscalls/syscall.tbl
# include/uapi/asm-generic/unistd.h

Merge remote-tracking branch 'regulator/for-next'

Merge remote-tracking branch 'battery/for-next'

Merge remote-tracking branch 'backlight/for-backlight-next'

Merge remote-tracking branch 'mfd/for-mfd-next'

Merge remote-tracking branch 'mmc/next'

Merge remote-tracking branch 'pcmcia/pcmcia-next'

Merge remote-tracking branch 'device-mapper/for-next'

Merge remote-tracking branch 'block/for-next'

Merge remote-tracking branch 'input/next'

Merge remote-tracking branch 'modules/modules-next'

Merge remote-tracking branch 'sound-asoc/for-next'

Merge remote-tracking branch 'sound/for-next'

Merge remote-tracking branch 'regmap/for-next'

Merge remote-tracking branch 'etnaviv/etnaviv/next'

Merge remote-tracking branch 'imx-drm/imx-drm/next'

# Conflicts:
# drivers/gpu/drm/imx/ipuv3-plane.c

Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

Merge remote-tracking branch 'drm-intel/for-linux-next'

# Conflicts:
# drivers/gpu/drm/i915/display/vlv_dsi.c

Merge remote-tracking branch 'amdgpu/drm-next'

Merge remote-tracking branch 'drm/drm-next'

Merge remote-tracking branch 'crypto/master'

Merge remote-tracking branch 'spi-nor/spi-nor/next'

Merge remote-tracking branch 'nand/nand/next'

Merge remote-tracking branch 'mtd/mtd/next'

Merge remote-tracking branch 'gfs2/for-next'

Merge remote-tracking branch 'mac80211-next/master'

Merge remote-tracking branch 'bluetooth/master'

Merge remote-tracking branch 'netfilter-next/master'

Merge remote-tracking branch 'mlx5-next/mlx5-next'

Merge remote-tracking branch 'ipsec-next/master'

Merge remote-tracking branch 'bpf-next/for-next'

Merge remote-tracking branch 'net-next/master'

Merge remote-tracking branch 'rdma/for-next'

Merge remote-tracking branch 'swiotlb/linux-next'

Merge remote-tracking branch 'dlm/next'

Merge remote-tracking branch 'ieee1394/for-next'

Merge remote-tracking branch 'thermal/thermal/linux-next'

Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next

remoteproc: imx_rproc: support remote cores booted before Linux Kernel

 - When remote cores are kicked before Linux Kernel, we are not able
   to get resource table from the firmware elf file, so we need to add
   rsc_table to hold the resource table published by remote cores and
   imx_rproc_get_loaded_rsc_table is to get the resource table.
 - Per remoteproc framework, add attach hook for processor in a detached
   state.
 - Add imx_rproc_detect_mode to detect remote cores' working mode to
   set the state which is required by remoteproc framework.

Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/1617846289-13496-5-git-send-email-peng.fan@oss.nxp.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

remoteproc: imx_rproc: move memory parsing to rproc_ops

Use the rproc_ops::prepare() hook for doing memory resources
reallocation when reattaching a remote procesor.

Suggested-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/1617846289-13496-4-git-send-email-peng.fan@oss.nxp.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

remoteproc: imx_rproc: enlarge IMX7D_RPROC_MEM_MAX

8 is not enough when we need more, such as resource table for remote cores
that booted before Linux Kernel, so enlarge IMX7D_RPROC_MEM_MAX to 32.
And also rename it to IMX_RPROC_MEM_MAX which make more sense.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/1617846289-13496-3-git-send-email-peng.fan@oss.nxp.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

remoteproc: imx_rproc: add missing of_node_put

After of_parse_phandle, we need of_node_put to decrease the refcount
of the device_node.

Reported-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/1617846289-13496-2-git-send-email-peng.fan@oss.nxp.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

remoteproc: imx_rproc: fix build error without CONFIG_MAILBOX

Fix build error when CONFIG_MAILBOX is not set:

arm-linux-gnueabi-ld: drivers/remoteproc/imx_rproc.o: in function `imx_rproc_kick':
imx_rproc.c:(.text+0x328): undefined reference to `mbox_send_message'
arm-linux-gnueabi-ld: drivers/remoteproc/imx_rproc.o: in function `imx_rproc_probe':
imx_rproc.c:(.text+0x52c): undefined reference to `mbox_request_channel_byname'
arm-linux-gnueabi-ld: imx_rproc.c:(.text+0x548): undefined reference to `mbox_request_channel_byname'
arm-linux-gnueabi-ld: imx_rproc.c:(.text+0x76c): undefined reference to `mbox_free_channel'
arm-linux-gnueabi-ld: imx_rproc.c:(.text+0x774): undefined reference to `mbox_free_channel'
arm-linux-gnueabi-ld: imx_rproc.c:(.text+0x7c4): undefined reference to `mbox_free_channel'
arm-linux-gnueabi-ld: drivers/remoteproc/imx_rproc.o: in function `imx_rproc_remove':
imx_rproc.c:(.text+0x86c): undefined reference to `mbox_free_channel'
arm-linux-gnueabi-ld: imx_rproc.c:(.text+0x874): undefined reference to `mbox_free_channel'
make: *** [Makefile:1292: vmlinux] Error 1

Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Fixes: 2df7062002d0 ("remoteproc: imx_proc: enable virtio/mailbox")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20210331122709.3935521-1-weiyongjun1@huawei.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>