drivers: net: sam_gmac: update for supporting multi GMAC instances #91040

TonyHan11 · 2025-06-04T08:00:57Z

The purpose of this PR is to update sam_gmac driver from supporting only one instance to supporting multiple instances.

The following two files are updated:

drivers/ethernet/eth_sam_gmac.c
drivers/ethernet/eth_sam_gmac_priv.h

Changes include:

centralize the lists used for different GMAC queues
add instance and num_queues to configuration
update for supporting multi GMAC instances

jukkar · 2025-06-04T08:27:36Z

drivers/ethernet/eth_sam_gmac_priv.h

+	uint32_t instance:8;
+	uint32_t num_queues:8;
+	uint32_t reserved:16;


Why bitfields instead of one uint16_t and two uint8_t?

No special reasons for using bitfields just it's easier to keep the structure word aligned.
Will be updated with uint16_t and uint8_t, thanks.

drivers/ethernet/eth_sam_gmac.c

drivers/ethernet/eth_sam_gmac_priv.h

drivers/ethernet/eth_sam_gmac.c

fabiobaltieri · 2025-06-04T14:43:16Z

Hey, this needs a rebase and force push to pick up the CI error workaround.

TonyHan11 · 2025-06-05T09:17:17Z

@maass-hamburg
Thank you for your comments, updated with the following changes:

remove bitfield variable instance and use dev->name for logging
assign .mac_addr using macro DT_INST_PROP_OR()
move DT_INST_FOREACH_STATUS_OKAY to the end and use it only once
remove init_done from the initialize procedure
PHY connection type: add multi instances support, remove build assert check (errors reported at runtime)
add multi instances support for MAC address

#define GMAC_QUEUE_NUM DT_INST_PROP(0, num_queues) in the header file not changed. Currently, we assume that the queue numbers of all instances are the same, otherwise the code and macros related to GMAC_QUEUE_NUM need to be updated. The code and macros are also be affected by some parameters come from CONFIG_. It's too complicated to put them in one pull request.

TonyHan11 · 2025-06-05T09:23:48Z

Rebased on the latest main branch to pick up the CI error workaround.

drivers/ethernet/eth_sam_gmac.c

drivers/ethernet/eth_sam_gmac_priv.h

TonyHan11 · 2025-11-05T07:20:44Z

line 34:

#define GMAC_QUEUE_NUM DT_INST_PROP(0, num_queues)

still depends on the first instance

still relevant, now line 30

Yes, the correlation needs to be solved. GMAC_QUEUE_NUM is used as the array sizeof of queue_list in struct eth_sam_dev_data. It comes from the num_queues of the first GMAC instance in DT.

The same num_queues is also used in Kconfig.sam_gmac for some configurations (also be used for SAMX7X, SAM4E and SAME54 series MCUs). Re-organize the configurations into the DT is a bit complicated and it's too big to put in a same PR with about 10 commits.

In this PR just keep it as is and validate it with BUILD_ASSERT in the last commit. It maybe solved in an additional pull request. Thank you very much for your comment.

TonyHan11 · 2025-11-05T07:21:12Z

Updated with the following:

Add validation of max_frame_size for jumbo frame size at the build stage
Add a new commit for ref_clk_source for multi instances support

drivers/ethernet/eth_sam_gmac.c

Add variable "phy_conn_type" to get and use the phy_connection_type from DT for different GMAC instances. Update the judgement on phy_connection_type for multi instances support. Signed-off-by: Tony Han <[email protected]>

Add variable "ref_clk_source" to get and set the source for the GMAC reference clock from DT for different GMAC instances. Signed-off-by: Tony Han <[email protected]>

To allow every interface be initialized properly when there are more than one instance, remove the static variable "init_done" which is used to make the initialize procedure only be done once. Signed-off-by: Tony Han <[email protected]>

As jumbo frame size is not supported by the networking subsystem, only max_frame_size 1518 and 1536 can be used. The Frame size 1536 would allow for packets with a vlan tag, so enable GMAC_NCFGR_MAXFS when NET_VLAN is configured. Signed-off-by: Tony Han <[email protected]>

