Commit Graph

982974 Commits

Author SHA1 Message Date
Colin Ian King
8354bcbebd net: sched: fix spelling mistake in Kconfig "trys" -> "tries"
There is a spelling mistake in the Kconfig help text. Fix it.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 16:01:56 -08:00
David Howells
4cb6829647 afs: Fix memory leak when mounting with multiple source parameters
There's a memory leak in afs_parse_source() whereby multiple source=
parameters overwrite fc->source in the fs_context struct without freeing
the previously recorded source.

Fix this by only permitting a single source parameter and rejecting with
an error all subsequent ones.

This was caught by syzbot with the kernel memory leak detector, showing
something like the following trace:

  unreferenced object 0xffff888114375440 (size 32):
    comm "repro", pid 5168, jiffies 4294923723 (age 569.948s)
    backtrace:
      slab_post_alloc_hook+0x42/0x79
      __kmalloc_track_caller+0x125/0x16a
      kmemdup_nul+0x24/0x3c
      vfs_parse_fs_string+0x5a/0xa1
      generic_parse_monolithic+0x9d/0xc5
      do_new_mount+0x10d/0x15a
      do_mount+0x5f/0x8e
      __do_sys_mount+0xff/0x127
      do_syscall_64+0x2d/0x3a
      entry_SYSCALL_64_after_hwframe+0x44/0xa9

Fixes: 13fcc68370 ("afs: Add fs_context support")
Reported-by: syzbot+86dc6632faaca40133ab@syzkaller.appspotmail.com
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-12-08 15:59:25 -08:00
David S. Miller
e1be4b5990 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:

====================
pull request: bluetooth-next 2020-12-07

Here's the main bluetooth-next pull request for the 5.11 kernel.

 - Updated Bluetooth entries in MAINTAINERS to include Luiz von Dentz
 - Added support for Realtek 8822CE and 8852A devices
 - Added support for MediaTek MT7615E device
 - Improved workarounds for fake CSR devices
 - Fix Bluetooth qualification test case L2CAP/COS/CFD/BV-14-C
 - Fixes for LL Privacy support
 - Enforce 16 byte encryption key size for FIPS security level
 - Added new mgmt commands for extended advertising support
 - Multiple other smaller fixes & improvements

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:58:49 -08:00
Julian Wiedmann
97f8841e04 net/af_iucv: use DECLARE_SOCKADDR to cast from sockaddr
This gets us compile-time size checking.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:56:53 -08:00
Cengiz Can
0398ba9e5a net: tipc: prevent possible null deref of link
`tipc_node_apply_property` does a null check on a `tipc_link_entry`
pointer but also accesses the same pointer out of the null check block.

This triggers a warning on Coverity Static Analyzer because we're
implying that `e->link` can BE null.

Move "Update MTU for node link entry" line into if block to make sure
that we're not in a state that `e->link` is null.

Signed-off-by: Cengiz Can <cengiz@kernel.wtf>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:53:41 -08:00
David S. Miller
41a6351763 Merge branch 'mlxsw-Add-support-for-Q-in-VNI'
Ido Schimmel says:

====================
mlxsw: Add support for Q-in-VNI

This patch set adds support for Q-in-VNI over Spectrum-{2,3} ASICs.
Q-in-VNI is like regular VxLAN encapsulation with the sole difference
that overlay packets can contain a VLAN tag. In Linux, this is achieved
by adding the VxLAN device to a 802.1ad bridge instead of a 802.1q
bridge.

From mlxsw perspective, Q-in-VNI support entails two main changes:

1. An outer VLAN tag should always be pushed to the overlay packet
during decapsulation

2. The EtherType used during decapsulation should be 802.1ad (0x88a8)
instead of the default 802.1q (0x8100)

Patch set overview:

Patches #1-#3 add required device registers and fields

Patch #4 performs small refactoring to allow code re-use

Patches #5-#7 make the EtherType used during decapsulation a property of
the tunnel port (i.e., VxLAN). This leads to the driver vetoing
configurations in which VxLAN devices are member in both 802.1ad and
802.1q/802.1d bridges. Will be handled in the future by determining the
overlay EtherType on the egress port instead

Patch #8 adds support for Q-in-VNI for Spectrum-2 and newer ASICs

Patches #9-#10 veto Q-in-VNI for Spectrum-1 ASICs due to some hardware
limitations. Can be worked around, but decided not to support it for now

Patch #11 adjusts mlxsw to stop vetoing addition of VXLAN devices to
802.1ad bridges

Patch #12 adds a generic forwarding test that can be used with both veth
pairs and physical ports with a loopback

Patch #13 adds a test to make sure mlxsw vetoes unsupported Q-in-VNI
configurations
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:46:40 -08:00
Amit Cohen
477ce6d971 selftests: mlxsw: Add Q-in-VNI veto tests
Add tests to ensure that the forbidden and unsupported cases are indeed
vetoed by mlxsw driver.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:57 -08:00
Petr Machata
4cec85296c selftests: forwarding: Add Q-in-VNI test
Add test to check Q-in-VNI traffic.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:57 -08:00
Amit Cohen
745f73deea mlxsw: spectrum_switchdev: Allow joining VxLAN to 802.1ad bridge
The previous patches added support for VxLAN device enslaved to 802.1ad
bridge in Spectrum-2 ASIC and vetoed it in Spectrum-1.

Do not veto VxLAN with 802.1ad bridge.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:57 -08:00
Amit Cohen
efbcb67339 mlxsw: Veto Q-in-VNI for Spectrum-1 ASIC
Implementation of Q-in-VNI is different between ASIC types, this set adds
support only for Spectrum-2.

Return an error when trying to create VxLAN device and enslave it to
802.1ad bridge in Spectrum-1.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Amit Cohen
7e9c72a5da mlxsw: spectrum_switchdev: Use ops->vxlan_join() when adding VLAN to VxLAN device
Currently mlxsw_sp_switchdev_vxlan_vlan_add() always calls
mlxsw_sp_bridge_8021q_vxlan_join() because VLANs were only ever added to
a VLAN-filtering bridge, which is only 802.1q bridge.

This set adds support for VxLAN with 802.1ad bridge, so VLAN-filtering
bridge is not only 802.1q.

Call ops->vxlan_join(), so mlxsw_sp_bridge_802{1q, 1ad}_vxlan_join()
will be called according to bridge type.

This is needed to ensure that VxLAN with 802.1ad bridge will be vetoed
in Spectrum-1 with the next patch.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Amit Cohen
0b5ec8f237 mlxsw: spectrum_nve_vxlan: Add support for Q-in-VNI for Spectrum-2 ASIC
On Spectrum-2, the default setting is not to push VLAN to the decapsulated
packet. This is controlled by SPVTR.ipvid_mode.
Set SPVTR.ipvid_mode to always push VLAN.
Without this setting, Spectrum-2 overtakes the VLAN tag of decapsulated
packet for bridging.

In addition, set SPVID register to use EtherType saved in
mlxsw_sp_nve_config when VLAN is pushed for the NVE tunnel.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Amit Cohen
4418096e84 mlxsw: spectrum: Publish mlxsw_sp_ethtype_to_sver_type()
Declare mlxsw_sp_ethtype_to_sver_type() in spectrum.h to enable using it
in other files.

It will be used in the next patch to map between EtherType and the
relevant value configured by SVER register.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Amit Cohen
49d18964e9 mlxsw: Save EtherType as part of mlxsw_sp_nve_config
Add EtherType field to mlxsw_sp_nve_config struct.
Set EtherType according to mlxsw_sp_nve_params.ethertype.

Pass 'mlxsw_sp_nve_params' instead of 'mlxsw_sp_nve_params->dev' to the
function which initializes mlxsw_sp_nve_config struct to know which
EtherType to use.

This field is needed to configure which EtherType will be used when
VLAN is pushed at ingress of the tunnel port.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Amit Cohen
0913a24b3a mlxsw: Save EtherType as part of mlxsw_sp_nve_params
Add EtherType field to mlxsw_sp_nve_params struct.
Set it when VxLAN device is added to bridge device.

This field is needed to configure which EtherType will be used when
VLAN is pushed at ingress of the tunnel port.

Use ETH_P_8021Q for tunnel port enslaved to 802.1d and 802.1q bridges.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Amit Cohen
e2c777d7e3 mlxsw: spectrum_switchdev: Create common function for joining VxLAN to VLAN-aware bridge
The code in mlxsw_sp_bridge_8021q_vxlan_join() can be used also for
802.1ad bridge.

Move the code to function called mlxsw_sp_bridge_vlan_aware_vxlan_join()
and call it from mlxsw_sp_bridge_8021q_vxlan_join() to enable code
reuse.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Amit Cohen
598874c8e9 mlxsw: reg: Add support for tunnel port in SPVID register
Add spvid_tport field which indicates if the port is tunnel port.
When spvid_tport is true, local_port field supposed to be tunnel port
type.

It will be used to configure which Ethertype will be used when VLAN is
pushed at ingress for tunnel port.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Amit Cohen
c1c32a79c5 mlxsw: reg: Add Switch Port VLAN Stacking Register
SPVTR register configures the VLAN mode of the port to enable VLAN
stacking.

