Message ID | 20191202232629.952385-1-stijn@linux-ipv6.be |
---|---|
State | Accepted |
Delegated to: | Stijn Tintel |
Headers | show |
Series | [OpenWrt-Devel] ath79: add support for Ubiquiti LiteBeam AC Gen2 | expand |
Hi Stijn, does the device have a MAC address label or imprint on the box? [...] > +define Device/ubnt_litebeam-ac-gen2 > + $(Device/ubnt-wa) > + DEVICE_TITLE := Ubiquiti LiteBeam AC Gen2 DEVICE_TITLE has been replaced by DEVICE_VENDOR, DEVICE_MODEL and DEVICE_VARIANT. In your case, I'd choose: DEVICE_MODEL := LiteBeam AC DEVICE_VARIANT := Gen2 DEVICE_VENDOR is inherited from Device/ubnt. > + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct > + IMAGE_SIZE := 15744k IMAGE_SIZE can be dropped here, it is inherited from Device/ubnt-wa. > + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split Can we reuse the IMAGE/factory.bin from Device/ubnt here? The only thing missing compared to your line is append-metadata ... Best Adrian
On 3/12/2019 01:39, mail@adrianschmutzler.de wrote: > Hi Stijn, > > does the device have a MAC address label or imprint on the box? It does. > > [...] > >> +define Device/ubnt_litebeam-ac-gen2 >> + $(Device/ubnt-wa) >> + DEVICE_TITLE := Ubiquiti LiteBeam AC Gen2 > DEVICE_TITLE has been replaced by DEVICE_VENDOR, DEVICE_MODEL and DEVICE_VARIANT. In your case, I'd choose: > > DEVICE_MODEL := LiteBeam AC > DEVICE_VARIANT := Gen2 > > DEVICE_VENDOR is inherited from Device/ubnt. Updated in my staging tree. > >> + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct >> + IMAGE_SIZE := 15744k > IMAGE_SIZE can be dropped here, it is inherited from Device/ubnt-wa. Updated in my staging tree. > >> + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split > Can we reuse the IMAGE/factory.bin from Device/ubnt here? The only thing missing compared to your line is append-metadata ... I used the same as with other ubnt-wa devices. I'm not really up to date on this metadata thing. Do we normally not include it in factory images? Thanks, Stijn
> -----Original Message----- > From: Stijn Tintel [mailto:stijn@linux-ipv6.be] > Sent: Dienstag, 3. Dezember 2019 00:58 > To: mail@adrianschmutzler.de; openwrt-devel@lists.openwrt.org > Cc: pozega.tomislav@gmail.com > Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for Ubiquiti > LiteBeam AC Gen2 > > On 3/12/2019 01:39, mail@adrianschmutzler.de wrote: > > Hi Stijn, > > > > does the device have a MAC address label or imprint on the box? > It does. Which one is it? (eth0, 2.4 GHz, 5 GHz)
On 3/12/2019 02:05, mail@adrianschmutzler.de wrote: >> -----Original Message----- >> From: Stijn Tintel [mailto:stijn@linux-ipv6.be] >> Sent: Dienstag, 3. Dezember 2019 00:58 >> To: mail@adrianschmutzler.de; openwrt-devel@lists.openwrt.org >> Cc: pozega.tomislav@gmail.com >> Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for Ubiquiti >> LiteBeam AC Gen2 >> >> On 3/12/2019 01:39, mail@adrianschmutzler.de wrote: >>> Hi Stijn, >>> >>> does the device have a MAC address label or imprint on the box? >> It does. > Which one is it? (eth0, 2.4 GHz, 5 GHz) 5 GHz. Does this need to be added somewhere? It's the MAC address of the wireless chip on the PCIe bus. As this is not defined in DTS, I don't know how to reference it (to set label-mac-device)? Stijn
i just checked mac addresses in the first image i built for this device (r10011) and they are correct: eth 18:E8:29:_device_specific wlan5g 18:E8:29:_device_specific wlan2g 1A:E8:29:_device_specific
> -----Original Message----- > From: Stijn Tintel [mailto:stijn@linux-ipv6.be] > Sent: Dienstag, 3. Dezember 2019 01:16 > To: mail@adrianschmutzler.de; openwrt-devel@lists.openwrt.org > Cc: pozega.tomislav@gmail.com > Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for Ubiquiti LiteBeam > AC Gen2 > > On 3/12/2019 02:05, mail@adrianschmutzler.de wrote: > >> -----Original Message----- > >> From: Stijn Tintel [mailto:stijn@linux-ipv6.be] > >> Sent: Dienstag, 3. Dezember 2019 00:58 > >> To: mail@adrianschmutzler.de; openwrt-devel@lists.openwrt.org > >> Cc: pozega.tomislav@gmail.com > >> Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for Ubiquiti > >> LiteBeam AC Gen2 > >> > >> On 3/12/2019 01:39, mail@adrianschmutzler.de wrote: > >>> Hi Stijn, > >>> > >>> does the device have a MAC address label or imprint on the box? > >> It does. > > Which one is it? (eth0, 2.4 GHz, 5 GHz) > > 5 GHz. Does this need to be added somewhere? It's the MAC address of the > wireless chip on the PCIe bus. As this is not defined in DTS, I don't > know how to reference it (to set label-mac-device)? > > Stijn > I've recently made an effort to include the label MAC address into OpenWrt, so that's why I try to advertise this here :-) If not available via DTS, you can specify label_mac in the MAC address section of 02_network, e.g. https://github.com/openwrt/openwrt/blob/master/target/linux/ath79/generic/base-files/etc/board.d/02_network#L296 So, for your case it looks like you would have to add ubnt,litebeam-ac-gen2) label_mac=$(mtd_get_mac_binary art 0x5006) ;; inside ath79_setup_macs() there. I've tried to provide a short overview about the label MAC address here: https://openwrt.org/docs/guide-developer/mac.address#label_mac_address Best Adrian
> >> + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split > > Can we reuse the IMAGE/factory.bin from Device/ubnt here? The only thing > missing compared to your line is append-metadata ... > > I used the same as with other ubnt-wa devices. I'm not really up to date > on this metadata thing. Do we normally not include it in factory images? I overlooked the definition for other ubnt-wa devices. I'm also not sure whether we need the append-metadata, thus I wouldn't deviate from the other ubnt-wa devices. So, either keep your version or move IMAGE/factory.bin definition from the ubnt-wa devices to parent Device/ubnt-wa as it's the same for all ubnt-wa devices. Best Adrian > > Thanks, > Stijn >
On 3/12/2019 13:54, Adrian Schmutzler wrote: >>>> + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split >>> Can we reuse the IMAGE/factory.bin from Device/ubnt here? The only thing >> missing compared to your line is append-metadata ... >> >> I used the same as with other ubnt-wa devices. I'm not really up to date >> on this metadata thing. Do we normally not include it in factory images? > I overlooked the definition for other ubnt-wa devices. > > I'm also not sure whether we need the append-metadata, thus I wouldn't deviate from the other ubnt-wa devices. > > So, either keep your version or move IMAGE/factory.bin definition from the ubnt-wa devices to parent Device/ubnt-wa as it's the same for all ubnt-wa devices. I've addressed this and added the MAC label in my staging tree: https://git.openwrt.org/?p=openwrt/staging/stintel.git;a=shortlog;h=refs/heads/lbe-5ac-gen2 Thanks for your review and guidance! Stijn
Hi, > > I used the same as with other ubnt-wa devices. I'm not really up to date > > on this metadata thing. Do we normally not include it in factory images? Indeed, but you've added following extra line to your device: IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split Which means, that you're constructing factory image from sysupgrade image, and sysupgrade images have this metadata included. I would just drop this line. > I'm also not sure whether we need the append-metadata, thus I wouldn't > deviate from the other ubnt-wa devices. I'm sure, that there is no need for this deviation from other ubnt-wa devices. -- ynezz
Hi, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] On > Behalf Of Petr Štetiar > Sent: Dienstag, 3. Dezember 2019 13:10 > To: Adrian Schmutzler <mail@adrianschmutzler.de> > Cc: 'Stijn Tintel' <stijn@linux-ipv6.be>; openwrt-devel@lists.openwrt.org; > pozega.tomislav@gmail.com > Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for Ubiquiti LiteBeam > AC Gen2 > > Hi, > > > > I used the same as with other ubnt-wa devices. I'm not really up to date > > > on this metadata thing. Do we normally not include it in factory images? > > Indeed, but you've added following extra line to your device: > > IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split > > Which means, that you're constructing factory image from sysupgrade image, and > sysupgrade images have this metadata included. I would just drop this line. > > > I'm also not sure whether we need the append-metadata, thus I wouldn't > > deviate from the other ubnt-wa devices. > > I'm sure, that there is no need for this deviation from other ubnt-wa devices. Other ubnt-wa do this, too, they just do not define it in parent node: https://github.com/openwrt/openwrt/blob/master/target/linux/ath79/image/generic-ubnt.mk#L127 and below that. So, the question is whether it would make sense to remove the line for all the other ubnt-wa devices, too, then. Best Adrian > > -- ynezz > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Stijn Tintel <stijn@linux-ipv6.be> [2019-12-03 14:03:16]: > I've addressed this and added the MAC label in my staging tree: > https://git.openwrt.org/?p=openwrt/staging/stintel.git;a=shortlog;h=refs/heads/lbe-5ac-gen2 Note, that this commit: ath79: move IMAGE/factory.bin to Device/ubnt-wa should be probably: ath79: remove wrong IMAGE/factory.bin from ubnt-wa devices (and use default and correct one from ubnt) because following: IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split is in essence: define Device/Default IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef + | mkubntimage-split = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) | mkubntimage-split where ubnt has following: define Device/ubnt IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | mkubntimage-split endef = append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | | check-size $$$$(IMAGE_SIZE) | mkubntimage-split ^------ append-metadata missing so using IMAGE/factory.bin from ubnt (default) is probably the correct way, because having OpenWrt specific metadata in the factory images doesn't make any sense. -- ynezz
Adrian Schmutzler <mail@adrianschmutzler.de> [2019-12-03 13:17:04]: > Other ubnt-wa do this, too, they just do not define it in parent node: Ok, I've checked only the parent node. > So, the question is whether it would make sense to remove the line for all the other ubnt-wa devices, too, then. I would remove it, it doesn't make sense and is misleading. -- ynezz
On 3/12/2019 14:31, Petr Štetiar wrote: > Adrian Schmutzler <mail@adrianschmutzler.de> [2019-12-03 13:17:04]: > >> Other ubnt-wa do this, too, they just do not define it in parent node: > Ok, I've checked only the parent node. > >> So, the question is whether it would make sense to remove the line for all the other ubnt-wa devices, too, then. > I would remove it, it doesn't make sense and is misleading. > > -- ynezz Updated my staging tree again: https://git.openwrt.org/?p=openwrt/staging/stintel.git;a=shortlog;h=refs/heads/lbe-5ac-gen2 Thanks, Stijn
LGTM. (Haven't checked the network setup.) :-) Adrian > -----Original Message----- > From: Stijn Tintel [mailto:stijn@linux-ipv6.be] > Sent: Dienstag, 3. Dezember 2019 13:33 > To: Petr Štetiar <ynezz@true.cz>; Adrian Schmutzler > <mail@adrianschmutzler.de> > Cc: openwrt-devel@lists.openwrt.org; pozega.tomislav@gmail.com > Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for Ubiquiti LiteBeam > AC Gen2 > > On 3/12/2019 14:31, Petr Štetiar wrote: > > Adrian Schmutzler <mail@adrianschmutzler.de> [2019-12-03 13:17:04]: > > > >> Other ubnt-wa do this, too, they just do not define it in parent node: > > Ok, I've checked only the parent node. > > > >> So, the question is whether it would make sense to remove the line for all the > other ubnt-wa devices, too, then. > > I would remove it, it doesn't make sense and is misleading. > > > > -- ynezz > > Updated my staging tree again: > https://git.openwrt.org/?p=openwrt/staging/stintel.git;a=shortlog;h=refs/heads > /lbe-5ac-gen2 > > Thanks, > Stijn
Current changes from Stijn's branch look fine, I've applied them to the master clone from Dec 2nd, built and flashed; mac addresses are correct, ethernet is working as well as both wifi interfaces. On 03/12/2019, Adrian Schmutzler <mail@adrianschmutzler.de> wrote: > LGTM. (Haven't checked the network setup.) :-) > > Adrian > >> -----Original Message----- >> From: Stijn Tintel [mailto:stijn@linux-ipv6.be] >> Sent: Dienstag, 3. Dezember 2019 13:33 >> To: Petr Štetiar <ynezz@true.cz>; Adrian Schmutzler >> <mail@adrianschmutzler.de> >> Cc: openwrt-devel@lists.openwrt.org; pozega.tomislav@gmail.com >> Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for Ubiquiti >> LiteBeam >> AC Gen2 >> >> On 3/12/2019 14:31, Petr Štetiar wrote: >> > Adrian Schmutzler <mail@adrianschmutzler.de> [2019-12-03 13:17:04]: >> > >> >> Other ubnt-wa do this, too, they just do not define it in parent node: >> > Ok, I've checked only the parent node. >> > >> >> So, the question is whether it would make sense to remove the line for >> >> all the >> other ubnt-wa devices, too, then. >> > I would remove it, it doesn't make sense and is misleading. >> > >> > -- ynezz >> >> Updated my staging tree again: >> https://git.openwrt.org/?p=openwrt/staging/stintel.git;a=shortlog;h=refs/heads >> /lbe-5ac-gen2 >> >> Thanks, >> Stijn >
On 4/12/2019 15:37, Tom Psyborg wrote: > Current changes from Stijn's branch look fine, I've applied them to > the master clone from Dec 2nd, built and flashed; mac addresses are > correct, ethernet is working as well as both wifi interfaces. > Can I get some [Ack|Review|Test]ed-by from you guys? Thanks Stijn
Acked-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Stijn Tintel > Sent: Mittwoch, 4. Dezember 2019 14:56 > To: Tom Psyborg <pozega.tomislav@gmail.com>; Adrian Schmutzler > <mail@adrianschmutzler.de> > Cc: Petr Štetiar <ynezz@true.cz>; openwrt-devel@lists.openwrt.org > Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for Ubiquiti > LiteBeam AC Gen2 > > On 4/12/2019 15:37, Tom Psyborg wrote: > > Current changes from Stijn's branch look fine, I've applied them to > > the master clone from Dec 2nd, built and flashed; mac addresses are > > correct, ethernet is working as well as both wifi interfaces. > > > Can I get some [Ack|Review|Test]ed-by from you guys? > > Thanks > Stijn > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff --git a/target/linux/ath79/dts/ar9342_ubnt_litebeam-ac-gen2.dts b/target/linux/ath79/dts/ar9342_ubnt_litebeam-ac-gen2.dts new file mode 100644 index 0000000000..d7eacf44d0 --- /dev/null +++ b/target/linux/ath79/dts/ar9342_ubnt_litebeam-ac-gen2.dts @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +#include "ar9342_ubnt_wa.dtsi" + +/ { + compatible = "ubnt,litebeam-ac-gen2", "ubnt,wa", "qca,ar9342"; + model = "Ubiquiti LiteBeam AC Gen2"; +}; + +&mdio0 { + status = "okay"; + + phy-mask = <4>; + phy4: ethernet-phy@4 { + reg = <4>; + }; +}; + +ð0 { + status = "okay"; + + /* default for ar934x, except for 1000M and 10M */ + pll-data = <0x02000000 0x00000101 0x00001313>; + + mtd-mac-address = <&art 0x0>; + + phy-mode = "rgmii-id"; + phy-handle = <&phy4>; + + gmac-config { + device = <&gmac>; + rxd-delay = <3>; + rxdv-delay = <3>; + }; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index e811f85f0e..c194def53d 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -40,6 +40,7 @@ ath79_setup_interfaces() ubnt,bullet-m|\ ubnt,bullet-m-xw|\ ubnt,lap-120|\ + ubnt,litebeam-ac-gen2|\ ubnt,nanobeam-ac|\ ubnt,nanostation-ac-loco|\ ubnt,rocket-m|\ diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 062caf6ad5..55c6b74e74 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -17,6 +17,7 @@ case "$FIRMWARE" in ubnt,unifiac-mesh|\ ubnt,unifiac-mesh-pro|\ ubnt,lap-120|\ + ubnt,litebeam-ac-gen2|\ ubnt,nanobeam-ac|\ ubnt,nanostation-ac|\ ubnt,nanostation-ac-loco|\ diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 19dbe2eb8b..7f59b6e841 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -128,6 +128,15 @@ define Device/ubnt_lap-120 endef TARGET_DEVICES += ubnt_lap-120 +define Device/ubnt_litebeam-ac-gen2 + $(Device/ubnt-wa) + DEVICE_TITLE := Ubiquiti LiteBeam AC Gen2 + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct + IMAGE_SIZE := 15744k + IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split +endef +TARGET_DEVICES += ubnt_litebeam-ac-gen2 + define Device/ubnt_nanobeam-ac $(Device/ubnt-wa) DEVICE_MODEL := NanoBeam AC
Hardware: * SoC: Atheros AR9342-BL1A * RAM: 64MB DDR2 (Winbond W9751G6KB-25) * Flash: 16MB SPI NOR (Macronix MX25L12835FZ2I-10G) * Ethernet: 1x 10/100/1000 Mbps (Atheros AR8035-A) with 24V PoE support * Wifi 2.4GHz: Atheros AR9340 v2 * WiFi 5GHz: Ubiquiti U-AME-G1-BR4A (rebranded QCA988X v2) * LEDs: 1x Power, 1x Ethernet * Buttons: 1x Reset * UART: 1x TTL 115200n8, 3.3V RX TX GND, 3.3V pin closest to RJ45 port The LEDs do not seem to be connected to any GPIO, so there is currently no way to control them. Installation via U-Boot, TFTP and serial console: * Configure your TFTP server with IP 192.168.1.254 * Connect serial console and power up the device * Hit any key to stop autoboot * tftpboot 0x81000000 openwrt-ath79-generic-ubnt_litebeam-ac-gen2-initramfs-kernel.bin * bootm 0x81000000 * copy openwrt-ath79-generic-ubnt_litebeam-ac-gen2-squashfs-sysupgrade.bin to /tmp * sysupgrade /tmp/openwrt-ath79-generic-ubnt_litebeam-ac-gen2-squashfs-sysupgrade.bin Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> --- Notes: Instructions can be found to install OpenWrt via AirOS at [0]. Unfortunately they require an AirOS image, which can only be downloaded by accepting the EULA. As I do not want to accept this EULA, I have not been able to test these instructions and did not include them in the commit message. Also available in my staging tree at [1] [0] https://github.com/openwrt/openwrt/pull/689#issuecomment-493658317 [1] https://git.openwrt.org/?p=openwrt/staging/stintel.git;a=shortlog;h=refs/heads/lbe-5ac-gen2 .../dts/ar9342_ubnt_litebeam-ac-gen2.dts | 39 +++++++++++++++++++ .../generic/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 1 + target/linux/ath79/image/generic-ubnt.mk | 9 +++++ 4 files changed, 50 insertions(+) create mode 100644 target/linux/ath79/dts/ar9342_ubnt_litebeam-ac-gen2.dts