Deprecate the 'ETH_SAM_GMAC_MAC_I2C_EEPROM' for the 'mac-eeprom' option, Limite it to be used when there's only one activated GMAC instance. Signed-off-by: Tony Han <[email protected]>

Add variable 'random_mac_addr' for 'zephyr,random-mac-address' from device tree. Update generate_mac() to get random MAC address for each GAMC interface with the 'zephyr,random-mac-address' property. Signed-off-by: Tony Han <[email protected]>

'GMAC_QUEUE_NUM' is a value of 'num-queues' for the first GMAC instance getting from the device tree. It is used directly or indirectly (by GMAC_PRIORITY_QUEUE_NUM) for defining and initializing 'struct eth_sam_dev_data' with a value from Kconfig (GMAC_ACTIVE_PRIORITY_QUEUE_NUM). As there will be a big change for applying the corresponding num-queues for each GMAC 'struct eth_sam_dev_data', here just keep it as is. Adding the BUITD_ASSERT to make sure the array queue_list[] is large enough for all GMAC instances. Signed-off-by: Tony Han <[email protected]>

maass-hamburg · 2025-11-07T09:04:23Z

line 34:

#define GMAC_QUEUE_NUM DT_INST_PROP(0, num_queues)

still depends on the first instance

still relevant, now line 30

Yes, the correlation needs to be solved. GMAC_QUEUE_NUM is used as the array sizeof of queue_list in struct eth_sam_dev_data. It comes from the num_queues of the first GMAC instance in DT.

The same num_queues is also used in Kconfig.sam_gmac for some configurations (also be used for SAMX7X, SAM4E and SAME54 series MCUs). Re-organize the configurations into the DT is a bit complicated and it's too big to put in a same PR with about 10 commits.

In this PR just keep it as is and validate it with BUILD_ASSERT in the last commit. It maybe solved in an additional pull request. Thank you very much for your comment.

Please open a issue for that, so we don't forget it later

dts/bindings/ethernet/atmel,gmac-common.yaml

TonyHan11 · 2025-11-07T09:45:14Z

Hi, @maass-hamburg ,

Please open a issue for that, so we don't forget it later

Created #99051, thanks.

The 'max-speed' property in atmel,gmac-common.yaml file is not used, remove it. Signed-off-by: Tony Han <[email protected]>

sonarqubecloud · 2025-11-10T10:18:18Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

nandojve · 2025-11-10T20:11:15Z

Ping @jukkar

github-actions bot added platform: Microchip SAM Microchip SAM Platform (formerly Atmel SAM) area: Ethernet labels Jun 4, 2025

github-actions bot requested review from a user, attie-argentum, decsny, lmajewski, maass-hamburg, mnkp, nandojve, pdgendt and stephanosio June 4, 2025 08:02

github-actions bot assigned maass-hamburg Jun 4, 2025

jukkar reviewed Jun 4, 2025

View reviewed changes

maass-hamburg requested changes Jun 4, 2025

View reviewed changes

TonyHan11 force-pushed the gmac_multi_instance branch from e667bf9 to 2f68375 Compare June 5, 2025 09:16

TonyHan11 force-pushed the gmac_multi_instance branch from 2f68375 to a6537c6 Compare June 5, 2025 09:22

maass-hamburg requested changes Jun 5, 2025

View reviewed changes

drivers/ethernet/eth_sam_gmac.c Outdated Show resolved Hide resolved

drivers/ethernet/eth_sam_gmac.c Outdated Show resolved Hide resolved

TonyHan11 force-pushed the gmac_multi_instance branch 2 times, most recently from dd166f8 to 69c7a1f Compare June 9, 2025 03:02

github-actions bot added area: Samples Samples area: Networking labels Jun 9, 2025

github-actions bot requested review from kartben and nashif June 9, 2025 03:03

TonyHan11 force-pushed the gmac_multi_instance branch from 69c7a1f to 0bf5ef1 Compare June 9, 2025 03:31

nandojve requested changes Jun 10, 2025

View reviewed changes

