Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix and enable sam4e ethernet port #23031

Merged
merged 16 commits into from
Apr 17, 2020
Merged

Fix and enable sam4e ethernet port #23031

merged 16 commits into from
Apr 17, 2020

Conversation

nandojve
Copy link
Member

@nandojve nandojve commented Feb 22, 2020 •
edited by stephanosio
Loading

This PR add all missing pieces to fix and enable SAM4E Ethernet port.

The changes were tested on SAM4E and SAMV71 boards using samples/net/telnet. Tests are conducted using DHCPv4, collecting stats and ping 8.8.8.8

@zephyrbot
Copy link
Collaborator

zephyrbot commented Feb 22, 2020 •
edited
Loading

All checks are passing now.

checkpatch (informational only, not a failure)

-:92: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,sam_e70_xplained" appears un-documented -- check ./dts/bindings/
#92: FILE: boards/arm/sam_e70_xplained/sam_e70_xplained.dts:16:
+	compatible = "atmel,sam_e70_xplained", "atmel,same70q21", "atmel,same70";

-:92: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,same70q21" appears un-documented -- check ./dts/bindings/
#92: FILE: boards/arm/sam_e70_xplained/sam_e70_xplained.dts:16:
+	compatible = "atmel,sam_e70_xplained", "atmel,same70q21", "atmel,same70";

-:92: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,same70" appears un-documented -- check ./dts/bindings/
#92: FILE: boards/arm/sam_e70_xplained/sam_e70_xplained.dts:16:
+	compatible = "atmel,sam_e70_xplained", "atmel,same70q21", "atmel,same70";

-:92: WARNING:LONG_LINE: line over 80 characters
#92: FILE: boards/arm/sam_e70_xplained/sam_e70_xplained.dts:16:
+	compatible = "atmel,sam_e70_xplained", "atmel,same70q21", "atmel,same70";

-:114: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,sam_e70b_xplained" appears un-documented -- check ./dts/bindings/
#114: FILE: boards/arm/sam_e70_xplained/sam_e70b_xplained.dts:15:
+	compatible = "atmel,sam_e70b_xplained", "atmel,same70q21b", "atmel,same70b";

-:114: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,same70q21b" appears un-documented -- check ./dts/bindings/
#114: FILE: boards/arm/sam_e70_xplained/sam_e70b_xplained.dts:15:
+	compatible = "atmel,sam_e70b_xplained", "atmel,same70q21b", "atmel,same70b";

-:114: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,same70b" appears un-documented -- check ./dts/bindings/
#114: FILE: boards/arm/sam_e70_xplained/sam_e70b_xplained.dts:15:
+	compatible = "atmel,sam_e70b_xplained", "atmel,same70q21b", "atmel,same70b";

-:114: WARNING:LONG_LINE: line over 80 characters
#114: FILE: boards/arm/sam_e70_xplained/sam_e70b_xplained.dts:15:
+	compatible = "atmel,sam_e70b_xplained", "atmel,same70q21b", "atmel,same70b";

-:160: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,sam_v71_xult" appears un-documented -- check ./dts/bindings/
#160: FILE: boards/arm/sam_v71_xult/sam_v71_xult.dts:16:
+	compatible = "atmel,sam_v71_xult", "atmel,samv71q21", "atmel,samv71";

-:160: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,samv71q21" appears un-documented -- check ./dts/bindings/
#160: FILE: boards/arm/sam_v71_xult/sam_v71_xult.dts:16:
+	compatible = "atmel,sam_v71_xult", "atmel,samv71q21", "atmel,samv71";

-:160: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,samv71" appears un-documented -- check ./dts/bindings/
#160: FILE: boards/arm/sam_v71_xult/sam_v71_xult.dts:16:
+	compatible = "atmel,sam_v71_xult", "atmel,samv71q21", "atmel,samv71";

-:182: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,sam_v71b_xult" appears un-documented -- check ./dts/bindings/
#182: FILE: boards/arm/sam_v71_xult/sam_v71b_xult.dts:15:
+	compatible = "atmel,sam_v71b_xult", "atmel,samv71q21b", "atmel,samv71b";

-:182: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,samv71q21b" appears un-documented -- check ./dts/bindings/
#182: FILE: boards/arm/sam_v71_xult/sam_v71b_xult.dts:15:
+	compatible = "atmel,sam_v71b_xult", "atmel,samv71q21b", "atmel,samv71b";

