Skip to content

[21.02] ipq40xx: backport devices #4126

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.

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

Conversation

PolynomialDivision
Copy link
Member

@PolynomialDivision PolynomialDivision commented Apr 29, 2021

Our wireless community needs the SXTsq 5 AC SoC. In particular, the device is ideal to be mounted on the balcony to supply public areas with internet access (we provide free internet access). This may become very important for the summer and the ongoing corona pandemic. I know the merge window is already completed, but I think it would be good to merge this. Otherwise, Gluon builds will not include this SoC.

(compile testing ...)

@PolynomialDivision PolynomialDivision changed the title ipq40xx: backport SoCs ipq40xx: backport devices Apr 29, 2021
@PolynomialDivision PolynomialDivision changed the title ipq40xx: backport devices [21.02] ipq40xx: backport devices Apr 29, 2021
@PolynomialDivision PolynomialDivision marked this pull request as ready for review April 29, 2021 19:52
@PolynomialDivision
Copy link
Member Author

Compile tested.
Runtested on SXTsq 5 AC.

@aparcar
Copy link
Member

aparcar commented Apr 30, 2021

@rogerpueyo @adschm thoughts?

@rogerpueyo
Copy link
Contributor

We'd probably need to backport support for hAP ac2 (faea7be), which can be directly cherry-picked. I'll give it a try with the device, although PolynomialDivision seems to have done it already.

@aparcar
Copy link
Member

aparcar commented Apr 30, 2021

We'd probably need to backport support for hAP ac2 (faea7be), which can be directly cherry-picked. I'll give it a try with the device, although PolynomialDivision seems to have done it already.

Looking at the two commits the former seems to do so, or am I understanding it wrong?

@rogerpueyo
Copy link
Contributor

Yes, but I'd say it's on @PolynomialDivision 's repo, not upstream.

@PolynomialDivision
Copy link
Member Author

I cherry-picked from trunk? (at least I think I did it xD)

@rogerpueyo
Copy link
Contributor

Sorry for the confusion. To add support for the SXTsq, we needed the support for hAP ac2 commit before. This is exactly what the PR does. I just meant to say that they had different hashes than master because they were cherry-picked to your openwrt-21.02 branch.

I gave it a try on the device. So far, so good. 😃

@PolynomialDivision
Copy link
Member Author

BTW thanks a lot @rogerpueyo and @robimarko. Our "island-firmware" is now available. :) Let's see how many balcony we can equip with it.

image

@PolynomialDivision
Copy link
Member Author

I gave it a try on the device. So far, so good. smiley

I can also give it a try in our freifunk network. But currently, I do not have internet access except my mobile hotspot, that is why I'm blocked. But maybe later today...

@zorun
Copy link

zorun commented Apr 30, 2021

Please update your commits to add the original commit hash (using git cherry-pick -x)

I am testing the hap-ac2 patch and will merge it if no issue pops up. For the SXTsq, it has just been merged to master, so I think it's best to wait a bit more for this one (but I agree it should be in 21.02).

In any case, good job for the long-running effort to support these boards 👍

robimarko and others added 2 commits April 30, 2021 17:14
This adds support for the MikroTik RouterBOARD RBD52G-5HacD2HnD-TC
(hAP ac²), a  indoor dual band, dual-radio 802.11ac
wireless AP with integrated omnidirectional antennae, USB port and  five
10/100/1000 Mbps Ethernet ports.

See https://mikrotik.com/product/hap_ac2 for more info.

Specifications:
 - SoC: Qualcomm Atheros IPQ4018
 - RAM: 128 MB
 - Storage: 16 MB NOR
 - Wireless:
   · Built-in IPQ4018 (SoC) 802.11b/g/n 2x2:2, 2.5 dBi antennae
   · Built-in IPQ4018 (SoC) 802.11a/n/ac 2x2:2, 2.5 dBi antennae
 - Ethernet: Built-in IPQ4018 (SoC, QCA8075) , 5x 1000/100/10 port,
             passive PoE in
- 1x USB Type A port

Installation:
Boot the initramfs image via TFTP and then flash the sysupgrade
image using "sysupgrade -n"

Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit faea7be)
[Compile Tested]
Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit adds support for the MikroTik SXTsq 5 ac (RBSXTsqG-5acD),
an outdoor 802.11ac wireless CPE with one 10/100/1000 Mbps Ethernet
port.

Specifications:
 - SoC: Qualcomm Atheros IPQ4018
 - RAM: 256 MB
 - Storage: 16 MB NOR
 - Wireless: IPQ4018 (SoC) 802.11a/n/ac 2x2:2, 16 dBi antennae
 - Ethernet: IPQ4018 (SoC) 1x 10/100/1000 port, 10-28 Vdc PoE in
 - 1x Ethernet LED (green)
 - 7x user-controllable LEDs
  · 1x power (blue)
  · 1x user (green)
  · 5x rssi (green)

Note:
 Serial UART is probably available on the board, but it has not been
 tested.

Flashing:
 Boot via TFTP the initramfs image. Then, upload a sysupgrade image
 via SSH and flash it normally. More info at the "Common procedures
 for MikroTik products" page https://openwrt.org/toh/mikrotik/common.

Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
(cherry picked from commit d1f1e52)
[Compile and Run Tested]
Signed-off-by: Nick Hainke <vincent@systemli.org>
@aparcar
Copy link
Member

aparcar commented Apr 30, 2021

@zorun thanks for taking over

@zorun
Copy link

zorun commented Apr 30, 2021

So, while testing this I found an issue where the wifi interfaces just don't appear and /sys/firmware/mikrotik/hard_config/wlan_data/ is empty. I have the same problem on master, see http://lists.openwrt.org/pipermail/openwrt-devel/2021-April/034911.html for details.

If you have this device, I'm interested to see if the hard_config partition can always be set to 0x2000, so that we can put that in the DTS: https://forum.openwrt.org/t/support-for-mikrotik-hap-ac2/23333/324

Other than that, it seems to be working nicely, but I would like to fix this issue before merging.

@PolynomialDivision
Copy link
Member Author

@zorun Your descript issue is not affecting the sxtsqac? So maybe I can change the PR so we can already merge the sxtsq?

@rogerpueyo
Copy link
Contributor

@zorun Your descript issue is not affecting the sxtsqac? So maybe I can change the PR so we can already merge the sxtsq?

By reading the mailing list I understand that Thibaut, the author of the MikroTik sysfs driver, is working on it. Maybe he can provide a fix for these hap ac versions with two radios that can be backported to 21.02 with both devices, so that you can merge both devices together?

@john-tho
Copy link
Contributor

john-tho commented May 3, 2021

Can we submit, test, and merge a quick fix for the long hard_config hap ac2 to master using a forced size for the routerboot parser.
That way we only modify one device, and it is simpler to justify including in 21.02.

--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts
@@ -189,6 +189,7 @@
                                reg = <0x80000 0x80000>;
 
                                hard_config {
+                                       size = <0x2000>;
                                        read-only;
                                };

Needs @zorun's device details (maybe the factory booter version is telling?) & testing.

I did not read @f00b4r0's email as if they were going to submit a fix, but a driver change would require extra testing.

Cheers

@zorun
Copy link

zorun commented May 3, 2021

Yes this is basically the patch I just sent, it's the most reasonable fix IMHO.

Since it apparently affects very few devices (actually, 1 so far), I'm merging this as it is now, including the SXTsq since @rogerpueyo run-tested it. I'll backport the hard_config patch later.

@zorun zorun closed this May 3, 2021
@adschm adschm added release/21.02 pull request/issue targeted (also) for OpenWrt 21.02 release target/ipq40xx pull request/issue for ipq40xx target labels May 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release/21.02 pull request/issue targeted (also) for OpenWrt 21.02 release target/ipq40xx pull request/issue for ipq40xx target
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants