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

Merge remote-tracking branch 'cpufreq-arm/cpufreq/arm/linux-next'

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

Merge remote-tracking branch 'v4l-dvb-next/master'

Merge remote-tracking branch 'v4l-dvb/master'

Merge remote-tracking branch 'jc_docs/docs-next'

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

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

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

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

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

Merge remote-tracking branch 'v9fs/9p-next'

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

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

Merge remote-tracking branch 'f2fs/dev'

Merge remote-tracking branch 'ext3/for_next'

Merge remote-tracking branch 'erofs/dev'

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

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

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

Merge remote-tracking branch 'ceph/master'

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

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

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

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

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

Merge remote-tracking branch 'risc-v/for-next'

Merge remote-tracking branch 'powerpc/next'

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

Merge remote-tracking branch 'microblaze/next'

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

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

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

Merge remote-tracking branch 'clk-renesas/renesas-clk'

Merge remote-tracking branch 'clk-imx/for-next'

Merge remote-tracking branch 'ti-k3-new/ti-k3-next'

Merge remote-tracking branch 'ti-k3/ti-k3-next'

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

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

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

Merge remote-tracking branch 'scmi/for-linux-next'

Merge remote-tracking branch 'samsung-krzk/for-next'

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

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

Merge remote-tracking branch 'renesas/next'

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

# Conflicts:
# arch/arm/boot/dts/bcm2711.dtsi

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

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

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

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

Merge remote-tracking branch 'keystone/next'

Merge remote-tracking branch 'imx-mxs/for-next'

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

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

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

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

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

Merge remote-tracking branch 'arm64/for-next/core'

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

Merge remote-tracking branch 'asm-generic/master'

Merge remote-tracking branch 'compiler-attributes/compiler-attributes'

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

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

Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'

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

Merge remote-tracking branch 'gpio-brgl-fixes/gpio/for-current'

Merge remote-tracking branch 'pidfd-fixes/fixes'

Merge remote-tracking branch 'risc-v-fixes/fixes'

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

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

Merge remote-tracking branch 'scsi-fixes/fixes'

Merge remote-tracking branch 'drivers-x86-fixes/fixes'

Merge remote-tracking branch 'vfs-fixes/fixes'

Merge remote-tracking branch 'btrfs-fixes/next-fixes'

Merge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'

Merge remote-tracking branch 'omap-fixes/fixes'

Merge remote-tracking branch 'v4l-dvb-fixes/fixes'

Merge remote-tracking branch 'dmaengine-fixes/fixes'

Merge remote-tracking branch 'vfio-fixes/for-linus'

Merge remote-tracking branch 'ide/master'

Merge remote-tracking branch 'input-current/for-linus'

Merge remote-tracking branch 'iio-fixes/fixes-togreg'

Merge remote-tracking branch 'phy/fixes'

Merge remote-tracking branch 'usb-chipidea-fixes/for-usb-fixes'

Merge remote-tracking branch 'usb-serial-fixes/usb-linus'

Merge remote-tracking branch 'usb.current/usb-linus'

Merge remote-tracking branch 'pci-current/for-linus'

Merge remote-tracking branch 'spi-fixes/for-linus'

Merge remote-tracking branch 'regulator-fixes/for-linus'

Merge remote-tracking branch 'sound-asoc-fixes/for-linus'

Merge remote-tracking branch 'sound-current/for-linus'

Merge remote-tracking branch 'mac80211/master'

Merge remote-tracking branch 'wireless-drivers/master'

Merge remote-tracking branch 'netfilter/master'

Merge remote-tracking branch 'ipsec/master'

Merge remote-tracking branch 'bpf/master'

Merge remote-tracking branch 'net/master'

Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next

* 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_scmi: Reset Rx buffer to max size during async commands
  firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig
  firmware: arm_scmi: Add clock management to the SCMI power domain

Merge tag 'arm-ffa-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next

Arm Firmware Framework for ARMv8-A(FFA) interface driver

The Arm FFA specification describes a software architecture to
leverages the virtualization extension to isolate software images
provided by an ecosystem of vendors from each other and describes
interfaces that standardize communication between the various software
images including communication between images in the Secure world and
Normal world. Any Hypervisor could use the FFA interfaces to enable
communication between VMs it manages.

The Hypervisor a.k.a Partition managers in FFA terminology can assign
system resources(Memory regions, Devices, CPU cycles) to the partitions
and manage isolation amongst them.

This is the initial and minimal support for the FFA interface to enable
communication between secure partitions and the normal world OS.

* tag 'arm-ffa-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_ffa: Add support for MEM_* interfaces
  firmware: arm_ffa: Setup in-kernel users of FFA partitions
  firmware: arm_ffa: Add support for SMCCC as transport to FFA driver
  firmware: arm_ffa: Add initial Arm FFA driver support
  firmware: arm_ffa: Add initial FFA bus support for device enumeration
  arm64: smccc: Add support for SMCCCv1.2 extended input/output registers

firmware: arm_scmi: Reset Rx buffer to max size during async commands

During an async commands execution the Rx buffer length is at first set
to max_msg_sz when the synchronous part of the command is first sent.
However once the synchronous part completes the transport layer waits
for the delayed response which will be processed using the same xfer
descriptor initially allocated. Since synchronous response received at
the end of the xfer will shrink the Rx buffer length to the effective
payload response length, it needs to be reset again.

Raise the Rx buffer length again to max_msg_sz before fetching the
delayed response to ensure full response is read correctly from the
shared memory.

Link: https://lore.kernel.org/r/20210601102421.26581-2-cristian.marussi@arm.com
Fixes: 58ecdf03dbb9 ("firmware: arm_scmi: Add support for asynchronous commands and delayed response")
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
[sudeep.holla: moved reset to scmi_handle_response as it could race with
               do_xfer_with_response]
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>