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>

net: stmmac: fix issue where clk is being unprepared twice

In the case of MDIO bus registration failure due to no external PHY
devices is connected to the MAC, clk_disable_unprepare() is called in
stmmac_bus_clk_config() and intel_eth_pci_probe() respectively.

The second call in intel_eth_pci_probe() will caused the following:-

[   16.578605] intel-eth-pci 0000:00:1e.5: No PHY found
[   16.583778] intel-eth-pci 0000:00:1e.5: stmmac_dvr_probe: MDIO bus (id: 2) registration failed
[   16.680181] ------------[ cut here ]------------
[   16.684861] stmmac-0000:00:1e.5 already disabled
[   16.689547] WARNING: CPU: 13 PID: 2053 at drivers/clk/clk.c:952 clk_core_disable+0x96/0x1b0
[   16.697963] Modules linked in: dwc3 iTCO_wdt mei_hdcp iTCO_vendor_support udc_core x86_pkg_temp_thermal kvm_intel marvell10g kvm sch_fq_codel nfsd irqbypass dwmac_intel(+) stmmac uio ax88179_178a pcs_xpcs phylink uhid spi_pxa2xx_platform usbnet mei_me pcspkr tpm_crb mii i2c_i801 dw_dmac dwc3_pci thermal dw_dmac_core intel_rapl_msr libphy i2c_smbus mei tpm_tis intel_th_gth tpm_tis_core tpm intel_th_acpi intel_pmc_core intel_th i915 fuse configfs snd_hda_intel snd_intel_dspcfg snd_intel_sdw_acpi snd_hda_codec snd_hda_core snd_pcm snd_timer snd soundcore
[   16.746785] CPU: 13 PID: 2053 Comm: systemd-udevd Tainted: G     U            5.13.0-rc3-intel-lts #76
[   16.756134] Hardware name: Intel Corporation Alder Lake Client Platform/AlderLake-S ADP-S DRR4 CRB, BIOS ADLIFSI1.R00.1494.B00.2012031421 12/03/2020
[   16.769465] RIP: 0010:clk_core_disable+0x96/0x1b0
[   16.774222] Code: 00 8b 05 45 96 17 01 85 c0 7f 24 48 8b 5b 30 48 85 db 74 a5 8b 43 7c 85 c0 75 93 48 8b 33 48 c7 c7 6e 32 cc b7 e8 b2 5d 52 00 <0f> 0b 5b 5d c3 65 8b 05 76 31 18 49 89 c0 48 0f a3 05 bc 92 1a 01
[   16.793016] RSP: 0018:ffffa44580523aa0 EFLAGS: 00010086
[   16.798287] RAX: 0000000000000000 RBX: ffff8d7d0eb70a00 RCX: 0000000000000000
[   16.805435] RDX: 0000000000000002 RSI: ffffffffb7c62d5f RDI: 00000000ffffffff
[   16.812610] RBP: 0000000000000287 R08: 0000000000000000 R09: ffffa445805238d0
[   16.819759] R10: 0000000000000001 R11: 0000000000000001 R12: ffff8d7d0eb70a00
[   16.826904] R13: ffff8d7d027370c8 R14: 0000000000000006 R15: ffffa44580523ad0
[   16.834047] FS:  00007f9882fa2600(0000) GS:ffff8d80a0940000(0000) knlGS:0000000000000000
[   16.842177] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[   16.847966] CR2: 00007f9882bea3d8 CR3: 000000010b126001 CR4: 0000000000370ee0
[   16.855144] Call Trace:
[   16.857614]  clk_core_disable_lock+0x1b/0x30
[   16.861941]  intel_eth_pci_probe.cold+0x11d/0x136 [dwmac_intel]
[   16.867913]  pci_device_probe+0xcf/0x150
[   16.871890]  really_probe+0xf5/0x3e0
[   16.875526]  driver_probe_device+0x64/0x150
[   16.879763]  device_driver_attach+0x53/0x60
[   16.883998]  __driver_attach+0x9f/0x150
[   16.887883]  ? device_driver_attach+0x60/0x60
[   16.892288]  ? device_driver_attach+0x60/0x60
[   16.896698]  bus_for_each_dev+0x77/0xc0
[   16.900583]  bus_add_driver+0x184/0x1f0
[   16.904469]  driver_register+0x6c/0xc0
[   16.908268]  ? 0xffffffffc07ae000
[   16.911598]  do_one_initcall+0x4a/0x210
[   16.915489]  ? kmem_cache_alloc_trace+0x305/0x4e0
[   16.920247]  do_init_module+0x5c/0x230
[   16.924057]  load_module+0x2894/0x2b70
[   16.927857]  ? __do_sys_finit_module+0xb5/0x120
[   16.932441]  __do_sys_finit_module+0xb5/0x120
[   16.936845]  do_syscall_64+0x42/0x80
[   16.940476]  entry_SYSCALL_64_after_hwframe+0x44/0xae
[   16.945586] RIP: 0033:0x7f98830e5ccd
[   16.949177] Code: 00 c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 93 31 0c 00 f7 d8 64 89 01 48
[   16.967970] RSP: 002b:00007ffc66b60168 EFLAGS: 00000246 ORIG_RAX: 0000000000000139
[   16.975583] RAX: ffffffffffffffda RBX: 000055885de35ef0 RCX: 00007f98830e5ccd
[   16.982725] RDX: 0000000000000000 RSI: 00007f98832541e3 RDI: 0000000000000012
[   16.989868] RBP: 0000000000020000 R08: 0000000000000000 R09: 0000000000000000
[   16.997042] R10: 0000000000000012 R11: 0000000000000246 R12: 00007f98832541e3
[   17.004222] R13: 0000000000000000 R14: 0000000000000000 R15: 00007ffc66b60328
[   17.011369] ---[ end trace df06a3dab26b988c ]---
[   17.016062] ------------[ cut here ]------------
[   17.020701] stmmac-0000:00:1e.5 already unprepared

Removing the stmmac_bus_clks_config() call in stmmac_dvr_probe and let
dwmac-intel to handle the unprepare and disable of the clk device.

Fixes: 5ec55823438e ("net: stmmac: add clocks management for gmac driver")
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: Wong Vee Khee <vee.khee.wong@linux.intel.com>
Reviewed-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>