It will be used to configure VxLAN to push VLAN to the decapsulated packet.
Without this setting, Spectrum-2 overtakes the VLAN tag of decapsulated
packet for bridging.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Amit Cohen
02c3b5c5d0 mlxsw: Use one enum for all registers that contain tunnel_port field
Currently SFN, TNUMT and TNPC registers use separate enums for
tunnel_port.

Create one enum with a neutral name and use it.
Remove the enums that are not currently required.

The next patches add two more registers that contain tunnel_port field,
the new enum can be used for them also.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:45:56 -08:00
Arnd Bergmann
694a5b5769 Merge tag 'memory-controller-drv-tegra-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers
Memory controller drivers for v5.11 - Tegra SoC, part two

Continuation of work on Tegra SoC memory controllers towards adding
interconnect support and integration with devfreq.

This brings few more patches including one which removes/fixes annoying
warning if the DTS patches get applied.  This is expected and only
informs that new features of Tegra memory controller drivers will not be
enabled however the warning itself could look worrying.

* tag 'memory-controller-drv-tegra-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  memory: tegra30: Support interconnect framework
  memory: tegra20: Support hardware versioning and clean up OPP table initialization
  dt-bindings: memory: tegra20-emc: Document opp-supported-hw property

Link: https://lore.kernel.org/r/20201207075758.5501-2-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:40:02 +01:00
Arnd Bergmann
c35ffce8a9 Merge tag 'memory-controller-drv-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers
Memory controller drivers for v5.11, part two

1. Several fixes for Renesas RPC-IF driver.
2. Correct compile testing of TI EMIF SRAM driver.
3. Fix potential NULL pointer in JZ4780 NEMC driver.

* tag 'memory-controller-drv-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  memory: jz4780_nemc: Fix potential NULL dereference in jz4780_nemc_probe()
  memory: ti-emif-sram: only build for ARMv7
  memory: renesas-rpc-if: Make rpcif_enable/disable_rpm() as static inline
  memory: renesas-rpc-if: Fix a node reference leak in rpcif_probe()
  memory: renesas-rpc-if: Fix unbalanced pm_runtime_enable in rpcif_{enable,disable}_rpm
  memory: renesas-rpc-if: Return correct value to the caller of rpcif_manual_xfer()

Link: https://lore.kernel.org/r/20201207075758.5501-1-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:40:01 +01:00
Arnd Bergmann
9ccd9ef36f Merge tag 'v5.11-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/drivers
Minor fixes for the io-domain soc-driver

* tag 'v5.11-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  soc: rockchip: io-domain: Fix error return code in rockchip_iodomain_probe()
  soc: rockchip: io-domain: Remove incorrect and incomplete comment header

Link: https://lore.kernel.org/r/2045618.irdbgypaU6@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:39:59 +01:00
Arnd Bergmann
5dd65cf78d Merge tag 'reset-for-v5.11' of git://git.pengutronix.de/pza/linux into arm/drivers
Reset controller updates for v5.11

This tag adds support for sharing pulsed resets under certain
conditions. For example, when multiple drivers go through a
suspend-resume cycle, a reset line they share can be triggered
again during resume.
Further, the reset-meson driver now can be built as a module, the
reset-socfpga driver properly releases its memory region in the
probe error path, and reset-ti-syscon driver uses regmap_write_bits()
instead of regmap_update_bits() to support devices without status
readback.

* tag 'reset-for-v5.11' of git://git.pengutronix.de/pza/linux:
  reset-controller: ti: force the write operation when assert or deassert
  reset: socfpga: add error handling and release mem-region
  reset: meson: make it possible to build as a module
  reset: make shared pulsed reset controls re-triggerable

Link: https://lore.kernel.org/r/d586ada0073f2ac50a02274f42bf07bfb0603835.camel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:39:58 +01:00
Arnd Bergmann
e0839f3ea4 Merge tag 'imx-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/drivers
i.MX drivers change for 5.11:

- A series from Daniel Baluta to update imx-dsp driver and export
  functions for on demand channel request/free.
- A number of patches to add power domains for i.MX8qxp DC0, LVDS1,
  MIPI1 and JPEG subsystems.
- Add dummy functions for i.MX firmware drivers to avoid build failure
  seen with COMPILE_TEST.

* tag 'imx-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  firmware: imx: scu-pd: Add some power domains support for i.MX8qxp MIPI1 subsystem
  firmware: imx: scu-pd: Add main power domain support for i.MX8qxp LVDS1 subsystem
  firmware: imx: scu-pd: Add video0/1 power domains support for i.MX8qxp DC0 subsystem
  firmware: imx-dsp: Export functions to request/free channels
  firmware: imx: Save channel name for further use
  firmware: imx: Introduce imx_dsp_setup_channels
  firmware: imx: scu-pd: Add power domains for imx-jpeg
  firmware: imx: add dummy functions

Link: https://lore.kernel.org/r/20201202142717.9262-1-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:39:57 +01:00
Arnd Bergmann
2bd87914b2 Merge tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/drivers
soc: amlogic: driver updates for v5.11
- enable building as modules
- reset API updates

* tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  soc: amlogic: replace devm_reset_control_array_get()
  soc: amlogic: canvas: add missing put_device() call in meson_canvas_get()
  firmware: meson-sm: enable build as module
  soc: meson: enable building drivers as modules
  soc: amlogic: socinfo: build for specific arch

Link: https://lore.kernel.org/r/7him9ljgtr.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:39:56 +01:00
Arnd Bergmann
8dc0aac1cc Merge tag 'drivers_soc_for_5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/drivers
drivers: soc: TI SOC changes for 5.11

- ti_sci changes towards DMSS support
- Static warning fixes
- Kconfig update for Keystone ARM64 socs
- AM64X SOC family support

* tag 'drivers_soc_for_5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: (23 commits)
  drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe
  soc: ti: Fix reference imbalance in knav_dma_probe
  soc: ti: pruss: Remove wrong check against *get_match_data return value
  soc: ti: Kconfig: Drop ARM64 SoC specific configs
  soc: ti: k3-ringacc: Provide documentation for 'k3_ring's 'state'
  soc: ti: wkup_m3_ipc: Document 'm3_ipc' parameter throughout
  soc: ti: pm33xx: Remove set but unused variable 'ret'
  soc: ti: knav_dma: Fix a kernel function doc formatting issue
  soc: ti: knav_qmss_queue: Fix a whole host of function documentation issues
  soc: ti: knav_qmss_queue: Remove set but unchecked variable 'ret'
  soc: ti: omap-prm: Do not check rstst bit on deassert if already deasserted
  soc: ti: knav_qmss: fix reference leak in knav_queue_probe
  soc: ti: k3-socinfo: Add entry for AM64X SoC family
  soc: ti: k3-ringacc: Use correct device for allocation in RING mode
  firmware: ti_sci: rm: Remove unused config() from ti_sci_rm_ringacc_ops
  soc: ti: k3-ringacc: Use the ti_sci set_cfg callback for ring configuration
  firmware: ti_sci: rm: Add new ops for ring configuration
  firmware: ti_sci: rm: Remove ring_get_config support
  firmware: ti_sci: rm: Add support for extended_ch_type for tx channel
  soc: ti: ti_sci_inta_msi: Add support for second range in resource ranges
  ...

Link: https://lore.kernel.org/r/1606851405-26338-1-git-send-email-santosh.shilimkar@oracle.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:39:54 +01:00
Arnd Bergmann
4cc6ae9896 Merge tag 'omap-for-v5.11/genpd-drivers-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/drivers
Driver changes for omaps for genpd for v5.11 merge window

This series of changes allows booting am335x with genpd and
device tree data without the legacy platform data. Also at
least am437x can be booted with gendp with power domain and
dts data. The SoC specific dts changes will be a separate
pull request.

We need the following driver changes merged before the dts
changes can be done:

- platform code needs a few improvments to probe l4_wkup first
  for clocks, and to bail out when there is no platform data

- ti-sysc driver needs a non-urgent fix for asserting rstctrl
  reset only after disabling the clocks, to probe modules with
  no known control registers, and added quirk handling for gpmc
  devices

- omap-prm driver needs a non-urgent fix for reset status bit,
  support added for pm_clk, and then we add the rest of am335x
  power domain data

- clock driver for am335x needs to keep l3_main clock enabled
  with genpd for suspend and resume to work

- wkup_m3 remoteproc driver needs support added for reset
  control if available instead of the legacy pdata callbacks

- pm33xx driver needs PM runtime support added for genpd

The am335x specific driver changes for the clock, wkup_m3,
pm33xx and remoteproc drivers are quite trivial and have not
caused merge conflicts in Linux next. I did not get acks for
these changes except from Santosh but had already pushed out
the branch already at that point. So I've added the related
driver maintainers to Cc.

