HSR/PRP is a industrial Ethernet protocol defined by IEC 62439
standard. Both use 6 bytes of protocol bytes to implement redundancy.
This consists of 2 bytes of sequence number, 1 byte of Ethernet
type identifying the protocol and LSDU length and pathid/network id
bits. Link Redundancy Entity (LRE) implements 1) duplication of Ethernet
frames at Egress and 2) discard of duplicates at the ingress and 3)
processing of Supervision frames to build the Node Table information.
Node table contains the health status of remote nodes in the network.

HSR/PRP driver offload part of LRE function. In the current version of
the firmware 2 & 3 are offloaded to PRU firmware. 1) is still performed
by upper HSR/PRP driver under net/hsr. This patch initialize the firmware
based on the Ethernet type. HSR/PRP firmware uses same memory map as
Switch firmware. So all places in the driver that initializes the basic
Switch firmware is re-used for HSR/PRP as well using the
!PRUETH_IS_EMAC() macro. Any HSR/PRP specific function is initialized
under PRUETH_IS_LRE() macro.

This update support both v1.0 and v2.1 of the ICSS firmware by using fw
offsets that are assigned at probe based on platform. A list of firmware
names are also picked at probe and then based on ethtype appropriate
firmware is picked to load on the PRUs. For Packet handling, NAPI is used
at at Ingress. There are two pair of Queues at the Ingress for each port.
Low priority and High priority. A NAPI instance is added for each of the
priority queue. An interrupt is raised by firmware when packets are
en-queued to one of the priority queue. red_emac_rx_packets() ensures that
packets are scanned from both queues at a specific priority and sends
them to network stack based on timestamp associated with the packet. At
the egress, packets are en-queued based on pcp bits. There are 2 queues
per port and other queues are for port to port traffic.

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

This document the bindings update to support HSR/PRP offload in
PRUETH driver.

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

This patch adds HSR/PRP Ethernet specific firmware init/config
functions, firmware header files, data types etc.

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

As an preparatory patch to support other Ethernet types in the driver,
driver needs to configure min/max frame sizes in MII_RT registers as
well as MUX_SEL as part of prueth_mii_init(). It is expected that this
function gets called in ndo_open() and Ethernet type may be different
than EMAC or SWITCH.  So update prueth_mii_init() to configure the
values for High Seamless Redundancy (HSR) and Parallel Redundancy
Protocol (PRP) Ethernet types. HSR and PRP are two industrial
protocols that operates at Layer 2 to implement redundancy. They
extend the frame size by 6 octets of protocol bytes at Layer 2.
Thus update the max frame size for these Ethernet types in
MII_RT_RX_FRMS. As standard management frames are expected to be
received as well, min frame size remains unaffected.
Introduce a new macro PRUETH_IS_LRE() to check for HSR or PRP
and use that to configure the Max frame value differently. Link
Redundancy Entity (LRE) is the common function in HSR and PRP that
implements redundancy for HSR and PRP. Also MUX_SEL reg values
are same for HSR, PRP and SWITCH. So adjust the code accordingly.

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

As a preparatory patch to introduce additional Ethernet types in
the driver that also requires timer related functions, it is cleaner
to have timer related main code in prueth_core driver and on event
make calls to appropriate firmware specific functions as needed. So
this add a function prueth_enable_nsp(), to configure storm prevention
and define the same in prueth_qos.c. On timeout, call prueth_enable_nsp()
to configure storm prevention feature.

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

As preparatory patch to introduce support for additional Ethernet
types, move prueth_hostinit() to inside ndo_open() as prueth_hostinit()
is common across all Ethernet types and make sense to do it as part
of ndo_open() since driver needs to support run time changing of
Ethernet type. Currently Ethernet type is set inside
prueth_change_to_switch_mode() or prueth_change_to_emac_mode() and
prueth_hostinit() is invoked there. So move this to inside ndo_open().
Now that driver always do rproc_set_firmware() in ndo_open() based on
Ethernet type, remove the restore of firmware names to EMAC firmware
in prueth_sw_shutdown_prus().

For switch based firmwarem there are common resources to be
initialized when the first port is initialized which are done part
of prueth_hostinit(). So introduce a mutex to enter the critical
region inside ndo_open() for initialization and in ndo_stop()
when last port is down. Also set emac_configured at the end after
the port is enabled and use proper input to prueth_port_enable()
call.

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

Now that driver lists the firmware names, remove this from the
dts.

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

Now that driver lists the firmware names, remove this from the
dts.

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

Now that driver lists the firmware names, remove this from the
dts.

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

Now that driver lists the firmware names, remove this from the
dts.

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

Use functions to initialize the fdb table and to free the memory and
move the code to prueth_switch.c. While at it place the fdb init
function ahead of booting the PRUs as this memory is used by PRU.

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

Now that firmware filenames are listed in the driver as a static
table, remove this from DTS. So update the documentation accordingly.

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

Remove firmware filename usage in dts and use compatibility private data
to specify firmware files names in the driver as driver is expected to
support run time change of Ethernet type in which case file name has to
be determined dynamically when network device is opened as Ethernet type
can be other than Dual EMAC. As file names are dependent on the platform
and Ethernet type, introduce an array to hold these names and use in the
driver. While at it move the macros to check Ethernet type to common
header file prueth.h as it this is common across all Ethernet types

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

Many functions such as prueth_hostconfig(), prueth_hostinit() doesn't
return any error code and can be void. Fix the return type to void
in such cases. Also check for return type of prueth_sw_emac_config()
since the function has a return value.

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

if driver is in single emac mode, then nsp code will crash because
there is no check for emac ptr. So fix it by adding a check for
null ptr.

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

tx irq is optional in the driver. So remove the same from dts
to get a better egress performance for small size frames.

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

tx irq is optional in the driver. So remove the same from dts
to get a better egress performance for small size frames.

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

tx irq is optional in the driver. So remove the same from dts
to get a better egress performance for small size frames.

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

tx irq is optional in the driver. So remove the same from dts
to get a better egress performance for small size frames.

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

Egress throughput with small size packet is better with
tx irq removed along with reduction in CPU usage. With DUT-DUT
test, a reduction in CPU usage of 7% is seen with iperf3 UDP
test using payload size of 76 bytes. 41% before change vs 34%
after the change on a RT kernel.

CPU usage measured using mpstat -P ALL 3 50 command. iperf
command used

Server
  iperf3 -s -i5

Client
  iperf3 -c <server IP> -u -b18M -l76 -i5 -t60&

DUT to PC test gives a higher throughput of 26-27 Mbits/sec
at this payload size of 76 bytes. client side command is
  iperf3 -c <server IP> -u -b30M -l76 -i5 -t60&

All tested on AM57x with ksoftirqd/0 & ksoftirqd/1 priority
raised as

chrt -f -p 40 9
chrt -f -p 40 20

With DUT to PC test, an improvement in effective throughput of
1.5Mbits/sec along with a reduction in CPU usage of ~1%. The
offered traffic is at 30Mbits/sec.

However with MTU size frames, a degradation in performance of about
7% seen based on testing with Tx IRQ removed. For industrial
networks, it is important to have higher performance at small size
packets since majority of the traffic is small sized. So make Tx IRQ
use in the driver optional for Dual EMAC firmware so that users can
add Tx IRQ entry in the DTS as needed if a specific application uses
predominantly MTU or near MTU sized frames and thus get the benefit
of higher throughput at that size.

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

Test has shown that at MTU size frames, PRUETH Driver gives better
performance numbers when using Tx IRQ. However performance is
batter for small size frames when not using Tx IRQ. So make the
tx irq use in the driver optional so that users can add it to DTS
for a specific case as needed.

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

IRQF_ONESHOT is used by request_threaded_irq() API and is not to
be used with request_irq(). Remove its use in the driver.

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

Use existing NUM_QUEUES constant to declare the size of queue context
arrays in the driver instead of hardcoded value.

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

Remove the redundant constant EMAC_MIN_PKTLEN in driver with existing
constant ETH_ZLEN.

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

