Introduce ICSSG Ethernet driver
Subsystems (3)
v5 cover Introduce ICSSG Ethernet driver
Introduce ICSSG PRUETH support in uboot. The ICSSG driver is used in TI AM654 SR2.0.
The ICSSG PRU Sub-system runs on EMAC firmware. This series Introduces support for ICSSG driver in uboot.
This series has been tested on AM65x SR2.0, and the ICSSG interface is able to ping / dhcp and boot kernel using tftp in uboot.
To use ICSSG2 ethernet, the ICSSG firmware needs to be loaded to PRU RPROC cores and RPROC cores need to be booted with the firmware. This step is done inside driver similar to kernel.
The remoteproc driver uses request_fw_into_buf() API from fs-loader driver to load and start rproc with the required firmwares.
This series only introduces driver files. The device tree and config changes to enable ICSSG driver will be introduced later.
This is v5 of the series [1].
Changes from v4 [4] to v5:
*) Fixed URL(s/http/https) in all the patches as asked by
Ravi Gunasekaran <[email protected]>
*) Collected RB tags of Ravi Gunasekaran <[email protected]> for patch
1/5, 3/5 and 5/5.
*) Used PKTSIZE macro instead of hardcoding 1522 in the definition of
UDMA_RX_BUF_SIZE in patch 4/5
Changes from v3 [3] to v4:
*) Dropped the dependncy patches and posted them seprately. *) Dropped the DTS and config patches, will post them seprately. *) Modified patch 4/5 to have multi port independent MAC mode support. *) Rebased the series on latest u-boot/next.
Changes from v2 [2] to v3:
*) No functional changes.
*) Rebased the series on latest u-boot/next.
*) Dropped the RFC tag.
Changes from v1 [1] to v2:
*) Modified the driver to load the firmware inside the driver only instead
of loading the firmware using commands at u-boot prompt. Added patch 3/16 for this.
*) Rebased the series on the latest u-boot/next.
*) Modified conf-0 configuration in k3-am65x-binman.dtsi as suggested by
Roger.
*) Dropped patch [5] as the patch is no longer needed.
*) Added patch 2/15 to modify fs-loader driver to use fw_storage_interface
env instead of storage_interface and keep the env storage_interface as fallback as suggested by Roger.
*) Added patch 15/15 to set default values to env fw_storage_interface and
fw_dev_part.
[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
[3] https://lore.kernel.org/all/[email protected]/
[4] https://lore.kernel.org/all/[email protected]/
[5] https://lore.kernel.org/all/[email protected]/
Thanks and Regards,
MD Danish Anwar
MD Danish Anwar (5):
net: ti: icssg: Add Firmware Interface for ICSSG Ethernet driver.
net: ti: icssg: Add Firmware config and classification APIs.
net: ti: icssg: Add icssg queues APIs and macros
net: ti: icssg: Add ICSSG ethernet driver
net: ti: icssg: Add support sending FDB command to update rx_flow_id
arch/arm/mach-k3/common.c | 11 + drivers/net/ti/Kconfig | 13 + drivers/net/ti/Makefile | 1 + drivers/net/ti/icss_mii_rt.h | 192 +++++++++ drivers/net/ti/icssg_classifier.c | 376 ++++++++++++++++ drivers/net/ti/icssg_config.c | 474 ++++++++++++++++++++ drivers/net/ti/icssg_config.h | 195 +++++++++ drivers/net/ti/icssg_prueth.c | 691 ++++++++++++++++++++++++++++++ drivers/net/ti/icssg_prueth.h | 97 +++++ drivers/net/ti/icssg_queues.c | 51 +++ drivers/net/ti/icssg_switch_map.h | 209 +++++++++ 11 files changed, 2310 insertions(+) create mode 100644 drivers/net/ti/icss_mii_rt.h create mode 100644 drivers/net/ti/icssg_classifier.c create mode 100644 drivers/net/ti/icssg_config.c create mode 100644 drivers/net/ti/icssg_config.h create mode 100644 drivers/net/ti/icssg_prueth.c create mode 100644 drivers/net/ti/icssg_prueth.h create mode 100644 drivers/net/ti/icssg_queues.c create mode 100644 drivers/net/ti/icssg_switch_map.h
base-commit: bc39e06778168a34bb4e0a34fbee4edbde4414d8
Signature · 1 line
2.34.1
PATCH v5 1/5 net: ti: icssg: Add Firmware Interface for ICSSG Ethernet driver.
Add firmware interface related headers and macros for ICSSG Ethernet driver. These macros will be later used by the ICSSG ethernet driver.
--- drivers/net/ti/icssg_switch_map.h | 209 ++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100644 drivers/net/ti/icssg_switch_map.h
drivers/net/ti/icssg_switch_map.h new file +209 -0
@@ -0,0 +1,209 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Texas Instruments ICSSG Ethernet driver +* +* Copyright (C) 2020-2024 Texas Instruments Incorporated - https://www.ti.com/ +* +*/ + +#ifndef __NET_TI_ICSSG_SWITCH_MAP_H +#define __NET_TI_ICSSG_SWITCH_MAP_H + +/*Time after which FDB entries are checked for aged out values. Value in nanoseconds*/ +#define FDB_AGEING_TIMEOUT_OFFSET 0x0014 + +/*default VLAN tag for Host Port*/ +#define HOST_PORT_DF_VLAN_OFFSET 0x001C + +/*Same as HOST_PORT_DF_VLAN_OFFSET*/ +#define EMAC_ICSSG_SWITCH_PORT0_DEFAULT_VLAN_OFFSET HOST_PORT_DF_VLAN_OFFSET + +/*default VLAN tag for P1 Port*/ +#define P1_PORT_DF_VLAN_OFFSET 0x0020 + +/*Same as P1_PORT_DF_VLAN_OFFSET*/ +#define EMAC_ICSSG_SWITCH_PORT1_DEFAULT_VLAN_OFFSET P1_PORT_DF_VLAN_OFFSET + +/*default VLAN tag for P2 Port*/ +#define P2_PORT_DF_VLAN_OFFSET 0x0024 + +/*Same as P2_PORT_DF_VLAN_OFFSET*/ +#define EMAC_ICSSG_SWITCH_PORT2_DEFAULT_VLAN_OFFSET P2_PORT_DF_VLAN_OFFSET + +/*VLAN-FID Table offset. 4096 VIDs. 2B per VID = 8KB = 0x2000*/ +#define VLAN_STATIC_REG_TABLE_OFFSET 0x0100 + +/*VLAN-FID Table offset for EMAC*/ +#define EMAC_ICSSG_SWITCH_DEFAULT_VLAN_TABLE_OFFSET VLAN_STATIC_REG_TABLE_OFFSET + +/*packet descriptor Q reserved memory*/ +#define PORT_DESC0_HI 0x2104 + +/*packet descriptor Q reserved memory*/ +#define PORT_DESC0_LO 0x2F6C + +/*packet descriptor Q reserved memory*/ +#define PORT_DESC1_HI 0x3DD4 + +/*packet descriptor Q reserved memory*/ +#define PORT_DESC1_LO 0x4C3C + +/*packet descriptor Q reserved memory*/ +#define HOST_DESC0_HI 0x5AA4 + +/*packet descriptor Q reserved memory*/ +#define HOST_DESC0_LO 0x5F0C + +/*packet descriptor Q reserved memory*/ +#define HOST_DESC1_HI 0x6374 + +/*packet descriptor Q reserved memory*/ +#define HOST_DESC1_LO 0x67DC + +/*special packet descriptor Q reserved memory*/ +#define HOST_SPPD0 0x7AAC + +/*special packet descriptor Q reserved memory*/ +#define HOST_SPPD1 0x7EAC + +/*_Small_Description_*/ +#define TIMESYNC_FW_WC_CYCLECOUNT_OFFSET 0x83EC + +/*IEP count hi roll over count*/ +#define TIMESYNC_FW_WC_HI_ROLLOVER_COUNT_OFFSET 0x83F4 + +/*_Small_Description_*/ +#define TIMESYNC_FW_WC_COUNT_HI_SW_OFFSET_OFFSET 0x83F8 + +/*Set clock descriptor*/ +#define TIMESYNC_FW_WC_SETCLOCK_DESC_OFFSET 0x83FC + +/*_Small_Description_*/ +#define TIMESYNC_FW_WC_SYNCOUT_REDUCTION_FACTOR_OFFSET 0x843C + +/*_Small_Description_*/ +#define TIMESYNC_FW_WC_SYNCOUT_REDUCTION_COUNT_OFFSET 0x8440 + +/*_Small_Description_*/ +#define TIMESYNC_FW_WC_SYNCOUT_START_TIME_CYCLECOUNT_OFFSET 0x8444 + +/*Control variable to generate SYNC1*/ +#define TIMESYNC_FW_WC_ISOM_PIN_SIGNAL_EN_OFFSET 0x844C + +/*SystemTime Sync0 periodicity*/ +#define TIMESYNC_FW_ST_SYNCOUT_PERIOD_OFFSET 0x8450 + +/*pktTxDelay for P1 = link speed dependent p1 mac delay + p1 phy delay*/ +#define TIMESYNC_FW_WC_PKTTXDELAY_P1_OFFSET 0x8454 + +/*pktTxDelay for P2 = link speed dependent p2 mac delay + p2 phy delay*/ +#define TIMESYNC_FW_WC_PKTTXDELAY_P2_OFFSET 0x8458 + +/*Set clock operation done signal for next task*/ +#define TIMESYNC_FW_SIG_PNFW_OFFSET 0x845C + +/*Set clock operation done signal for next task*/ +#define TIMESYNC_FW_SIG_TIMESYNCFW_OFFSET 0x8460 + +/*New list is copied at this time*/ +#define TAS_CONFIG_CHANGE_TIME 0x000C + +/*config change error counter*/ +#define TAS_CONFIG_CHANGE_ERROR_COUNTER 0x0014 + +/*TAS List update pending flag*/ +#define TAS_CONFIG_PENDING 0x0018 + +/*TAS list update trigger flag*/ +#define TAS_CONFIG_CHANGE 0x0019 + +/*List length for new TAS schedule*/ +#define TAS_ADMIN_LIST_LENGTH 0x001A + +/*Currently active TAS list index*/ +#define TAS_ACTIVE_LIST_INDEX 0x001B + +/*Cycle time for the new TAS schedule*/ +#define TAS_ADMIN_CYCLE_TIME 0x001C + +/*Cycle counts remaining till the TAS list update*/ +#define TAS_CONFIG_CHANGE_CYCLE_COUNT 0x0020 + +/*Base Flow ID for sending packets to Host for Slice0*/ +#define PSI_L_REGULAR_FLOW_ID_BASE_OFFSET 0x0024 + +/*Same as PSI_L_REGULAR_FLOW_ID_BASE_OFFSET*/ +#define EMAC_ICSSG_SWITCH_PSI_L_REGULAR_FLOW_ID_BASE_OFFSET PSI_L_REGULAR_FLOW_ID_BASE_OFFSET + +/*Base Flow ID for sending mgmt and Tx TS to Host for Slice0*/ +#define PSI_L_MGMT_FLOW_ID_OFFSET 0x0026 + +/*Same as PSI_L_MGMT_FLOW_ID_OFFSET*/ +#define EMAC_ICSSG_SWITCH_PSI_L_MGMT_FLOW_ID_BASE_OFFSET PSI_L_MGMT_FLOW_ID_OFFSET + +/*Queue number for Special packets written here*/ +#define SPL_PKT_DEFAULT_PRIORITY 0x0028 + +/*Express Preemptible Queue Mask*/ +#define EXPRESS_PRE_EMPTIVE_Q_MASK 0x0029 + +/*Port1/Port2 Default Queue number for untagged packets, only 1B is used*/ +#define QUEUE_NUM_UNTAGGED 0x002A + +/*Stores the table used for priority regeneration. 1B per PCP/Queue*/ +#define PORT_Q_PRIORITY_REGEN_OFFSET 0x002C + +/* For marking Packet as priority/express (this feature is disabled) or +* cut-through/S&F. +*/ +#define EXPRESS_PRE_EMPTIVE_Q_MAP 0x0034 + +/*Stores the table used for priority mapping. 1B per PCP/Queue*/ +#define PORT_Q_PRIORITY_MAPPING_OFFSET 0x003C + +/*TAS gate mask for windows list0*/ +#define TAS_GATE_MASK_LIST0 0x0100 + +/*TAS gate mask for windows list1*/ +#define TAS_GATE_MASK_LIST1 0x0350 + +/*Memory to Enable/Disable Preemption on TX side*/ +#define PRE_EMPTION_ENABLE_TX 0x05A0 + +/*Active State of Preemption on TX side*/ +#define PRE_EMPTION_ACTIVE_TX 0x05A1 + +/*Memory to Enable/Disable Verify State Machine Preemption*/ +#define PRE_EMPTION_ENABLE_VERIFY 0x05A2 + +/*Verify Status of State Machine*/ +#define PRE_EMPTION_VERIFY_STATUS 0x05A3 + +/*Non Final Fragment Size supported by Link Partner*/ +#define PRE_EMPTION_ADD_FRAG_SIZE_REMOTE 0x05A4 + +/*Non Final Fragment Size supported by Firmware*/ +#define PRE_EMPTION_ADD_FRAG_SIZE_LOCAL 0x05A6 + +/*Time in ms the State machine waits for respond packet*/ +#define PRE_EMPTION_VERIFY_TIME 0x05A8 + +/*Memory used for R30 related management commands*/ +#define MGR_R30_CMD_OFFSET 0x05AC + +/*HW Buffer Pool0 base address*/ +#define BUFFER_POOL_0_ADDR_OFFSET 0x05BC + +/*16B for Host Egress MSMC Q (Pre-emptible) context*/ +#define HOST_RX_Q_PRE_CONTEXT_OFFSET 0x0684 + +/*Buffer for 8 FDB entries to be added by 'Add Multiple FDB entries IOCTL*/ +#define FDB_CMD_BUFFER 0x0894 + +/*16B for Host Egress MSMC Q (Express) context*/ +#define HOST_RX_Q_EXP_CONTEXT_OFFSET 0x0940 + +/*Start of 32 bits PA_STAT counters*/ +#define PA_STAT_32b_START_OFFSET 0x0080 + +#endif +/* __NET_TI_ICSSG_SWITCH_MAP_H */
Signature · 1 line
2.34.1
PATCH v5 2/5 net: ti: icssg: Add Firmware config and classification APIs.
In reply to MD Danish AnwarAdd icssg_config.h / .c and icssg_classifier.c files. These are firmware configuration and classification related files. Add MII helper APIs and MACROs. These APIs and MACROs will be later used by ICSSG Ethernet driver. Also introduce icssg_prueth.h which has definition of prueth related structures.
--- drivers/net/ti/icss_mii_rt.h | 192 ++++++++++++++ drivers/net/ti/icssg_classifier.c | 376 +++++++++++++++++++++++++++ drivers/net/ti/icssg_config.c | 406 ++++++++++++++++++++++++++++++ drivers/net/ti/icssg_config.h | 177 +++++++++++++ drivers/net/ti/icssg_prueth.h | 83 ++++++ 5 files changed, 1234 insertions(+) create mode 100644 drivers/net/ti/icss_mii_rt.h create mode 100644 drivers/net/ti/icssg_classifier.c create mode 100644 drivers/net/ti/icssg_config.c create mode 100644 drivers/net/ti/icssg_config.h create mode 100644 drivers/net/ti/icssg_prueth.h
drivers/net/ti/icss_mii_rt.h new file +192 -0
@@ -0,0 +1,192 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* PRU-ICSS MII_RT register definitions +* +* Copyright (C) 2015-2024 Texas Instruments Incorporated - https://www.ti.com +*/ + +#ifndef __NET_PRUSS_MII_RT_H__ +#define __NET_PRUSS_MII_RT_H__ + +#include <regmap.h> + +/* PRUSS_MII_RT Registers */ +#define PRUSS_MII_RT_RXCFG0 0x0 +#define PRUSS_MII_RT_RXCFG1 0x4 +#define PRUSS_MII_RT_TXCFG0 0x10 +#define PRUSS_MII_RT_TXCFG1 0x14 +#define PRUSS_MII_RT_TX_CRC0 0x20 +#define PRUSS_MII_RT_TX_CRC1 0x24 +#define PRUSS_MII_RT_TX_IPG0 0x30 +#define PRUSS_MII_RT_TX_IPG1 0x34 +#define PRUSS_MII_RT_PRS0 0x38 +#define PRUSS_MII_RT_PRS1 0x3c +#define PRUSS_MII_RT_RX_FRMS0 0x40 +#define PRUSS_MII_RT_RX_FRMS1 0x44 +#define PRUSS_MII_RT_RX_PCNT0 0x48 +#define PRUSS_MII_RT_RX_PCNT1 0x4c +#define PRUSS_MII_RT_RX_ERR0 0x50 +#define PRUSS_MII_RT_RX_ERR1 0x54 + +/* PRUSS_MII_RT_RXCFG0/1 bits */ +#define PRUSS_MII_RT_RXCFG_RX_ENABLE BIT(0) +#define PRUSS_MII_RT_RXCFG_RX_DATA_RDY_MODE_DIS BIT(1) +#define PRUSS_MII_RT_RXCFG_RX_CUT_PREAMBLE BIT(2) +#define PRUSS_MII_RT_RXCFG_RX_MUX_SEL BIT(3) +#define PRUSS_MII_RT_RXCFG_RX_L2_EN BIT(4) +#define PRUSS_MII_RT_RXCFG_RX_BYTE_SWAP BIT(5) +#define PRUSS_MII_RT_RXCFG_RX_AUTO_FWD_PRE BIT(6) +#define PRUSS_MII_RT_RXCFG_RX_L2_EOF_SCLR_DIS BIT(9) + +/* PRUSS_MII_RT_TXCFG0/1 bits */ +#define PRUSS_MII_RT_TXCFG_TX_ENABLE BIT(0) +#define PRUSS_MII_RT_TXCFG_TX_AUTO_PREAMBLE BIT(1) +#define PRUSS_MII_RT_TXCFG_TX_EN_MODE BIT(2) +#define PRUSS_MII_RT_TXCFG_TX_BYTE_SWAP BIT(3) +#define PRUSS_MII_RT_TXCFG_TX_MUX_SEL BIT(8) +#define PRUSS_MII_RT_TXCFG_PRE_TX_AUTO_SEQUENCE BIT(9) +#define PRUSS_MII_RT_TXCFG_PRE_TX_AUTO_ESC_ERR BIT(10) +#define PRUSS_MII_RT_TXCFG_TX_32_MODE_EN BIT(11) +#define PRUSS_MII_RT_TXCFG_TX_IPG_WIRE_CLK_EN BIT(12)/* SR2.0 onwards */ + +#define PRUSS_MII_RT_TXCFG_TX_START_DELAY_SHIFT 16 +#define PRUSS_MII_RT_TXCFG_TX_START_DELAY_MASK GENMASK(25, 16) + +#define PRUSS_MII_RT_TXCFG_TX_CLK_DELAY_SHIFT 28 +#define PRUSS_MII_RT_TXCFG_TX_CLK_DELAY_MASK GENMASK(30, 28) + +/* PRUSS_MII_RT_TX_IPG0/1 bits */ +#define PRUSS_MII_RT_TX_IPG_IPG_SHIFT 0 +#define PRUSS_MII_RT_TX_IPG_IPG_MASK GENMASK(9, 0) + +/* PRUSS_MII_RT_PRS0/1 bits */ +#define PRUSS_MII_RT_PRS_COL BIT(0) +#define PRUSS_MII_RT_PRS_CRS BIT(1) + +/* PRUSS_MII_RT_RX_FRMS0/1 bits */ +#define PRUSS_MII_RT_RX_FRMS_MIN_FRM_SHIFT 0 +#define PRUSS_MII_RT_RX_FRMS_MIN_FRM_MASK GENMASK(15, 0) + +#define PRUSS_MII_RT_RX_FRMS_MAX_FRM_SHIFT 16 +#define PRUSS_MII_RT_RX_FRMS_MAX_FRM_MASK GENMASK(31, 16) + +/* Min/Max in MII_RT_RX_FRMS */ +/* For EMAC and Switch */ +#define PRUSS_MII_RT_RX_FRMS_MAX (VLAN_ETH_FRAME_LEN + ETH_FCS_LEN) +#define PRUSS_MII_RT_RX_FRMS_MIN_FRM (64) + +/* for HSR and PRP */ +#define PRUSS_MII_RT_RX_FRMS_MAX_FRM_LRE (PRUSS_MII_RT_RX_FRMS_MAX + \ + ICSS_LRE_TAG_RCT_SIZE) +/* PRUSS_MII_RT_RX_PCNT0/1 bits */ +#define PRUSS_MII_RT_RX_PCNT_MIN_PCNT_SHIFT 0 +#define PRUSS_MII_RT_RX_PCNT_MIN_PCNT_MASK GENMASK(3, 0) + +#define PRUSS_MII_RT_RX_PCNT_MAX_PCNT_SHIFT 4 +#define PRUSS_MII_RT_RX_PCNT_MAX_PCNT_MASK GENMASK(7, 4) + +/* PRUSS_MII_RT_RX_ERR0/1 bits */ +#define PRUSS_MII_RT_RX_ERR_MIN_PCNT_ERR BIT(0) +#define PRUSS_MII_RT_RX_ERR_MAX_PCNT_ERR BIT(1) +#define PRUSS_MII_RT_RX_ERR_MIN_FRM_ERR BIT(2) +#define PRUSS_MII_RT_RX_ERR_MAX_FRM_ERR BIT(3) + +#define ICSSG_CFG_OFFSET 0 +#define RGMII_CFG_OFFSET 4 + +/* Constant to choose between MII0 and MII1 */ +#define ICSS_MII0 0 +#define ICSS_MII1 1 + +/* ICSSG_CFG Register bits */ +#define ICSSG_CFG_SGMII_MODE BIT(16) +#define ICSSG_CFG_TX_PRU_EN BIT(11) +#define ICSSG_CFG_RX_SFD_TX_SOF_EN BIT(10) +#define ICSSG_CFG_RTU_PRU_PSI_SHARE_EN BIT(9) +#define ICSSG_CFG_IEP1_TX_EN BIT(8) +#define ICSSG_CFG_MII1_MODE GENMASK(6, 5) +#define ICSSG_CFG_MII1_MODE_SHIFT 5 +#define ICSSG_CFG_MII0_MODE GENMASK(4, 3) +#define ICSSG_CFG_MII0_MODE_SHIFT 3 +#define ICSSG_CFG_RX_L2_G_EN BIT(2) +#define ICSSG_CFG_TX_L2_EN BIT(1) +#define ICSSG_CFG_TX_L1_EN BIT(0) + +enum mii_mode {MII_MODE_MII =0 ,MII_MODE_RGMII ,MII_MODE_SGMII }; + +/* RGMII CFG Register bits */ +#define RGMII_CFG_INBAND_EN_MII0 BIT(16) +#define RGMII_CFG_GIG_EN_MII0 BIT(17) +#define RGMII_CFG_INBAND_EN_MII1 BIT(20) +#define RGMII_CFG_GIG_EN_MII1 BIT(21) +#define RGMII_CFG_FULL_DUPLEX_MII0 BIT(18) +#define RGMII_CFG_FULL_DUPLEX_MII1 BIT(22) +#define RGMII_CFG_SPEED_MII0 GENMASK(2, 1) +#define RGMII_CFG_SPEED_MII1 GENMASK(6, 5) +#define RGMII_CFG_SPEED_MII0_SHIFT 1 +#define RGMII_CFG_SPEED_MII1_SHIFT 5 +#define RGMII_CFG_FULLDUPLEX_MII0 BIT(3) +#define RGMII_CFG_FULLDUPLEX_MII1 BIT(7) +#define RGMII_CFG_FULLDUPLEX_MII0_SHIFT 3 +#define RGMII_CFG_FULLDUPLEX_MII1_SHIFT 7 +#define RGMII_CFG_SPEED_10M 0 +#define RGMII_CFG_SPEED_100M 1 +#define RGMII_CFG_SPEED_1G 2 + +static inline void icssg_mii_update_ipg (struct regmap *mii_rt,int mii,u32 ipg) +{ +u32 val; + +if (mii ==ICSS_MII0 ) { +regmap_write (mii_rt,PRUSS_MII_RT_TX_IPG0 , ipg); + }else { +/* Errata workaround: IEP1 is not read by h/w unless IEP0 is written */ +regmap_read (mii_rt,PRUSS_MII_RT_TX_IPG0 , &val); +regmap_write (mii_rt,PRUSS_MII_RT_TX_IPG1 , ipg); +regmap_write (mii_rt,PRUSS_MII_RT_TX_IPG0 , val); + } +} + +static inline void icssg_update_rgmii_cfg (struct regmap *miig_rt,int speed, +bool full_duplex,int slice,struct prueth_priv *priv) +{ +u32 gig_en_mask, gig_val =0 , full_duplex_mask, full_duplex_val =0 ; +u32 inband_en_mask, inband_val =0 ; + + gig_en_mask = (slice ==ICSS_MII0 ) ?RGMII_CFG_GIG_EN_MII0 : +RGMII_CFG_GIG_EN_MII1 ; +if (speed ==SPEED_1000 ) + gig_val = gig_en_mask; +regmap_update_bits (miig_rt,RGMII_CFG_OFFSET , gig_en_mask, gig_val); + + inband_en_mask = (slice ==ICSS_MII0 ) ?RGMII_CFG_INBAND_EN_MII0 : +RGMII_CFG_INBAND_EN_MII1 ; +if (speed ==SPEED_10 &&phy_interface_is_rgmii (priv->phydev)) + inband_val = inband_en_mask; +regmap_update_bits (miig_rt,RGMII_CFG_OFFSET , inband_en_mask, inband_val); + + full_duplex_mask = (slice ==ICSS_MII0 ) ?RGMII_CFG_FULL_DUPLEX_MII0 : +RGMII_CFG_FULL_DUPLEX_MII1 ; +if (full_duplex) + full_duplex_val = full_duplex_mask; +regmap_update_bits (miig_rt,RGMII_CFG_OFFSET , full_duplex_mask, + full_duplex_val); +} + +static inline void icssg_miig_set_interface_mode (struct regmap *miig_rt,int mii,int phy_if) +{ +u32 val, mask, shift; + + mask = mii ==ICSS_MII0 ?ICSSG_CFG_MII0_MODE :ICSSG_CFG_MII1_MODE ; + shift = mii ==ICSS_MII0 ?ICSSG_CFG_MII0_MODE_SHIFT :ICSSG_CFG_MII1_MODE_SHIFT ; + + val =MII_MODE_RGMII ; +if (phy_if ==PHY_INTERFACE_MODE_MII ) + val =MII_MODE_MII ; + + val <<= shift; +regmap_update_bits (miig_rt,ICSSG_CFG_OFFSET , mask, val); +regmap_read (miig_rt,ICSSG_CFG_OFFSET , &val); +} + +#endif /* __NET_PRUSS_MII_RT_H__ */
drivers/net/ti/icssg_classifier.c new file +376 -0
376 lines not on this page · raw message
drivers/net/ti/icssg_config.c new file +406 -0
406 lines not on this page · raw message
drivers/net/ti/icssg_config.h new file +177 -0
177 lines not on this page · raw message
drivers/net/ti/icssg_prueth.h new file +83 -0
83 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v5 2/5] net: ti: icssg: Add Firmware config and classification APIs.
Quoted 7 lines · MD Danish Anwar
Add
icssg_config.h/ .c andicssg_classifier.cfiles. These are firmware configuration and classification related files. Add MII helper APIs and MACROs. These APIs and MACROs will be later used by ICSSG Ethernet driver. Also introduceicssg_prueth.hwhich has definition of prueth related structures.Signed-off-by MD Danish Anwar <[email protected]>
Quoted 13 lines
--- drivers/net/ti/icss_mii_rt.h | 192 ++++++++++++++ drivers/net/ti/icssg_classifier.c | 376 +++++++++++++++++++++++++++ drivers/net/ti/icssg_config.c | 406 ++++++++++++++++++++++++++++++ drivers/net/ti/icssg_config.h | 177 +++++++++++++ drivers/net/ti/icssg_prueth.h | 83 ++++++ 5 files changed, 1234 insertions(+) create mode 100644 drivers/net/ti/icss_mii_rt.h create mode 100644 drivers/net/ti/icssg_classifier.c create mode 100644 drivers/net/ti/icssg_config.c create mode 100644 drivers/net/ti/icssg_config.h create mode 100644 drivers/net/ti/icssg_prueth.h
Signature · 2 lines
Regards, Ravi
PATCH v5 3/5 net: ti: icssg: Add icssg queues APIs and macros
In reply to MD Danish AnwarAdd icssg_queue.c file. This file introduces macros and APIs related to ICSSG queues. These will be used by ICSSG Ethernet driver.
--- drivers/net/ti/icssg_prueth.h | 5 ++++ drivers/net/ti/icssg_queues.c | 51 +++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 drivers/net/ti/icssg_queues.c
drivers/net/ti/icssg_prueth.h +5 -0
@@ -80,4 +80,9 @@ void icssg_config_ipg(struct prueth_priv *priv, int speed, int mii);int icssg_config (struct prueth_priv *priv);int emac_set_port_state (struct prueth_priv *priv,enum icssg_port_state_cmd cmd); +/* Buffer queue helpers */ +int icssg_queue_pop (struct prueth *prueth,u8 queue); +void icssg_queue_push (struct prueth *prueth,int queue,u16 addr); +u32 icssg_queue_level (struct prueth *prueth,int queue); +#endif /* __NET_TI_ICSSG_PRUETH_H */
drivers/net/ti/icssg_queues.c new file +51 -0
51 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v5 4/5 net: ti: icssg: Add ICSSG ethernet driver
In reply to MD Danish AnwarThis is the PRUSS Ethernet driver for TI AM654 SR2.0 and later SoCs with the ICSSG PRU Sub-system running EMAC firmware. ICSSG Subsystem supports two slices per instance. This driver caters to both slices / ports of the icssg subsystem.
Since it is not possible for Ethernet driver to register more than one port for a given instance, this patch introduces top level PRUETH as UCLASS_MISC and binds UCLASS_ETH to individual ports in order to support bringing up more than one Ethernet interface in U-Boot.
Since top level driver is UCLASS_MISC, board files would need to instantiate the driver explicitly.
--- arch/arm/mach-k3/common.c | 11 + drivers/net/ti/Kconfig | 13 + drivers/net/ti/Makefile | 1 + drivers/net/ti/icssg_prueth.c | 685 ++++++++++++++++++++++++++++++++++ drivers/net/ti/icssg_prueth.h | 3 + 5 files changed, 713 insertions(+) create mode 100644 drivers/net/ti/icssg_prueth.c
arch/arm/mach-k3/common.c +11 -0
@@ -270,6 +270,17 @@ int misc_init_r(void)printf ("Failed to probe am65_cpsw_nuss driver\n" ); } +if (IS_ENABLED (CONFIG_TI_ICSSG_PRUETH )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC , +DM_DRIVER_GET (prueth), + &dev); +if (ret) +printf ("Failed to probe prueth driver\n" ); + } +/* Default FIT boot on HS-SE devices */ if (get_device_type () ==K3_DEVICE_TYPE_HS_SE )env_set ("boot_fit" ,"1" );
drivers/net/ti/Kconfig +13 -0
@@ -57,3 +57,16 @@ config MDIO_TI_CPSW help This driver supports the TI CPSW MDIO interface found in various TI SoCs. + +config TI_ICSSG_PRUETH + bool "TI Gigabit PRU Ethernet driver" + depends on ARCH_K3 + imply DM_MDIO + imply MISC_INIT_R + imply MISC + imply MDIO_TI_CPSW + select PHYLIB + select FS_LOADER + help + Support Gigabit Ethernet ports over the ICSSG PRU Subsystem + This subsystem is available starting with the AM65 platform.
drivers/net/ti/Makefile +1 -0
@@ -7,3 +7,4 @@ obj-$(CONFIG_DRIVER_TI_EMAC) += davinci_emac.o obj-$(CONFIG_DRIVER_TI_KEYSTONE_NET) += keystone_net.o cpsw_mdio.o obj-$(CONFIG_TI_AM65_CPSW_NUSS) += am65-cpsw-nuss.o obj-$(CONFIG_MDIO_TI_CPSW) += cpsw_mdio.o +obj-$(CONFIG_TI_ICSSG_PRUETH) += icssg_prueth.o icssg_classifier.o icssg_config.o icssg_queues.o
drivers/net/ti/icssg_prueth.c new file +685 -0
685 lines not on this page · raw message
drivers/net/ti/icssg_prueth.h +3 -0
@@ -62,6 +62,9 @@ struct prueth {bool mdio_manual_mode;int speed;int duplex; +u8 pru_core_id; +u8 rtu_core_id; +u8 txpru_core_id; };struct prueth_priv {
Signature · 1 line
2.34.1
Re: [PATCH v5 4/5] net: ti: icssg: Add ICSSG ethernet driver
Quoted 14 lines · MD Danish Anwar
This is the PRUSS Ethernet driver for TI AM654 SR2.0 and later SoCs with the ICSSG PRU Sub-system running EMAC firmware. ICSSG Subsystem supports two slices per instance. This driver caters to both slices / ports of the icssg subsystem.
Since it is not possible for Ethernet driver to register more than one port for a given instance, this patch introduces top level PRUETH as
UCLASS_MISCand bindsUCLASS_ETHto individual ports in order to support bringing up more than one Ethernet interface in U-Boot.Since top level driver is
UCLASS_MISC, board files would need to instantiate the driver explicitly.Signed-off-by MD Danish Anwar <[email protected]>
Quoted 9 lines
--- arch/arm/mach-k3/common.c | 11 + drivers/net/ti/Kconfig | 13 + drivers/net/ti/Makefile | 1 + drivers/net/ti/icssg_prueth.c | 685 ++++++++++++++++++++++++++++++++++ drivers/net/ti/icssg_prueth.h | 3 + 5 files changed, 713 insertions(+) create mode 100644 drivers/net/ti/icssg_prueth.c
Signature · 2 lines
Regards, Ravi
PATCH v5 5/5 net: ti: icssg: Add support sending FDB command to update rx_flow_id
In reply to MD Danish AnwarICSSG firmware supports FDB commands. Add support to send FDB commands from driver. Once rx_flow_id is obtained from dma, let firmware know that we are using this rx_flow_id by sending a FDB command.
--- drivers/net/ti/icssg_config.c | 68 +++++++++++++++++++++++++++++++++++ drivers/net/ti/icssg_config.h | 18 ++++++++++ drivers/net/ti/icssg_prueth.c | 6 ++++ drivers/net/ti/icssg_prueth.h | 6 ++++ 4 files changed, 98 insertions(+)
drivers/net/ti/icssg_config.c +68 -0
@@ -9,6 +9,7 @@#include "icssg_switch_map.h" #include "icss_mii_rt.h" #include <dm/device_compat.h> +#include <linux/iopoll.h> /* TX IPG Values to be set for 100M and 1G link speeds. These values are * in ocp_clk cycles. So need change if ocp_clk is changed for a specific
@@ -404,3 +405,70 @@ int emac_set_port_state(struct prueth_priv *priv,return ret; } + +int icssg_send_fdb_msg (struct prueth_priv *priv,struct mgmt_cmd *cmd, +struct mgmt_cmd_rsp *rsp) +{ +struct prueth *prueth = priv->prueth; +int slice = priv->port_id; +int ret, addr; + + addr =icssg_queue_pop (prueth, slice ==0 ? +ICSSG_CMD_POP_SLICE0 :ICSSG_CMD_POP_SLICE1 ); +if (addr <0 ) +return addr; + +/* First 4 bytes have FW owned buffer linking info which should +* not be touched +*/ +memcpy_toio ((void __iomem *)prueth->shram.pa + addr +4 , cmd,sizeof (*cmd)); +icssg_queue_push (prueth, slice ==0 ? +ICSSG_CMD_PUSH_SLICE0 :ICSSG_CMD_PUSH_SLICE1 , addr); + ret =read_poll_timeout (icssg_queue_pop, addr, addr >=0 , +2000 ,20000000 , prueth, slice ==0 ? +ICSSG_RSP_POP_SLICE0 :ICSSG_RSP_POP_SLICE1 ); + +if (ret) { +dev_err (prueth->dev,"Timedout sending HWQ message\n" ); +return ret; + } + +memcpy_fromio (rsp, (void __iomem *)prueth->shram.pa + addr,sizeof (*rsp)); +/* Return buffer back for to pool */ +icssg_queue_push (prueth, slice ==0 ? +ICSSG_RSP_PUSH_SLICE0 :ICSSG_RSP_PUSH_SLICE1 , addr); + +return 0 ; +} + +int emac_fdb_flow_id_updated (struct prueth_priv *priv) +{ +struct mgmt_cmd_rsp fdb_cmd_rsp = {0 }; +struct prueth *prueth = priv->prueth; +struct mgmt_cmd fdb_cmd = {0 }; +int slice = priv->port_id; +int ret =0 ; + + fdb_cmd.header =ICSSG_FW_MGMT_CMD_HEADER ; + fdb_cmd.type =ICSSG_FW_MGMT_FDB_CMD_TYPE_RX_FLOW ; + fdb_cmd.seqnum = ++(prueth->icssg_hwcmdseq); + fdb_cmd.param =0 ; + + fdb_cmd.param |= (slice <<4 ); + fdb_cmd.cmd_args[0 ] =0 ; + + ret =icssg_send_fdb_msg (priv, &fdb_cmd, &fdb_cmd_rsp); +if (ret) +return ret; + +if (fdb_cmd.seqnum != fdb_cmd_rsp.seqnum) { +dev_err (prueth->dev,"seqnum doesn't match, cmd.seqnum %d != rsp.seqnum %d\n" , + fdb_cmd.seqnum, fdb_cmd_rsp.seqnum); +return -EINVAL ; + } + +if (fdb_cmd_rsp.status ==1 ) +return 0 ; + +return -EINVAL ; +}
drivers/net/ti/icssg_config.h +18 -0
@@ -80,6 +80,7 @@ struct icssg_rxq_ctx {#define ICSSG_FW_MGMT_FDB_CMD_TYPE 0x03#define ICSSG_FW_MGMT_CMD_TYPE 0x04#define ICSSG_FW_MGMT_PKT 0x80000000 +#define ICSSG_FW_MGMT_FDB_CMD_TYPE_RX_FLOW 0x05struct icssg_r30_cmd {u32 cmd[4 ];
@@ -156,6 +157,23 @@ struct icssg_setclock_desc {u32 CMP0_new; } __packed; +struct mgmt_cmd { +u8 param; +u8 seqnum; +u8 type; +u8 header; +u32 cmd_args[3 ]; +} __packed; + +struct mgmt_cmd_rsp { +u32 reserved; +u8 status; +u8 seqnum; +u8 type; +u8 header; +u32 cmd_args[3 ]; +} __packed; +#define ICSSG_CMD_POP_SLICE0 56#define ICSSG_CMD_POP_SLICE1 60
drivers/net/ti/icssg_prueth.c +6 -0
@@ -374,6 +374,12 @@ static int prueth_start(struct udevice *dev)dev_info (dev,"K3 ICSSG: rflow_id_base: %u, chn_name = %s\n" , dma_rx_cfg_data->flow_id_base, chn_name); + ret =emac_fdb_flow_id_updated (priv); +if (ret) { +dev_err (dev,"Failed to update Rx Flow ID %d" , ret); + goto phy_fail; + } + ret =phy_startup (priv->phydev);if (ret) {dev_err (dev,"phy_startup failed\n" );
drivers/net/ti/icssg_prueth.h +6 -0
@@ -65,6 +65,7 @@ struct prueth {u8 pru_core_id;u8 rtu_core_id;u8 txpru_core_id; +u8 icssg_hwcmdseq; };struct prueth_priv {
@@ -88,4 +89,9 @@ int icssg_queue_pop(struct prueth *prueth, u8 queue);void icssg_queue_push (struct prueth *prueth,int queue,u16 addr);u32 icssg_queue_level (struct prueth *prueth,int queue); +/* FDB helpers */ +int icssg_send_fdb_msg (struct prueth_priv *priv,struct mgmt_cmd *cmd, +struct mgmt_cmd_rsp *rsp); +int emac_fdb_flow_id_updated (struct prueth_priv *priv); +#endif /* __NET_TI_ICSSG_PRUETH_H */
Signature · 1 line
2.34.1
Quoted 10 lines · MD Danish Anwar
Introduce ICSSG PRUETH support in uboot. The ICSSG driver is used in TI AM654 SR2.0.
The ICSSG PRU Sub-system runs on EMAC firmware. This series Introduces support for ICSSG driver in uboot.
This series has been tested on AM65x SR2.0, and the ICSSG interface is able to ping / dhcp and boot kernel using tftp in uboot.
[...]
Applied to u-boot/master, thanks!
Signature · 1 line
Tom