* tag 'omap-for-v5.11/genpd-drivers-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  remoteproc/wkup_m3: Use reset control driver if available
  soc: ti: pm33xx: Enable basic PM runtime support for genpd
  soc: ti: omap-prm: am3: add genpd support for remaining PRM instances
  soc: ti: omap-prm: Add pm_clk for genpd
  clk: ti: am33xx: Keep am3 l3 main clock always on for genpd
  bus: ti-sysc: Implement GPMC debug quirk to drop platform data
  bus: ti-sysc: Support modules without control registers
  ARM: OMAP2+: Probe PRCM first to probe l4_wkup with simple-pm-bus
  ARM: OMAP2+: Check for inited flag
  bus: ti-sysc: Assert reset only after disabling clocks
  soc: ti: omap-prm: Do not check rstst bit on deassert if already deasserted
  bus: ti-sysc: Fix bogus resetdone warning on enable for cpsw
  bus: ti-sysc: Fix reset status check for modules with quirks
  ARM: OMAP2+: Fix missing select PM_GENERIC_DOMAINS_OF
  ARM: OMAP2+: Fix location for select PM_GENERIC_DOMAINS

Link: https://lore.kernel.org/r/pull-1606806458-694517@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:39:53 +01:00
Arnd Bergmann
a97d8ffac8 Merge tag 'qcom-drivers-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/drivers
Qualcomm driver updates for v5.11

This adds support for the core power domains on MSM8916, MSM8939, SDM660
and SDX55. It adds SM8150 support to the last-level cache controller
driver and it makes it possible to build the Command DB and RPMh drivers
as modules.

It also contains a slew of smaller cleanups, style and bug fixes
throughout the various drivers.

* tag 'qcom-drivers-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (39 commits)
  soc: qcom: rpmhpd: Add SDX55 power domains
  dt-bindings: power: Add rpm power domain bindings for sdx55
  soc: qcom: rpmh: Use __fill_rpmh_msg API during rpmh_write()
  samples: qmi: Constify static qmi ops
  soc: qcom: pdr: Constify static qmi structs
  soc: qcom: initialize local variable
  soc: qcom: socinfo: add soc ids for msm8953 variants
  soc: qcom: geni: Remove "iova" check
  soc: qcom: llcc: Add configuration data for SM8150
  dt-bindings: msm: Add LLCC for SM8150
  soc: qcom: rpmh: Fix possible doc-rot in rpmh_write()'s header
  soc: qcom: kryo-l2-accessors: Fix misnaming of 'val'
  soc: qcom: rpmhpd: Provide some missing struct member descriptions
  soc: qcom: llcc-qcom: Fix expected kernel-doc formatting
  soc: qcom: smp2p: Remove unused struct attribute provide another
  soc: qcom: wcnss_ctrl: Demote non-conformant struct header and fix function headers
  soc: qcom: smsm: Fix some kernel-doc formatting and naming problems
  soc: qcom: smem: Fix formatting and missing documentation issues
  soc: qcom: qcom-geni-se: Fix misnamed function parameter 'rx_rfr'
  soc: qcom: qcom_aoss: Add missing description for 'cooling_devs'
  ...

Link: https://lore.kernel.org/r/20201130190142.345246-1-bjorn.andersson@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:39:52 +01:00
Daeho Jeong
6422a71ef4 f2fs: fix race of pending_pages in decompression
I found out f2fs_free_dic() is invoked in a wrong timing, but
f2fs_verify_bio() still needed the dic info and it triggered the
below kernel panic. It has been caused by the race condition of
pending_pages value between decompression and verity logic, when
the same compression cluster had been split in different bios.
By split bios, f2fs_verify_bio() ended up with decreasing
pending_pages value before it is reset to nr_cpages by
f2fs_decompress_pages() and caused the kernel panic.

[ 4416.564763] Unable to handle kernel NULL pointer dereference
               at virtual address 0000000000000000
...
[ 4416.896016] Workqueue: fsverity_read_queue f2fs_verity_work
[ 4416.908515] pc : fsverity_verify_page+0x20/0x78
[ 4416.913721] lr : f2fs_verify_bio+0x11c/0x29c
[ 4416.913722] sp : ffffffc019533cd0
[ 4416.913723] x29: ffffffc019533cd0 x28: 0000000000000402
[ 4416.913724] x27: 0000000000000001 x26: 0000000000000100
[ 4416.913726] x25: 0000000000000001 x24: 0000000000000004
[ 4416.913727] x23: 0000000000001000 x22: 0000000000000000
[ 4416.913728] x21: 0000000000000000 x20: ffffffff2076f9c0
[ 4416.913729] x19: ffffffff2076f9c0 x18: ffffff8a32380c30
[ 4416.913731] x17: ffffffc01f966d97 x16: 0000000000000298
[ 4416.913732] x15: 0000000000000000 x14: 0000000000000000
[ 4416.913733] x13: f074faec89ffffff x12: 0000000000000000
[ 4416.913734] x11: 0000000000001000 x10: 0000000000001000
[ 4416.929176] x9 : ffffffff20d1f5c7 x8 : 0000000000000000
[ 4416.929178] x7 : 626d7464ff286b6b x6 : ffffffc019533ade
[ 4416.929179] x5 : 000000008049000e x4 : ffffffff2793e9e0
[ 4416.929180] x3 : 000000008049000e x2 : ffffff89ecfa74d0
[ 4416.929181] x1 : 0000000000000c40 x0 : ffffffff2076f9c0
[ 4416.929184] Call trace:
[ 4416.929187]  fsverity_verify_page+0x20/0x78
[ 4416.929189]  f2fs_verify_bio+0x11c/0x29c
[ 4416.929192]  f2fs_verity_work+0x58/0x84
[ 4417.050667]  process_one_work+0x270/0x47c
[ 4417.055354]  worker_thread+0x27c/0x4d8
[ 4417.059784]  kthread+0x13c/0x320
[ 4417.063693]  ret_from_fork+0x10/0x18

Chao pointed this can happen by the below race condition.

Thread A        f2fs_post_read_wq          fsverity_wq
- f2fs_read_multi_pages()
  - f2fs_alloc_dic
   - dic->pending_pages = 2
   - submit_bio()
   - submit_bio()
               - f2fs_post_read_work() handle first bio
                - f2fs_decompress_work()
                 - __read_end_io()
                  - f2fs_decompress_pages()
                   - dic->pending_pages--
                - enqueue f2fs_verity_work()
                                           - f2fs_verity_work() handle first bio
                                            - f2fs_verify_bio()
                                             - dic->pending_pages--
               - f2fs_post_read_work() handle second bio
                - f2fs_decompress_work()
                - enqueue f2fs_verity_work()
                                            - f2fs_verify_pages()
                                            - f2fs_free_dic()

                                          - f2fs_verity_work() handle second bio
                                           - f2fs_verfy_bio()
                                                 - use-after-free on dic

Signed-off-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
2020-12-08 15:39:14 -08:00
David S. Miller
a8d5dd192a mlx5-updates-2020-12-01
mlx5e port TX timestamping support and MISC updates
 
 1) Add support for port TX timestamping, for better PTP accuracy.
 
 Currently in mlx5 HW TX timestamping is done on CQE (TX completion)
 generation, which much earlier than when the packet actually goes out to
 the wire, in this series Eran implements the option to do timestamping on
 the port using a special SQ (Send Queue), such Send Queue will generate 2
 CQEs (TX completions), the original one and a new one when the packet
 leaves the port, due to the nature of this special handling, such mechanism
 is an opt-in only and it is off by default to avoid any performance
 degradation on normal traffic flows.
 
 This patchset improves TX Hardware timestamping offset to be less than
 40ns at a 100Gbps line rate, compared to 600ns before.
 
 With that, making our HW compliant with G.8273.2 class C, and allow Linux
 systems to be deployed in the 5G telco edge, where this standard is a must.
 
 2) Misc updates and trivial improvements.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEGhZs6bAKwk/OTgTpSD+KveBX+j4FAl/P0/EACgkQSD+KveBX
 +j5ETAf/Y6zPUHEk8mufD7RJaeQ/11gDtT3JKaPfcYBxaHs9VOPUTA2vemAZUuM0
 0Rfsrv25PeLjvBtE2wCyA/gZ9naEeE2UELHR6FKEipnrnT+b2JD/dYG9Nb7EiARw
 zu8djoOza/bLLKvNew+VAr1P0+of0IIkD7NXqRTnUTnATQubLYm/AF7TGhINIa8H
 xXnBHu1C7Lz8Ow2f6IBA1ntrGoWApdyuXpHJQlJvwgpPLXkD10GEoqXk3LtP11/J
 KCAKDdMAlChydCo2rmruwwCM0z3Gjl86uffIbLE0bbJJGk3Gpkq12B2aUk/l3Xzj
 Y3RtiMHTgqaqo9AVjBPI435mw/LPvA==
 =kvQC
 -----END PGP SIGNATURE-----

Merge tag 'mlx5-updates-2020-12-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux

mlx5-updates-2020-12-01

mlx5e port TX timestamping support and MISC updates

1) Add support for port TX timestamping, for better PTP accuracy.

Currently in mlx5 HW TX timestamping is done on CQE (TX completion)
generation, which much earlier than when the packet actually goes out to
the wire, in this series Eran implements the option to do timestamping on
the port using a special SQ (Send Queue), such Send Queue will generate 2
CQEs (TX completions), the original one and a new one when the packet
leaves the port, due to the nature of this special handling, such mechanism
is an opt-in only and it is off by default to avoid any performance
degradation on normal traffic flows.

This patchset improves TX Hardware timestamping offset to be less than
40ns at a 100Gbps line rate, compared to 600ns before.

