WingMan Kwok authored 4 years ago and Vignesh Raghavendra committed 4 years ago

PRU based ethernet subsystem can operate in RSTP switch using a
different firmware (than Dual EMAC mode). RSTP switch support L2
forwarding offloading and RSTP state maintenance.

This patch adds switch support for PRUETH driver using switchdev
framework in order to support RSTP switch mode.

Driver supports:
- FDB (forwarding database) offload
- RSTP

Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
[vigneshr@ti.com:
 - Move to new switchdev APIs
 - Use static RX/TX/Host queue sizes
 - Split switch related code to separate function
 - Rebase to v5.4]
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

Update the firmware headers with definitions required to support switch
firmware

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

ICSS_LOCAL_SHARED_RAM will be used by both Dual EMAC and Switch driver.
Therefore move the definition to prueth.h

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

Include missing headers to make header compilable stand alone

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

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

:
  ti_config_fragments: v8_baseport: Enable UIO_IVSHMEM
  uio: Add driver for inter-VM shared memory device
  ivshmem: Add header file
  uio: Enable read-only mappings

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

Enable CONFIG_UIO_IVSHMEM to include the UIO driver
used by Jailhouse inter VM communication

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>

This adds a UIO driver the ivshmem device, found in QEMU and the
Jailhouse hypervisor. It exposes the MMIO register region and all shared
memory section to userspace. Interrupts are configured in one-shot mode
so that userspace needs to re-enable them after each event via the
Interrupt Control register. The driver registers all possible MSI-X
vectors, coalescing them into the single notifier UIO provides.

Note: Specification work for the interface is ongoing, so details may
still change.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>

Common defines and structures for the ivshmem device.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>

This allows to tag memory regions read-only, denying userspace to map
them writable. Default remains read/write.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Nikhil Devshatwar <nikhil.nd@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

:
  arm64: dts: ti: k3-am65-main: Add Support for UHS modes
  mmc: sdhci_am654: Update phy configuration for AM65x SR2.0
  mmc: sdhci_am654: Add Support for SR2.0
  mmc: sdhci_am654: Add flag for PHY calibration

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

TI-Feature: rpmsg
TI-Branch: rpmsg-ti-linux-5.4.y-intg

* 'rpmsg-ti-linux-5.4.y-intg' of git://git.ti.com/rpmsg/rpmsg

:
  arm64: dts: ti: k3-j721e-main: Configure MAIN R5FSS1 for Split-mode
  ti_config_fragments: rpmsg/v8_rpmsg: Enable rpmsg_char driver

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

Signed-off-by: Suman Anna <s-anna@ti.com>

Pull in the updated remoteproc feature branch that changes the default
mode for Main R5FSS1 cluster on J721E SoCs from LockStep to Split mode.
This makes the default number of R5F cores from 4 to 5 on the latest
kernel.

* 'rproc-linux-5.4.y' of git://git.ti.com/rpmsg/remoteproc

:
  arm64: dts: ti: k3-j721e-main: Configure MAIN R5FSS1 for Split-mode

Signed-off-by: Suman Anna <s-anna@ti.com>

With SR2.0, UHS modes can be supported. Enable it for the 4 bit
IP. This involves adding a GPIO regulator to the dts to power
cycle the card.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

The clock > CLOCK_TOO_SLOW_HZ was added to prevent the DLL
from getting enabled in the early stages of enumeration. From the
latest updates to the internal RIOT, the am654x SR2.0 IP requires
that TXCLKDLY and OTAPDLY be enabled when the DLL is not enabled.

Therefore, move the clock too slow condition to gate just the DLL properties,
enable TXCLKDLY and always have OTAPDLY enabled.

Also add a write to clkbufsel as indicated in the RIOT.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

Add Support for AM65x PG2.0. Use the SoC bus framework to fixup
the driver data and skip do DLL calibration if the revision is 1.0

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

Not all controllers need calibration for the PHY DLL. Add a DLL_CALIB flag to
indicate the same.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>

Switch the MAIN R5FSS1 cluster to be configured for Split-mode as the
default so that two different applications can be run on each of the
R5F cores in performance mode. LockStep-mode would be available only
on SoCs efused with the appropriate capability bit, and Split-mode is
the mode that is available on all J721E SoCs.

Signed-off-by: Suman Anna <s-anna@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

:
  rpmsg-kdrv: rpmsg_kdrv_switch: fix build warnings
  rpmsg-kdrv: rpmsg_kdrv_display: fix build warns
  rpmsg-kdrv: fix 'variable 'ret' is used uninitialized whenever 'for' loop exits'

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

Enable the generic rpmsg_char driver (RPMSG_CHAR) in both the
ipc.cfg and v8_ipc.cfg so that the driver is built as a module
by default on all applicable TI platforms. The module is built
as a rpmsg_char.ko, and the driver name in sysfs is rpmsg_chrdev.

The driver presents a /dev/rpmsg_ctrlX (where X is an allocated
number) for each rpmsg device that can probe this driver. The
driver currently does not get auto-probed, but if desired, can
have the published rpmsg devices be bound to this driver using
udev rules or some userspace admin process.