-:182: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "atmel,samv71b" appears un-documented -- check ./dts/bindings/
#182: FILE: boards/arm/sam_v71_xult/sam_v71b_xult.dts:15:
+	compatible = "atmel,sam_v71b_xult", "atmel,samv71q21b", "atmel,samv71b";

- total: 0 errors, 14 warnings, 425 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

Your patch has style problems, please review.

NOTE: Ignored message types: AVOID_EXTERNS BRACES CONFIG_EXPERIMENTAL CONST_STRUCT DATE_TIME FILE_PATH_CHANGES MINMAX NETWORKING_BLOCK_COMMENT_STYLE PRINTK_WITHOUT_KERN_LEVEL SPLIT_STRING VOLATILE

NOTE: If any of the errors are false positives, please report
      them to the maintainers.

Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages.

@nandojve nandojve mentioned this pull request Feb 22, 2020
Merged
@stephanosio stephanosio mentioned this pull request Feb 24, 2020
Merged
@stephanosio stephanosio added area: Ethernet platform: Microchip SAM Microchip SAM Platform (formerly Atmel SAM) DNM This PR should not be merged (Do Not Merge) labels Feb 24, 2020
@nandojve nandojve closed this Feb 26, 2020
@nandojve nandojve reopened this Feb 26, 2020
stephanosio
stephanosio reviewed Feb 27, 2020
View reviewed changes
Copy link
Member

@stephanosio stephanosio left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add supported: netif:eth in sam4e_xpro.yaml too.

@stephanosio
Copy link
Member

Just a reminder that, if #23045 gets merged before this PR, we need to add device tree stuff here as well.

I already have the commits for that here:
stephanosio@a142166
stephanosio@da8a868

@nandojve
Copy link
Member Author

nandojve commented Feb 28, 2020 •
edited
Loading

Just a reminder that, if #23045 gets merged before this PR, we need to add device tree stuff here as well.

I already have the commits for that here:
stephanosio@a142166
stephanosio@da8a868

@stephanosio I added missing netif:eth to sam4e_xpro.yaml, thank you for remind me about it. I cherry-picked both commits plus DTS definition and reworked. Now we have phy-connection-type 0dab05d to select between RMII and MII interfaces. I added more DTS options to work in future and now I'll work on max-frame-size. It'll be here soon.

Maybe you can update your version with 84e274f.

@nandojve nandojve closed this Feb 28, 2020
@nandojve nandojve reopened this Feb 28, 2020
@nandojve nandojve force-pushed the fix_sam4e_gmac branch 3 times, most recently from c99464e to ccb27ad Compare February 28, 2020 15:29
@nandojve
Copy link
Member Author

@mnkp

@nandojve nandojve mentioned this pull request Mar 5, 2020
Closed
61 tasks
@stephanosio stephanosio mentioned this pull request Apr 10, 2020
Closed
@nandojve
drivers: eth: eth_sam_gmac: Split DMA queue flags
e587f36 
This cleans up DMA flags by separating the necessary flags for devices
with one or multiple RX/TX queues.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
dts: arm: atmel: Add SAM 4E GMAC instance
a16bebe 
This commit adds a GMAC instance to the SAM 4E device tree.

Signed-off-by: Stephanos Ioannidis <[email protected]>
Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
soc: arm: atmel: Add sam4e gmac pins
34fd5ba 
Add sam4e gmac pin definitions to use ethernet driver.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@zephyrbot zephyrbot added the area: API Changes to public APIs label Apr 11, 2020
@nandojve
Copy link
Member Author

rebase and added:

9ad5426 better approach to handle __nocache
62cca3b better way to handle in Kconfig

Thank you @stephanosio @galak @vlotech for all effort spend with the Kconfig issue.

vlotech and others added 13 commits April 11, 2020 14:49
@vlotech @nandojve
include: linker: section_tags.h: Add __nocache fallback
199649b 
Some drivers support NOCACHE_MEMORY sections. To have a default
fallback for systems where this isn't available or disabled a
fallback define is added.