With that, making our HW compliant with G.8273.2 class C, and allow Linux
systems to be deployed in the 5G telco edge, where this standard is a must.

2) Misc updates and trivial improvements.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 15:39:01 -08:00
Arnd Bergmann
d23e629717 A few more RGMII-ID fixes
-----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCX8+ocQAKCRDj7w1vZxhR
 xYTCAQDuwJCQDbBh5+UFsWUBPnphCTo53H9kxY/GO/g6fw4gNAD+NhV1F8l53n+e
 jCmnANqbNP1T/blps9RJgMsw57NvRAY=
 =xWDk
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-fixes-for-5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

A few more RGMII-ID fixes

* tag 'sunxi-fixes-for-5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: H5: NanoPi Neo Plus2: phy-mode rgmii-id
  arm64: dts: allwinner: A64 Sopine: phy-mode rgmii-id

Link: https://lore.kernel.org/r/2a351c9c-470f-4c5e-ba37-80065ae0586d.lettre@localhost
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:13:38 +01:00
Arnd Bergmann
4f9f1415bb arm64: dts: amlogic updates for v5.11, round 2
- audio support for several more boards
 - PHY timing fixes
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAl/P0pIACgkQWTcYmtP7
 xmUYRQ//R7B1Qh94p79Lj8swFQxzjJJutIaw5weI/xeZ2V9kGp21+IXtj7btM2PF
 JyCYhnP4iuvsehRXd5FzK2Q2YQR3wsKMx7yzO9mD7I6pFkvhEOwDIDwzz+NV76SU
 yU2eNHjE07TyKwGfbbo2Gt4UkXIB0Hv6cHsHzRo9HswsR3bZ1lznytvnBf8ZQUeR
 QQxXvZeA/BHAgsvCqHsOcXnnzcRR8PUQ9rtPVeIL6RB0yzQaZ590jWsLXW2LTPHr
 l13KkJ+/+izkTua3QI3CSMv85RydTN6RTWkc+1/WxA5uGgl6Sj3fj8B8117tIVR5
 3WAMDtp7qYYBfXSfV+xWg3ov1EQOPYri6pOHaco8YZgA0jxHolHJIF0dUXQLWzGg
 HByQIwpZ5ZGw2179dVg/UwPeKUKHxWOudxsFA5SIAMAlpbsHeXShkfjB5Pd1tS42
 COHjyrX47h8zoD0Il0nNDNU//+GYP52RmDpsSakxNIP/dXYt/OzDeCgo1gipPOdd
 W1FBb1VKQKJbxlLGrSWdeB4A13uY2XKeQcjac1Dd0sQ48A0lvseK1MLe8Q92KmPh
 vBFpq1qqjJUl8hbywC99xqTiXwUE2QxzmXS3uLmu6+VpHJiMx0eVIilOkTLdbveZ
 Mu1lQFEvucd7w6cYVDICUg37O8zuP3ZA0pZXllpFFc0xZCe5Fmc=
 =0cIr
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

arm64: dts: amlogic updates for v5.11, round 2
- audio support for several more boards
- PHY timing fixes

* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: add i2c3/rtc nodes and vrtc alias to GT-King/GT-King-Pro
  arm64: dts: meson: g12b: w400: fix PHY deassert timing requirements
  arm64: dts: meson: g12a: x96-max: fix PHY deassert timing requirements
  ARM: dts: meson: fix PHY deassert timing requirements
  arm64: dts: meson: fix PHY deassert timing requirements
  arm64: dts: meson: g12b: odroid-n2: fix PHY deassert timing requirements
  arm64: dts: meson: minor fixups for Khadas VIM/VIM2 dts
  arm64: dts: meson: add audio playback to wetek-play2
  arm64: dts: meson: add audio playback to wetek-hub
  arm64: dts: meson: add audio playback to odroid-c2
  arm64: dts: meson: add audio playback to nanopi-k2
  arm64: dts: meson: add audio playback to khadas-vim2
  arm64: dts: meson: add audio playback to khadas-vim
  arm64: dts: meson: add audio playback to a95x
  arm64: dts: meson-axg: add GE2D node

Link: https://lore.kernel.org/r/7ho8j4gkxo.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:06:33 +01:00
Arnd Bergmann
b4e217d0b3 Samsung DTS ARM changes for v5.11, part three
1. S3C bindings and DTS cleanup,
 2. Correct the clock rates for SPI0 in Artik 5 which is a fix for recently
    introduced Ethernet on SPI on Artik 5 board.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAl/N3EkQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD14axEACAZBYVpy3AY6XHjw9ARzeO3yv+VXUsgTJv
 Qrz5sOjOI3hXIDYeQ1utnpkdfDHNuOqp48cDQhLCpPmXcSmqvpCRxghX012L7tmh
 1VuiVwj6h+cAjeNDS/qYVJSQyy+VpMutCmjy4ri6mFxy7X0wQKuSB2sStZmGAgw8
 0RDemVrKQUtWiAjKlTO+rfoeAZZQv7qj2VLrdb/vXZiNkEfh3Vhqfjs2yc9RRWQF
 k2vDxJWm0fZoMkKKDjVazdnDDxJX4nlUAB68m6GegO9fmSu1MO0hKsHdVdUiaul8
 ytZKSoXCvzP83hESMd6C0RI1zQ79BJLQp+8C+vlcxeLScr32MkXN29JMFO4FNnsF
 mYQPTxRmZKA1KMOaYZ5xdcBS8NjT+69mnX6DTX/LuV0x6FObjbmY7YnLvjXRGXU0
 RTKdLijtTXB4E6IKDzrdo54LNCytomw8/SyjEmboRrNwPgvccwusGN8r6FP6+Lzx
 kFqdvGDgWoBlJVc2bGF5xQ9WF36vO3YF2c0Uys5SOpFfeerNQ7zz9G8udYHAm1Kh
 SUTlBAMZLvbGJfETscZnPTyxDCpR9NpIAPDEhmBa2OEEiHJ0nfJHhWerOpZ508gX
 yRAgICScFEsPjJkGLF4gSDGMqpFOQr5njidOzy/4MIkeV6xxlbHQZkdNMn1BX7kN
 eOllG9Rvig==
 =7AY9
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM changes for v5.11, part three

1. S3C bindings and DTS cleanup,
2. Correct the clock rates for SPI0 in Artik 5 which is a fix for recently
   introduced Ethernet on SPI on Artik 5 board.

* tag 'samsung-dt-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Reduce assigned-clocks entries for SPI0 on Artik5 board
  ARM: dts: s3c6410: correct SMDK6410 board compatible
  ARM: dts: s3c24xx: add SMDK2416 board compatible
  dt-bindings: arm: samsung: document S3C6410-based boards binding
  dt-bindings: arm: samsung: document SMDK2416 board binding

Link: https://lore.kernel.org/r/20201207074528.4475-2-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:05:30 +01:00
Arnd Bergmann
4569830224 Veyron backlight fix, another fix for dtbs-check and some additions
to the rk3288-based VMARC boards.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAl/NHWkQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgVlcB/wIdj41vGWslMZcShijb+QeW5W6bYus3WkX
 Zvl+RDGccGbjDH6UEKP+XETXR2tgKfXSooiO8YKjEV9L/fnfMZQWQh3rPg8SA39b
 f2N7JTnB7YCasZU4XXeQtqB6TKRubAZixUxEWibY1l1mwb+izPeij73PptjEMgsm
 jkVOjwX4lWhfISbVf2Nl5d6KWfbJgPgqu0yA7kIDlRDOvmsxh8vQyByHaTltoa/+
 slLEGn0B+7kMEdGSdL6TgGQ1jwF1WPGoBokl7CnTsNzBkzQIm2wVnbvzZNY/5oI4
 2HCR8ihpqjDxy84Dx3mmlVCl6uGCG8ipHSpLubg3rvqRhA2w1fes
 =oBVw
 -----END PGP SIGNATURE-----

Merge tag 'v5.11-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Veyron backlight fix, another fix for dtbs-check and some additions
to the rk3288-based VMARC boards.

* tag 'v5.11-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add SDIO0 node for VMARC SOM
  ARM: dts: rockchip: Add rtc node for VMARC SOM
  ARM: dts: rockchip: rename wdt nodename to watchdog on rv1108
  ARM: dts: rockchip: Remove 0 point from brightness-levels on rk3288-veyron

Link: https://lore.kernel.org/r/4582475.GXAFRqVoOG@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:04:35 +01:00
Linus Torvalds
c6f7e1510b Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull sparc64 csum fix from Al Viro:
 "Fix for a brown paperbag regression in sparc64"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [regression fix] really dumb fuckup in sparc64 __csum_partial_copy() changes