Signed-off-by: Suman Anna <s-anna@ti.com>

Merge tag 'LCPD-18522' of ssh://bitbucket.itg.ti.com/~x1045550/ti-priv-linux-kernel into connectivity-ti-linux-5.4.y

rpmsg_kdrv_switch.c:711:39: warning: symbol 'switch_ops' was not declared. Should it be static?
rpmsg_kdrv_switch.c:806:26: warning: symbol 'rpmsg_kdrv_switch' was not declared. Should it be static?

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

../drivers/rpmsg-kdrv/rpmsg_kdrv_display.c:359:36: warning: symbol 'disp_ops' was not declared. Should it be static?
../drivers/rpmsg-kdrv/rpmsg_kdrv_display.c:452:26: warning: symbol 'rpmsg_kdrv_display' was not declared. Should it be static?

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

Fix build warning
rpmsg_kdrv.c:282:14: warning: variable 'ret' is used uninitialized whenever 'for' loop exits because its condition is false [-Wsometimes-uninitialized]
        for (i = 0; i < priv->num_raw_devices; i++)

Signed-off-by: Grygorii Strashko <grygorii.strashko@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: ethernet: ti: icssg_prueth: fix irqs type
  net: ethernet: ti: j721e-cpsw-virt-mac: fix irqs type

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

Merge tag 'LCPD-18501' of ssh://bitbucket.itg.ti.com/~x1045550/ti-priv-linux-kernel into connectivity-ti-linux-5.4.y

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

This is the 5.4.34 stable release

* tag 'v5.4.34' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable

: (565 commits)
  Linux 5.4.34
  x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE
  scsi: target: fix hang when multiple threads try to destroy the same iscsi session
  scsi: target: remove boilerplate code
  x86/resctrl: Fix invalid attempt at removing the default resource group
  x86/resctrl: Preserve CDP enable over CPU hotplug
  irqchip/ti-sci-inta: Fix processing of masked irqs
  ext4: do not zeroout extents beyond i_disksize
  i2c: designware: platdrv: Remove DPM_FLAG_SMART_SUSPEND flag on BYT and CHT
  drm/amdgpu: fix the hw hang during perform system reboot and reset
  drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled
  net/mlx5e: Use preactivate hook to set the indirection table
  net/mlx5e: Rename hw_modify to preactivate
  net/mlx5e: Encapsulate updating netdev queues into a function
  mac80211_hwsim: Use kstrndup() in place of kasprintf()
  mac80211: fix race in ieee80211_register_hw()
  nl80211: fix NL80211_ATTR_FTM_RESPONDER policy
  btrfs: check commit root generation in should_ignore_root
  tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation
  keys: Fix proc_keys_next to increase position index
  ...

Signed-off-by: Dan Murphy <dmurphy@ti.com>

# Conflicts:
#	drivers/media/platform/ti-vpe/cal.c
#	drivers/misc/pci_endpoint_test.c
#	drivers/net/phy/dp83867.c

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

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

:
  perf: Make perf able to build with latest libbfd

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

[ Upstream commit 0ada120c ]

libbfd has changed the bfd_section_* macros to inline functions
bfd_section_<field> since 2019-09-18. See below two commits:
  o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html
  o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html



This fix make perf able to build with both old and new libbfd.

Signed-off-by: Changbin Du <changbin.du@gmail.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

TI-Feature: rpmsg
TI-Branch: rpmsg-ti-linux-5.4.y-intg

* 'rpmsg-ti-linux-5.4.y-intg' of git://git.ti.com/rpmsg/rpmsg

:
  arm64: dts: ti: am654-base-board: Add a board dts variant for SR1.0
  arm64: dts: ti: k3-am65-main: Update ICSSG nodes for SR2.0
  remoteproc/pru: Add support for Tx PRU cores on K3 AM65x SR2.0 SoCs
  dt-bindings: remoteproc: pru: Update bindings for K3 AM65x SR2.0 SoCs
  remoteproc/pru: Cleanup of_device_is_compatible() usage

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

The AM65x family of SoCs has two Silicon Revisions - SR1.0 and SR2.0.
The AM65x SR2.0 will be the officially supported revision, and all
the current dtsi and dts files will be reused to represent this Silicon
Revision.

The AM65x SR2.0 SoCs have a revised ICSSG IP that is based off the
subsequent IP revision used on J721E SoCs. The ICSSG IP on AM65x SR2.0
SoCs have two new custom auxiliary PRU cores called Transmit PRUs
(Tx_PRUs) in addition to the existing PRUs and RTUs, but these are
not present on AM65x SR1.0 SoCs. The Tx_PRU nodes are added and enabled
by default in the base k3-am654-main.dtsi file.

Add a new board dts variant file am654-base-board-sr1.dts, that inherits
the regular am654-base-board.dts file, and will be customized to add
any changes required to boot a AM65x board using the SR1.0 Silicon.
The Tx_PRU nodes are absent on SR1.0 and so are disabled to begin
with.

NOTE:
This will not be upstreamed, and so there is no refactoring done to
either introduce a am654-base-board-common.dtsi or a am65x-sr1.dtsi
files.

Signed-off-by: Suman Anna <s-anna@ti.com>

The AM65x SR2.0 SoCs have a significantly revised ICSSG IP that is
based off the subsequent IP used on J721E SoCs, yet retaining some
of the features from AM65x SR1.0 like the PRU IRAM size etc. The
ICSSG2 instance also continues to have a few additional sub-modules
like on AM65x SR1.0.

One of the main changes is the presence of two new auxiliary PRU cores
called Tx_PRUs. The Tx_PRUs have 6 KB of IRAMs and leverage the same
host interrupts as the regular PRU cores. The Broadside (BS) RAM within
each core is also sized differently w.r.t SR1.0.

Update the existing ICSSG nodes for SR2.0 by adding new sub-nodes for
the Tx_PRU cores. The compatibles are currently maintained to be the
same between SR1.0 and SR2.0, with any sub-module IP differences handled
within the driver using SoC device match logic. The Tx_PRU nodes are
expected to be disabled in the SR1.0 specific dts or overlay file.

The default names for the firmware images for each Tx_PRU core is defined
as follows (these can be adjusted either in derivative board dts files or
through sysfs at runtime if required):
  ICSSG0 Tx_PRU0 Core: am65x-txpru0_0-fw ; Tx_PRU1 Core: am65x-txpru0_1-fw
  ICSSG1 Tx_PRU0 Core: am65x-txpru1_0-fw ; Tx_PRU1 Core: am65x-txpru1_1-fw
  ICSSG2 Tx_PRU0 Core: am65x-txpru2_0-fw ; Tx_PRU1 Core: am65x-txpru2_1-fw

Signed-off-by: Suman Anna <s-anna@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>

Signed-off-by: Suman Anna <s-anna@ti.com>

Pull in the updated remoteproc feature branch that adds the base
support to the PRU remoteproc driver for supporting the enhanced
ICSSG IP in AM65x SR2.0 SoCs. The merge also includes some cleanup
to the PRU remoteproc driver to introduce device match data so as
to move away from runtime of_device_is_compatible() usage in code.

* 'rproc-linux-5.4.y' of git://git.ti.com/rpmsg/remoteproc

:
  remoteproc/pru: Add support for Tx PRU cores on K3 AM65x SR2.0 SoCs
  dt-bindings: remoteproc: pru: Update bindings for K3 AM65x SR2.0 SoCs
  remoteproc/pru: Cleanup of_device_is_compatible() usage

Signed-off-by: Suman Anna <s-anna@ti.com>

The AM65x SR2.0 SoCs have a revised ICSSG IP that is based off the
subsequent IP revision used on J721E SoCs. This IP instance has two
new custom auxiliary PRU cores called Transmit PRUs (Tx_PRUs) in
addition to the existing PRUs and RTUs.

The Tx_PRU cores have their own dedicated IRAM (smaller than a PRU
or RTY), Control and debug feature sets. The RTU and Tx_PRU cores
though share the same Data RAMs as the PRU cores, so the memories
have to be partitioned carefully between different applications.

Enhance the existing PRU remoteproc driver to support these new Tx
PRU cores by using specific compatibles.

Signed-off-by: Suman Anna <s-anna@ti.com>

The AM65x SR2.0 SoCs have a revised ICSSG IP that is based off the
subsequent IP revision used on J721E SoCs, yet retaining some of the
features from AM65x SR1.0 like the PRU IRAM size etc. The ICSSG IP
on K3 AM65x SR2.0 SoCs have two new custom auxiliary PRU cores called
Transmit PRUs (Tx_PRUs) in addition to the existing PRUs and RTUs.

Update the PRU remoteproc bindings for these Tx PRU cores.

Signed-off-by: Suman Anna <s-anna@ti.com>

The PRU remoteproc driver uses the of_device_is_compatible() function
during probe to dynamically assign some flags and properties for each
PRU core. This usage is not recommended and makes the code a bit
cumbersome. Cleanup most of this usage by using device compatible
match data. The check for K2G to conditionally avoid the mailbox
usage is the only check left-out.

Signed-off-by: Suman Anna <s-anna@ti.com>

The K3 INTA driver, which is source TX/RX IRQs for ICSSG network, defines
IRQs triggering type as EDGE by default, but triggering type for CPSW NUSS
TX/RX IRQs has to be LEVEL as the EDGE triggering type may cause
unnecessary IRQs triggering and NAPI scheduling for empty queues.

Fix it by explicitly specifying ICSSG TX/RX IRQ type as IRQF_TRIGGER_HIGH.

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

The K3 INTA driver, which is source TX/RX IRQs for CPSW NUSS, defines IRQs
triggering type as EDGE by default, but triggering type for CPSW NUSS TX/RX
IRQs has to be LEVEL as the EDGE triggering type may cause unnecessary IRQs
triggering and NAPI scheduling for empty queues.

Fix it by explicitly specifying CPSW NUSS TX/RX IRQ type as
IRQF_TRIGGER_HIGH.

Signed-off-by: Grygorii Strashko <grygorii.strashko@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

:
  ti_config_fragments/connectivity.cfg: Enable pwm omap dmtimer

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