Skip to contentSkip to conversation

arm64: dts: qcom: ipq5018: add Ubiquiti UniFi U6 Enterprise

PATCH Superseded Andrei-Alexandru Bleortu 2 participants 6 messages Oct 4 – Oct 23

Subsystems (5)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover arm64: dts: qcom: ipq5018: add Ubiquiti UniFi U6 Enterprise

Add the Ubiquiti UniFi U6 Enterprise, an IPQ5018 access point with two QCN9074 radios on PCIe (5 GHz and 6 GHz). The first patch documents the QCN9074's PCI ID in the ath11k PCI binding, so the radios' nodes can carry the calibration variants their board data is looked up by.

The Ethernet port (GMAC1 with a QCA8081 PHY) and the IPQ5018's own 2.4 GHz radio are left out until the GMAC and the WCSS remoteproc have bindings.

The vendor U-Boot only boots Ubiquiti-signed images, so the boards were booted by chainloading from it. Tested on two units with Linux 7.2 and the out-of-tree board description these nodes come from: both QCN9074 radios come up with ath11k and their board data selected by these variants, and the eMMC and the SPI NOR (including U-Boot environment writes) are in use. The reset button and the accelerometer are described as in the vendor device tree and were not exercised.

Patch 1 is for the ath11k binding; the rest go through the qcom tree.

The patches were written with an AI coding assistant (Claude Code), which also drafted the changelogs; the testing above was done on the devices.

Changes in v2:
- Collected Krzysztof's Acked-by on the two binding patches.
- Squashed "label the PCIe1 root port" into the board patch, its only user (Krzysztof).
- No code changes otherwise.

v1: https://lore.kernel.org/all/[email protected]/

Andrei-Alexandru Bleortu (3):
dt-bindings: net: wireless: qcom,ath11k-pci: add QCN9074
dt-bindings: arm: qcom: add Ubiquiti UniFi U6 Enterprise
arm64: dts: qcom: ipq5018: add Ubiquiti UniFi U6 Enterprise

 .../devicetree/bindings/arm/qcom.yaml         |   1 +
 .../net/wireless/qcom,ath11k-pci.yaml         |   1 +
 arch/arm64/boot/dts/qcom/Makefile             |   1 +
 .../dts/qcom/ipq5018-ubnt-u6-enterprise.dts   | 236 ++++++++++++++++++
 arch/arm64/boot/dts/qcom/ipq5018.dtsi         |   2 +-
 5 files changed, 240 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts
Signature · 1 line
2.47.3
#1 lore raw

PATCH v2 1/3 dt-bindings: net: wireless: qcom,ath11k-pci: add QCN9074

QCN9074 is a PCIe 802.11ax radio that boards such as the IPQ5018-based Ubiquiti UniFi U6 Enterprise solder down, two of them on different bands. Like the other ath11k PCIe devices, each needs qcom,calibration-variant to select its board data. Document its PCI ID.

No supplies are added: on these boards the radio's rails are fixed and not under software control.

---
 .../devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml        | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml +1 -0
index 0162e3657..605ac5e01 100644
@@ -18,6 +18,7 @@ properties:
     enum:
       - pci17cb,1101  # QCA6390
       - pci17cb,1103  # WCN6855
+      - pci17cb,1104  # QCN9074
 
   reg:
     maxItems: 1
Signature · 1 line
2.47.3
#2 lore raw

PATCH v2 2/3 dt-bindings: arm: qcom: add Ubiquiti UniFi U6 Enterprise

In reply to Andrei-Alexandru Bleortu

Document the Ubiquiti UniFi U6 Enterprise, an IPQ5018 based access point.

---
 Documentation/devicetree/bindings/arm/qcom.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/qcom.yaml +1 -0
index 121ca557c..4524f76b4 100644
@@ -113,6 +113,7 @@ properties:
           - enum:
               - qcom,ipq5018-rdp432-c2
               - tplink,archer-ax55-v1
+              - ubnt,u6-enterprise
           - const: qcom,ipq5018
 
       - items:
Signature · 1 line
2.47.3
#3 lore raw

PATCH v2 3/3 arm64: dts: qcom: ipq5018: add Ubiquiti UniFi U6 Enterprise

In reply to Andrei-Alexandru Bleortu

The Ubiquiti UniFi U6 Enterprise is a ceiling-mount Wi-Fi 6E access point:

- SoC: Qualcomm IPQ5018
- RAM: 1 GiB
- Flash: SPI NOR (boot chain) and eMMC
- 5 GHz: QCN9074 on PCIe0
- 6 GHz: QCN9074 on PCIe1
- Ethernet: one 2.5GbE PoE port, a QCA8081 PHY behind GMAC1
- Accelerometer: ST LIS2DH12
- Button: reset

Describe what mainline supports today. The Ethernet port and the IPQ5018's own 2.4 GHz radio are left out until the GMAC and the WCSS remoteproc have bindings; the LED controller and the board MCU on the I2C bus have none. The QCN9074s carry the calibration variants their board data is looked up by. The SoC dtsi gains the pcie1_port0 label, as pcie0 has, for the 6 GHz radio below that root port. The vendor QSEE reserves 4 MiB, twice the SoC default.

---
 arch/arm64/boot/dts/qcom/Makefile             |   1 +
 .../dts/qcom/ipq5018-ubnt-u6-enterprise.dts   | 236 ++++++++++++++++++
 arch/arm64/boot/dts/qcom/ipq5018.dtsi         |   2 +-
 3 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts
arch/arm64/boot/dts/qcom/Makefile +1 -0
index 88230c4e0..aca7d8e41 100644
@@ -32,6 +32,7 @@ dtb-$(CONFIG_ARCH_QCOM)	+= hamoa-lenovo-ideacentre-mini-01q8x10.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= hawi-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq5018-rdp432-c2.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq5018-tplink-archer-ax55-v1.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= ipq5018-ubnt-u6-enterprise.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq5210-rdp504.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq5332-rdp441.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq5332-rdp442.dtb
arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts new file +236 -0

236 lines not on this page · raw message

arch/arm64/boot/dts/qcom/ipq5018.dtsi +1 -1
index fe1ed240d..2f3bcfa88 100644
@@ -838,7 +838,7 @@ pcie1: pcie@80000000 {
 
 			status = "disabled";
 
-			pcie@0 {
+			pcie1_port0: pcie@0 {
 				device_type = "pci";
 				reg = <0x0 0x0 0x0 0x0 0x0>;
 				bus-range = <0x01 0xff>;
Signature · 1 line
2.47.3
#4 lore raw
Quoted 1 line · Andrei-Alexandru Bleortu

The Ubiquiti UniFi U6 Enterprise is a ceiling-mount Wi-Fi 6E access point:

[...]

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts line 28

Quoted 7 lines
arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts new file +7 -0
+	keys {
+		compatible = "gpio-keys";
+		pinctrl-0 = <&button_pins>;
+		pinctrl-names = "default";
+
+		button-reset {
+			label = "reset";

Normally we do sentence case here, i.e. "Reset"

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts line 38

Quoted 10 lines
arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts new file +10 -0
+			gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+};
+
+&blsp1_i2c3 {
+	pinctrl-0 = <&i2c_pins>;
+	pinctrl-names = "default";
+	status = "okay";

Please keep a \n before 'status', file-wide for consistency

[...]

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts line 137

Quoted 2 lines

+&pcie0_port0 {

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts new file +1 -0
+	reset-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;

No wake-gpios?

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts line 142

Quoted 5 lines
arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts new file +5 -0
+
+	wifi@0,0 {
+		compatible = "pci17cb,1104";
+		reg = <0x10000 0x0 0x0 0x0 0x0>;
+		qcom,calibration-variant = "Ubiquiti-U6-Enterprise-5G";

Does the same calibration work for both radios?

[...]

Review

Quoted 3 lines

+&prng {

(quoted diff) +2 -0
+	status = "okay";
+};

Please add a preceding patch to enable it in the SoC DTSI, this should never really need to be disabled

Konrad

#5 lore raw
Quoted 5 lines · Konrad Dybcio

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts line 28

Quoted 2 lines · Andrei-Alexandru Bleortu
arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts new file +2 -0
+		button-reset {
+			label = "reset";

Normally we do sentence case here, i.e. "Reset"

Will do in v3.

Quoted 6 lines

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts line 38

Quoted 4 lines

+&blsp1_i2c3 {

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts new file +3 -0
+	pinctrl-0 = <&i2c_pins>;
+	pinctrl-names = "default";
+	status = "okay";

Please keep a \n before 'status', file-wide for consistency

Will do, for &blsp1_i2c3, &blsp1_spi1 and &sdhc_1.

Quoted 4 lines

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts line 137

Quoted 2 lines

+&pcie0_port0 {

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts new file +1 -0
+	reset-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;

No wake-gpios?

Not that I can find. The vendor device tree gives only PERST# for the two radios (GPIO15 and GPIO18) and configures nothing on GPIO16, 17 or 19, where a reference-design WAKE# would be. Without a schematic I can't tell whether WAKE# is routed at all, so I'd rather leave it out than copy the RDP's GPIO16. Both radios work without it.

Quoted 6 lines

arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts line 142

Quoted 4 lines
arch/arm64/boot/dts/qcom/ipq5018-ubnt-u6-enterprise.dts new file +4 -0
+	wifi@0,0 {
+		compatible = "pci17cb,1104";
+		reg = <0x10000 0x0 0x0 0x0 0x0>;
+		qcom,calibration-variant = "Ubiquiti-U6-Enterprise-5G";

Does the same calibration work for both radios?

No, they need different board data: the 6 GHz radio below pcie1_port0 has "Ubiquiti-U6-Enterprise-6G". The two QCN9074s are otherwise indistinguishable to ath11k: both are 17cb:1104 with subsystem 17cb:1104, and both report chip-id 0 and board-id 255 (unprogrammed OTP). So the variant is the only part of the board name that differs:

bus=pci,qmi-chip-id=0,qmi-board-id=255,variant=Ubiquiti-U6-Enterprise-5G bus=pci,qmi-chip-id=0,qmi-board-id=255,variant=Ubiquiti-U6-Enterprise-6G

The stock firmware also ships a separate board file per band. Both board files went to the ath11k list under these names.

Quoted 6 lines

Review

Quoted 3 lines

+&prng {

(quoted diff) +2 -0
+	status = "okay";
+};

Please add a preceding patch to enable it in the SoC DTSI, this should never really need to be disabled

Will do; v3 drops the status from the dtsi, as ipq5332 and ipq9574 have it, and the board no longer touches &prng.

Thanks for the review!
Andrei