Signed-off-by: Vincent van der Locht <[email protected]>
Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
drivers: eth: sam_gmac: Add data cache checks
f676d08 
Improve data cache conditional build. Now data cache code is build
only if device have support to it. This enables GMAC driver for use
with devices that don't have data cache instructions.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
drivers: eth: Kconfig.sam_gmac: Fix NOCACHE dependency
90e4db1 
The NOCACHE_MEMORY can be enabled only for those MCU that support data
cache. The currently SoC that doesn't have data cache is SAM4E.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
dts: bindings: eth: Add GMAC options
7b2e9cb 
This add the following options to GMAC device tree bindings:
 - max-frame-size
 - max-speed
 - phy-connection-type

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
dts: arm: atmel: Add SAM4E GMAC phy-connection-type
4107dc9 
The SAM4E GMAC version can use only MII as phy-connection-type. This
update the current default RMII value to MII.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
drivers: eth: sam_gmac: Fix phy layer setup
7ddc0f3 
The current setup of physical layer forces RMII interface. The code was
refactored to have only one point to select proper phy interface. Now,
GMAC driver works with both RMII or MII interface. The phy connection
type is now selected by device tree. The default phy connection is RMII.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
drivers: eth: sam_gmac: Use DT max_frame_size option
fe1d99d 
This commit updates the Atmel SAM GMAC driver to select max frame size
value from the device tree. Now GMAC driver can operate with the three
different frame size options available.

The current supported values are: 1518, 1536 and 10240.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
boards: arm: sam4e_xpro: Add GMAC defaults
f361769 
This enable GMAC driver by default if the end application selects
NETWORKING. The driver will set MII interface since is the only one
available for SAM4E and will select a random MAC value.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
boards: sam4e_xpro: Enable GMAC in device tree
2a0991e 
This commit enables the newly added GMAC instance in the `sam4e_xpro`
device tree.

Signed-off-by: Stephanos Ioannidis <[email protected]>
Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
drivers: ethernet: eth_sam_gmac.c: Fix macro name
bb427a4 
Fix macro name from disable_all_queue_interrupt to
disable_all_priority_queue_interrupt.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
boards: arm: sam_e70_xplained: Fix dts model and compatible
a749a9a 
Set model according with SoC revision A or B. Compatible follows
same approach.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
boards: arm: sam_v71_xult: Fix dts model and compatible
2f26655 
Set model according with SoC revision A or B. Compatible follows
same approach.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@vlotech @nandojve
drivers: eth: Kconfig.sam_gmac: Add sam4e support for queues
551ae07 
Fixed the ETH_SAM_GMAC_QUEUES config by adding if-statements per SoC
series.

Signed-off-by: Vincent van der Locht <[email protected]>
Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve nandojve closed this Apr 14, 2020
@nandojve nandojve reopened this Apr 14, 2020
@stephanosio stephanosio mentioned this pull request Apr 15, 2020
Closed
@nandojve
Copy link
Member Author

Hi everyone, I was wondering if there is anything missing here? This is an important feature that have been blocked since Feb and will be great have it on Zephyr 2.3.

@jukkar jukkar merged commit d1f51db into zephyrproject-rtos:master Apr 17, 2020
@nandojve nandojve deleted the fix_sam4e_gmac branch April 17, 2020 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephanosio stephanosio stephanosio approved these changes

@vlotech vlotech vlotech left review comments

@nvlsianpu nvlsianpu nvlsianpu approved these changes

@jukkar jukkar jukkar approved these changes

@tgorochowik tgorochowik Awaiting requested review from tgorochowik

@aurel32 aurel32 Awaiting requested review from aurel32

@mnkp mnkp Awaiting requested review from mnkp

@galak galak Awaiting requested review from galak

@MaureenHelm MaureenHelm Awaiting requested review from MaureenHelm

@pfalcon pfalcon Awaiting requested review from pfalcon

@tbursztyka tbursztyka Awaiting requested review from tbursztyka

@nashif nashif Awaiting requested review from nashif

@ulfalizer ulfalizer Awaiting requested review from ulfalizer

@andrewboie andrewboie Awaiting requested review from andrewboie

@andyross andyross Awaiting requested review from andyross

Assignees
No one assigned
Labels
area: API Changes to public APIs area: Boards area: Devicetree area: Ethernet platform: Microchip SAM Microchip SAM Platform (formerly Atmel SAM)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nandojve @zephyrbot @stephanosio @vlotech @jukkar @nvlsianpu