drivers/ethernet/eth_sam_gmac.c Outdated Show resolved Hide resolved

TonyHan11 force-pushed the gmac_multi_instance branch 2 times, most recently from d04c0e2 to 75008f4 Compare June 12, 2025 02:16

maass-hamburg requested changes Nov 4, 2025

View reviewed changes

drivers/ethernet/eth_sam_gmac.c Outdated Show resolved Hide resolved

drivers/ethernet/eth_sam_gmac_priv.h Show resolved Hide resolved

TonyHan11 force-pushed the gmac_multi_instance branch from b54ec29 to 07fdcb3 Compare November 5, 2025 07:05

maass-hamburg requested changes Nov 5, 2025

View reviewed changes

drivers/ethernet/eth_sam_gmac.c Outdated Show resolved Hide resolved

TonyHan11 added 3 commits November 6, 2025 15:35

drivers: net: sam_gmac: ref_clk_source for multi instances support

28d5df6

Add variable "ref_clk_source" to get and set the source for the GMAC reference clock from DT for different GMAC instances. Signed-off-by: Tony Han <[email protected]>

TonyHan11 force-pushed the gmac_multi_instance branch from 07fdcb3 to 1b93805 Compare November 6, 2025 08:23

TonyHan11 added 3 commits November 6, 2025 16:47

drivers: net: sam_gmac: deprecate the 'mac-eeprom' option

937fc24

Deprecate the 'ETH_SAM_GMAC_MAC_I2C_EEPROM' for the 'mac-eeprom' option, Limite it to be used when there's only one activated GMAC instance. Signed-off-by: Tony Han <[email protected]>

TonyHan11 force-pushed the gmac_multi_instance branch from 1b93805 to f27d14a Compare November 6, 2025 08:50

TonyHan11 force-pushed the gmac_multi_instance branch from f27d14a to dec5331 Compare November 7, 2025 01:10

TonyHan11 requested a review from maass-hamburg November 7, 2025 01:55

maass-hamburg requested changes Nov 7, 2025

View reviewed changes

dts/bindings/ethernet/atmel,gmac-common.yaml Show resolved Hide resolved

dts/bindings/ethernet/atmel,gmac-common.yaml Outdated Show resolved Hide resolved

TonyHan11 mentioned this pull request Nov 7, 2025

Microchip: SAM: GMAC: enhance queue configuration support for multiple instances #99051

Open

TonyHan11 force-pushed the gmac_multi_instance branch 2 times, most recently from 7b894ed to ef34457 Compare November 10, 2025 09:26

dts: bindings: ethernet-controller: remove unused prop 'max-speed'

02c0820

The 'max-speed' property in atmel,gmac-common.yaml file is not used, remove it. Signed-off-by: Tony Han <[email protected]>

TonyHan11 force-pushed the gmac_multi_instance branch from ef34457 to 02c0820 Compare November 10, 2025 09:46

maass-hamburg approved these changes Nov 10, 2025

View reviewed changes

nandojve approved these changes Nov 10, 2025

View reviewed changes

nashif merged commit 8876d0e into zephyrproject-rtos:main Nov 14, 2025
27 checks passed

TonyHan11 deleted the gmac_multi_instance branch November 17, 2025 01:39

drivers: net: sam_gmac: update for supporting multi GMAC instances #91040

drivers: net: sam_gmac: update for supporting multi GMAC instances #91040

Uh oh!

Conversation

TonyHan11 commented Jun 4, 2025

Uh oh!

jukkar Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

TonyHan11 Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fabiobaltieri commented Jun 4, 2025

Uh oh!

TonyHan11 commented Jun 5, 2025

Uh oh!

TonyHan11 commented Jun 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

TonyHan11 commented Nov 5, 2025

Uh oh!

TonyHan11 commented Nov 5, 2025

Uh oh!

Uh oh!

maass-hamburg commented Nov 7, 2025

Uh oh!

Uh oh!

Uh oh!

TonyHan11 commented Nov 7, 2025

Uh oh!

sonarqubecloud bot commented Nov 10, 2025

Quality Gate passed

Uh oh!

nandojve commented Nov 10, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants