FB4040 MAC address improvements #11
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The code assumes that no_of_macs is always at least 2 when CONFIG_AVM_EVA_MAC_EXTRACT is set, writing 2*6 bytes into enetaddr. This is not always the case however: get_eth_mac_address() is not only called by the board code, but also by ipq40xx_edma_init(). The latter passes IPQ40XX_EDMA_DEV == 1 as no_of_macs, and its buffer is only 6 bytes long. Check no_of_macs and return early to avoid the buffer overflow. Signed-off-by: Matthias Schiffer <[email protected]>
get_eth_mac_address() may set fewer addresses than CONFIG_IPQ_NO_MACS. Make sure that we don't read uninitialized memory in this case. Signed-off-by: Matthias Schiffer <[email protected]>
Implement a new version that can extract an arbitrary number of MAC addresses from the urconfig partition. The new implementation is ifdef'ed for now, as it makes a few more assumption about the format of the data, and should be verified on each supported device before it is used. Signed-off-by: Matthias Schiffer <[email protected]>
The urconfig partition of the FritzBox 4040 contains 7 MAC addresses in total: - maca - macb - macwlan - macwlan2 - macdsl - usb_board_mac - usb_rndis_mac In the vendor firmware, the first 5 addresses are assigned to the 5 Ethernet ports (so macdsl is used for the WAN port); the individual MAC addresses of the LAN ports are usually not visible, as all 4 ports are bridged, but the assignment can be extracted using a serial console. Make all 7 addresses available to the OS. Signed-off-by: Matthias Schiffer <[email protected]>
|
Also cc @robimarko @Ansuel as current OpenWrt maintainers of the target. It's unfortunate that we don't update U-Boot during sysupgrade even though U-Boot is initially installed as part of OpenWrt for these devices, but that will be annoying to change without increasing the image compat version... |
|
ping @chunkeey - can I get a review for this? Also, do you think it would make sense to move this repo into the OpenWrt org (if that's okay with the other maintainers who are more active than me)? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains:
The vendor firmware of the FB4040 assigns the first 5 MAC addresses to the 5 Ethernet ports, and I intend to update OpenWrt to match (on the current OpenWrt main branch, the
ethernet0alias got lost for most ipq40xx devices unfortunately, so even the assignment of the first address is not working as intended - going to fix that together with the U-Boot update)