2020-12-08 15:03:39 -08:00
Arnd Bergmann
261078ab90 Newly added boards are the PX30 SOM system from Engicam and Kobol Helios64.
The Scarlet tablet finally gets support for its cameras, now that the
 the rk3399-isp moved out of staging.
 The Odroid-Go-Advance got its joystick support now that the adc-joystick
 driver was merged and misc omprovements to the RockPi4, rk3328-roc-cc
 and orange-pi.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAl/NIB8QHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgSkWB/9XzLgxka9y6ntWV6+dlhHJQ/KnlvFwIH0m
 o/thgqAd6ns0ey0pYEpQ8Hj6piMHuNWuqIq0S6u19ssv/CPK38lpbrcx+rPnXyd5
 Vvu5KiXtMILPBTz4M0wSNuUfjGtvYvud86OcFKEc8AgWHKs7S8OoxaoRWr2CE+bH
 L4wMUQIsafT0iZEe/PoNl8HwfaNWbf1/5qjhW6oD+DVc0ssbWEdOwDTzwb0rgsK0
 LSgxX+j/qlP57mS5b2CRot18C7meep4EvHcQII2JtHnbY7dgzuqENTI5utTj/q9c
 MtwUNWOlSFUpuu4tMiPf9C29hOoQfWsaW+r9yrsO84Yl+U04TYT9
 =84Fb
 -----END PGP SIGNATURE-----

Merge tag 'v5.11-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Newly added boards are the PX30 SOM system from Engicam and Kobol Helios64.
The Scarlet tablet finally gets support for its cameras, now that the
the rk3399-isp moved out of staging.
The Odroid-Go-Advance got its joystick support now that the adc-joystick
driver was merged and misc omprovements to the RockPi4, rk3328-roc-cc
and orange-pi.

* tag 'v5.11-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (28 commits)
  arm64: dts: rockchip: use USB host by default on rk3399-rock-pi-4
  arm64: dts: rockchip: fix I2S conflict on rk3399-rock-pi-4
  arm64: dts: rockchip: fix supplies on rk3399-rock-pi-4
  arm64: dts: rockchip: Fix UART pull-ups on rk3328
  arm64: dts: rockchip: add isp and sensors for Scarlet
  arm64: dts: rockchip: add isp0 node for rk3399
  arm64: dts: rockchip: Properly define the type C connector on rk3399-orangepi
  arm64: dts: rockchip: Add BT support on px30-engicam
  arm64: dts: rockchip: Add WiFi support on px30-engicam
  arm64: dts: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
  dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0 10.1" OF
  arm64: dts: rockchip: Enable LVDS panel on px30-engicam-edimm2.2
  arm64: dts: rockchip: Enable USB Host, OTG on px30-enagicam
  arm64: dts: rockchip: rename sdhci nodename to mmc on rk3399
  arm64: dts: rockchip: Enable analog audio on rk3328-roc-cc
  arm64: dts: rockchip: Enable HDMI audio on rk3328-roc-cc
  arm64: dts: rockchip: Set dr_mode to "host" for OTG on rk3328-roc-cc
  arm64: dts: rockchip: Add Engicam PX30.Core C.TOUCH 2.0
  arm64: dts: rockchip: Add Engicam C.TOUCH 2.0
  dt-bindings: arm: rockchip: Add Engicam PX30.Core C.TOUCH 2.0
  ...

Link: https://lore.kernel.org/r/4278011.LvFx2qVVIh@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:03:14 +01:00
Arnd Bergmann
f8ff2f057e AT91 DT for 5.11 #2:
- switch to new TCB PWM bindings
  - rework ADC bindings
  - fix sama5d2 securam and can1
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEycoQi/giopmpPgB12wIijOdRNOUFAl/MNUMACgkQ2wIijOdR
 NOV5Kw/9GqV12iNTx1com+sz1NcnWC3owpk9KNBL8WmvxWtCE2N0qyHg16gsFSMy
 b0lrmnO/xH8BlQNVICOLsPhY1RJpSSqqSCdO/HvlWb1kYJytU7Hc2ruVPbfH5K2K
 qJ8BvyNUvE9bN/TZtuiTwYOid0TnuS1D4bH/Zvoy7OPw9yyUZA0CMgAu/f/dw3Yl
 smmrC5ws2ZM/AxfqnMIQVrRzYrUaOr15sCb1uqqMDJ1mSXmWDUHsNLp75ZMpTVnd
 Dsi4wgmpkE1HDeAEorcHKwuRbpmCVxFHPd5TdsRUq94KItr/SfjkEBLFvZnF5mw9
 A9RzbqqBYqBJQmeKfUzC1c3K1fQ0Akueb9pNcdDjkkse2+TFKKLrKbL/chp8gAvJ
 Y3uAhsh1rYTrFRPEaP0+ObXCvjtfWX7bvL/1eil1a3rtW76BEWZuqxIbvmOR4mqq
 YQnyWp3Sr7YhaGR6D2BxjYyg3Ky1nHCWgUMU3iSNe0YedqEGOU2epdwPLsEToILn
 1srKfWE3i/Dw5YoQrnScPE8Er2U9iUApoDORGcGONW4KS5lWyOFFwPhz+JX7VWgo
 aj9KiPLLVz3b78NDOqb/UUIfqNqTukFAeMZ6gG//9DRu1R9e9t5dnaDegMSDFKv5
 u4A7jMi7JDG8EOWIrFSmUYaWUVYe4EH9MkZOrORxrjW0kxBWfL4=
 =Dw4H
 -----END PGP SIGNATURE-----

Merge tag 'at91-dt-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt

AT91 DT for 5.11 #2:

 - switch to new TCB PWM bindings
 - rework ADC bindings
 - fix sama5d2 securam and can1

* tag 'at91-dt-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d2: fix CAN message ram offset and size
  ARM: dts: at91: sama5d2: map securam as device
  ARM: dts: at91: sam9x60ek: remove bypass property
  ARM: dts: at91: remove deprecated ADC properties
  ARM: dts: at91: at91sam9rl: fix ADC triggers
  ARM: dts: at91: sama5d3: use proper ADC compatible
  ARM: dts: at91: kizbox: switch to new pwm-atmel-tcb binding

Link: https://lore.kernel.org/r/20201206013840.GA627225@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:01:59 +01:00
Linus Torvalds
1a0e1943d8 Revert "scsi: megaraid_sas: Added support for shared host tagset for cpuhotplug"
This reverts commit 103fbf8e40.

It turns out that it causes long boot-time latencies (to the point of
timeouts and failed boots).

The cause is the increase in request queues, and a fix for that is
queued up for 5.11, but we're reverting this commit that triggered the
problem for now.

Reported-and-tested-by: John Garry <john.garry@huawei.com>
Reported-and-tested-by: Julia Lawall <julia.lawall@inria.fr>
Reported-by: Qian Cai <cai@redhat.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/linux-scsi/fe3dff7dae4494e5a88caffbb4d877bbf472dceb.camel@redhat.com/
Link: https://lore.kernel.org/lkml/alpine.DEB.2.22.394.2012081813310.2680@hadrien/
Link: https://lore.kernel.org/linux-block/20201203012638.543321-1-ming.lei@redhat.com/
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-12-08 15:00:36 -08:00
Arnd Bergmann
49d47bf9f5 i.MX arm64 device tree changes for 5.11:
- New board support: LX2162A QDS, Kontron i.MX8M Mini SoMs and
   baseboards.
 - A number of patches from Adam Ford to add various audio devices for
   i.MX8MM/MN and update imx8mm-beacon-som board on QSPI NOR and RTC.
 - Correct WDOG_B pin configuration for i.MX8MM/MN/MP.
 - A series from Ioana Ciornei complete the MAC/PCS/PHY representation
   on DPAA2 devices.
 - Add PMU device for i.MX8MP/MN.
 - Add IR and CAN support for i.MX8MP/MN/MM EVK board.
 - Adjust GIC CPU mask to match number of CPUs for i.MX8MP/MN/MM.
 - A series of patch from Michael Walle to update LS1028A support with
   addition of CAN and OPTEE, also ENETC PTP and FlexSPI clock input
   correction.
 - Add SPDIF sound card support on imx8mq-evk board.
 - Misc random updates and device additions.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAl/HoBgUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM5KUQf8Dby60Z9z0QtFSzjGNr9MaHMerP7/
 9qtngN9PTUTjdAviCCg8tORU9+knjnRe/gOTjIbeWWHUTsG6sKNFBrEtqoCCT7Sz
 RUm+cdYcg2FEiIV5p4xwCbrvKt3ISLud6qyTk3HkTkknUNDZfhuv3QPPSrH8Zc0l
 526D6gkHJW9DqHt8XFHT4l3OJNHN7QAw/z16dVueseons+Uhz3eUxG9keUpQhH6F
 mBoqfTkMx2JtHnsdG/8V1BFbc2Kry7HhZkK+96wb+LoZ0TtK7h7SR6iFoVFu3dnB
 ugDmkzG8TPzjAt9oSGy9+vgNXqIZwpRa+DiXvjWuaAoaI9/c3QDsWmS44g==
 =asj6
 -----END PGP SIGNATURE-----

Merge tag 'imx-dt64-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt

i.MX arm64 device tree changes for 5.11:

- New board support: LX2162A QDS, Kontron i.MX8M Mini SoMs and
  baseboards.
- A number of patches from Adam Ford to add various audio devices for
  i.MX8MM/MN and update imx8mm-beacon-som board on QSPI NOR and RTC.
- Correct WDOG_B pin configuration for i.MX8MM/MN/MP.
- A series from Ioana Ciornei complete the MAC/PCS/PHY representation
  on DPAA2 devices.
