nv-tegra-mirror/nvethernetrm
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/kernel/nvethernetrm.git synced 2025-12-22 09:12:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

osi: MACSec: Update IPG changes for EQoS MACSec

Browse Source 
Issue: IPG is not updated when MACsec is enabled for Thor

Fix: Removed the check to program IPG only if MAC type is Orin

Bug 4768403

Change-Id: I68ddac02d241a94e0a270d15d3c441fb7fc945a7
Signed-off-by: Sanath Kumar Gampa <sgampa@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/kernel/nvethernetrm/+/3188748
Reviewed-by: Krishna Thota <kthota@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Mahesh Patil <maheshp@nvidia.com>
This commit is contained in:
Sanath Kumar Gampa
2024-08-06 06:15:37 +00:00
committed by mobile promotions
parent 26c551ceba
commit 35d0eb1f7d
1 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
osi/core/eqos_core.c
View File

@@ -4130,46 +4130,44 @@ static void eqos_config_for_macsec(struct osi_core_priv_data *const osi_core,
{ {
nveu32_t value = 0U, temp = 0U; nveu32_t value = 0U, temp = 0U;
if (osi_core->mac_ver == OSI_EQOS_MAC_5_30) { /* stop MAC Tx */
/* stop MAC Tx */ eqos_config_mac_tx(osi_core, OSI_DISABLE);
eqos_config_mac_tx(osi_core, OSI_DISABLE); if (enable == OSI_ENABLE) {
if (enable == OSI_ENABLE) { /* Configure IPG {EIPG,IPG} value according to macsec IAS in
/* Configure IPG {EIPG,IPG} value according to macsec IAS in * MAC_Configuration and MAC_Extended_Configuration
* MAC_Configuration and MAC_Extended_Configuration * IPG (12 B[default] + 32 B[sectag]) = 352 bits
* IPG (12 B[default] + 32 B[sectag]) = 352 bits */
*/ value = osi_readla(osi_core, (nveu8_t *)osi_core->base +
value = osi_readla(osi_core, (nveu8_t *)osi_core->base + EQOS_MAC_MCR);
EQOS_MAC_MCR); temp = EQOS_MCR_IPG;
temp = EQOS_MCR_IPG; temp = temp << EQOS_MCR_IPG_SHIFT;
temp = temp << EQOS_MCR_IPG_SHIFT; value |= temp & EQOS_MCR_IPG_MASK;
value |= temp & EQOS_MCR_IPG_MASK; osi_writela(osi_core, value, (nveu8_t *)osi_core->base +
osi_writela(osi_core, value, (nveu8_t *)osi_core->base + EQOS_MAC_MCR);
EQOS_MAC_MCR); value = osi_readla(osi_core, (nveu8_t *)osi_core->base +
value = osi_readla(osi_core, (nveu8_t *)osi_core->base + EQOS_MAC_EXTR);
EQOS_MAC_EXTR); value |= EQOS_MAC_EXTR_EIPGEN;
value |= EQOS_MAC_EXTR_EIPGEN; temp = EQOS_MAC_EXTR_EIPG;
temp = EQOS_MAC_EXTR_EIPG; temp = temp << EQOS_MAC_EXTR_EIPG_SHIFT;
temp = temp << EQOS_MAC_EXTR_EIPG_SHIFT; value |= temp & EQOS_MAC_EXTR_EIPG_MASK;
value |= temp & EQOS_MAC_EXTR_EIPG_MASK; osi_writela(osi_core, value, (nveu8_t *)osi_core->base +
osi_writela(osi_core, value, (nveu8_t *)osi_core->base + EQOS_MAC_EXTR);
EQOS_MAC_EXTR); } else {
} else { /* reset to default IPG 12B */
/* reset to default IPG 12B */ value = osi_readla(osi_core, (nveu8_t *)osi_core->base +
value = osi_readla(osi_core, (nveu8_t *)osi_core->base + EQOS_MAC_MCR);
EQOS_MAC_MCR); value &= ~EQOS_MCR_IPG_MASK;
value &= ~EQOS_MCR_IPG_MASK; osi_writela(osi_core, value, (nveu8_t *)osi_core->base +
osi_writela(osi_core, value, (nveu8_t *)osi_core->base + EQOS_MAC_MCR);
EQOS_MAC_MCR); value = osi_readla(osi_core, (nveu8_t *)osi_core->base +
value = osi_readla(osi_core, (nveu8_t *)osi_core->base + EQOS_MAC_EXTR);
EQOS_MAC_EXTR); value &= ~EQOS_MAC_EXTR_EIPGEN;
value &= ~EQOS_MAC_EXTR_EIPGEN; value &= ~EQOS_MAC_EXTR_EIPG_MASK;
value &= ~EQOS_MAC_EXTR_EIPG_MASK; osi_writela(osi_core, value, (nveu8_t *)osi_core->base +
osi_writela(osi_core, value, (nveu8_t *)osi_core->base + EQOS_MAC_EXTR);
EQOS_MAC_EXTR);
}
/* start MAC Tx */
eqos_config_mac_tx(osi_core, OSI_ENABLE);
} }
/* start MAC Tx */
eqos_config_mac_tx(osi_core, OSI_ENABLE);
/* Updated MTL_EST depending on MACSEC enable/disable */ /* Updated MTL_EST depending on MACSEC enable/disable */
value = osi_readla(osi_core, value = osi_readla(osi_core,