TI-Feature: platform_base
TI-Branch: platform-ti-linux-5.4.y

* 'platform-ti-linux-5.4.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/platform

:
  dmaengine: ti: k3-udma-glue: fix build warnng
  dmaengine: ti: k3-psil: fix deadlock on error path

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

TI-Feature: connectivity
TI-Branch: connectivity-ti-linux-5.4.y

* 'connectivity-ti-linux-5.4.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/connectivity

:
  net: ti: prueth_core: prp: drop rct for normal case
  net: ethernet: ti: am65-cpts: fix build warning
  net: ti: prueth_core: Add support for dumping FW's VLAN/MC table

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Fix build warning:
 k3-udma-glue.c: In function ‘k3_udma_glue_cfg_rx_flow’:
 k3-udma-glue.c:662:1: warning: label ‘err_ringrx_free’ defined but not used
 err_ringrx_free:
 ^~~~~~~~~~~~~~~

Fixes: 6a42ce8a

 ("dmaengine: ti: k3-udma: Switch to k3_ringacc_request_rings_pair")
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

commit 172d59ec upstream.

The mutex_unlock() is missed on error path of psil_get_ep_config()
which causes deadlock.
Add missed mutex_unlock().

Fixes: 8c6bb62f

 ("dmaengine: ti: k3 PSI-L remote endpoint configuration")
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>

Murali Karicheri authored 4 years ago and Vignesh Raghavendra committed 4 years ago

Currently RCT is part of the payload delivered to network
stack which is not right. So drop Tag if transparent
reception setting is IEC62439_3_TR_REMOVE_RCT.

Fixes: a9b8608a

 ("net: ti: prueth_core: add HSR/PRP driver")

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

Grygorii Strashko authored 4 years ago and Vignesh Raghavendra committed 4 years ago

Fix build warning for the case TI_AM65_CPTS=n

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

Add support for userspace to dump VLAN and Multicast filter table
maintained by PRUETH firmware via ethtool IOCTL's register dump
interface.

This is helpful in debugging issues around these filters.

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

TI-Feature: connectivity
TI-Branch: connectivity-ti-linux-5.4.y

* 'connectivity-ti-linux-5.4.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/connectivity:
  Revert "HACK: soc: ti: k3: add dma descriptors pool"
  net: ethernet: ti: j721e-cpsw-virt-mac: use lkml dma desc pool api
  net: ethernet: ti: icssg_prueth: use lkml dma desc pool api
  net: ethernet: ti: am65-cpsw: use lkml dma desc pool api
  net: ethernet: ti: add lkml version of dma descriptors pool
  net: ethernet: ti: am65-cpsw-nuss: enable am65x sr2.0 support
  Revert "net: ethernet: ti: am65-cpsw-nuss: enable am65x sr2.0 support"
  net: ethernet: ti: am65-cpsw-ethtool: configured critical setting only when no running netdevs
  net: ethernet: ti: am65-cpsw-ethtool: skip hw cfg when change p0-rx-ptype-rrobin
  net: ethernet: ti: am65-cpsw-nuss: fix ports mac sl initialization
  net: ethernet: ti: am65-cpsw: move to pf_p0_rx_ptype_rrobin init in probe
  ethernet: ti: am65-cpsw-qos: Use struct_siz...

Merge tag 'v5.4.52' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-5.4.y

This is the 5.4.52 stable release

* tag 'v5.4.52' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (920 commits)
  Linux 5.4.52
  s390/maccess: add no DAT mode to kernel_write
  s390: Change s390_kernel_write() return type to match memcpy()
  pwm: jz4740: Fix build failure
  perf scripts python: exported-sql-viewer.py: Fix unexpanded 'Find' result
  perf scripts python: exported-sql-viewer.py: Fix zero id in call tree 'Find' result
  perf scripts python: exported-sql-viewer.py: Fix zero id in call graph 'Find' result
  perf scripts python: export-to-postgresql.py: Fix struct.pack() int argument
  dm writecache: reject asynchronous pmem devices
  blk-mq: consider non-idle request as "inflight" in blk_mq_rq_inflight()
  s390/mm: fix huge pte soft dirty copying
  s390/setup: init jump labels before command line parsing
  ARC: elf: use right ELF_ARCH
  ARC: entry: fix potential ...

TI-Feature: platform_base
TI-Branch: platform-ti-linux-5.4.y

* 'platform-ti-linux-5.4.y' of ssh://bitbucket.itg.ti.com/lcpdpublicdom/platform

: (26 commits)
  dmaengine: ti: k3-psil: Use soc_device_match to get the psil map
  dmaengine: ti: k3-udma: Switch to k3_ringacc_request_rings_pair
  soc: ti: k3-ringacc: separate soc specific initialization
  soc: ti: k3-ringacc: add request pair of rings api.
  soc: ti: k3-ringacc: add ring's flags to dump
  soc: ti: k3-ringacc: Move state tracking variables under a struct
  dt-bindings: soc: ti: k3-ringacc: convert bindings to json-schema
  dmaengine: ti: k3-udma: Query throughput level information from hardware
  dmaengine: ti: k3-udma: Use defines for capabilities register parsing
  dmaengine: ti: k3-udma: Use udma_chan instead of tchan/rchan for IO functions
  dmaengine: ti: k3-udma-private: Use udma_read/write for register access
  dmaengine: ti: k3-udma: Use common defines for TCHANRT/RCHANRT registers
  dmaengine: ti: k3-udma: Do not use ring_get_occ in udma_pop_from_ring
  dmaengine: ti: k3-udma: Remove dma_sync_single calls for descriptors
  dmaengine: ti: k3-udma: Fix cleanup code for alloc_chan_resources
  dmaengine: ti: k3-udma: Fix the running channel handling in alloc_chan_resources
  dmaengine: ti: k3-udma: Use proper return code in alloc_chan_resources
  dmaengine: ti: k3-udma: Remove udma_chan.in_ring_cnt
  dmaengine: ti: k3-udma: Add missing dma_sync call for rx flush descriptor
  dmaengine: Create debug directories for DMA devices
  ...

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