- Add PMU device for i.MX8MP/MN.
- Add IR and CAN support for i.MX8MP/MN/MM EVK board.
- Adjust GIC CPU mask to match number of CPUs for i.MX8MP/MN/MM.
- A series of patch from Michael Walle to update LS1028A support with
  addition of CAN and OPTEE, also ENETC PTP and FlexSPI clock input
  correction.
- Add SPDIF sound card support on imx8mq-evk board.
- Misc random updates and device additions.

* tag 'imx-dt64-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (50 commits)
  arm64: dts: imx8mm-beacon-som: Assign PMIC clock
  arm64: dts: imx8mm-beacon-som: Configure RTC aliases
  arm64: dts: imx8mn: Add node for SPDIF
  arm64: dts: imx8mn: Add support for micfil
  arm64: dts: imx8mn: Add SAI nodes
  arm64: dts: imx8mn: Enable Asynchronous Sample Rate Converter
  arm64: dts: ls1028a: make the eMMC and SD card controllers use fixed indices
  arm64: dts: freescale: update calibration table for TMU module
  arm64: dts: freescale: sl28: combine SPI MTD partitions
  arm64: dts: ls1028a: add optee node
  arm64: dts: ls1028a: fix FlexSPI clock input
  arm64: dts: ls1028a: fix ENETC PTP clock input
  arm64: dts: imx: Fix imx8mm-kontron-n801x-s.dtb target
  arm64: dts: imx8mn-evk: add IR support
  arm64: dts: imx8mm-evk: add IR support
  arm64: dts: imx8mq-evk: add linux,autosuspend-period property for IR
  arm64: dts: imx8mp-evk: add CAN support
  arm64: dts: imx8mq-evk: Add spdif sound card support
  arm64: dts: imx8mq: Configure clock rate for audio plls
  arm64: dts: layerscape: Add PCIe EP node for ls1088a
  ...

Link: https://lore.kernel.org/r/20201202142717.9262-5-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-09 00:00:23 +01:00
Arnd Bergmann
aa66be3bff i.MX device tree update for 5.11:
- New board support: imx6dl-alti6p, imx6dl-lanmcu, mx6qp-prtwd3,
   imx6ul-phytec-segin and imx7d-flex-concentrator.
 - Fix schema warnings for pwm-leds, watchdog and GPIO hog devices.
 - A few patches from Krzysztof Kozlowski to correct compatibles for
   i.MX6/7 boards.
 - A series from Matthias Schiffer to polish imx7-mba7 board support.
 - Update i.MX6/7 device trees for fsl,stop-mode support.
 - Correct fsl,rcpm-wakeup of LS1021A to get flextimer wake-up work.
 - A series of patch from Stefan Riedmueller to update phytec and segin
   devices.
 - Other small and random changes.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAl/HmQEUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM4ddwgAmoQFJuz/g7QRj0WFvyIofeiQSM/G
 0MLlaiVo0JLW9+0iQmscmLSyWpPqNGTew+zkOzKnfUevIWygt32q6SJhxWM5KMpL
 Xuj7Aix3PE6Vz6luFtITMHq4Mve3W//98jwL9+pTG2QGt7RYqiMsW+eRQbrj7W/6
 sQeUQqXA4LKnqhlHq88iAHqEKFECpF/u3AtrtbD3YSHAlNn+HG0Hh/bI5DK595Q4
 apQES1uQaUspVcXeU3c0KSAEUW7BejtzybA/RNli9Z+Fg65B1XQfLvif24AIZ4yG
 dQ7KUCnYyDUGV6NI3Xjz1muwGh3y/MzaQZMraNQfx0mm2GCayysjX/yGzw==
 =SdR/
 -----END PGP SIGNATURE-----

Merge tag 'imx-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt

i.MX device tree update for 5.11:

- New board support: imx6dl-alti6p, imx6dl-lanmcu, mx6qp-prtwd3,
  imx6ul-phytec-segin and imx7d-flex-concentrator.
- Fix schema warnings for pwm-leds, watchdog and GPIO hog devices.
- A few patches from Krzysztof Kozlowski to correct compatibles for
  i.MX6/7 boards.
- A series from Matthias Schiffer to polish imx7-mba7 board support.
- Update i.MX6/7 device trees for fsl,stop-mode support.
- Correct fsl,rcpm-wakeup of LS1021A to get flextimer wake-up work.
- A series of patch from Stefan Riedmueller to update phytec and segin
  devices.
- Other small and random changes.

* tag 'imx-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (40 commits)
  ARM: dts: imx28: Fix label name for L2 switch
  ARM: dts: add Protonic WD3 board
  ARM: dts: imx6qdl-kontron-samx6i: increase i2c-frequency
  ARM: dts: imx7: add support for kamstrup flex concentrator
  ARM: dts: ls1021a: update calibration table for TMU module
  ARM: dts: ls1021a: fix rcpm failed to claim resource
  ARM: dts: ls1021a: fix flextimer failed to wake system
  ARM: dts: imx50-kobo-aura: Enable eKTF2132 touchscreen
  ARM: dts: imx: Change flexcan node name to "can"
  ARM: dts: imx6q-pico: fix board compatibles
  ARM: dts: add Van der Laan LANMCU board
  ARM: dts: add Altesco I6P board
  ARM: dts: imx6ul: segin: peb-av-02: Mark stmpe touch as wakeup-source
  ARM: dts: imx6ul: phytec: Add support for optional PEB-AV-02 LCD adapter
  ARM: dts: imx6ul: segin: Add phyBOARD-Segin with eMMC phyCORE-i.MX6UL
  ARM: dts: imx50-kobo-aura: Add 'grp' suffix to pinctrl node names
  ARM: dts: imx: add usb alias
  ARM: dts: imx6/7: sync fsl,stop-mode with current flexcan driver
  ARM: dts: imx: Fix schema warnings for pwm-leds
  ARM: dts: imx7s-warp: correct vendor in compatible to Element14
  ...

Link: https://lore.kernel.org/r/20201202142717.9262-4-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-08 23:58:19 +01:00
Arnd Bergmann
3eaac3aed2 i.MX DT bindings update for 5.11:
- Quite some patches that update vendor-prefixes.yaml and fsl.yaml to
   document missing board compatibles and add new board compatibles.
 - A couple of patches from Dong Aisheng to update imx-scu firmware and
   imx-lpcg clock bindings for new SCU two cells clock support.
 - A couple of net bindings update from Ioana Ciornei to complete the
   MAC/PCS/PHY representation on DPAA2 devices.
 - Document watchdog compatibles for all i.MX and Layerscape devices.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAl/HlOYUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM4yegf/eP6henuph6c+Ay/y7Ia4V51UY4ot
 Sb9pJatgaX4GmFowfztltd//gJMtpHnYbqAsXhk2hkRZ7h0hFIIji2Dp7knq3naD
 rQykAmT4eWy1CuQFq86XvFaqHc5AVuygBpMmP6nSFDBzBeqDRQ+q813aUpQdUlUH
 iAeN2Ov62U+4kEc0AxF2mNNcGW1/ikKcFT5nJmJGmgUKuwSUSJ0l09MvXHhQeEjr
 //gswg/5XU4tweEjAHeEJKM60XLtRFdmoLnz/0nDlLY0BXfBYRpicvNXzxDWEPOd
 qdf20NOWyz2UUcmMgy1vpVJKHQumSDNxB9M0FwtkcB8+x0YjE4gB8AxUNA==
 =YiM1
 -----END PGP SIGNATURE-----

Merge tag 'imx-bindings-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt

i.MX DT bindings update for 5.11:

- Quite some patches that update vendor-prefixes.yaml and fsl.yaml to
  document missing board compatibles and add new board compatibles.
- A couple of patches from Dong Aisheng to update imx-scu firmware and
  imx-lpcg clock bindings for new SCU two cells clock support.
- A couple of net bindings update from Ioana Ciornei to complete the
  MAC/PCS/PHY representation on DPAA2 devices.
- Document watchdog compatibles for all i.MX and Layerscape devices.

* tag 'imx-bindings-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (35 commits)
  dt-bindings: arm: fsl: add Protonic WD3 board
  dt-bindings: vendor-prefixes: add "virtual" prefix
  dt-bindings: fsl: add kamstrup flex concentrator to schema
  dt-bindings: arm: fsl: document i.MX7S boards
  dt-bindings: arm: fsl: document SolidRun LX2160A boards
  dt-bindings: arm: fsl: document LS1012A FRWY board
  dt-bindings: arm: fsl: add Van der Laan LANMCU board
  dt-bindings: arm: fsl: add Altesco I6P board
  dt-bindings: vendor-prefixes: Add an entry for Altus-Escon-Company
  dt-bindings: net: add the 10gbase-r connection type
  dt-bindings: net: add the DPAA2 MAC DTS definition
  dt-bindings: fsl: add compatible for LX2162A QDS Board
  dt-bindings: vendor-prefixes: Add an entry for Van der Laan b.v.
  dt-bindings: arm: fsl: document i.MX7D boards
  dt-bindings: arm: fsl: document i.MX6ULL boards
  dt-bindings: arm: fsl: document i.MX6UL boards
  dt-bindings: arm: fsl: document i.MX6SX boards
  dt-bindings: arm: fsl: document i.MX6SL boards
  dt-bindings: arm: fsl: document i.MX6QP boards
  dt-bindings: arm: fsl: document i.MX6Q boards
  ...