Replace skb_padto() with eth_skb_pad() and avoid checks for min
packet length as it is already part of eth_skb_pad()

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

Add rx Supervision (SV) frame count for Link A and B to
debug stats. This is needed as the LRE rx stats is inclusive
of SV frames and user may want to count how many rx non SV
frames received for debug purpose. So add these counters to
the lre_info debugfs and update it in the packet processing
code.

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

Currently when hsr/prp interface is deleted, hsr_del_port() doesn't
check if device is not offloaded before calling dev_set_promiscuity().
This patch fixes that by calling dev_set_promiscuity() only when
not offloaded

Signed-off-by: Murali Karicheri <m-karicheri2@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: Drop duplicate CONFIG_USB_USBNET=m
  ti_config_fragments: Drop omap5_soc.cfg
  net: ti: prueth_core: Fix initialization of iep timer
  net: ti: prueth_switch: Ignore FDB table update when interface is down
  net: ti: prueth_core: Fix packet reception on second port in switch mode

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

Drop duplicate CONFIG_USB_USBNET=m entry

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

There is no reference to this file in the
ti_config_fragments/defconfig_map.txt file. So drop the unused file

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

Lokesh Vutla authored 4 years ago and Vignesh Raghavendra committed 4 years ago

IEP is initialized during the probe of prueth driver. When switching to

different firmware(from dual emac to HSR) IEP counter is not reset and
current timer is used. Also when both the ports are down, IEP need not
be running as there are no users. So, move icss_iep_init/exit() calls to
emac_ndo_open/stop() respectively.

Fixes: 5ed1a006

 ("net: ti: prueth_core: Add support for initializing IEP")
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

When switch interfaces are down, PRUs are down and FDB table does not
exist. Therefore avoid accessing FDB table when interfaces are down.

Fixes: f3142191

 ("net: ti: prueth_core: Add support for RSTP switch")
Reported-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

prueth->emac[0] represents port 1 and prueth->emac[1] represents port 2.
Therefore fix indexing of prueth->emac array by subtracting one from
port_id.

Without this driver would be doing out of bound access and therefore
packets received on port 2 (for host) is not forwarded correctly to the
Linux networking stack.

Fixes: f3142191

 ("net: ti: prueth_core: Add support for RSTP switch")
Reported-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

:
  serial: 8250: pruss: fix overflow in conversion build warning
  net: hsr/prp: fix cppcheck 'warning: Clarify calculation precedence'

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

Bin Liu authored 4 years ago and Vignesh Raghavendra committed 4 years ago

Fix the build warning in arm64 build:

drivers/tty/serial/8250/8250_pruss.c: In function 'pruss8250_set_divisor':
drivers/tty/serial/8250/8250_pruss.c:131:41: warning: overflow in conversion from 'long unsigned int' to 'int' changes value from '18446744073709551614' to '-2' [-Woverflow]

Fixes: 57fe8746

 ("serial: 8250: add pruss uart driver")

Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

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

kernel test robot reported following warning:-

In file included from net/hsr/hsr_device.c:
net/hsr/hsr_device.c:465:21: warning: Clarify calculation precedence for '&' and '?'. [clarifyCalculation]
           IFF_ALLMULTI ? 1 : -1);
                        ^
This patch fixes the issue by adding parenthesis around the expression.

Signed-off-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

:
  dmaengine: ti: k3-udma: Add support for second resource range from sysfw
  soc: ti: ti_sci_inta_msi: Add support for second range in resource ranges
  firmware: ti_sci: rm: Add support for second resource range
  firmware: ti_sci: Use struct ti_sci_resource_desc in get_range ops

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

Resource allocation via sysfw can use up to two ranges per resource subtype
to support more complex resource assignment, mainly for DMA channels.

Take the second range also into consideration when setting up the maps for
available resources.

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

Allocate MSI entries for both first and second range if they are valid

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

Sysfw added support for a second range in the resource range API to be able
to describe complex allocations mainly for DMA channels.

Update the ti_sci part to consider the second range as well.

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