This reverts commit c37937f4

.
Replaced with LKML version.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Use lkml dma desc pool api to sync MCU CPSW code to LKML version as max as
possible.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Use lkml dma desc pool api to sync MCU CPSW code to LKML version as max as
possible.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

commit 93a76530

 upstream.

Use lkml dma desc pool api to sync MCU CPSW code to LKML version as max as
possible. Used initial LKML commit to identify that code already upstream.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

commit 93a76530

 upstream.

Add lkml version of dma descriptors pool to sync MCU CPSW code to LKML
version as max as possible. Used initial LKML commit to identify that code
already upstream.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

commit 38389aa6

 upstream.

The AM65x SR2.0 MCU CPSW has fixed errata i2027 "CPSW: CPSW Does Not
Support CPPI Receive Checksum (Host to Ethernet) Offload Feature". This
errata also fixed for J271E SoC.

Use SOC bus data for K3 SoC identification and apply i2027 errata w/a only
for the AM65x SR1.0 SoC.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

This reverts commit a7a0fbd2

.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

commit 3d0fda90

 upstream.

Ensure that critical setting can only be configured when there are no
running netdevs - all ports are down.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7d58d3eb

 upstream.

Skip HW configuration when p0-rx-ptype-rrobin is changed as it will be done
by .ndev_open(),

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit d6d0aeaf

 upstream.

The MAC SL has to be initialized for each port otherwise
am65_cpsw_nuss_slave_disable_unused() will crash for disabled ports.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit 51824048

 upstream.

The pf_p0_rx_ptype_rrobin is global parameter so move its initialization in
probe.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit f362b70b upstream.

Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes. Also, remove unnecessary
variable _size_.

This code was detected with the help of Coccinelle and, audited and
fixed manually.

Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83


Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit a45cfcc6

 upstream.

The MCU CPSW expected to populate only MDIO device, but follow up patches
will add "compatible" property to the MCU CPSW CPTS node which will cause
creation of CPTS device and MCU CPSW init failure. Hence, switch to use
of_platform_device_create() instead of of_platform_populate() for MDIO
device population.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit a9a495d5

 upstream.

Sync MCU CPSW DT bindings to LKML version as max as possible.
Used initial LKML commit to identify that code already upstream.

Note. yaml required some additional work and not critical at this stage.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

commit ba86a6e9

 upstream.

Sync MCU CPSW to LKML version as max as possible.
Used initial LKML commit to identify that code already upstream.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

commit ae7fdac8

 upstream.

Sync MCU CPSW to LKML version as max as possible.
Used initial LKML commit to identify that code already upstream.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

commit 93a76530

 upstream.

Sync MCU CPSW code to LKML version as max as possible.
Used initial LKML commit to identify that code already upstream.

It will break networking due to binding changes which will be fixed by
following patches.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Instead of separate of_machine_is_compatible() it is better to use
soc_device_match() and soc_device_attribute struct to get the PSI-L map
for the booted device.

By using soc_device_match() it is easier to add support for new devices.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

We only request ring pairs via K3 DMA driver, switch to use the new
k3_ringacc_request_rings_pair() to simplify the code.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

In preparation of adding AM64 SoC support separate soc specific
initialization and and OF mach data.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Add new API k3_ringacc_request_rings_pair() to request pair of rings at
once, as in the most case Rings are used with DMA channels which required
to request pair of rings - one to feed DMA with descriptors (TX/RX FDQ) and
one to receive completions (RX/TX CQ). This will allow to simplify Ringacc
API users.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Add struct k3_ring *ring->flags to the ring dump.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Move the free, occ, windex and rinfex under a struct.
We can use memset to zero them and it will allow a cleaner way to extend
the variables for duplex rings.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Convert the K3 NavigatorSS Ring Accelerator bindings documentation to
json-schema.

Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

The CAP3 register contains information about the number of
HCHAN (High Capacity) and UCHAN (Ultra High Capacity) channels in UDMAP.

Based on this information the start indexes of the levels can be calculated
without a need of a table in the match data.

On am654 the CAP3 does not contain information about the number different
channels. Set up the tpl information beased on the available documentation.

This change will allow to use the same compatible for different SoCs where
the only difference is the number of channel types.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Add defines for the CAP register fields to make the code self explaining.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Move the uc->tchan/rchan checks to the IO wrappers itself instead of
calling the functions with tchan/rchan directly.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Instead of using higher level wrappers (udma_rchanrt/tchanrt read/write),
use the underlying register access functions directly.

This will allow changes in the higher level wrappers within the DMAengine
driver.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

The register offsets and functions are the same among TCHAN and RCHAN.
Use generic, common names for them.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

The ring_get_occ is redundant as the k3_ringacc_ring_pop() is also
checking the occ of the ring.

With removing the ring_get_occ, the function can be simplified as well.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>