Link: https://lore.kernel.org/r/20201202142717.9262-3-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-08 23:57:15 +01:00
Arnd Bergmann
1e3e7ca547 arm64: dts: amlogic updates for v5.11
- AXG SoCs: add/enable PCIe & USB OTG support
 - AXG SoCs: add MIPI DSI support
 - Khadas VIM: add RTC
 - several cleanups & fixups
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAl/GxC4ACgkQWTcYmtP7
 xmUbdA/+IA2JJZg9q2u0xJmePsft6QTwLqIiDRp970jfooVSLqSPz7xYhdlWiXR5
 Gxzyv6Kyd0Nw/G16Ffl6sPs30/lMI8OYsR/imOqc8SYTRvUE/4gy0xXEd8aLWSU4
 2g4B8k985WIEeRNz/788SoGvtpA+zXMmS7EHNczoyQaihfywE56fYaM/TjT+pi+a
 prrCxdiRCX8DGOjB6ynR8efQyguUxRhOKx5sJZnaymY5NhaYl0ZUjRNR8iqhkFj0
 SLSGghTal5PcweVSDWMuZbtxaCtf6v3dnZ9ohzS0w25U7xnNoVVQX/OMjA19ZLDt
 SX2QcS5fCr1BcTfSxsw8zXrbPAqGlrb1PlWdf9uneHf02ze38P7FZSQFhyjzM+1v
 L9aZgSbvg4jJ/H/p8HFyxuf3ynQMzadRkhcfGo5sUfGWDgwG6189tNjpTPD3BSub
 CguzUOSuIfml/8KnS0S5aI0NCXyESprHfNwZQyvz6FdgXxdtF38twwKgpmUHUoxA
 uw5bzpJgrpF7PM9OpmP/yCfETj4EQ++hQyosJNeAweIrt+VIkQ/OW4SZ5dBrwB3k
 R0rCU80E5gpNBrmmY7AvbjCv91DH2xzxz7/w2FZmt5vs5KBxRCPnCkeRwor0n+sT
 asQ0YMUoMnJqCbay8ditaARhCvNQCfNe8w+KDrr2MqnCi/PLYLw=
 =XtmV
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

arm64: dts: amlogic updates for v5.11
- AXG SoCs: add/enable PCIe & USB OTG support
- AXG SoCs: add MIPI DSI support
- Khadas VIM: add RTC
- several cleanups & fixups

* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson-sm1: fix typo in opp table
  arm64: dts: meson: add KHAMSIN IR remote node to SML5442TW
  arm64: dts: meson: update the Khadas VIM3/3L LED bindings
  arm64: dts: meson: fix spi-max-frequency on Khadas VIM2
  arm64: dts: meson: add rtc aliases to meson-khadas-vim3.dtsi
  arm64: dts: meson: Add capacity-dmips-mhz attributes to GXM
  arm64: dts: meson-axg-s400: enable PCIe M.2 Key E slots
  arm64: dts: meson-axg: add PCIe nodes
  arm64: dts: meson-axg: add MIPI DSI PHY nodes
  arm64: dts: meson-axg: add PWRC node
  arm64: dts: meson: enable rtc node on Khadas VIM1/VIM2 boards
  dt-bindings: clk: axg-clkc: add MIPI DSI Host clock binding
  dt-bindings: clk: axg-clkc: add Video Clocks
  arm64: dts: meson: add watchdog to g12-common dtsi
  arm64: dts: meson: remove empty lines from aml-s905x-cc v2 dts

Link: https://lore.kernel.org/r/7heek9jgox.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-08 23:56:07 +01:00
Arnd Bergmann
96631a0d11 Samsung DTS ARM64 changes for v5.11
1. Several cleanups, including aligning node names with dtschema.
 2. Add WiFi/PCIe to TM2 boards (Exynos5433).
 3. Correct restart and shutdown of Exynos7 boards, as part of Paweł
    Chmiel Exynos7420 mainlining effort.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAl/GqikQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD14LnD/9YevUbxVHz0k9Whgb/uWNuai4uH8nbbm3i
 Iw97MTQA/QoVlbblm8hTo83UOL5zWy0zfQhslNFJ46BrxXi79oNS5CCVWvS9mYtv
 9BPjT93CAsdc8iVwd8DAampW/eghvd7KpApg8pgmvon8kXFwpqcXjN11SQ/jDpwv
 7/87RF8bvaIRW8NZBoxD/qWkqgYKK+Gb8UhZMDtpI2UWt+mW9O6efuBqgL9nDvQh
 9+5nQM3BBOWKee1Xnsmka6iuRQZpO2I+JqRk1iAVQdFx6QJ2mnfwQJK7nLlnR6Ff
 h4t0TbmEn4jqDtH7ZiQa7B4fYWK4BtnBi1aAwvlJewwaxDrjJdmDHHQgTXd5zeUx
 L4FeOM5u0stGb+610omuFvPzPAE+1B5upoEoga2qMhI8pnWkpEidGXe+LhU4//wE
 vS5wRqBzC6Mv+qUf5qV3iUOmzZhvMaWqMvQ1PaKSPOhDuE1yBrkcda0dd2kYcaK7
 nfLOTXaqRhBTdEt0NRevzeq1+xKMr3gTN7neg1rPNXNGzqyPRyAPlVU8mm9nYnHA
 sKaIlZJ7PaUizN5MMQZFJVZ3nSEU+VXYRaP4GGK5JSfDpgw5MwTXY2SlKGBBokG8
 AIQFJycH4sJx6/udueC2IRIdZEslJxTGvSnimL2rHuxgKxbnHtYIugvZvgOF17Iw
 tsFR2mG4rQ==
 =sxn6
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt64-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM64 changes for v5.11

1. Several cleanups, including aligning node names with dtschema.
2. Add WiFi/PCIe to TM2 boards (Exynos5433).
3. Correct restart and shutdown of Exynos7 boards, as part of Paweł
   Chmiel Exynos7420 mainlining effort.

* tag 'samsung-dt64-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: Drop incorrect use of io-channel-ranges property
  arm64: dts: exynos: use hyphens in Exynos5433 node names
  arm64: dts: exynos: Correct psci compatible used on Exynos7
  arm64: dts: exynos: Include common syscon restart/poweroff for Exynos7
  arm64: dts: exynos: add the WiFi/PCIe support to TM2(e) boards
  arm64: dts: exynos: remove redundant status=okay in Exynos5433 TM2
  arm64: dts: exynos: adjust node names to DT spec in Exynos7 Espresso
  arm64: dts: exynos: adjust node names to DT spec in Exynos5433 TM2
  arm64: dts: exynos: Harmonize DWC USB3 DT nodes name

Link: https://lore.kernel.org/r/20201201204404.22675-3-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-08 23:55:32 +01:00
Arnd Bergmann
ff741319bc Samsung DTS ARM changes for v5.11, part two
1. Add devicetree of Samsung Galaxy Note 10.1 tablets
    (GT-N8010/GT-N8013), called P4 Note.  These are quite old but
    still functional devices, based on Exynos4412.
 2. Minor cleanups in Odroid XU3 Ethernet.
 3. Minor fixes: ADC io-channel-ranges and P4 Note touchscreen GPIO
    polarity.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAl/GqXYQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD148AD/9Ztlg5vJ+hKOTD/K83lRFWhpO4e3gmcU+g
 +2nWJExyR1N6TbL0zpv9I0exgV1vqyI9lNIpNcRzF+3hUx1d5OTOhmQ8VNZyMveX
 +voxz9v0yptQO+OaSoXIXpVSJdXf4Y8NqCl745GZ+UETnh0wilbopjXxJ14Y6fUZ
 m/a4aHO6x5GPi6eUHqBRulQZeGZ3SI+hOLl8HQeNunWtcmSILDmfoT1EdkNLVAVx
 R9zM54TAu6x5b33pf2QjyTO4NkfOQ0xzsVlv+MQ5InxDy/yzfpwn1OvDOcu0aKik
 hlCVVKzEX8oRE9CvIV8icSatGkStpYRO0wxPLEaR9c2m1buTSM3erYlRIeTtRL+O
 0gyJ34j7SmgcqlLaLvKeMsOFRXTUhIRZ3kzcaPqY58V+ZLFAhalk0686JJzPRpm/
 YA1yNZwRXuvMv/AMsuGYX9RZXHTfaTL55ym70zkbO1bzB+DLZrjUs7uVgIWWm1G9
 BIgQ7Lf0Co6Rgr9hrdxwbpjgqu9IBh3g5MDDvSMXflfvuSMF5lQutyamJT9W4Vvv
 9VjpJ4t+Ma1qzmTpdR+9mFWwxWIlE22mDc5pQnmH6vvfrkxp3Z8tstrLCxXSFDk6
 uW9LppMJi8vctGJKjTko59UGBpykLNM8cP+U35RPo6VMd6ai7OPsca8BZ/hqc2/+
 qb0cMgYtzA==
 =FN69
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM changes for v5.11, part two

1. Add devicetree of Samsung Galaxy Note 10.1 tablets
   (GT-N8010/GT-N8013), called P4 Note.  These are quite old but
   still functional devices, based on Exynos4412.
