Skip to content

Commit a868b48

Browse files
Radu Pirea (NXP OSS)davem330
Radu Pirea (NXP OSS)
authored andcommitted
net: phy: nxp-c45-tja11xx: add MACsec support
Add MACsec support. The MACsec block has four TX SCs and four RX SCs. The driver supports up to four SecY. Each SecY with one TX SC and one RX SC. The RX SCs can have two keys, key A and key B, written in hardware and enabled at the same time. The TX SCs can have two keys written in hardware, but only one can be active at a given time. On TX, the SC is selected using the MAC source address. Due of this selection mechanism, each offloaded netdev must have a unique MAC address. On RX, the SC is selected by SCI(found in SecTAG or calculated using MAC SA), or using RX SC 0 as implicit. Signed-off-by: Radu Pirea (NXP OSS) <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a73d877 commit a868b48

File tree

6 files changed

+1460
-33
lines changed

6 files changed

+1460
-33
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15444,7 +15444,7 @@ NXP C45 TJA11XX PHY DRIVER
1544415444
M: Radu Pirea <[email protected]>
1544515445
1544615446
S: Maintained
15447-
F: drivers/net/phy/nxp-c45-tja11xx.c
15447+
F: drivers/net/phy/nxp-c45-tja11xx*
1544815448

1544915449
NXP FSPI DRIVER
1545015450
M: Han Xu <[email protected]>

drivers/net/phy/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,10 @@ config NXP_CBTX_PHY
317317
config NXP_C45_TJA11XX_PHY
318318
tristate "NXP C45 TJA11XX PHYs"
319319
depends on PTP_1588_CLOCK_OPTIONAL
320+
depends on MACSEC || !MACSEC
320321
help
321322
Enable support for NXP C45 TJA11XX PHYs.
322-
Currently supports the TJA1103 and TJA1120 PHYs.
323+
Currently supports the TJA1103, TJA1104 and TJA1120 PHYs.
323324

324325
config NXP_TJA11XX_PHY
325326
tristate "NXP TJA11xx PHYs support"

drivers/net/phy/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@ obj-$(CONFIG_MICROSEMI_PHY) += mscc/
8484
obj-$(CONFIG_MOTORCOMM_PHY) += motorcomm.o
8585
obj-$(CONFIG_NATIONAL_PHY) += national.o
8686
obj-$(CONFIG_NCN26000_PHY) += ncn26000.o
87-
obj-$(CONFIG_NXP_C45_TJA11XX_PHY) += nxp-c45-tja11xx.o
87+
nxp-c45-tja-objs += nxp-c45-tja11xx.o
88+
ifdef CONFIG_MACSEC
89+
nxp-c45-tja-objs += nxp-c45-tja11xx-macsec.o
90+
endif
91+
obj-$(CONFIG_NXP_C45_TJA11XX_PHY) += nxp-c45-tja.o
8892
obj-$(CONFIG_NXP_CBTX_PHY) += nxp-cbtx.o
8993
obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o
9094
obj-$(CONFIG_QSEMI_PHY) += qsemi.o

0 commit comments

Comments
 (0)