2. Minor cleanups in Odroid XU3 Ethernet.
3. Minor fixes: ADC io-channel-ranges and P4 Note touchscreen GPIO
   polarity.

* tag 'samsung-dt-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: switch Atmel mxt reset GPIO to active low on P4 Note
  ARM: dts: s5pv210: Drop unneeded io-channel-ranges property in Aries
  ARM: dts: s5pv210: Drop incorrect use of io-channel-ranges property
  ARM: dts: exynos: Drop incorrect use of io-channel-ranges
  ARM: dts: exynos: add Samsung's Exynos4412-based P4 Note boards
  dt-bindings: arm: samsung: document bindings for P4 Note family board
  ARM: dts: exynos: Add an alias for the Ethernet interface on Odroid XU3
  ARM: dts: exynos: Fix Ethernet interface description on Odroid XU3

Link: https://lore.kernel.org/r/20201201204404.22675-2-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-08 23:54:12 +01:00
Arnd Bergmann
30912c3ce6 ARM: dts: Keystone DTS update for v5.11
- HDMI Support
 - Analog Audio data support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJfxphsAAoJEHJsHOdBp5c/yPEP/jjEJdSQ2HHF0OQAiiWeMyfA
 ZACvYgmSfUq6Xo74QHinthLShQ7hUDF+OHJO7lhLSdPxUwjJxr4WlvqMSwSMlV7R
 GiyjjGKWCX/6+N5AWWnBJplkWgdZhbdUmdT7L5EzxBBdWYTuf129kEMVynkCQx3V
 gKn9gweeBkAUqXnDm7dyFqZ5xukiEE/yFmcF5+5gDHN1S2AT7ji8qxkNfh5Pm2kt
 X8Po2/901NuJMnw9uh5H/Azkz9B112QCDOHMzubDLKfDCNbBaWFA22bb1tJD9r4W
 o7BGSq2gEn8bMx1QN5Kq0riMeShSAdZc6biCK4Hk/MnstJjjLK+DjTOs1MzuXGrr
 BPGsagMI1IWu9oQILo8mShlkJlCcvb6/peJ813wmwsm5REO+Lm2sQNCbbYAI9bOA
 RCdKR8Mg8jIjw9MyasVPGxBTSTC+wKjLG4u6kKVgCWjBnwSsEWwZbyq3sSmN+Vj1
 aSp/oti4kwPCnwRM4iAklHlpAesQZokypWWdXnc1Ce+CUMK9nShe3My1CXEVLQzA
 oFQWsscr4171vPLDfZM8bvAyXxSSKVXzU186NY+8lQEPgsVp73yFC5RUwOWU+joc
 HRT4xGdWYmi9j+aOG0Jb+PMz8Q/lXSKoGfqNeWU4QLtdcmtJyn8FVV13oPyAxZUp
 R8GNAN+t/EHOK1Uw726f
 =pR0E
 -----END PGP SIGNATURE-----

Merge tag 'keystone_dts_for_5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/dt

ARM: dts: Keystone DTS update for v5.11

- HDMI Support
- Analog Audio data support

* tag 'keystone_dts_for_5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone-k2g-evm: add HDMI and analog audio data

Link: https://lore.kernel.org/r/1606851472-26593-1-git-send-email-santosh.shilimkar@oracle.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2020-12-08 23:53:14 +01:00
David S. Miller
9756bb63e8 Merge branch 'stmmac-fixes'
Joakim Zhang says:

====================
patches for stmmac

A patch set for stmmac, fix some driver issues.

ChangeLogs:
V1->V2:
	* add Fixes tag.
	* add patch 5/5 into this patch set.

V2->V3:
	* rebase to latest net tree where fixes go.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 14:52:29 -08:00
Fugang Duan
f119cc9818 net: stmmac: overwrite the dma_cap.addr64 according to HW design
The current IP register MAC_HW_Feature1[ADDR64] only defines
32/40/64 bit width, but some SOCs support others like i.MX8MP
support 34 bits but it maps to 40 bits width in MAC_HW_Feature1[ADDR64].
So overwrite dma_cap.addr64 according to HW real design.

Fixes: 94abdad697 ("net: ethernet: dwmac: add ethernet glue logic for NXP imx8 chip")
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 14:52:29 -08:00
Fugang Duan
5f58591323 net: stmmac: delete the eee_ctrl_timer after napi disabled
There have chance to re-enable the eee_ctrl_timer and fire the timer
in napi callback after delete the timer in .stmmac_release(), which
introduces to access eee registers in the timer function after clocks
are disabled then causes system hang. Found this issue when do
suspend/resume and reboot stress test.

It is safe to delete the timer after napi disabled and disable lpi mode.

Fixes: d765955d2a ("stmmac: add the Energy Efficient Ethernet support")
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 14:52:29 -08:00
Fugang Duan
4ec236c7c5 net: stmmac: free tx skb buffer in stmmac_resume()
When do suspend/resume test, there have WARN_ON() log dump from
stmmac_xmit() funciton, the code logic:
	entry = tx_q->cur_tx;
	first_entry = entry;
	WARN_ON(tx_q->tx_skbuff[first_entry]);

In normal case, tx_q->tx_skbuff[txq->cur_tx] should be NULL because
the skb should be handled and freed in stmmac_tx_clean().

But stmmac_resume() reset queue parameters like below, skb buffers
may not be freed.
	tx_q->cur_tx = 0;
	tx_q->dirty_tx = 0;

So free tx skb buffer in stmmac_resume() to avoid warning and
memory leak.

log:
[   46.139824] ------------[ cut here ]------------
[   46.144453] WARNING: CPU: 0 PID: 0 at drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:3235 stmmac_xmit+0x7a0/0x9d0
[   46.154969] Modules linked in: crct10dif_ce vvcam(O) flexcan can_dev
[   46.161328] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G           O      5.4.24-2.1.0+g2ad925d15481 #1
[   46.170369] Hardware name: NXP i.MX8MPlus EVK board (DT)
[   46.175677] pstate: 80000005 (Nzcv daif -PAN -UAO)
[   46.180465] pc : stmmac_xmit+0x7a0/0x9d0
[   46.184387] lr : dev_hard_start_xmit+0x94/0x158
[   46.188913] sp : ffff800010003cc0
[   46.192224] x29: ffff800010003cc0 x28: ffff000177e2a100
[   46.197533] x27: ffff000176ef0840 x26: ffff000176ef0090
[   46.202842] x25: 0000000000000000 x24: 0000000000000000
[   46.208151] x23: 0000000000000003 x22: ffff8000119ddd30
[   46.213460] x21: ffff00017636f000 x20: ffff000176ef0cc0
[   46.218769] x19: 0000000000000003 x18: 0000000000000000
[   46.224078] x17: 0000000000000000 x16: 0000000000000000
[   46.229386] x15: 0000000000000079 x14: 0000000000000000
[   46.234695] x13: 0000000000000003 x12: 0000000000000003
[   46.240003] x11: 0000000000000010 x10: 0000000000000010
[   46.245312] x9 : ffff00017002b140 x8 : 0000000000000000
[   46.250621] x7 : ffff00017636f000 x6 : 0000000000000010
[   46.255930] x5 : 0000000000000001 x4 : ffff000176ef0000
[   46.261238] x3 : 0000000000000003 x2 : 00000000ffffffff
[   46.266547] x1 : ffff000177e2a000 x0 : 0000000000000000
[   46.271856] Call trace:
[   46.274302]  stmmac_xmit+0x7a0/0x9d0
[   46.277874]  dev_hard_start_xmit+0x94/0x158
[   46.282056]  sch_direct_xmit+0x11c/0x338
[   46.285976]  __qdisc_run+0x118/0x5f0
[   46.289549]  net_tx_action+0x110/0x198
[   46.293297]  __do_softirq+0x120/0x23c
[   46.296958]  irq_exit+0xb8/0xd8
[   46.300098]  __handle_domain_irq+0x64/0xb8
[   46.304191]  gic_handle_irq+0x5c/0x148
[   46.307936]  el1_irq+0xb8/0x180
[   46.311076]  cpuidle_enter_state+0x84/0x360
[   46.315256]  cpuidle_enter+0x34/0x48
[   46.318829]  call_cpuidle+0x18/0x38
[   46.322314]  do_idle+0x1e0/0x280
[   46.325539]  cpu_startup_entry+0x24/0x40
[   46.329460]  rest_init+0xd4/0xe0
[   46.332687]  arch_call_rest_init+0xc/0x14
[   46.336695]  start_kernel+0x420/0x44c
[   46.340353] ---[ end trace bc1ee695123cbacd ]---

Fixes: 47dd7a540b ("net: add support for STMicroelectronics Ethernet controllers.")
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 14:52:29 -08:00
Fugang Duan
36d18b5664 net: stmmac: start phylink instance before stmmac_hw_setup()
Start phylink instance and resume back the PHY to supply
RX clock to MAC before MAC layer initialization by calling
.stmmac_hw_setup(), since DMA reset depends on the RX clock,
otherwise DMA reset cost maximum timeout value then finally
timeout.

Fixes: 74371272f9 ("net: stmmac: Convert to phylink and remove phylib logic")
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-12-08 14:52:29 -08:00