* [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332
@ 2024-08-14 9:43 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module Raj Kumar Bhagat
` (17 more replies)
0 siblings, 18 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Raj Kumar Bhagat
Currently, Ath12k driver only supports WiFi devices that are based on
PCI bus. New Ath12k device IPQ5332 is based on AHB bus. Hence, add
Ath12k AHB support for IPQ5332.
IPQ5332 is IEEE802.11be 2 GHz 2x2 Wifi device. To bring-up IPQ5332
device:
- Add hardware parameters for IPQ5332.
- CE and CMEM register address space in IPQ5332 is separate from WCSS
register space. Hence, add logic to remap CE and CMEM register
address.
- Add support for fixed QMI firmware memory for IPQ5332.
- Add ath12k AHB support.
Depends-On: [v6] Add multipd remoteproc support
Link: https://lore.kernel.org/all/20231110091939.3025413-1-quic_mmanikan@quicinc.com/
Note that the dependency patch series - [v6,00/11] Add multipd
remoteproc support, has the below issues:
1. The remoteproc maintainers don't want any userpd code in remoteproc.
As a result of this, the approach being taken by this series may
change.
2. Due to latest changes in linux-next/ath ToT, [v6,00/11] Add multipd
remoteproc support is unable to compile. Below compilation fixes are
required in the file "drivers/remoteproc/qcom_q6v5_mpd.c":
- Add "#include <linux/of_platform.h>"
- Change "static int q6_wcss_remove" to "static void q6_wcss_remove"
and remove "return 0".
3. The IPQ5332 firmware patch is pointing to ath11k firmware path, but
IPQ5332 is Ath12k chipset.
In patch [v6,10/11] arm64: dts: qcom: ipq5332: Add nodes to bringup
multipd, firmware path should be: ath12k/IPQ5332/hw1.0/
Balamurugan S (9):
wifi: ath12k: add ath12k_hw_params for IPQ5332
wifi: ath12k: add ath12k_hw_hal_params for IPQ5332
wifi: ath12k: avoid m3 firmware download in AHB device IPQ5332
wifi: ath12k: add new CMEM read-write ath12k_hif_ops
wifi: ath12k: remap CMEM register space for IPQ5332
wifi: ath12k: fix incorrect CE addresses
wifi: ath12k: remap CE register space for IPQ5332
wifi: ath12k: add AHB driver support for IPQ5332
wifi: ath12k: enable ath12k AHB support
P Praneesh (4):
wifi: ath12k: refactor ath12k_hw_regs structure
wifi: ath12k: add ath12k_hw_regs for IPQ5332
wifi: ath12k: add ath12k_hw_ring_mask for IPQ5332
wifi: ath12k: add CE configurations for IPQ5332
Raj Kumar Bhagat (5):
dt-bindings: net: wireless: describe the ath12k AHB module
arm64: dts: qcom: add wifi node for IPQ5332 based RDP441
wifi: ath12k: add support for fixed QMI firmware memory
wifi: ath12k: add support to read board_id from device-tree
wifi: ath12k: convert tasklet to BH workqueue for CE interrupts
.../net/wireless/qcom,ath12k-ahb.yaml | 325 ++++++
arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts | 56 +-
arch/arm64/boot/dts/qcom/ipq5332.dtsi | 131 ++-
drivers/net/wireless/ath/ath12k/Kconfig | 6 +
drivers/net/wireless/ath/ath12k/Makefile | 1 +
drivers/net/wireless/ath/ath12k/ahb.c | 1028 +++++++++++++++++
drivers/net/wireless/ath/ath12k/ahb.h | 50 +
drivers/net/wireless/ath/ath12k/ce.c | 90 ++
drivers/net/wireless/ath/ath12k/ce.h | 18 +-
drivers/net/wireless/ath/ath12k/core.c | 35 +-
drivers/net/wireless/ath/ath12k/core.h | 19 +-
drivers/net/wireless/ath/ath12k/dp.c | 10 +-
drivers/net/wireless/ath/ath12k/hal.c | 82 +-
drivers/net/wireless/ath/ath12k/hal.h | 69 +-
drivers/net/wireless/ath/ath12k/hif.h | 13 +
drivers/net/wireless/ath/ath12k/hw.c | 478 ++++++++
drivers/net/wireless/ath/ath12k/hw.h | 14 +
drivers/net/wireless/ath/ath12k/pci.c | 28 +-
drivers/net/wireless/ath/ath12k/pci.h | 2 +
drivers/net/wireless/ath/ath12k/qmi.c | 188 ++-
drivers/net/wireless/ath/ath12k/qmi.h | 1 +
21 files changed, 2525 insertions(+), 119 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
create mode 100644 drivers/net/wireless/ath/ath12k/ahb.c
create mode 100644 drivers/net/wireless/ath/ath12k/ahb.h
base-commit: 1462e8e1c93ecb96b5820ec28f7cbbb8a5aeb732
prerequisite-patch-id: 0c516eb530339e5398eaaf8ece5e72dfac419f93
prerequisite-patch-id: bfefff55ba6a3fdf8930b3b4d48746bc9cd5a0a0
prerequisite-patch-id: 9e143f9cd10add55d2fd52bac0e538b904d6dee5
prerequisite-patch-id: cb987ee3dbc145fee1135307badb61c0e21f0ccd
prerequisite-patch-id: 14b990ceacec658b924c78d91ce33b45f70ca112
prerequisite-patch-id: b1f6cc6ae066f3e10b5626ff0af3267449d613d3
prerequisite-patch-id: 06bbcd43424f4ee2f116372855665f7dc932158d
prerequisite-patch-id: 73a4b0a87c136697874bb120a3bf0a7ec6e54a32
prerequisite-patch-id: 6cab6a588aa5479276228e60693ea6d472e2f844
prerequisite-patch-id: df1119a31756da103188d8880077ce0bcec3d352
prerequisite-patch-id: cf47f0a66dbe5f11d50ce2e62682b0f48dfc4e76
--
2.34.1
^ permalink raw reply [flat|nested] 29+ messages in thread
* [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-16 5:42 ` Krzysztof Kozlowski
2024-08-16 5:44 ` Krzysztof Kozlowski
2024-08-14 9:43 ` [RFC PATCH 02/18] arm64: dts: qcom: add wifi node for IPQ5332 based RDP441 Raj Kumar Bhagat
` (16 subsequent siblings)
17 siblings, 2 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Raj Kumar Bhagat
Add device-tree bindings for the ATH12K module found in the IPQ5332
device.
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
.../net/wireless/qcom,ath12k-ahb.yaml | 325 ++++++++++++++++++
1 file changed, 325 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
new file mode 100644
index 000000000000..8cecc50b6341
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
@@ -0,0 +1,325 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+# Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/wireless/qcom,ath12k-ahb.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Technologies ath12k wireless devices (AHB)
+
+maintainers:
+ - Kalle Valo <kvalo@kernel.org>
+ - Jeff Johnson <jjohnson@kernel.org>
+
+description:
+ Qualcomm Technologies IEEE 802.11be AHB devices.
+
+properties:
+ compatible:
+ enum:
+ - qcom,ipq5332-wifi
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ minItems: 1
+ maxItems: 2
+
+ clock-names:
+ minItems: 1
+ maxItems: 2
+
+ interrupts:
+ minItems: 32
+ maxItems: 56
+
+ interrupt-names:
+ minItems: 32
+ maxItems: 56
+
+ memory-region:
+ minItems: 1
+ description:
+ phandle to a node describing reserved memory (System RAM memory)
+ used by ath12k firmware (see bindings/reserved-memory/reserved-memory.txt)
+
+ qcom,bdf-addr:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ System RAM memory address reserved for board data.
+
+ qcom,board_id:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Board id value, it identifies the variant of ath12k WiFi device.
+
+ qcom,rproc:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ DT entry of a WCSS node. WCSS node is the child node of q6 remoteproc driver.
+ (see bindings/remoteproc/qcom,multipd-pil.yaml)
+
+required:
+ - compatible
+ - reg
+ - memory-region
+ - qcom,board_id
+ - qcom,rproc
+
+additionalProperties: false
+
+allOf:
+ - $ref: ieee80211.yaml#
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - qcom,ipq5332-wifi
+ then:
+ properties:
+ clocks:
+ items:
+ - description: gcc_xo_clk used for copy engine
+ - description: gcc_im_sleep_clk used for q6.
+
+ clock-names:
+ items:
+ - const: gcc_xo_clk
+ - const: gcc_im_sleep_clk
+
+ interrupts:
+ items:
+ - description: misc-pulse1 interrupt events
+ - description: misc-latch interrupt events
+ - description: sw exception interrupt events
+ - description: interrupt event for ring CE0
+ - description: interrupt event for ring CE1
+ - description: interrupt event for ring CE2
+ - description: interrupt event for ring CE3
+ - description: interrupt event for ring CE4
+ - description: interrupt event for ring CE5
+ - description: interrupt event for ring CE6
+ - description: interrupt event for ring CE7
+ - description: interrupt event for ring CE8
+ - description: interrupt event for ring CE9
+ - description: interrupt event for ring CE10
+ - description: interrupt event for ring CE11
+ - description: interrupt event for ring host2wbm-desc-feed
+ - description: interrupt event for ring host2reo-re-injection
+ - description: interrupt event for ring host2reo-command
+ - description: interrupt event for ring host2rxdma-monitor-ring1
+ - description: interrupt event for ring reo2ost-exception
+ - description: interrupt event for ring wbm2host-rx-release
+ - description: interrupt event for ring reo2host-status
+ - description: interrupt event for ring reo2host-destination-ring4
+ - description: interrupt event for ring reo2host-destination-ring3
+ - description: interrupt event for ring reo2host-destination-ring2
+ - description: interrupt event for ring reo2host-destination-ring1
+ - description: interrupt event for ring rxdma2host-monitor-destination-mac3
+ - description: interrupt event for ring rxdma2host-monitor-destination-mac2
+ - description: interrupt event for ring rxdma2host-monitor-destination-mac1
+ - description: interrupt event for ring host2rxdma-host-buf-ring-mac3
+ - description: interrupt event for ring host2rxdma-host-buf-ring-mac2
+ - description: interrupt event for ring host2rxdma-host-buf-ring-mac1
+ - description: interrupt event for ring host2tcl-input-ring4
+ - description: interrupt event for ring host2tcl-input-ring3
+ - description: interrupt event for ring host2tcl-input-ring2
+ - description: interrupt event for ring host2tcl-input-ring1
+ - description: interrupt event for ring wbm2host-tx-completions-ring4
+ - description: interrupt event for ring wbm2host-tx-completions-ring3
+ - description: interrupt event for ring wbm2host-tx-completions-ring2
+ - description: interrupt event for ring wbm2host-tx-completions-ring1
+ - description: interrupt event for ring host2tx-monitor-ring1
+ - description: interrupt event for ring txmon2host-monitor-destination-mac3
+ - description: interrupt event for ring txmon2host-monitor-destination-mac2
+ - description: interrupt event for ring txmon2host-monitor-destination-mac1
+ - description: interrupt event for umac_reset
+ interrupt-names:
+ items:
+ - const: misc-pulse1
+ - const: misc-latch
+ - const: sw-exception
+ - const: ce0
+ - const: ce1
+ - const: ce2
+ - const: ce3
+ - const: ce4
+ - const: ce5
+ - const: ce6
+ - const: ce7
+ - const: ce8
+ - const: ce9
+ - const: ce10
+ - const: ce11
+ - const: host2wbm-desc-feed
+ - const: host2reo-re-injection
+ - const: host2reo-command
+ - const: host2rxdma-monitor-ring1
+ - const: reo2ost-exception
+ - const: wbm2host-rx-release
+ - const: reo2host-status
+ - const: reo2host-destination-ring4
+ - const: reo2host-destination-ring3
+ - const: reo2host-destination-ring2
+ - const: reo2host-destination-ring1
+ - const: rxdma2host-monitor-destination-mac3
+ - const: rxdma2host-monitor-destination-mac2
+ - const: rxdma2host-monitor-destination-mac1
+ - const: host2rxdma-host-buf-ring-mac3
+ - const: host2rxdma-host-buf-ring-mac2
+ - const: host2rxdma-host-buf-ring-mac1
+ - const: host2tcl-input-ring4
+ - const: host2tcl-input-ring3
+ - const: host2tcl-input-ring2
+ - const: host2tcl-input-ring1
+ - const: wbm2host-tx-completions-ring4
+ - const: wbm2host-tx-completions-ring3
+ - const: wbm2host-tx-completions-ring2
+ - const: wbm2host-tx-completions-ring1
+ - const: host2tx-monitor-ring1
+ - const: txmon2host-monitor-destination-mac3
+ - const: txmon2host-monitor-destination-mac2
+ - const: txmon2host-monitor-destination-mac1
+ - const: umac_reset
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - qcom,ipq5332-wifi
+ then:
+ required:
+ - clocks
+ - clock-names
+ - interrupts
+ - interrupt-names
+ - qcom,bdf-addr
+
+examples:
+ - |
+
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/qcom,ipq5332-gcc.h>
+
+ reserved-memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ q6_region: wcnss@4a900000 {
+ no-map;
+ reg = <0x0 0x4a900000 0x0 0x02300000>;
+ };
+
+ m3_dump: m3_dump@4cc00000 {
+ no-map;
+ reg = <0x0 0x4CC00000 0x0 0x100000>;
+ };
+ };
+
+ wifi0: wifi@c0000000 {
+ compatible = "qcom,ipq5332-wifi";
+ reg = <0xc000000 0x1000000>;
+ clocks = <&gcc GCC_XO_CLK>,
+ <&gcc GCC_IM_SLEEP_CLK>;
+ clock-names = "gcc_xo_clk",
+ "gcc_im_sleep_clk";
+ interrupts = <GIC_SPI 559 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 560 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 561 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 422 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 423 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 424 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 425 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 426 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 427 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 428 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 429 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 430 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 431 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 432 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 433 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 491 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 495 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 493 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 544 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 457 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 466 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 497 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 454 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 453 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 452 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 451 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 488 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 488 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 484 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 554 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 554 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 549 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 507 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 500 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 499 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 498 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 450 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 448 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 447 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 543 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 486 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 486 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 482 IRQ_TYPE_EDGE_RISING>,
+ <GIC_SPI 419 IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "misc-pulse1",
+ "misc-latch",
+ "sw-exception",
+ "ce0",
+ "ce1",
+ "ce2",
+ "ce3",
+ "ce4",
+ "ce5",
+ "ce6",
+ "ce7",
+ "ce8",
+ "ce9",
+ "ce10",
+ "ce11",
+ "host2wbm-desc-feed",
+ "host2reo-re-injection",
+ "host2reo-command",
+ "host2rxdma-monitor-ring1",
+ "reo2ost-exception",
+ "wbm2host-rx-release",
+ "reo2host-status",
+ "reo2host-destination-ring4",
+ "reo2host-destination-ring3",
+ "reo2host-destination-ring2",
+ "reo2host-destination-ring1",
+ "rxdma2host-monitor-destination-mac3",
+ "rxdma2host-monitor-destination-mac2",
+ "rxdma2host-monitor-destination-mac1",
+ "host2rxdma-host-buf-ring-mac3",
+ "host2rxdma-host-buf-ring-mac2",
+ "host2rxdma-host-buf-ring-mac1",
+ "host2tcl-input-ring4",
+ "host2tcl-input-ring3",
+ "host2tcl-input-ring2",
+ "host2tcl-input-ring1",
+ "wbm2host-tx-completions-ring4",
+ "wbm2host-tx-completions-ring3",
+ "wbm2host-tx-completions-ring2",
+ "wbm2host-tx-completions-ring1",
+ "host2tx-monitor-ring1",
+ "txmon2host-monitor-destination-mac3",
+ "txmon2host-monitor-destination-mac2",
+ "txmon2host-monitor-destination-mac1",
+ "umac_reset";
+
+ memory-region = <&q6_region>;
+ qcom,bdf-addr = <0x4B500000>;
+ qcom,board_id = <0x12>;
+ qcom,rproc = <&q6_wcss_pd1>;
+ status = "okay";
+ };
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 02/18] arm64: dts: qcom: add wifi node for IPQ5332 based RDP441
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-16 5:44 ` Krzysztof Kozlowski
2024-08-14 9:43 ` [RFC PATCH 03/18] wifi: ath12k: add ath12k_hw_params for IPQ5332 Raj Kumar Bhagat
` (15 subsequent siblings)
17 siblings, 1 reply; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Raj Kumar Bhagat
RDP441 is based on IPQ5332. It has inbuilt AHB bus based IPQ5332 WiFi
device.
Describe and add WiFi node for RDP441. Also, reserve the memory
required by IPQ5332 firmware.
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts | 56 ++++++++-
arch/arm64/boot/dts/qcom/ipq5332.dtsi | 131 +++++++++++++++++++-
2 files changed, 184 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts b/arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts
index 9aaa3d802178..0168d3a11416 100644
--- a/arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts
+++ b/arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts
@@ -2,7 +2,7 @@
/*
* IPQ5332 AP-MI01.2 board device tree source
*
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
@@ -12,6 +12,51 @@
/ {
model = "Qualcomm Technologies, Inc. IPQ5332 MI01.2";
compatible = "qcom,ipq5332-ap-mi01.2", "qcom,ipq5332";
+
+ /* Default Profile
+ * +============+==============+=====================+
+ * | | | |
+ * | Region | Start Offset | Size |
+ * | | | |
+ * +------------+--------------+---------------------+
+ * | | | |
+ * | | | |
+ * | | | |
+ * | WLAN Q6 | 0x4A900000 | 35MB |
+ * | | | |
+ * | | | |
+ * +------------+--------------+---------------------+
+ * | M3 Dump | 0x4CC00000 | 1MB |
+ * +============+==============+=====================+
+ * | |
+ * | |
+ * | |
+ * | Rest of memory for Linux |
+ * | |
+ * | |
+ * | |
+ * +=================================================+
+ */
+
+ reserved-memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ q6_region: wcnss@4a900000 {
+ no-map;
+ reg = <0x0 0x4a900000 0x0 0x02300000>;
+ };
+
+ m3_dump: m3_dump@4cc00000 {
+ no-map;
+ reg = <0x0 0x4CC00000 0x0 0x100000>;
+ };
+
+ /* mlo_global_mem0: The MLO global memory is not
+ * enabled yet.
+ */
+ };
};
&blsp1_i2c1 {
@@ -22,7 +67,7 @@ &blsp1_i2c1 {
};
&q6v5_wcss {
- pd-1 {
+ q6_wcss_pd1: pd-1 {
firmware-name = "ath11k/IPQ5332/hw1.0/q6_fw1.mdt";
interrupts-extended = <&wcss_smp2p_in 8 IRQ_TYPE_NONE>,
<&wcss_smp2p_in 9 IRQ_TYPE_NONE>,
@@ -42,6 +87,13 @@ pd-1 {
};
};
+&wifi0 {
+ memory-region = <&q6_region>;
+ qcom,board_id = <0x12>;
+ qcom,rproc = <&q6_wcss_pd1>;
+ status = "okay";
+};
+
&sdhc {
bus-width = <4>;
max-frequency = <192000000>;
diff --git a/arch/arm64/boot/dts/qcom/ipq5332.dtsi b/arch/arm64/boot/dts/qcom/ipq5332.dtsi
index 1c4e5e0104ca..eb9a1ce7e2e2 100644
--- a/arch/arm64/boot/dts/qcom/ipq5332.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq5332.dtsi
@@ -2,7 +2,7 @@
/*
* IPQ5332 device tree source
*
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <dt-bindings/clock/qcom,apss-ipq.h>
@@ -511,6 +511,135 @@ glink-edge {
mboxes = <&apcs_glb 8>;
};
};
+
+ wifi0: wifi@c0000000 {
+ compatible = "qcom,ipq5332-wifi";
+ reg = <0xc000000 0x1000000>;
+ clocks = <&gcc GCC_XO_CLK>,
+ <&gcc GCC_IM_SLEEP_CLK>;
+ clock-names = "gcc_xo_clk",
+ "gcc_im_sleep_clk";
+ interrupts = <GIC_SPI 559 IRQ_TYPE_EDGE_RISING>, // misc-pulse1
+ <GIC_SPI 560 IRQ_TYPE_EDGE_RISING>, // misc-latch
+ <GIC_SPI 561 IRQ_TYPE_EDGE_RISING>, // sw-exception
+ <GIC_SPI 422 IRQ_TYPE_EDGE_RISING>, // ce0
+ <GIC_SPI 423 IRQ_TYPE_EDGE_RISING>, // ce1
+ <GIC_SPI 424 IRQ_TYPE_EDGE_RISING>, // ce2
+ <GIC_SPI 425 IRQ_TYPE_EDGE_RISING>, // ce3
+ <GIC_SPI 426 IRQ_TYPE_EDGE_RISING>, // ce4
+ <GIC_SPI 427 IRQ_TYPE_EDGE_RISING>, // ce5
+ <GIC_SPI 428 IRQ_TYPE_EDGE_RISING>, // ce6
+ <GIC_SPI 429 IRQ_TYPE_EDGE_RISING>, // ce7
+ <GIC_SPI 430 IRQ_TYPE_EDGE_RISING>, // ce8
+ <GIC_SPI 431 IRQ_TYPE_EDGE_RISING>, // ce9
+ <GIC_SPI 432 IRQ_TYPE_EDGE_RISING>, // ce10
+ <GIC_SPI 433 IRQ_TYPE_EDGE_RISING>, // ce11
+ <GIC_SPI 491 IRQ_TYPE_EDGE_RISING>, // host2wbm-desc-feed
+ <GIC_SPI 495 IRQ_TYPE_EDGE_RISING>,
+ // host2reo-re-injection
+ <GIC_SPI 493 IRQ_TYPE_EDGE_RISING>, // host2reo-command
+ <GIC_SPI 544 IRQ_TYPE_EDGE_RISING>,
+ // host2rxdma-monitor-ring1
+ <GIC_SPI 457 IRQ_TYPE_EDGE_RISING>, // reo2ost-exception
+ <GIC_SPI 466 IRQ_TYPE_EDGE_RISING>,
+ // wbm2host-rx-release
+ <GIC_SPI 497 IRQ_TYPE_EDGE_RISING>, // reo2host-status
+ <GIC_SPI 454 IRQ_TYPE_EDGE_RISING>,
+ // reo2host-destination-ring4
+ <GIC_SPI 453 IRQ_TYPE_EDGE_RISING>,
+ // reo2host-destination-ring3
+ <GIC_SPI 452 IRQ_TYPE_EDGE_RISING>,
+ // reo2host-destination-ring2
+ <GIC_SPI 451 IRQ_TYPE_EDGE_RISING>,
+ // reo2host-destination-ring1
+ <GIC_SPI 488 IRQ_TYPE_EDGE_RISING>,
+ // rxdma2host-monitor-destination-mac3
+ <GIC_SPI 488 IRQ_TYPE_EDGE_RISING>,
+ // rxdma2host-monitor-destination-mac2
+ <GIC_SPI 484 IRQ_TYPE_EDGE_RISING>,
+ // rxdma2host-monitor-destination-mac1
+ <GIC_SPI 554 IRQ_TYPE_EDGE_RISING>,
+ // host2rxdma-host-buf-ring-mac3
+ <GIC_SPI 554 IRQ_TYPE_EDGE_RISING>,
+ // host2rxdma-host-buf-ring-mac2
+ <GIC_SPI 549 IRQ_TYPE_EDGE_RISING>,
+ // host2rxdma-host-buf-ring-mac1
+ <GIC_SPI 507 IRQ_TYPE_EDGE_RISING>,
+ // host2tcl-input-ring4
+ <GIC_SPI 500 IRQ_TYPE_EDGE_RISING>,
+ // host2tcl-input-ring3
+ <GIC_SPI 499 IRQ_TYPE_EDGE_RISING>,
+ // host2tcl-input-ring2
+ <GIC_SPI 498 IRQ_TYPE_EDGE_RISING>,
+ // host2tcl-input-ring1
+ <GIC_SPI 450 IRQ_TYPE_EDGE_RISING>,
+ // wbm2host-tx-completions-ring4
+ <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>,
+ // wbm2host-tx-completions-ring3
+ <GIC_SPI 448 IRQ_TYPE_EDGE_RISING>,
+ // wbm2host-tx-completions-ring2
+ <GIC_SPI 447 IRQ_TYPE_EDGE_RISING>,
+ // wbm2host-tx-completions-ring1
+ <GIC_SPI 543 IRQ_TYPE_EDGE_RISING>,
+ // host2tx-monitor-ring1
+ <GIC_SPI 486 IRQ_TYPE_EDGE_RISING>,
+ // txmon2host-monitor-destination-mac3
+ <GIC_SPI 486 IRQ_TYPE_EDGE_RISING>,
+ // txmon2host-monitor-destination-mac2
+ <GIC_SPI 482 IRQ_TYPE_EDGE_RISING>,
+ // txmon2host-monitor-destination-mac1
+ <GIC_SPI 419 IRQ_TYPE_EDGE_RISING>; // umac_reset
+
+ interrupt-names = "misc-pulse1",
+ "misc-latch",
+ "sw-exception",
+ "ce0",
+ "ce1",
+ "ce2",
+ "ce3",
+ "ce4",
+ "ce5",
+ "ce6",
+ "ce7",
+ "ce8",
+ "ce9",
+ "ce10",
+ "ce11",
+ "host2wbm-desc-feed",
+ "host2reo-re-injection",
+ "host2reo-command",
+ "host2rxdma-monitor-ring1",
+ "reo2ost-exception",
+ "wbm2host-rx-release",
+ "reo2host-status",
+ "reo2host-destination-ring4",
+ "reo2host-destination-ring3",
+ "reo2host-destination-ring2",
+ "reo2host-destination-ring1",
+ "rxdma2host-monitor-destination-mac3",
+ "rxdma2host-monitor-destination-mac2",
+ "rxdma2host-monitor-destination-mac1",
+ "host2rxdma-host-buf-ring-mac3",
+ "host2rxdma-host-buf-ring-mac2",
+ "host2rxdma-host-buf-ring-mac1",
+ "host2tcl-input-ring4",
+ "host2tcl-input-ring3",
+ "host2tcl-input-ring2",
+ "host2tcl-input-ring1",
+ "wbm2host-tx-completions-ring4",
+ "wbm2host-tx-completions-ring3",
+ "wbm2host-tx-completions-ring2",
+ "wbm2host-tx-completions-ring1",
+ "host2tx-monitor-ring1",
+ "txmon2host-monitor-destination-mac3",
+ "txmon2host-monitor-destination-mac2",
+ "txmon2host-monitor-destination-mac1",
+ "umac_reset";
+
+ qcom,bdf-addr = <0x4B500000>;
+ status = "disabled";
+ };
+
};
timer {
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 03/18] wifi: ath12k: add ath12k_hw_params for IPQ5332
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 02/18] arm64: dts: qcom: add wifi node for IPQ5332 based RDP441 Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 04/18] wifi: ath12k: refactor ath12k_hw_regs structure Raj Kumar Bhagat
` (14 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Balamurugan S, P Praneesh, Raj Kumar Bhagat
From: Balamurugan S <quic_bselvara@quicinc.com>
Add ath12k_hw_params for new ath12k AHB based WiFi device IPQ5332.
Some hardware parameters like hw_ops, wmi_init & hal_ops are same
between IPQ5332 and QCN9274, hence use these same parameters for
IPQ5332. Other parameters are specific to IPQ5332, and those are
initially set to 0 or NULL, and will be populated in subsequent
patches.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/core.h | 3 +-
drivers/net/wireless/ath/ath12k/hw.c | 71 ++++++++++++++++++++++++++
drivers/net/wireless/ath/ath12k/qmi.h | 1 +
3 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index cdfd43a7321a..6fa13165149d 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -128,7 +128,8 @@ struct ath12k_skb_rxcb {
enum ath12k_hw_rev {
ATH12K_HW_QCN9274_HW10,
ATH12K_HW_QCN9274_HW20,
- ATH12K_HW_WCN7850_HW20
+ ATH12K_HW_WCN7850_HW20,
+ ATH12K_HW_IPQ5332_HW10,
};
enum ath12k_firmware_mode {
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index f2a0f28b27d2..a58c9b9193b4 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -1082,6 +1082,77 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.iova_mask = 0,
.supports_aspm = false,
},
+ {
+ .name = "ipq5332 hw1.0",
+ .hw_rev = ATH12K_HW_IPQ5332_HW10,
+ .fw = {
+ .dir = "IPQ5332/hw1.0",
+ .board_size = 256 * 1024,
+ .cal_offset = 128 * 1024,
+ },
+ .max_radios = 1,
+ .single_pdev_only = false,
+ .qmi_service_ins_id = ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ5332,
+ .internal_sleep_clock = false,
+
+ .hw_ops = &qcn9274_ops,
+ .regs = NULL,
+ .ring_mask = NULL,
+
+ .host_ce_config = NULL,
+ .ce_count = 0,
+ .target_ce_config = NULL,
+ .target_ce_count = 0,
+ .svc_to_ce_map = NULL,
+ .svc_to_ce_map_len = 0,
+
+ .hal_params = NULL,
+
+ .rxdma1_enable = false,
+ .num_rxdma_per_pdev = 1,
+ .num_rxdma_dst_ring = 0,
+ .rx_mac_buf_ring = false,
+ .vdev_start_delay = false,
+
+ .interface_modes = BIT(NL80211_IFTYPE_STATION) |
+ BIT(NL80211_IFTYPE_AP) |
+ BIT(NL80211_IFTYPE_MESH_POINT),
+ .supports_monitor = false,
+
+ .idle_ps = false,
+ .download_calib = true,
+ .supports_suspend = false,
+ .tcl_ring_retry = true,
+ .reoq_lut_support = false,
+ .supports_shadow_regs = false,
+
+ .num_tcl_banks = 48,
+ .max_tx_ring = 4,
+
+ .wmi_init = &ath12k_wmi_init_qcn9274,
+
+ .hal_ops = &hal_qcn9274_ops,
+
+ .qmi_cnss_feature_bitmap = BIT(CNSS_QDSS_CFG_MISS_V01),
+
+ .rfkill_pin = 0,
+ .rfkill_cfg = 0,
+ .rfkill_on_level = 0,
+
+ .rddm_size = 0,
+
+ .def_num_link = 0,
+ .max_mlo_peer = 256,
+
+ .otp_board_id_register = 0,
+
+ .supports_sta_ps = false,
+
+ .acpi_guid = NULL,
+ .supports_dynamic_smps_6ghz = false,
+ .iova_mask = 0,
+ .supports_aspm = false,
+ },
};
int ath12k_hw_init(struct ath12k_base *ab)
diff --git a/drivers/net/wireless/ath/ath12k/qmi.h b/drivers/net/wireless/ath/ath12k/qmi.h
index 0dfcbd8cb59b..6ce11060f1aa 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.h
+++ b/drivers/net/wireless/ath/ath12k/qmi.h
@@ -21,6 +21,7 @@
#define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_WCN7850 0x1
#define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_QCN9274 0x07
+#define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ5332 0x2
#define ATH12K_QMI_WLANFW_MAX_TIMESTAMP_LEN_V01 32
#define ATH12K_QMI_RESP_LEN_MAX 8192
#define ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01 52
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 04/18] wifi: ath12k: refactor ath12k_hw_regs structure
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (2 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 03/18] wifi: ath12k: add ath12k_hw_params for IPQ5332 Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 05/18] wifi: ath12k: add ath12k_hw_regs for IPQ5332 Raj Kumar Bhagat
` (13 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, P Praneesh, Balamurugan S, Raj Kumar Bhagat
From: P Praneesh <quic_ppranees@quicinc.com>
IPQ5332 device have different register address values for the below
registers:
HAL_TCL1_RING_BASE_LSB
HAL_TCL1_RING_BASE_MSB
HAL_TCL2_RING_BASE_LSB
HAL_SEQ_WCSS_UMAC_CE0_SRC_REG
HAL_SEQ_WCSS_UMAC_CE0_DST_REG
HAL_SEQ_WCSS_UMAC_CE1_SRC_REG
HAL_SEQ_WCSS_UMAC_CE1_DST_REG
Hence, refactor ath12k_hw_regs structure to accommodate these changes
in IPQ5332.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Co-developed-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/hal.c | 82 +++++++++++++--------------
drivers/net/wireless/ath/ath12k/hal.h | 61 +++++++++++---------
drivers/net/wireless/ath/ath12k/hw.c | 27 +++++++++
drivers/net/wireless/ath/ath12k/hw.h | 8 +++
4 files changed, 110 insertions(+), 68 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/hal.c b/drivers/net/wireless/ath/ath12k/hal.c
index ca04bfae8bdc..d2ad0224fdfe 100644
--- a/drivers/net/wireless/ath/ath12k/hal.c
+++ b/drivers/net/wireless/ath/ath12k/hal.c
@@ -552,9 +552,9 @@ static int ath12k_hal_srng_create_config_qcn9274(struct ath12k_base *ab)
s->reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_STATUS_HP;
s = &hal->srng_config[HAL_TCL_DATA];
- s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB;
+ s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB(ab);
s->reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_HP;
- s->reg_size[0] = HAL_TCL2_RING_BASE_LSB - HAL_TCL1_RING_BASE_LSB;
+ s->reg_size[0] = HAL_TCL2_RING_BASE_LSB(ab) - HAL_TCL1_RING_BASE_LSB(ab);
s->reg_size[1] = HAL_TCL2_RING_HP - HAL_TCL1_RING_HP;
s = &hal->srng_config[HAL_TCL_CMD];
@@ -566,29 +566,29 @@ static int ath12k_hal_srng_create_config_qcn9274(struct ath12k_base *ab)
s->reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_STATUS_RING_HP;
s = &hal->srng_config[HAL_CE_SRC];
- s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG + HAL_CE_DST_RING_BASE_LSB;
- s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG + HAL_CE_DST_RING_HP;
- s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG -
- HAL_SEQ_WCSS_UMAC_CE0_SRC_REG;
- s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG -
- HAL_SEQ_WCSS_UMAC_CE0_SRC_REG;
+ s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_BASE_LSB;
+ s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_HP;
+ s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);
+ s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);
s = &hal->srng_config[HAL_CE_DST];
- s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_RING_BASE_LSB;
- s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_RING_HP;
- s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG -
- HAL_SEQ_WCSS_UMAC_CE0_DST_REG;
- s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG -
- HAL_SEQ_WCSS_UMAC_CE0_DST_REG;
+ s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_BASE_LSB;
+ s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_HP;
+ s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);
+ s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);
s = &hal->srng_config[HAL_CE_DST_STATUS];
- s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG +
+ s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) +
HAL_CE_DST_STATUS_RING_BASE_LSB;
- s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_STATUS_RING_HP;
- s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG -
- HAL_SEQ_WCSS_UMAC_CE0_DST_REG;
- s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG -
- HAL_SEQ_WCSS_UMAC_CE0_DST_REG;
+ s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_HP;
+ s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);
+ s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);
s = &hal->srng_config[HAL_WBM_IDLE_LINK];
s->reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_IDLE_LINK_RING_BASE_LSB(ab);
@@ -1371,9 +1371,9 @@ static int ath12k_hal_srng_create_config_wcn7850(struct ath12k_base *ab)
s = &hal->srng_config[HAL_TCL_DATA];
s->max_rings = 5;
- s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB;
+ s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB(ab);
s->reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_HP;
- s->reg_size[0] = HAL_TCL2_RING_BASE_LSB - HAL_TCL1_RING_BASE_LSB;
+ s->reg_size[0] = HAL_TCL2_RING_BASE_LSB(ab) - HAL_TCL1_RING_BASE_LSB(ab);
s->reg_size[1] = HAL_TCL2_RING_HP - HAL_TCL1_RING_HP;
s = &hal->srng_config[HAL_TCL_CMD];
@@ -1386,31 +1386,31 @@ static int ath12k_hal_srng_create_config_wcn7850(struct ath12k_base *ab)
s = &hal->srng_config[HAL_CE_SRC];
s->max_rings = 12;
- s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG + HAL_CE_DST_RING_BASE_LSB;
- s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG + HAL_CE_DST_RING_HP;
- s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG -
- HAL_SEQ_WCSS_UMAC_CE0_SRC_REG;
- s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG -
- HAL_SEQ_WCSS_UMAC_CE0_SRC_REG;
+ s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_BASE_LSB;
+ s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_HP;
+ s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);
+ s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab);
s = &hal->srng_config[HAL_CE_DST];
s->max_rings = 12;
- s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_RING_BASE_LSB;
- s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_RING_HP;
- s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG -
- HAL_SEQ_WCSS_UMAC_CE0_DST_REG;
- s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG -
- HAL_SEQ_WCSS_UMAC_CE0_DST_REG;
+ s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_BASE_LSB;
+ s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_HP;
+ s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);
+ s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);
s = &hal->srng_config[HAL_CE_DST_STATUS];
s->max_rings = 12;
- s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG +
+ s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) +
HAL_CE_DST_STATUS_RING_BASE_LSB;
- s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_STATUS_RING_HP;
- s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG -
- HAL_SEQ_WCSS_UMAC_CE0_DST_REG;
- s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG -
- HAL_SEQ_WCSS_UMAC_CE0_DST_REG;
+ s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_HP;
+ s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);
+ s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) -
+ HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab);
s = &hal->srng_config[HAL_WBM_IDLE_LINK];
s->reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_IDLE_LINK_RING_BASE_LSB(ab);
@@ -1756,7 +1756,7 @@ static void ath12k_hal_srng_src_hw_init(struct ath12k_base *ab,
HAL_TCL1_RING_BASE_MSB_RING_BASE_ADDR_MSB) |
u32_encode_bits((srng->entry_size * srng->num_entries),
HAL_TCL1_RING_BASE_MSB_RING_SIZE);
- ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_BASE_MSB_OFFSET, val);
+ ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_BASE_MSB_OFFSET(ab), val);
val = u32_encode_bits(srng->entry_size, HAL_REO1_RING_ID_ENTRY_SIZE);
ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_ID_OFFSET(ab), val);
diff --git a/drivers/net/wireless/ath/ath12k/hal.h b/drivers/net/wireless/ath/ath12k/hal.h
index 8a78bb9a10bc..69579f118b81 100644
--- a/drivers/net/wireless/ath/ath12k/hal.h
+++ b/drivers/net/wireless/ath/ath12k/hal.h
@@ -44,10 +44,14 @@ struct ath12k_base;
#define HAL_SEQ_WCSS_UMAC_OFFSET 0x00a00000
#define HAL_SEQ_WCSS_UMAC_REO_REG 0x00a38000
#define HAL_SEQ_WCSS_UMAC_TCL_REG 0x00a44000
-#define HAL_SEQ_WCSS_UMAC_CE0_SRC_REG 0x01b80000
-#define HAL_SEQ_WCSS_UMAC_CE0_DST_REG 0x01b81000
-#define HAL_SEQ_WCSS_UMAC_CE1_SRC_REG 0x01b82000
-#define HAL_SEQ_WCSS_UMAC_CE1_DST_REG 0x01b83000
+#define HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) \
+ ((ab)->hw_params->regs->hal_umac_ce0_src_reg_base)
+#define HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) \
+ ((ab)->hw_params->regs->hal_umac_ce0_dest_reg_base)
+#define HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) \
+ ((ab)->hw_params->regs->hal_umac_ce1_src_reg_base)
+#define HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) \
+ ((ab)->hw_params->regs->hal_umac_ce1_dest_reg_base)
#define HAL_SEQ_WCSS_UMAC_WBM_REG 0x00a34000
#define HAL_CE_WFSS_CE_REG_BASE 0x01b80000
@@ -57,8 +61,10 @@ struct ath12k_base;
/* SW2TCL(x) R0 ring configuration address */
#define HAL_TCL1_RING_CMN_CTRL_REG 0x00000020
#define HAL_TCL1_RING_DSCP_TID_MAP 0x00000240
-#define HAL_TCL1_RING_BASE_LSB 0x00000900
-#define HAL_TCL1_RING_BASE_MSB 0x00000904
+#define HAL_TCL1_RING_BASE_LSB(ab) \
+ ((ab)->hw_params->regs->hal_tcl1_ring_base_lsb)
+#define HAL_TCL1_RING_BASE_MSB(ab) \
+ ((ab)->hw_params->regs->hal_tcl1_ring_base_msb)
#define HAL_TCL1_RING_ID(ab) ((ab)->hw_params->regs->hal_tcl1_ring_id)
#define HAL_TCL1_RING_MISC(ab) \
((ab)->hw_params->regs->hal_tcl1_ring_misc)
@@ -76,30 +82,31 @@ struct ath12k_base;
((ab)->hw_params->regs->hal_tcl1_ring_msi1_base_msb)
#define HAL_TCL1_RING_MSI1_DATA(ab) \
((ab)->hw_params->regs->hal_tcl1_ring_msi1_data)
-#define HAL_TCL2_RING_BASE_LSB 0x00000978
+#define HAL_TCL2_RING_BASE_LSB(ab) \
+ ((ab)->hw_params->regs->hal_tcl2_ring_base_lsb)
#define HAL_TCL_RING_BASE_LSB(ab) \
((ab)->hw_params->regs->hal_tcl_ring_base_lsb)
-#define HAL_TCL1_RING_MSI1_BASE_LSB_OFFSET(ab) \
- (HAL_TCL1_RING_MSI1_BASE_LSB(ab) - HAL_TCL1_RING_BASE_LSB)
-#define HAL_TCL1_RING_MSI1_BASE_MSB_OFFSET(ab) \
- (HAL_TCL1_RING_MSI1_BASE_MSB(ab) - HAL_TCL1_RING_BASE_LSB)
-#define HAL_TCL1_RING_MSI1_DATA_OFFSET(ab) \
- (HAL_TCL1_RING_MSI1_DATA(ab) - HAL_TCL1_RING_BASE_LSB)
-#define HAL_TCL1_RING_BASE_MSB_OFFSET \
- (HAL_TCL1_RING_BASE_MSB - HAL_TCL1_RING_BASE_LSB)
-#define HAL_TCL1_RING_ID_OFFSET(ab) \
- (HAL_TCL1_RING_ID(ab) - HAL_TCL1_RING_BASE_LSB)
-#define HAL_TCL1_RING_CONSR_INT_SETUP_IX0_OFFSET(ab) \
- (HAL_TCL1_RING_CONSUMER_INT_SETUP_IX0(ab) - HAL_TCL1_RING_BASE_LSB)
-#define HAL_TCL1_RING_CONSR_INT_SETUP_IX1_OFFSET(ab) \
- (HAL_TCL1_RING_CONSUMER_INT_SETUP_IX1(ab) - HAL_TCL1_RING_BASE_LSB)
-#define HAL_TCL1_RING_TP_ADDR_LSB_OFFSET(ab) \
- (HAL_TCL1_RING_TP_ADDR_LSB(ab) - HAL_TCL1_RING_BASE_LSB)
-#define HAL_TCL1_RING_TP_ADDR_MSB_OFFSET(ab) \
- (HAL_TCL1_RING_TP_ADDR_MSB(ab) - HAL_TCL1_RING_BASE_LSB)
-#define HAL_TCL1_RING_MISC_OFFSET(ab) \
- (HAL_TCL1_RING_MISC(ab) - HAL_TCL1_RING_BASE_LSB)
+#define HAL_TCL1_RING_MSI1_BASE_LSB_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_MSI1_BASE_LSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
+#define HAL_TCL1_RING_MSI1_BASE_MSB_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_MSI1_BASE_MSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
+#define HAL_TCL1_RING_MSI1_DATA_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_MSI1_DATA(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
+#define HAL_TCL1_RING_BASE_MSB_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_BASE_MSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
+#define HAL_TCL1_RING_ID_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_ID(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
+#define HAL_TCL1_RING_CONSR_INT_SETUP_IX0_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_CONSUMER_INT_SETUP_IX0(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
+#define HAL_TCL1_RING_CONSR_INT_SETUP_IX1_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_CONSUMER_INT_SETUP_IX1(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
+#define HAL_TCL1_RING_TP_ADDR_LSB_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_TP_ADDR_LSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
+#define HAL_TCL1_RING_TP_ADDR_MSB_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_TP_ADDR_MSB(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
+#define HAL_TCL1_RING_MISC_OFFSET(ab) ({ typeof(ab) _ab = (ab); \
+ (HAL_TCL1_RING_MISC(_ab) - HAL_TCL1_RING_BASE_LSB(_ab)); })
/* SW2TCL(x) R2 ring pointers (head/tail) address */
#define HAL_TCL1_RING_HP 0x00002000
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index a58c9b9193b4..7944be6a9973 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -615,6 +615,9 @@ static const struct ath12k_hw_regs qcn9274_v1_regs = {
.hal_tcl1_ring_msi1_base_msb = 0x0000094c,
.hal_tcl1_ring_msi1_data = 0x00000950,
.hal_tcl_ring_base_lsb = 0x00000b58,
+ .hal_tcl1_ring_base_lsb = 0x00000900,
+ .hal_tcl1_ring_base_msb = 0x00000904,
+ .hal_tcl2_ring_base_lsb = 0x00000978,
/* TCL STATUS ring address */
.hal_tcl_status_ring_base_lsb = 0x00000d38,
@@ -677,6 +680,12 @@ static const struct ath12k_hw_regs qcn9274_v1_regs = {
/* REO status ring address */
.hal_reo_status_ring_base = 0x00000a84,
+
+ /* CE base address */
+ .hal_umac_ce0_src_reg_base = 0x01b80000,
+ .hal_umac_ce0_dest_reg_base = 0x01b81000,
+ .hal_umac_ce1_src_reg_base = 0x01b82000,
+ .hal_umac_ce1_dest_reg_base = 0x01b83000,
};
static const struct ath12k_hw_regs qcn9274_v2_regs = {
@@ -691,6 +700,9 @@ static const struct ath12k_hw_regs qcn9274_v2_regs = {
.hal_tcl1_ring_msi1_base_msb = 0x0000094c,
.hal_tcl1_ring_msi1_data = 0x00000950,
.hal_tcl_ring_base_lsb = 0x00000b58,
+ .hal_tcl1_ring_base_lsb = 0x00000900,
+ .hal_tcl1_ring_base_msb = 0x00000904,
+ .hal_tcl2_ring_base_lsb = 0x00000978,
/* TCL STATUS ring address */
.hal_tcl_status_ring_base_lsb = 0x00000d38,
@@ -757,6 +769,12 @@ static const struct ath12k_hw_regs qcn9274_v2_regs = {
/* REO status ring address */
.hal_reo_status_ring_base = 0x00000aa0,
+
+ /* CE base address */
+ .hal_umac_ce0_src_reg_base = 0x01b80000,
+ .hal_umac_ce0_dest_reg_base = 0x01b81000,
+ .hal_umac_ce1_src_reg_base = 0x01b82000,
+ .hal_umac_ce1_dest_reg_base = 0x01b83000,
};
static const struct ath12k_hw_regs wcn7850_regs = {
@@ -771,6 +789,9 @@ static const struct ath12k_hw_regs wcn7850_regs = {
.hal_tcl1_ring_msi1_base_msb = 0x0000094c,
.hal_tcl1_ring_msi1_data = 0x00000950,
.hal_tcl_ring_base_lsb = 0x00000b58,
+ .hal_tcl1_ring_base_lsb = 0x00000900,
+ .hal_tcl1_ring_base_msb = 0x00000904,
+ .hal_tcl2_ring_base_lsb = 0x00000978,
/* TCL STATUS ring address */
.hal_tcl_status_ring_base_lsb = 0x00000d38,
@@ -833,6 +854,12 @@ static const struct ath12k_hw_regs wcn7850_regs = {
/* REO status ring address */
.hal_reo_status_ring_base = 0x00000a84,
+
+ /* CE base address */
+ .hal_umac_ce0_src_reg_base = 0x01b80000,
+ .hal_umac_ce0_dest_reg_base = 0x01b81000,
+ .hal_umac_ce1_src_reg_base = 0x01b82000,
+ .hal_umac_ce1_dest_reg_base = 0x01b83000,
};
static const struct ath12k_hw_hal_params ath12k_hw_hal_params_qcn9274 = {
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index 8d52182e28ae..36bec99e9e4d 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -293,6 +293,9 @@ struct ath12k_hw_regs {
u32 hal_tcl1_ring_msi1_base_msb;
u32 hal_tcl1_ring_msi1_data;
u32 hal_tcl_ring_base_lsb;
+ u32 hal_tcl1_ring_base_lsb;
+ u32 hal_tcl1_ring_base_msb;
+ u32 hal_tcl2_ring_base_lsb;
u32 hal_tcl_status_ring_base_lsb;
@@ -316,6 +319,11 @@ struct ath12k_hw_regs {
u32 pcie_qserdes_sysclk_en_sel;
u32 pcie_pcs_osc_dtct_config_base;
+ u32 hal_umac_ce0_src_reg_base;
+ u32 hal_umac_ce0_dest_reg_base;
+ u32 hal_umac_ce1_src_reg_base;
+ u32 hal_umac_ce1_dest_reg_base;
+
u32 hal_ppe_rel_ring_base;
u32 hal_reo2_ring_base;
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 05/18] wifi: ath12k: add ath12k_hw_regs for IPQ5332
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (3 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 04/18] wifi: ath12k: refactor ath12k_hw_regs structure Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 06/18] wifi: ath12k: add ath12k_hw_ring_mask " Raj Kumar Bhagat
` (12 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, P Praneesh, Balamurugan S, Raj Kumar Bhagat
From: P Praneesh <quic_ppranees@quicinc.com>
Add register addresses (ath12k_hw_regs) for new ath12k AHB based
WiFi device IPQ5332.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Co-developed-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/hw.c | 86 +++++++++++++++++++++++++++-
1 file changed, 85 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 7944be6a9973..d1c0227cc212 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -777,6 +777,90 @@ static const struct ath12k_hw_regs qcn9274_v2_regs = {
.hal_umac_ce1_dest_reg_base = 0x01b83000,
};
+static const struct ath12k_hw_regs ipq5332_regs = {
+ /* SW2TCL(x) R0 ring configuration address */
+ .hal_tcl1_ring_id = 0x00000918,
+ .hal_tcl1_ring_misc = 0x00000920,
+ .hal_tcl1_ring_tp_addr_lsb = 0x0000092c,
+ .hal_tcl1_ring_tp_addr_msb = 0x00000930,
+ .hal_tcl1_ring_consumer_int_setup_ix0 = 0x00000940,
+ .hal_tcl1_ring_consumer_int_setup_ix1 = 0x00000944,
+ .hal_tcl1_ring_msi1_base_lsb = 0x00000958,
+ .hal_tcl1_ring_msi1_base_msb = 0x0000095c,
+ .hal_tcl1_ring_base_lsb = 0x00000910,
+ .hal_tcl1_ring_base_msb = 0x00000914,
+ .hal_tcl1_ring_msi1_data = 0x00000960,
+ .hal_tcl2_ring_base_lsb = 0x00000988,
+ .hal_tcl_ring_base_lsb = 0x00000b68,
+
+ /* TCL STATUS ring address */
+ .hal_tcl_status_ring_base_lsb = 0x00000d48,
+
+ /* REO DEST ring address */
+ .hal_reo2_ring_base = 0x00000578,
+ .hal_reo1_misc_ctrl_addr = 0x00000b9c,
+ .hal_reo1_sw_cookie_cfg0 = 0x0000006c,
+ .hal_reo1_sw_cookie_cfg1 = 0x00000070,
+ .hal_reo1_qdesc_lut_base0 = 0x00000074,
+ .hal_reo1_qdesc_lut_base1 = 0x00000078,
+ .hal_reo1_ring_base_lsb = 0x00000500,
+ .hal_reo1_ring_base_msb = 0x00000504,
+ .hal_reo1_ring_id = 0x00000508,
+ .hal_reo1_ring_misc = 0x00000510,
+ .hal_reo1_ring_hp_addr_lsb = 0x00000514,
+ .hal_reo1_ring_hp_addr_msb = 0x00000518,
+ .hal_reo1_ring_producer_int_setup = 0x00000524,
+ .hal_reo1_ring_msi1_base_lsb = 0x00000548,
+ .hal_reo1_ring_msi1_base_msb = 0x0000054C,
+ .hal_reo1_ring_msi1_data = 0x00000550,
+ .hal_reo1_aging_thres_ix0 = 0x00000B28,
+ .hal_reo1_aging_thres_ix1 = 0x00000B2C,
+ .hal_reo1_aging_thres_ix2 = 0x00000B30,
+ .hal_reo1_aging_thres_ix3 = 0x00000B34,
+
+ /* REO Exception ring address */
+ .hal_reo2_sw0_ring_base = 0x000008c0,
+
+ /* REO Reinject ring address */
+ .hal_sw2reo_ring_base = 0x00000320,
+ .hal_sw2reo1_ring_base = 0x00000398,
+
+ /* REO cmd ring address */
+ .hal_reo_cmd_ring_base = 0x000002A8,
+
+ /* REO status ring address */
+ .hal_reo_status_ring_base = 0x00000aa0,
+
+ /* WBM idle link ring address */
+ .hal_wbm_idle_ring_base_lsb = 0x00000d3c,
+ .hal_wbm_idle_ring_misc_addr = 0x00000d4c,
+ .hal_wbm_r0_idle_list_cntl_addr = 0x00000240,
+ .hal_wbm_r0_idle_list_size_addr = 0x00000244,
+ .hal_wbm_scattered_ring_base_lsb = 0x00000250,
+ .hal_wbm_scattered_ring_base_msb = 0x00000254,
+ .hal_wbm_scattered_desc_head_info_ix0 = 0x00000260,
+ .hal_wbm_scattered_desc_head_info_ix1 = 0x00000264,
+ .hal_wbm_scattered_desc_tail_info_ix0 = 0x00000270,
+ .hal_wbm_scattered_desc_tail_info_ix1 = 0x00000274,
+ .hal_wbm_scattered_desc_ptr_hp_addr = 0x0000027c,
+
+ /* SW2WBM release ring address */
+ .hal_wbm_sw_release_ring_base_lsb = 0x0000037c,
+
+ /* WBM2SW release ring address */
+ .hal_wbm0_release_ring_base_lsb = 0x00000e08,
+ .hal_wbm1_release_ring_base_lsb = 0x00000e80,
+
+ /* PPE release ring address */
+ .hal_ppe_rel_ring_base = 0x0000046c,
+
+ /* CE base address */
+ .hal_umac_ce0_src_reg_base = 0x00740000,
+ .hal_umac_ce0_dest_reg_base = 0x00741000,
+ .hal_umac_ce1_src_reg_base = 0x00742000,
+ .hal_umac_ce1_dest_reg_base = 0x00743000,
+};
+
static const struct ath12k_hw_regs wcn7850_regs = {
/* SW2TCL(x) R0 ring configuration address */
.hal_tcl1_ring_id = 0x00000908,
@@ -1123,7 +1207,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.internal_sleep_clock = false,
.hw_ops = &qcn9274_ops,
- .regs = NULL,
+ .regs = &ipq5332_regs,
.ring_mask = NULL,
.host_ce_config = NULL,
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 06/18] wifi: ath12k: add ath12k_hw_ring_mask for IPQ5332
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (4 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 05/18] wifi: ath12k: add ath12k_hw_regs for IPQ5332 Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 07/18] wifi: ath12k: add CE configurations " Raj Kumar Bhagat
` (11 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, P Praneesh, Balamurugan S, Raj Kumar Bhagat
From: P Praneesh <quic_ppranees@quicinc.com>
Add ath12k_hw_ring_mask for new ath12k AHB based WiFi device IPQ5332.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Co-developed-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/hw.c | 42 +++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index d1c0227cc212..25225d5c6669 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -573,6 +573,46 @@ static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = {
},
};
+static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_ipq5332 = {
+ .tx = {
+ ATH12K_TX_RING_MASK_0,
+ ATH12K_TX_RING_MASK_1,
+ ATH12K_TX_RING_MASK_2,
+ ATH12K_TX_RING_MASK_3,
+ },
+ .rx_mon_dest = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ ATH12K_RX_MON_RING_MASK_0,
+ },
+ .rx = {
+ 0, 0, 0, 0,
+ ATH12K_RX_RING_MASK_0,
+ ATH12K_RX_RING_MASK_1,
+ ATH12K_RX_RING_MASK_2,
+ ATH12K_RX_RING_MASK_3,
+ },
+ .rx_err = {
+ 0, 0, 0,
+ ATH12K_RX_ERR_RING_MASK_0,
+ },
+ .rx_wbm_rel = {
+ 0, 0, 0,
+ ATH12K_RX_WBM_REL_RING_MASK_0,
+ },
+ .reo_status = {
+ 0, 0, 0,
+ ATH12K_REO_STATUS_RING_MASK_0,
+ },
+ .host2rxdma = {
+ 0, 0, 0,
+ ATH12K_HOST2RXDMA_RING_MASK_0,
+ },
+ .tx_mon_dest = {
+ ATH12K_TX_MON_RING_MASK_0,
+ ATH12K_TX_MON_RING_MASK_1,
+ },
+};
+
static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_wcn7850 = {
.tx = {
ATH12K_TX_RING_MASK_0,
@@ -1208,7 +1248,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.hw_ops = &qcn9274_ops,
.regs = &ipq5332_regs,
- .ring_mask = NULL,
+ .ring_mask = &ath12k_hw_ring_mask_ipq5332,
.host_ce_config = NULL,
.ce_count = 0,
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 07/18] wifi: ath12k: add CE configurations for IPQ5332
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (5 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 06/18] wifi: ath12k: add ath12k_hw_ring_mask " Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 08/18] wifi: ath12k: add ath12k_hw_hal_params " Raj Kumar Bhagat
` (10 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, P Praneesh, Balamurugan S, Raj Kumar Bhagat
From: P Praneesh <quic_ppranees@quicinc.com>
Add below CE configurations for new ath12k AHB based WiFi device
IPQ5332:
- host ce config (ce_attr)
- target ce config (ce_pipe_config)
- target service to ce map (service_to_pipe)
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Co-developed-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/ce.c | 90 +++++++++++
drivers/net/wireless/ath/ath12k/ce.h | 1 +
drivers/net/wireless/ath/ath12k/hw.c | 223 ++++++++++++++++++++++++++-
3 files changed, 308 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/ce.c b/drivers/net/wireless/ath/ath12k/ce.c
index be0d669d31fc..5ffe59c4cd9c 100644
--- a/drivers/net/wireless/ath/ath12k/ce.c
+++ b/drivers/net/wireless/ath/ath12k/ce.c
@@ -219,6 +219,96 @@ const struct ce_attr ath12k_host_ce_config_wcn7850[] = {
};
+const struct ce_attr ath12k_host_ce_config_ipq5332[] = {
+ /* CE0: host->target HTC control and raw streams */
+ {
+ .flags = CE_ATTR_FLAGS,
+ .src_nentries = 16,
+ .src_sz_max = 2048,
+ .dest_nentries = 0,
+ },
+ /* CE1: target->host HTT + HTC control */
+ {
+ .flags = CE_ATTR_FLAGS,
+ .src_nentries = 0,
+ .src_sz_max = 2048,
+ .dest_nentries = 512,
+ .recv_cb = ath12k_htc_rx_completion_handler,
+ },
+ /* CE2: target->host WMI */
+ {
+ .flags = CE_ATTR_FLAGS,
+ .src_nentries = 0,
+ .src_sz_max = 2048,
+ .dest_nentries = 128,
+ .recv_cb = ath12k_htc_rx_completion_handler,
+ },
+ /* CE3: host->target WMI */
+ {
+ .flags = CE_ATTR_FLAGS,
+ .src_nentries = 32,
+ .src_sz_max = 2048,
+ .dest_nentries = 0,
+ },
+ /* CE4: host->target HTT */
+ {
+ .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,
+ .src_nentries = 2048,
+ .src_sz_max = 256,
+ .dest_nentries = 0,
+ },
+ /* CE5: target -> host PKTLOG */
+ {
+ .flags = CE_ATTR_FLAGS,
+ .src_nentries = 0,
+ .src_sz_max = 2048,
+ .dest_nentries = 512,
+ .recv_cb = ath12k_dp_htt_htc_t2h_msg_handler,
+ },
+ /* CE6: Target autonomous HIF_memcpy */
+ {
+ .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,
+ .src_nentries = 0,
+ .src_sz_max = 0,
+ .dest_nentries = 0,
+ },
+ /* CE7: CV Prefetch */
+ {
+ .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,
+ .src_nentries = 0,
+ .src_sz_max = 0,
+ .dest_nentries = 0,
+ },
+ /* CE8: Target HIF memcpy (Generic HIF memcypy) */
+ {
+ .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,
+ .src_nentries = 0,
+ .src_sz_max = 0,
+ .dest_nentries = 0,
+ },
+ /* CE9: WMI logging/CFR/Spectral/Radar */
+ {
+ .flags = CE_ATTR_FLAGS,
+ .src_nentries = 0,
+ .src_sz_max = 2048,
+ .dest_nentries = 128,
+ },
+ /* CE10: Unused */
+ {
+ .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,
+ .src_nentries = 0,
+ .src_sz_max = 0,
+ .dest_nentries = 0,
+ },
+ /* CE11: Unused */
+ {
+ .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR,
+ .src_nentries = 0,
+ .src_sz_max = 0,
+ .dest_nentries = 0,
+ },
+};
+
static int ath12k_ce_rx_buf_enqueue_pipe(struct ath12k_ce_pipe *pipe,
struct sk_buff *skb, dma_addr_t paddr)
{
diff --git a/drivers/net/wireless/ath/ath12k/ce.h b/drivers/net/wireless/ath/ath12k/ce.h
index 857bc5f9e946..1d9542e1c21a 100644
--- a/drivers/net/wireless/ath/ath12k/ce.h
+++ b/drivers/net/wireless/ath/ath12k/ce.h
@@ -164,6 +164,7 @@ struct ath12k_ce {
extern const struct ce_attr ath12k_host_ce_config_qcn9274[];
extern const struct ce_attr ath12k_host_ce_config_wcn7850[];
+extern const struct ce_attr ath12k_host_ce_config_ipq5332[];
void ath12k_ce_cleanup_pipes(struct ath12k_base *ab);
void ath12k_ce_rx_replenish_retry(struct timer_list *t);
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 25225d5c6669..7ef41524c0ce 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -535,6 +535,217 @@ static const struct service_to_pipe ath12k_target_service_to_ce_map_wlan_wcn7850
},
};
+static const struct ce_pipe_config ath12k_target_ce_config_wlan_ipq5332[] = {
+ /* host->target HTC control and raw streams */
+ {
+ .pipenum = __cpu_to_le32(0),
+ .pipedir = __cpu_to_le32(PIPEDIR_OUT),
+ .nentries = __cpu_to_le32(32),
+ .nbytes_max = __cpu_to_le32(2048),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* target->host HTT */
+ {
+ .pipenum = __cpu_to_le32(1),
+ .pipedir = __cpu_to_le32(PIPEDIR_IN),
+ .nentries = __cpu_to_le32(32),
+ .nbytes_max = __cpu_to_le32(2048),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* target->host WMI + HTC control */
+ {
+ .pipenum = __cpu_to_le32(2),
+ .pipedir = __cpu_to_le32(PIPEDIR_IN),
+ .nentries = __cpu_to_le32(32),
+ .nbytes_max = __cpu_to_le32(2048),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* host->target WMI */
+ {
+ .pipenum = __cpu_to_le32(3),
+ .pipedir = __cpu_to_le32(PIPEDIR_OUT),
+ .nentries = __cpu_to_le32(32),
+ .nbytes_max = __cpu_to_le32(2048),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* host->target HTT */
+ {
+ .pipenum = __cpu_to_le32(4),
+ .pipedir = __cpu_to_le32(PIPEDIR_OUT),
+ .nentries = __cpu_to_le32(256),
+ .nbytes_max = __cpu_to_le32(256),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS | CE_ATTR_DIS_INTR),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* Target -> host PKTLOG */
+ {
+ .pipenum = __cpu_to_le32(5),
+ .pipedir = __cpu_to_le32(PIPEDIR_IN),
+ .nentries = __cpu_to_le32(32),
+ .nbytes_max = __cpu_to_le32(2048),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* Reserved for target autonomous HIF_memcpy */
+ {
+ .pipenum = __cpu_to_le32(6),
+ .pipedir = __cpu_to_le32(PIPEDIR_INOUT),
+ .nentries = __cpu_to_le32(32),
+ .nbytes_max = __cpu_to_le32(16384),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* CE7 Reserved for CV Prefetch */
+ {
+ .pipenum = __cpu_to_le32(7),
+ .pipedir = __cpu_to_le32(PIPEDIR_OUT),
+ .nentries = __cpu_to_le32(32),
+ .nbytes_max = __cpu_to_le32(2048),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* CE8 Reserved for target generic HIF memcpy */
+ {
+ .pipenum = __cpu_to_le32(8),
+ .pipedir = __cpu_to_le32(PIPEDIR_INOUT),
+ .nentries = __cpu_to_le32(32),
+ .nbytes_max = __cpu_to_le32(16384),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* CE9 WMI logging/CFR/Spectral/Radar/ */
+ {
+ .pipenum = __cpu_to_le32(9),
+ .pipedir = __cpu_to_le32(PIPEDIR_IN),
+ .nentries = __cpu_to_le32(32),
+ .nbytes_max = __cpu_to_le32(2048),
+ .flags = __cpu_to_le32(CE_ATTR_FLAGS),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* Unused TBD */
+ {
+ .pipenum = __cpu_to_le32(10),
+ .pipedir = __cpu_to_le32(PIPEDIR_NONE),
+ .nentries = __cpu_to_le32(0),
+ .nbytes_max = __cpu_to_le32(0),
+ .flags = __cpu_to_le32(0),
+ .reserved = __cpu_to_le32(0),
+ },
+ /* Unused TBD */
+ {
+ .pipenum = __cpu_to_le32(11),
+ .pipedir = __cpu_to_le32(PIPEDIR_NONE),
+ .nentries = __cpu_to_le32(0),
+ .nbytes_max = __cpu_to_le32(0),
+ .flags = __cpu_to_le32(0),
+ .reserved = __cpu_to_le32(0),
+ },
+};
+
+static const struct service_to_pipe ath12k_target_service_to_ce_map_wlan_ipq5332[] = {
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO),
+ __cpu_to_le32(PIPEDIR_OUT),
+ __cpu_to_le32(3),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(2),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK),
+ __cpu_to_le32(PIPEDIR_OUT),
+ __cpu_to_le32(3),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(2),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE),
+ __cpu_to_le32(PIPEDIR_OUT),
+ __cpu_to_le32(3),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(2),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI),
+ __cpu_to_le32(PIPEDIR_OUT),
+ __cpu_to_le32(3),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(2),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL),
+ __cpu_to_le32(PIPEDIR_OUT),
+ __cpu_to_le32(3),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(2),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL),
+ __cpu_to_le32(PIPEDIR_OUT),
+ __cpu_to_le32(0),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(1),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS),
+ __cpu_to_le32(PIPEDIR_OUT),
+ __cpu_to_le32(0),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(1),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG),
+ __cpu_to_le32(PIPEDIR_OUT),
+ __cpu_to_le32(4),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(1),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_PKT_LOG),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(5),
+ },
+ {
+ __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL_DIAG),
+ __cpu_to_le32(PIPEDIR_IN),
+ __cpu_to_le32(9),
+ },
+ /* (Additions here) */
+
+ { /* must be last */
+ __cpu_to_le32(0),
+ __cpu_to_le32(0),
+ __cpu_to_le32(0),
+ },
+};
+
static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = {
.tx = {
ATH12K_TX_RING_MASK_0,
@@ -1250,12 +1461,12 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.regs = &ipq5332_regs,
.ring_mask = &ath12k_hw_ring_mask_ipq5332,
- .host_ce_config = NULL,
- .ce_count = 0,
- .target_ce_config = NULL,
- .target_ce_count = 0,
- .svc_to_ce_map = NULL,
- .svc_to_ce_map_len = 0,
+ .host_ce_config = ath12k_host_ce_config_ipq5332,
+ .ce_count = 12,
+ .target_ce_config = ath12k_target_ce_config_wlan_ipq5332,
+ .target_ce_count = 12,
+ .svc_to_ce_map = ath12k_target_service_to_ce_map_wlan_ipq5332,
+ .svc_to_ce_map_len = 18,
.hal_params = NULL,
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 08/18] wifi: ath12k: add ath12k_hw_hal_params for IPQ5332
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (6 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 07/18] wifi: ath12k: add CE configurations " Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 09/18] wifi: ath12k: avoid m3 firmware download in AHB device IPQ5332 Raj Kumar Bhagat
` (9 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Balamurugan S, Raj Kumar Bhagat
From: Balamurugan S <quic_bselvara@quicinc.com>
Add ath12k_hw_hal_params for new ath12k AHB based WiFi device IPQ5332.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/hw.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 7ef41524c0ce..fcf2b462263b 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -1214,6 +1214,15 @@ static const struct ath12k_hw_hal_params ath12k_hw_hal_params_wcn7850 = {
HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN,
};
+static const struct ath12k_hw_hal_params ath12k_hw_hal_params_ipq5332 = {
+ .rx_buf_rbm = HAL_RX_BUF_RBM_SW3_BM,
+ .wbm2sw_cc_enable = HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW0_EN |
+ HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW1_EN |
+ HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW2_EN |
+ HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW3_EN |
+ HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN,
+};
+
static const struct ath12k_hw_params ath12k_hw_params[] = {
{
.name = "qcn9274 hw1.0",
@@ -1468,7 +1477,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.svc_to_ce_map = ath12k_target_service_to_ce_map_wlan_ipq5332,
.svc_to_ce_map_len = 18,
- .hal_params = NULL,
+ .hal_params = &ath12k_hw_hal_params_ipq5332,
.rxdma1_enable = false,
.num_rxdma_per_pdev = 1,
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 09/18] wifi: ath12k: avoid m3 firmware download in AHB device IPQ5332
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (7 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 08/18] wifi: ath12k: add ath12k_hw_hal_params " Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 10/18] wifi: ath12k: add new CMEM read-write ath12k_hif_ops Raj Kumar Bhagat
` (8 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Balamurugan S, P Praneesh, Raj Kumar Bhagat
From: Balamurugan S <quic_bselvara@quicinc.com>
Current ath12k devices, QCN9274 and WCN7850, supports m3.bin firmware
download through ath12k driver. The new ath12k AHB based device
IPQ5332 supports m3 firmware download through remoteproc driver.
Hence, add new parameter (m3_fw_support) in ath12k_hw_params to avoid
m3 firmware download in IPQ5332.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/hw.c | 8 ++++++++
drivers/net/wireless/ath/ath12k/hw.h | 2 ++
drivers/net/wireless/ath/ath12k/qmi.c | 28 ++++++++++++++++-----------
3 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index fcf2b462263b..58ffdef3efcb 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -1298,6 +1298,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.iova_mask = 0,
.supports_aspm = false,
+
+ .m3_fw_support = true,
},
{
.name = "wcn7850 hw2.0",
@@ -1377,6 +1379,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
.supports_aspm = true,
+
+ .m3_fw_support = true,
},
{
.name = "qcn9274 hw2.0",
@@ -1452,6 +1456,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.iova_mask = 0,
.supports_aspm = false,
+
+ .m3_fw_support = true,
},
{
.name = "ipq5332 hw1.0",
@@ -1523,6 +1529,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.supports_dynamic_smps_6ghz = false,
.iova_mask = 0,
.supports_aspm = false,
+
+ .m3_fw_support = false,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index 36bec99e9e4d..22bd0a91b3e9 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -220,6 +220,8 @@ struct ath12k_hw_params {
bool supports_dynamic_smps_6ghz;
u32 iova_mask;
+
+ bool m3_fw_support;
};
struct ath12k_hw_ops {
diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index b93ce9f87f61..668232d83c10 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -2080,10 +2080,12 @@ static int ath12k_qmi_host_cap_send(struct ath12k_base *ab)
req.bdf_support_valid = 1;
req.bdf_support = 1;
- req.m3_support_valid = 1;
- req.m3_support = 1;
- req.m3_cache_support_valid = 1;
- req.m3_cache_support = 1;
+ if (ab->hw_params->m3_fw_support) {
+ req.m3_support_valid = 1;
+ req.m3_support = 1;
+ req.m3_cache_support_valid = 1;
+ req.m3_cache_support = 1;
+ }
req.cal_done_valid = 1;
req.cal_done = ab->qmi.cal_done;
@@ -2721,6 +2723,9 @@ static void ath12k_qmi_m3_free(struct ath12k_base *ab)
{
struct m3_mem_region *m3_mem = &ab->qmi.m3_mem;
+ if (!ab->hw_params->m3_fw_support)
+ return;
+
if (!m3_mem->vaddr)
return;
@@ -2799,15 +2804,16 @@ static int ath12k_qmi_wlanfw_m3_info_send(struct ath12k_base *ab)
struct qmi_txn txn;
int ret = 0;
- ret = ath12k_qmi_m3_load(ab);
- if (ret) {
- ath12k_err(ab, "failed to load m3 firmware: %d", ret);
- return ret;
+ if (ab->hw_params->m3_fw_support) {
+ ret = ath12k_qmi_m3_load(ab);
+ if (ret) {
+ ath12k_err(ab, "failed to load m3 firmware: %d", ret);
+ return ret;
+ }
+ req.addr = m3_mem->paddr;
+ req.size = m3_mem->size;
}
- req.addr = m3_mem->paddr;
- req.size = m3_mem->size;
-
ret = qmi_txn_init(&ab->qmi.handle, &txn,
qmi_wlanfw_m3_info_resp_msg_v01_ei, &resp);
if (ret < 0)
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 10/18] wifi: ath12k: add new CMEM read-write ath12k_hif_ops
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (8 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 09/18] wifi: ath12k: avoid m3 firmware download in AHB device IPQ5332 Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 11/18] wifi: ath12k: remap CMEM register space for IPQ5332 Raj Kumar Bhagat
` (7 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Balamurugan S, P Praneesh, Raj Kumar Bhagat
From: Balamurugan S <quic_bselvara@quicinc.com>
In IPQ5332 AHB device, CMEM region is outside of WCSS register block.
Hence, add new ath12k_hif_ops (cmem_read32 and cmem_write32) for
accessing CMEM register.
In PCI devices (QCN9274 and WCN7850), these cmem_read32/cmem_write32
are same as read32/write32 ath12k_hif_ops. Hence, use the same
functions for these new ath12k_hif_ops cmem_read32/cmem_write32.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/dp.c | 10 ++++++----
drivers/net/wireless/ath/ath12k/hif.h | 13 +++++++++++++
drivers/net/wireless/ath/ath12k/pci.c | 2 ++
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c
index 61aa78d8bd8c..86cb3aa33e69 100644
--- a/drivers/net/wireless/ath/ath12k/dp.c
+++ b/drivers/net/wireless/ath/ath12k/dp.c
@@ -1468,7 +1468,7 @@ static int ath12k_dp_cmem_init(struct ath12k_base *ab,
struct ath12k_dp *dp,
enum ath12k_dp_desc_type type)
{
- u32 cmem_base;
+ u32 cmem_base, data;
int i, start, end;
cmem_base = ab->qmi.dev_mem[ATH12K_QMI_DEVMEM_CMEM_INDEX].start;
@@ -1489,9 +1489,11 @@ static int ath12k_dp_cmem_init(struct ath12k_base *ab,
}
/* Write to PPT in CMEM */
- for (i = start; i < end; i++)
- ath12k_hif_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i),
- dp->spt_info[i].paddr >> ATH12K_SPT_4K_ALIGN_OFFSET);
+ for (i = start; i < end; i++) {
+ data = dp->spt_info[i].paddr >> ATH12K_SPT_4K_ALIGN_OFFSET;
+ ath12k_hif_cmem_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i),
+ data);
+ }
return 0;
}
diff --git a/drivers/net/wireless/ath/ath12k/hif.h b/drivers/net/wireless/ath/ath12k/hif.h
index 0e53ec269fa4..44e42065b551 100644
--- a/drivers/net/wireless/ath/ath12k/hif.h
+++ b/drivers/net/wireless/ath/ath12k/hif.h
@@ -12,6 +12,8 @@
struct ath12k_hif_ops {
u32 (*read32)(struct ath12k_base *ab, u32 address);
void (*write32)(struct ath12k_base *ab, u32 address, u32 data);
+ u32 (*cmem_read32)(struct ath12k_base *sc, u32 address);
+ void (*cmem_write32)(struct ath12k_base *sc, u32 address, u32 data);
void (*irq_enable)(struct ath12k_base *ab);
void (*irq_disable)(struct ath12k_base *ab);
int (*start)(struct ath12k_base *ab);
@@ -132,6 +134,17 @@ static inline void ath12k_hif_write32(struct ath12k_base *ab, u32 address,
ab->hif.ops->write32(ab, address, data);
}
+static inline u32 ath12k_hif_cmem_read32(struct ath12k_base *ab, u32 address)
+{
+ return ab->hif.ops->cmem_read32(ab, address);
+}
+
+static inline void ath12k_hif_cmem_write32(struct ath12k_base *ab, u32 address,
+ u32 data)
+{
+ ab->hif.ops->cmem_write32(ab, address, data);
+}
+
static inline int ath12k_hif_power_up(struct ath12k_base *ab)
{
if (!ab->hif.ops->power_up)
diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c
index bd269aa1740b..0c393bc30f92 100644
--- a/drivers/net/wireless/ath/ath12k/pci.c
+++ b/drivers/net/wireless/ath/ath12k/pci.c
@@ -1316,6 +1316,8 @@ static const struct ath12k_hif_ops ath12k_pci_hif_ops = {
.stop = ath12k_pci_stop,
.read32 = ath12k_pci_read32,
.write32 = ath12k_pci_write32,
+ .cmem_read32 = ath12k_pci_read32,
+ .cmem_write32 = ath12k_pci_write32,
.power_down = ath12k_pci_power_down,
.power_up = ath12k_pci_power_up,
.suspend = ath12k_pci_hif_suspend,
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 11/18] wifi: ath12k: remap CMEM register space for IPQ5332
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (9 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 10/18] wifi: ath12k: add new CMEM read-write ath12k_hif_ops Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 12/18] wifi: ath12k: fix incorrect CE addresses Raj Kumar Bhagat
` (6 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Balamurugan S, P Praneesh, Raj Kumar Bhagat
From: Balamurugan S <quic_bselvara@quicinc.com>
In IPQ5332 CMEM region is outside of WCSS register block. Hence, add
hardware param cmem_remap for IPQ5332. This parameter would be used
by Ath12k AHB driver to remap the CMEM registers to a new space for
accessing them.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/core.h | 7 +++++++
drivers/net/wireless/ath/ath12k/hal.h | 4 ++++
drivers/net/wireless/ath/ath12k/hw.c | 9 +++++++++
drivers/net/wireless/ath/ath12k/hw.h | 1 +
4 files changed, 21 insertions(+)
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index 6fa13165149d..0493c0c522e3 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -719,6 +719,11 @@ struct ath12k_pdev {
struct mlo_timestamp timestamp;
};
+struct cmem_remap {
+ u32 base;
+ u32 size;
+};
+
struct ath12k_fw_pdev {
u32 pdev_id;
u32 phy_id;
@@ -784,6 +789,8 @@ struct ath12k_base {
void __iomem *mem;
unsigned long mem_len;
+ void __iomem *mem_cmem;
+
struct {
enum ath12k_bus bus;
const struct ath12k_hif_ops *ops;
diff --git a/drivers/net/wireless/ath/ath12k/hal.h b/drivers/net/wireless/ath/ath12k/hal.h
index 69579f118b81..2184da129966 100644
--- a/drivers/net/wireless/ath/ath12k/hal.h
+++ b/drivers/net/wireless/ath/ath12k/hal.h
@@ -372,6 +372,10 @@ struct ath12k_base;
* ath12k_hal_rx_desc_get_err().
*/
+#define HAL_IPQ5332_CMEM_REG_BASE 0xC100000
+#define HAL_IPQ5332_CMEM_SIZE 0x40000
+#define HAL_IPQ5332_CMEM_BASE 0x100000
+
enum hal_srng_ring_id {
HAL_SRNG_RING_ID_REO2SW0 = 0,
HAL_SRNG_RING_ID_REO2SW1,
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 58ffdef3efcb..6be0d15d87ae 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -1223,6 +1223,11 @@ static const struct ath12k_hw_hal_params ath12k_hw_hal_params_ipq5332 = {
HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN,
};
+static const struct cmem_remap ath12k_cmem_remap_ipq5332 = {
+ .base = HAL_IPQ5332_CMEM_REG_BASE,
+ .size = HAL_IPQ5332_CMEM_SIZE,
+};
+
static const struct ath12k_hw_params ath12k_hw_params[] = {
{
.name = "qcn9274 hw1.0",
@@ -1300,6 +1305,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.supports_aspm = false,
.m3_fw_support = true,
+ .cmem_remap = NULL,
},
{
.name = "wcn7850 hw2.0",
@@ -1381,6 +1387,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.supports_aspm = true,
.m3_fw_support = true,
+ .cmem_remap = NULL,
},
{
.name = "qcn9274 hw2.0",
@@ -1458,6 +1465,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.supports_aspm = false,
.m3_fw_support = true,
+ .cmem_remap = NULL,
},
{
.name = "ipq5332 hw1.0",
@@ -1531,6 +1539,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.supports_aspm = false,
.m3_fw_support = false,
+ .cmem_remap = &ath12k_cmem_remap_ipq5332,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index 22bd0a91b3e9..e30bec688b74 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -222,6 +222,7 @@ struct ath12k_hw_params {
u32 iova_mask;
bool m3_fw_support;
+ const struct cmem_remap *cmem_remap;
};
struct ath12k_hw_ops {
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 12/18] wifi: ath12k: fix incorrect CE addresses
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (10 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 11/18] wifi: ath12k: remap CMEM register space for IPQ5332 Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 13/18] wifi: ath12k: remap CE register space for IPQ5332 Raj Kumar Bhagat
` (5 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Balamurugan S, Raj Kumar Bhagat
From: Balamurugan S <quic_bselvara@quicinc.com>
In the current ath12k implementation, the CE addresses
CE_HOST_IE_ADDRESS and CE_HOST_IE_2_ADDRESS are incorrect. These
values were inherited from ath11k, but ath12k does not currently use
them.
However, the Ath12k AHB support relies on these addresses. Therefore,
corrects the CE addresses for ath12k.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/ce.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/ce.h b/drivers/net/wireless/ath/ath12k/ce.h
index 1d9542e1c21a..46fd1f49ec4a 100644
--- a/drivers/net/wireless/ath/ath12k/ce.h
+++ b/drivers/net/wireless/ath/ath12k/ce.h
@@ -39,8 +39,8 @@
#define PIPEDIR_INOUT_H2H 4 /* bidirectional, host to host */
/* CE address/mask */
-#define CE_HOST_IE_ADDRESS 0x00A1803C
-#define CE_HOST_IE_2_ADDRESS 0x00A18040
+#define CE_HOST_IE_ADDRESS 0x75804C
+#define CE_HOST_IE_2_ADDRESS 0x758050
#define CE_HOST_IE_3_ADDRESS CE_HOST_IE_ADDRESS
#define CE_HOST_IE_3_SHIFT 0xC
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 13/18] wifi: ath12k: remap CE register space for IPQ5332
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (11 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 12/18] wifi: ath12k: fix incorrect CE addresses Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 14/18] wifi: ath12k: add support for fixed QMI firmware memory Raj Kumar Bhagat
` (4 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Balamurugan S, P Praneesh, Raj Kumar Bhagat
From: Balamurugan S <quic_bselvara@quicinc.com>
For IPQ5332 CE register space is moved out of WCSS region and the
space is not contiguous. Hence, add hardware params (ce_ie_addr &
ce_remap) for IPQ5332. These parameters would be used by Ath12k
AHB driver to remap the CE registers to a new space for accessing
them.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/ce.h | 11 +++++++++++
drivers/net/wireless/ath/ath12k/core.h | 4 ++++
drivers/net/wireless/ath/ath12k/hal.h | 4 ++++
drivers/net/wireless/ath/ath12k/hw.c | 19 +++++++++++++++++++
drivers/net/wireless/ath/ath12k/hw.h | 2 ++
5 files changed, 40 insertions(+)
diff --git a/drivers/net/wireless/ath/ath12k/ce.h b/drivers/net/wireless/ath/ath12k/ce.h
index 46fd1f49ec4a..9dd71056e1c5 100644
--- a/drivers/net/wireless/ath/ath12k/ce.h
+++ b/drivers/net/wireless/ath/ath12k/ce.h
@@ -76,6 +76,17 @@ struct ce_pipe_config {
__le32 reserved;
};
+struct ce_ie_addr {
+ u32 ie1_reg_addr;
+ u32 ie2_reg_addr;
+ u32 ie3_reg_addr;
+};
+
+struct ce_remap {
+ u32 base;
+ u32 size;
+};
+
struct ce_attr {
/* CE_ATTR_* values */
unsigned int flags;
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index 0493c0c522e3..46c33a6a553f 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -791,6 +791,10 @@ struct ath12k_base {
void __iomem *mem_cmem;
+ void __iomem *mem_ce;
+ u32 ce_remap_base_addr;
+ bool ce_remap;
+
struct {
enum ath12k_bus bus;
const struct ath12k_hif_ops *ops;
diff --git a/drivers/net/wireless/ath/ath12k/hal.h b/drivers/net/wireless/ath/ath12k/hal.h
index 2184da129966..90756af4c4c2 100644
--- a/drivers/net/wireless/ath/ath12k/hal.h
+++ b/drivers/net/wireless/ath/ath12k/hal.h
@@ -11,6 +11,7 @@
#include "rx_desc.h"
struct ath12k_base;
+#define HAL_CE_REMAP_REG_BASE (ab->ce_remap_base_addr)
#define HAL_LINK_DESC_SIZE (32 << 2)
#define HAL_LINK_DESC_ALIGN 128
@@ -376,6 +377,9 @@ struct ath12k_base;
#define HAL_IPQ5332_CMEM_SIZE 0x40000
#define HAL_IPQ5332_CMEM_BASE 0x100000
+#define HAL_IPQ5332_CE_WFSS_REG_BASE 0x740000
+#define HAL_IPQ5332_CE_SIZE 0x200000
+
enum hal_srng_ring_id {
HAL_SRNG_RING_ID_REO2SW0 = 0,
HAL_SRNG_RING_ID_REO2SW1,
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 6be0d15d87ae..83dc98891166 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -1228,6 +1228,17 @@ static const struct cmem_remap ath12k_cmem_remap_ipq5332 = {
.size = HAL_IPQ5332_CMEM_SIZE,
};
+static const struct ce_ie_addr ath12k_ce_ie_addr_ipq5332 = {
+ .ie1_reg_addr = CE_HOST_IE_ADDRESS,
+ .ie2_reg_addr = CE_HOST_IE_2_ADDRESS,
+ .ie3_reg_addr = CE_HOST_IE_3_ADDRESS,
+};
+
+static const struct ce_remap ath12k_ce_remap_ipq5332 = {
+ .base = HAL_IPQ5332_CE_WFSS_REG_BASE,
+ .size = HAL_IPQ5332_CE_SIZE,
+};
+
static const struct ath12k_hw_params ath12k_hw_params[] = {
{
.name = "qcn9274 hw1.0",
@@ -1306,6 +1317,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.m3_fw_support = true,
.cmem_remap = NULL,
+ .ce_ie_addr = NULL,
+ .ce_remap = NULL,
},
{
.name = "wcn7850 hw2.0",
@@ -1388,6 +1401,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.m3_fw_support = true,
.cmem_remap = NULL,
+ .ce_ie_addr = NULL,
+ .ce_remap = NULL,
},
{
.name = "qcn9274 hw2.0",
@@ -1466,6 +1481,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.m3_fw_support = true,
.cmem_remap = NULL,
+ .ce_ie_addr = NULL,
+ .ce_remap = NULL,
},
{
.name = "ipq5332 hw1.0",
@@ -1540,6 +1557,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.m3_fw_support = false,
.cmem_remap = &ath12k_cmem_remap_ipq5332,
+ .ce_ie_addr = &ath12k_ce_ie_addr_ipq5332,
+ .ce_remap = &ath12k_ce_remap_ipq5332,
},
};
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index e30bec688b74..580c7be109e0 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -223,6 +223,8 @@ struct ath12k_hw_params {
bool m3_fw_support;
const struct cmem_remap *cmem_remap;
+ const struct ce_ie_addr *ce_ie_addr;
+ const struct ce_remap *ce_remap;
};
struct ath12k_hw_ops {
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 14/18] wifi: ath12k: add support for fixed QMI firmware memory
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (12 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 13/18] wifi: ath12k: remap CE register space for IPQ5332 Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 15/18] wifi: ath12k: add support to read board_id from device-tree Raj Kumar Bhagat
` (3 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Raj Kumar Bhagat
IPQ5332 firmware supports only fixed QMI firmware memory.
Hence, add support to read reserved fixed memory region from
device-tree and provide the reserved memory segments for
firmware to use during QMI firmware memory request.
Note that the ability to set the fixed memory will be introduced in
a subsequent patch. Currently, the flag remains unset by default,
ensuring that existing chipsets are unaffected.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/core.h | 1 +
drivers/net/wireless/ath/ath12k/qmi.c | 147 ++++++++++++++++++++++++-
2 files changed, 142 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index 46c33a6a553f..e766e5616ee5 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -212,6 +212,7 @@ enum ath12k_dev_flags {
ATH12K_FLAG_HTC_SUSPEND_COMPLETE,
ATH12K_FLAG_CE_IRQ_ENABLED,
ATH12K_FLAG_EXT_IRQ_ENABLED,
+ ATH12K_FLAG_FIXED_MEM_REGION,
};
struct ath12k_tx_conf {
diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index 668232d83c10..7a039659dbec 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -11,6 +11,8 @@
#include "debug.h"
#include <linux/of.h>
#include <linux/firmware.h>
+#include <linux/of_address.h>
+#include <linux/ioport.h>
#define SLEEP_CLOCK_SELECT_INTERNAL_BIT 0x02
#define HOST_CSTATE_BIT 0x04
@@ -2294,7 +2296,8 @@ static int ath12k_qmi_respond_fw_mem_request(struct ath12k_base *ab)
* failure to firmware and firmware then request multiple blocks of
* small chunk size memory.
*/
- if (ab->qmi.target_mem_delayed) {
+ if (!test_bit(ATH12K_FLAG_FIXED_MEM_REGION, &ab->dev_flags) &&
+ ab->qmi.target_mem_delayed) {
delayed = true;
ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi delays mem_request %d\n",
ab->qmi.mem_seg_count);
@@ -2357,6 +2360,11 @@ static void ath12k_qmi_free_target_mem_chunk(struct ath12k_base *ab)
int i;
for (i = 0; i < ab->qmi.mem_seg_count; i++) {
+ if (test_bit(ATH12K_FLAG_FIXED_MEM_REGION, &ab->dev_flags) &&
+ ab->qmi.target_mem[i].v.ioaddr) {
+ iounmap(ab->qmi.target_mem[i].v.ioaddr);
+ ab->qmi.target_mem[i].v.ioaddr = NULL;
+ }
if (!ab->qmi.target_mem[i].v.addr)
continue;
@@ -2435,6 +2443,124 @@ static int ath12k_qmi_alloc_target_mem_chunk(struct ath12k_base *ab)
return 0;
}
+static int ath12k_qmi_assign_target_mem_chunk(struct ath12k_base *ab)
+{
+ struct device *dev = ab->dev;
+ struct device_node *mem_node, *dev_node;
+ struct resource res, m3_res;
+ int i, idx, ret;
+ unsigned int bdf_location;
+
+ for (i = 0, idx = 0; i < ab->qmi.mem_seg_count; i++) {
+ switch (ab->qmi.target_mem[i].type) {
+ case HOST_DDR_REGION_TYPE:
+ mem_node = of_parse_phandle(dev->of_node, "memory-region", 0);
+ if (!mem_node) {
+ ath12k_dbg(ab, ATH12K_DBG_QMI,
+ "memory-region not defined in device-tree\n");
+ ret = -ENODEV;
+ goto out;
+ }
+
+ ret = of_address_to_resource(mem_node, 0, &res);
+ of_node_put(mem_node);
+ if (ret) {
+ ath12k_dbg(ab, ATH12K_DBG_QMI,
+ "fail to get reg from memory-region\n");
+ goto out;
+ }
+
+ if (res.end - res.start + 1 < ab->qmi.target_mem[i].size) {
+ ath12k_dbg(ab, ATH12K_DBG_QMI,
+ "failed to assign mem type %d req size %d avail size %lld\n",
+ ab->qmi.target_mem[i].type,
+ ab->qmi.target_mem[i].size,
+ (res.end - res.start + 1));
+ ret = -EINVAL;
+ goto out;
+ }
+
+ ab->qmi.target_mem[idx].paddr = res.start;
+ ab->qmi.target_mem[idx].v.ioaddr =
+ ioremap(ab->qmi.target_mem[idx].paddr,
+ ab->qmi.target_mem[i].size);
+ if (!ab->qmi.target_mem[idx].v.ioaddr) {
+ ret = -EIO;
+ goto out;
+ }
+ ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size;
+ ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type;
+ idx++;
+ break;
+ case BDF_MEM_REGION_TYPE:
+ if (of_property_read_u32(dev->of_node,
+ "qcom,bdf-addr", &bdf_location)) {
+ ath12k_err(ab, "qcom,bdf-addr not defined in device-tree\n");
+ ret = -EINVAL;
+ goto out;
+ }
+ ab->qmi.target_mem[idx].paddr = bdf_location;
+ ab->qmi.target_mem[idx].v.ioaddr = NULL;
+ ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size;
+ ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type;
+ idx++;
+ break;
+ case CALDB_MEM_REGION_TYPE:
+ /* Cold boot calibration is not enabled in Ath12k. Hence,
+ * assign paddr = 0.
+ * Once cold boot calibration is enabled add support to
+ * assign reserved memory from DT.
+ */
+ ab->qmi.target_mem[idx].paddr = 0;
+ ab->qmi.target_mem[idx].v.ioaddr = NULL;
+ ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size;
+ ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type;
+ idx++;
+ break;
+ case M3_DUMP_REGION_TYPE:
+ dev_node = of_find_node_by_name(NULL, "m3_dump");
+ if (!dev_node || of_address_to_resource(dev_node, 0, &m3_res)) {
+ ath12k_err(ab, "m3_dump not defined in device-tree\n");
+ ret = -EINVAL;
+ goto out;
+ }
+
+ if (m3_res.end - m3_res.start + 1 < ab->qmi.target_mem[i].size) {
+ ath12k_dbg(ab, ATH12K_DBG_QMI,
+ "failed to assign mem type %d req size %d avail size %lld\n",
+ ab->qmi.target_mem[i].type,
+ ab->qmi.target_mem[i].size,
+ (m3_res.end - m3_res.start + 1));
+ ret = -EINVAL;
+ goto out;
+ }
+
+ ab->qmi.target_mem[idx].paddr = m3_res.start;
+ ab->qmi.target_mem[idx].v.ioaddr =
+ ioremap(ab->qmi.target_mem[idx].paddr,
+ ab->qmi.target_mem[i].size);
+ if (!ab->qmi.target_mem[idx].v.ioaddr) {
+ ret = -EIO;
+ goto out;
+ }
+ ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size;
+ ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type;
+ idx++;
+ break;
+ default:
+ ath12k_warn(ab, "qmi ignore invalid mem req type %d\n",
+ ab->qmi.target_mem[i].type);
+ break;
+ }
+ }
+ ab->qmi.mem_seg_count = idx;
+
+ return 0;
+out:
+ ath12k_qmi_free_target_mem_chunk(ab);
+ return ret;
+}
+
static int ath12k_qmi_request_target_cap(struct ath12k_base *ab)
{
struct qmi_wlanfw_cap_req_msg_v01 req = {};
@@ -3185,11 +3311,20 @@ static void ath12k_qmi_msg_mem_request_cb(struct qmi_handle *qmi_hdl,
msg->mem_seg[i].type, msg->mem_seg[i].size);
}
- ret = ath12k_qmi_alloc_target_mem_chunk(ab);
- if (ret) {
- ath12k_warn(ab, "qmi failed to alloc target memory: %d\n",
- ret);
- return;
+ if (test_bit(ATH12K_FLAG_FIXED_MEM_REGION, &ab->dev_flags)) {
+ ret = ath12k_qmi_assign_target_mem_chunk(ab);
+ if (ret) {
+ ath12k_warn(ab, "failed to assign qmi target memory: %d\n",
+ ret);
+ return;
+ }
+ } else {
+ ret = ath12k_qmi_alloc_target_mem_chunk(ab);
+ if (ret) {
+ ath12k_warn(ab, "qmi failed to alloc target memory: %d\n",
+ ret);
+ return;
+ }
}
ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_REQUEST_MEM, NULL);
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 15/18] wifi: ath12k: add support to read board_id from device-tree
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (13 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 14/18] wifi: ath12k: add support for fixed QMI firmware memory Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 16/18] wifi: ath12k: convert tasklet to BH workqueue for CE interrupts Raj Kumar Bhagat
` (2 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Raj Kumar Bhagat
Currently, QMI target board_id is read from firmware during QMI
target capability request. If the board_id is not fused in WiFi
device, firmware responds with the default board id (0xFF). Due to
this, "board-2.bin" board data download fails if "board-2.bin" does
not have board data for the default board id (0xFF).
Hence, add support to read board_id from device-tree. If the board_id
is not fused in WiFi device, use device-tree to read board_id.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/qmi.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index 7a039659dbec..428d081f722f 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -2566,7 +2566,8 @@ static int ath12k_qmi_request_target_cap(struct ath12k_base *ab)
struct qmi_wlanfw_cap_req_msg_v01 req = {};
struct qmi_wlanfw_cap_resp_msg_v01 resp = {};
struct qmi_txn txn;
- unsigned int board_id = ATH12K_BOARD_ID_DEFAULT;
+ struct device *dev = ab->dev;
+ u32 board_id = ATH12K_BOARD_ID_DEFAULT;
int ret = 0;
int r;
int i;
@@ -2606,9 +2607,13 @@ static int ath12k_qmi_request_target_cap(struct ath12k_base *ab)
}
if (resp.board_info_valid)
- ab->qmi.target.board_id = resp.board_info.board_id;
- else
- ab->qmi.target.board_id = board_id;
+ board_id = resp.board_info.board_id;
+ if (board_id == ATH12K_BOARD_ID_DEFAULT || ~board_id == 0)
+ of_property_read_u32(dev->of_node, "qcom,board_id", &board_id);
+ if (board_id == ATH12K_BOARD_ID_DEFAULT || ~board_id == 0)
+ ath12k_warn(ab, "unable to read board_id, using default board_id: 0x%x\n",
+ board_id);
+ ab->qmi.target.board_id = board_id;
if (resp.soc_info_valid)
ab->qmi.target.soc_id = resp.soc_info.soc_id;
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 16/18] wifi: ath12k: convert tasklet to BH workqueue for CE interrupts
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (14 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 15/18] wifi: ath12k: add support to read board_id from device-tree Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 17/18] wifi: ath12k: add AHB driver support for IPQ5332 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 18/18] wifi: ath12k: enable ath12k AHB support Raj Kumar Bhagat
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Raj Kumar Bhagat
Currently in Ath12k, tasklet is used to handle the BH context of CE
interrupts. However the tasklet is marked deprecated and has some
design flaws. To replace tasklets, BH workqueue support has been
added. BH workqueue behaves similarly to regular workqueues except
that the queued work items are executed in the BH context.
Hence, convert the tasklet to BH workqueue for handling CE interrupts
in the BH context.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/ce.h | 2 +-
drivers/net/wireless/ath/ath12k/pci.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/ce.h b/drivers/net/wireless/ath/ath12k/ce.h
index 9dd71056e1c5..75c9f8f1f7c6 100644
--- a/drivers/net/wireless/ath/ath12k/ce.h
+++ b/drivers/net/wireless/ath/ath12k/ce.h
@@ -159,7 +159,7 @@ struct ath12k_ce_pipe {
void (*send_cb)(struct ath12k_ce_pipe *pipe);
void (*recv_cb)(struct ath12k_base *ab, struct sk_buff *skb);
- struct tasklet_struct intr_tq;
+ struct work_struct intr_wq;
struct ath12k_ce_ring *src_ring;
struct ath12k_ce_ring *dest_ring;
struct ath12k_ce_ring *status_ring;
diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c
index 0c393bc30f92..9a50d813e9b4 100644
--- a/drivers/net/wireless/ath/ath12k/pci.c
+++ b/drivers/net/wireless/ath/ath12k/pci.c
@@ -425,9 +425,9 @@ static void ath12k_pci_sync_ce_irqs(struct ath12k_base *ab)
}
}
-static void ath12k_pci_ce_tasklet(struct tasklet_struct *t)
+static void ath12k_pci_ce_workqueue(struct work_struct *work)
{
- struct ath12k_ce_pipe *ce_pipe = from_tasklet(ce_pipe, t, intr_tq);
+ struct ath12k_ce_pipe *ce_pipe = from_work(ce_pipe, work, intr_wq);
int irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + ce_pipe->pipe_num;
ath12k_ce_per_engine_service(ce_pipe->ab, ce_pipe->pipe_num);
@@ -449,7 +449,7 @@ static irqreturn_t ath12k_pci_ce_interrupt_handler(int irq, void *arg)
disable_irq_nosync(ab->irq_num[irq_idx]);
- tasklet_schedule(&ce_pipe->intr_tq);
+ queue_work(system_bh_wq, &ce_pipe->intr_wq);
return IRQ_HANDLED;
}
@@ -675,7 +675,7 @@ static int ath12k_pci_config_irq(struct ath12k_base *ab)
irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + i;
- tasklet_setup(&ce_pipe->intr_tq, ath12k_pci_ce_tasklet);
+ INIT_WORK(&ce_pipe->intr_wq, ath12k_pci_ce_workqueue);
ret = request_irq(irq, ath12k_pci_ce_interrupt_handler,
ab_pci->irq_flags, irq_name[irq_idx],
@@ -962,7 +962,7 @@ static void ath12k_pci_aspm_restore(struct ath12k_pci *ab_pci)
PCI_EXP_LNKCTL_ASPMC);
}
-static void ath12k_pci_kill_tasklets(struct ath12k_base *ab)
+static void ath12k_pci_cancel_workqueue(struct ath12k_base *ab)
{
int i;
@@ -972,7 +972,7 @@ static void ath12k_pci_kill_tasklets(struct ath12k_base *ab)
if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
continue;
- tasklet_kill(&ce_pipe->intr_tq);
+ cancel_work_sync(&ce_pipe->intr_wq);
}
}
@@ -980,7 +980,7 @@ static void ath12k_pci_ce_irq_disable_sync(struct ath12k_base *ab)
{
ath12k_pci_ce_irqs_disable(ab);
ath12k_pci_sync_ce_irqs(ab);
- ath12k_pci_kill_tasklets(ab);
+ ath12k_pci_cancel_workqueue(ab);
}
int ath12k_pci_map_service_to_pipe(struct ath12k_base *ab, u16 service_id,
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 17/18] wifi: ath12k: add AHB driver support for IPQ5332
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (15 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 16/18] wifi: ath12k: convert tasklet to BH workqueue for CE interrupts Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
2024-08-16 5:47 ` Krzysztof Kozlowski
2024-08-14 9:43 ` [RFC PATCH 18/18] wifi: ath12k: enable ath12k AHB support Raj Kumar Bhagat
17 siblings, 1 reply; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Balamurugan S, P Praneesh, Raj Kumar Bhagat
From: Balamurugan S <quic_bselvara@quicinc.com>
Add Initial Ath12k AHB driver support for IPQ5332. IPQ5332 is AHB
based IEEE802.11be 2 GHz 2x2 WiFi device.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Co-developed-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/ahb.c | 1028 ++++++++++++++++++++++++
drivers/net/wireless/ath/ath12k/ahb.h | 38 +
drivers/net/wireless/ath/ath12k/core.h | 4 +
drivers/net/wireless/ath/ath12k/hw.h | 1 +
4 files changed, 1071 insertions(+)
create mode 100644 drivers/net/wireless/ath/ath12k/ahb.c
create mode 100644 drivers/net/wireless/ath/ath12k/ahb.h
diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c
new file mode 100644
index 000000000000..e16516248fcb
--- /dev/null
+++ b/drivers/net/wireless/ath/ath12k/ahb.c
@@ -0,0 +1,1028 @@
+// SPDX-License-Identifier: BSD-3-Clause-Clear
+/*
+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include <linux/dma-mapping.h>
+#include <linux/iommu.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/remoteproc.h>
+#include <linux/soc/qcom/smem.h>
+#include <linux/soc/qcom/smem_state.h>
+#include "ahb.h"
+#include "debug.h"
+#include "hif.h"
+
+static const struct of_device_id ath12k_ahb_of_match[] = {
+ { .compatible = "qcom,ipq5332-wifi",
+ .data = (void *)ATH12K_HW_IPQ5332_HW10,
+ },
+ { }
+};
+
+MODULE_DEVICE_TABLE(of, ath12k_ahb_of_match);
+
+#define ATH12K_IRQ_CE0_OFFSET 4
+
+static const char *irq_name[ATH12K_IRQ_NUM_MAX] = {
+ "misc-pulse1",
+ "misc-latch",
+ "sw-exception",
+ "watchdog",
+ "ce0",
+ "ce1",
+ "ce2",
+ "ce3",
+ "ce4",
+ "ce5",
+ "ce6",
+ "ce7",
+ "ce8",
+ "ce9",
+ "ce10",
+ "ce11",
+ "host2wbm-desc-feed",
+ "host2reo-re-injection",
+ "host2reo-command",
+ "host2rxdma-monitor-ring3",
+ "host2rxdma-monitor-ring2",
+ "host2rxdma-monitor-ring1",
+ "reo2ost-exception",
+ "wbm2host-rx-release",
+ "reo2host-status",
+ "reo2host-destination-ring4",
+ "reo2host-destination-ring3",
+ "reo2host-destination-ring2",
+ "reo2host-destination-ring1",
+ "rxdma2host-monitor-destination-mac3",
+ "rxdma2host-monitor-destination-mac2",
+ "rxdma2host-monitor-destination-mac1",
+ "ppdu-end-interrupts-mac3",
+ "ppdu-end-interrupts-mac2",
+ "ppdu-end-interrupts-mac1",
+ "rxdma2host-monitor-status-ring-mac3",
+ "rxdma2host-monitor-status-ring-mac2",
+ "rxdma2host-monitor-status-ring-mac1",
+ "host2rxdma-host-buf-ring-mac3",
+ "host2rxdma-host-buf-ring-mac2",
+ "host2rxdma-host-buf-ring-mac1",
+ "rxdma2host-destination-ring-mac3",
+ "rxdma2host-destination-ring-mac2",
+ "rxdma2host-destination-ring-mac1",
+ "host2tcl-input-ring4",
+ "host2tcl-input-ring3",
+ "host2tcl-input-ring2",
+ "host2tcl-input-ring1",
+ "wbm2host-tx-completions-ring4",
+ "wbm2host-tx-completions-ring3",
+ "wbm2host-tx-completions-ring2",
+ "wbm2host-tx-completions-ring1",
+ "tcl2host-status-ring",
+};
+
+enum ext_irq_num {
+ host2wbm_desc_feed = 16,
+ host2reo_re_injection,
+ host2reo_command,
+ host2rxdma_monitor_ring3,
+ host2rxdma_monitor_ring2,
+ host2rxdma_monitor_ring1,
+ reo2host_exception,
+ wbm2host_rx_release,
+ reo2host_status,
+ reo2host_destination_ring4,
+ reo2host_destination_ring3,
+ reo2host_destination_ring2,
+ reo2host_destination_ring1,
+ rxdma2host_monitor_destination_mac3,
+ rxdma2host_monitor_destination_mac2,
+ rxdma2host_monitor_destination_mac1,
+ ppdu_end_interrupts_mac3,
+ ppdu_end_interrupts_mac2,
+ ppdu_end_interrupts_mac1,
+ rxdma2host_monitor_status_ring_mac3,
+ rxdma2host_monitor_status_ring_mac2,
+ rxdma2host_monitor_status_ring_mac1,
+ host2rxdma_host_buf_ring_mac3,
+ host2rxdma_host_buf_ring_mac2,
+ host2rxdma_host_buf_ring_mac1,
+ rxdma2host_destination_ring_mac3,
+ rxdma2host_destination_ring_mac2,
+ rxdma2host_destination_ring_mac1,
+ host2tcl_input_ring4,
+ host2tcl_input_ring3,
+ host2tcl_input_ring2,
+ host2tcl_input_ring1,
+ wbm2host_tx_completions_ring4,
+ wbm2host_tx_completions_ring3,
+ wbm2host_tx_completions_ring2,
+ wbm2host_tx_completions_ring1,
+ tcl2host_status_ring,
+};
+
+static u32 ath12k_ahb_cmem_read32(struct ath12k_base *ab, u32 offset)
+{
+ offset = offset - HAL_IPQ5332_CMEM_BASE;
+ return ioread32(ab->mem_cmem + offset);
+}
+
+static void ath12k_ahb_cmem_write32(struct ath12k_base *ab, u32 offset,
+ u32 value)
+{
+ offset = offset - HAL_IPQ5332_CMEM_BASE;
+ iowrite32(value, ab->mem_cmem + offset);
+}
+
+static u32 ath12k_ahb_read32(struct ath12k_base *ab, u32 offset)
+{
+ if (ab->ce_remap && offset < HAL_SEQ_WCSS_UMAC_OFFSET) {
+ offset = offset - HAL_CE_REMAP_REG_BASE;
+ return ioread32(ab->mem_ce + offset);
+ }
+ return ioread32(ab->mem + offset);
+}
+
+static void ath12k_ahb_write32(struct ath12k_base *ab, u32 offset,
+ u32 value)
+{
+ if (ab->ce_remap && offset < HAL_SEQ_WCSS_UMAC_OFFSET) {
+ offset = offset - HAL_CE_REMAP_REG_BASE;
+ iowrite32(value, ab->mem_ce + offset);
+ } else {
+ iowrite32(value, ab->mem + offset);
+ }
+}
+
+static void ath12k_ahb_cancel_workqueue(struct ath12k_base *ab)
+{
+ int i;
+
+ for (i = 0; i < ab->hw_params->ce_count; i++) {
+ struct ath12k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];
+
+ if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
+ continue;
+
+ cancel_work_sync(&ce_pipe->intr_wq);
+ }
+}
+
+static void ath12k_ahb_ext_grp_disable(struct ath12k_ext_irq_grp *irq_grp)
+{
+ int i;
+
+ for (i = 0; i < irq_grp->num_irq; i++)
+ disable_irq_nosync(irq_grp->ab->irq_num[irq_grp->irqs[i]]);
+}
+
+static void __ath12k_ahb_ext_irq_disable(struct ath12k_base *ab)
+{
+ int i;
+
+ for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {
+ struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];
+
+ ath12k_ahb_ext_grp_disable(irq_grp);
+ if (irq_grp->napi_enabled) {
+ napi_synchronize(&irq_grp->napi);
+ napi_disable(&irq_grp->napi);
+ irq_grp->napi_enabled = false;
+ }
+ }
+}
+
+static void ath12k_ahb_ext_grp_enable(struct ath12k_ext_irq_grp *irq_grp)
+{
+ int i;
+
+ for (i = 0; i < irq_grp->num_irq; i++)
+ enable_irq(irq_grp->ab->irq_num[irq_grp->irqs[i]]);
+}
+
+static void ath12k_ahb_setbit32(struct ath12k_base *ab, u8 bit, u32 offset)
+{
+ u32 val;
+
+ val = ath12k_ahb_read32(ab, offset);
+ ath12k_ahb_write32(ab, offset, val | BIT(bit));
+}
+
+static void ath12k_ahb_clearbit32(struct ath12k_base *ab, u8 bit, u32 offset)
+{
+ u32 val;
+
+ val = ath12k_ahb_read32(ab, offset);
+ ath12k_ahb_write32(ab, offset, val & ~BIT(bit));
+}
+
+static void ath12k_ahb_ce_irq_enable(struct ath12k_base *ab, u16 ce_id)
+{
+ const struct ce_attr *ce_attr;
+ const struct ce_ie_addr *ce_ie_addr = ab->hw_params->ce_ie_addr;
+ u32 ie1_reg_addr, ie2_reg_addr, ie3_reg_addr;
+
+ ie1_reg_addr = ce_ie_addr->ie1_reg_addr;
+ ie2_reg_addr = ce_ie_addr->ie2_reg_addr;
+ ie3_reg_addr = ce_ie_addr->ie3_reg_addr;
+
+ ce_attr = &ab->hw_params->host_ce_config[ce_id];
+ if (ce_attr->src_nentries)
+ ath12k_ahb_setbit32(ab, ce_id, ie1_reg_addr);
+
+ if (ce_attr->dest_nentries) {
+ ath12k_ahb_setbit32(ab, ce_id, ie2_reg_addr);
+ ath12k_ahb_setbit32(ab, ce_id + CE_HOST_IE_3_SHIFT,
+ ie3_reg_addr);
+ }
+}
+
+static void ath12k_ahb_ce_irq_disable(struct ath12k_base *ab, u16 ce_id)
+{
+ const struct ce_attr *ce_attr;
+ const struct ce_ie_addr *ce_ie_addr = ab->hw_params->ce_ie_addr;
+ u32 ie1_reg_addr, ie2_reg_addr, ie3_reg_addr;
+
+ ie1_reg_addr = ce_ie_addr->ie1_reg_addr;
+ ie2_reg_addr = ce_ie_addr->ie2_reg_addr;
+ ie3_reg_addr = ce_ie_addr->ie3_reg_addr;
+
+ ce_attr = &ab->hw_params->host_ce_config[ce_id];
+ if (ce_attr->src_nentries)
+ ath12k_ahb_clearbit32(ab, ce_id, ie1_reg_addr);
+
+ if (ce_attr->dest_nentries) {
+ ath12k_ahb_clearbit32(ab, ce_id, ie2_reg_addr);
+ ath12k_ahb_clearbit32(ab, ce_id + CE_HOST_IE_3_SHIFT,
+ ie3_reg_addr);
+ }
+}
+
+static void ath12k_ahb_sync_ce_irqs(struct ath12k_base *ab)
+{
+ int i;
+ int irq_idx;
+
+ for (i = 0; i < ab->hw_params->ce_count; i++) {
+ if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
+ continue;
+
+ irq_idx = ATH12K_IRQ_CE0_OFFSET + i;
+ synchronize_irq(ab->irq_num[irq_idx]);
+ }
+}
+
+static void ath12k_ahb_sync_ext_irqs(struct ath12k_base *ab)
+{
+ int i, j;
+ int irq_idx;
+
+ for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {
+ struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];
+
+ for (j = 0; j < irq_grp->num_irq; j++) {
+ irq_idx = irq_grp->irqs[j];
+ synchronize_irq(ab->irq_num[irq_idx]);
+ }
+ }
+}
+
+static void ath12k_ahb_ce_irqs_enable(struct ath12k_base *ab)
+{
+ int i;
+
+ for (i = 0; i < ab->hw_params->ce_count; i++) {
+ if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
+ continue;
+ ath12k_ahb_ce_irq_enable(ab, i);
+ }
+}
+
+static void ath12k_ahb_ce_irqs_disable(struct ath12k_base *ab)
+{
+ int i;
+
+ for (i = 0; i < ab->hw_params->ce_count; i++) {
+ if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
+ continue;
+ ath12k_ahb_ce_irq_disable(ab, i);
+ }
+}
+
+static int ath12k_ahb_start(struct ath12k_base *ab)
+{
+ ath12k_ahb_ce_irqs_enable(ab);
+ ath12k_ce_rx_post_buf(ab);
+
+ return 0;
+}
+
+static void ath12k_ahb_ext_irq_enable(struct ath12k_base *ab)
+{
+ struct ath12k_ext_irq_grp *irq_grp;
+ int i;
+
+ for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {
+ irq_grp = &ab->ext_irq_grp[i];
+ if (!irq_grp->napi_enabled) {
+ napi_enable(&irq_grp->napi);
+ irq_grp->napi_enabled = true;
+ }
+ ath12k_ahb_ext_grp_enable(irq_grp);
+ }
+}
+
+static void ath12k_ahb_ext_irq_disable(struct ath12k_base *ab)
+{
+ __ath12k_ahb_ext_irq_disable(ab);
+ ath12k_ahb_sync_ext_irqs(ab);
+}
+
+static void ath12k_ahb_stop(struct ath12k_base *ab)
+{
+ if (!test_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags))
+ ath12k_ahb_ce_irqs_disable(ab);
+ ath12k_ahb_sync_ce_irqs(ab);
+ ath12k_ahb_cancel_workqueue(ab);
+ del_timer_sync(&ab->rx_replenish_retry);
+ ath12k_ce_cleanup_pipes(ab);
+}
+
+static int ath12k_ahb_power_up(struct ath12k_base *ab)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+ int ret;
+
+ ret = rproc_boot(ab_ahb->tgt_rproc);
+ if (ret)
+ ath12k_err(ab, "failed to boot the remote processor Q6\n");
+
+ return ret;
+}
+
+static void ath12k_ahb_power_down(struct ath12k_base *ab, bool is_suspend)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+
+ rproc_shutdown(ab_ahb->tgt_rproc);
+}
+
+static void ath12k_ahb_init_qmi_ce_config(struct ath12k_base *ab)
+{
+ struct ath12k_qmi_ce_cfg *cfg = &ab->qmi.ce_cfg;
+
+ cfg->tgt_ce_len = ab->hw_params->target_ce_count;
+ cfg->tgt_ce = ab->hw_params->target_ce_config;
+ cfg->svc_to_ce_map_len = ab->hw_params->svc_to_ce_map_len;
+ cfg->svc_to_ce_map = ab->hw_params->svc_to_ce_map;
+ ab->qmi.service_ins_id = ab->hw_params->qmi_service_ins_id;
+}
+
+static void ath12k_ahb_free_ext_irq(struct ath12k_base *ab)
+{
+ int i, j;
+
+ for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {
+ struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];
+
+ for (j = 0; j < irq_grp->num_irq; j++)
+ free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp);
+
+ netif_napi_del(&irq_grp->napi);
+ free_netdev(irq_grp->napi_ndev);
+ }
+}
+
+static void ath12k_ahb_free_irq(struct ath12k_base *ab)
+{
+ int irq_idx;
+ int i;
+
+ for (i = 0; i < ab->hw_params->ce_count; i++) {
+ if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
+ continue;
+ irq_idx = ATH12K_IRQ_CE0_OFFSET + i;
+ free_irq(ab->irq_num[irq_idx], &ab->ce.ce_pipe[i]);
+ }
+
+ ath12k_ahb_free_ext_irq(ab);
+}
+
+static void ath12k_ahb_ce_workqueue(struct work_struct *work)
+{
+ struct ath12k_ce_pipe *ce_pipe = from_work(ce_pipe, work, intr_wq);
+
+ ath12k_ce_per_engine_service(ce_pipe->ab, ce_pipe->pipe_num);
+
+ ath12k_ahb_ce_irq_enable(ce_pipe->ab, ce_pipe->pipe_num);
+}
+
+static irqreturn_t ath12k_ahb_ce_interrupt_handler(int irq, void *arg)
+{
+ struct ath12k_ce_pipe *ce_pipe = arg;
+
+ /* last interrupt received for this CE */
+ ce_pipe->timestamp = jiffies;
+
+ ath12k_ahb_ce_irq_disable(ce_pipe->ab, ce_pipe->pipe_num);
+
+ queue_work(system_bh_wq, &ce_pipe->intr_wq);
+
+ return IRQ_HANDLED;
+}
+
+static int ath12k_ahb_ext_grp_napi_poll(struct napi_struct *napi, int budget)
+{
+ struct ath12k_ext_irq_grp *irq_grp = container_of(napi,
+ struct ath12k_ext_irq_grp,
+ napi);
+ struct ath12k_base *ab = irq_grp->ab;
+ int work_done;
+
+ work_done = ath12k_dp_service_srng(ab, irq_grp, budget);
+ if (work_done < budget) {
+ napi_complete_done(napi, work_done);
+ ath12k_ahb_ext_grp_enable(irq_grp);
+ }
+
+ if (work_done > budget)
+ work_done = budget;
+
+ return work_done;
+}
+
+static irqreturn_t ath12k_ahb_ext_interrupt_handler(int irq, void *arg)
+{
+ struct ath12k_ext_irq_grp *irq_grp = arg;
+
+ /* last interrupt received for this group */
+ irq_grp->timestamp = jiffies;
+
+ ath12k_ahb_ext_grp_disable(irq_grp);
+
+ napi_schedule(&irq_grp->napi);
+
+ return IRQ_HANDLED;
+}
+
+static int ath12k_ahb_config_ext_irq(struct ath12k_base *ab)
+{
+ struct ath12k_ext_irq_grp *irq_grp;
+ const struct hal_ops *hal_ops;
+ int i, j, irq, irq_idx, ret;
+ u32 num_irq;
+
+ hal_ops = ab->hw_params->hal_ops;
+ for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) {
+ irq_grp = &ab->ext_irq_grp[i];
+ num_irq = 0;
+
+ irq_grp->ab = ab;
+ irq_grp->grp_id = i;
+
+ irq_grp->napi_ndev = alloc_netdev_dummy(0);
+ if (!irq_grp->napi_ndev)
+ return -ENOMEM;
+
+ netif_napi_add(irq_grp->napi_ndev, &irq_grp->napi,
+ ath12k_ahb_ext_grp_napi_poll);
+
+ for (j = 0; j < ATH12K_EXT_IRQ_NUM_MAX; j++) {
+ if (ab->hw_params->ring_mask->tx[i] &&
+ j <= ATH12K_MAX_TCL_RING_NUM &&
+ (ab->hw_params->ring_mask->tx[i] &
+ BIT(hal_ops->tcl_to_wbm_rbm_map[j].wbm_ring_num))) {
+ irq_grp->irqs[num_irq++] =
+ wbm2host_tx_completions_ring1 - j;
+ }
+
+ if (ab->hw_params->ring_mask->rx[i] & BIT(j)) {
+ irq_grp->irqs[num_irq++] =
+ reo2host_destination_ring1 - j;
+ }
+
+ if (ab->hw_params->ring_mask->rx_err[i] & BIT(j))
+ irq_grp->irqs[num_irq++] = reo2host_exception;
+
+ if (ab->hw_params->ring_mask->rx_wbm_rel[i] & BIT(j))
+ irq_grp->irqs[num_irq++] = wbm2host_rx_release;
+
+ if (ab->hw_params->ring_mask->reo_status[i] & BIT(j))
+ irq_grp->irqs[num_irq++] = reo2host_status;
+
+ if (ab->hw_params->ring_mask->rx_mon_dest[i] & BIT(j))
+ irq_grp->irqs[num_irq++] =
+ rxdma2host_monitor_destination_mac1;
+ }
+
+ irq_grp->num_irq = num_irq;
+
+ for (j = 0; j < irq_grp->num_irq; j++) {
+ irq_idx = irq_grp->irqs[j];
+
+ irq = platform_get_irq_byname(ab->pdev,
+ irq_name[irq_idx]);
+ ab->irq_num[irq_idx] = irq;
+ irq_set_status_flags(irq, IRQ_NOAUTOEN | IRQ_DISABLE_UNLAZY);
+ ret = request_irq(irq, ath12k_ahb_ext_interrupt_handler,
+ IRQF_TRIGGER_RISING,
+ irq_name[irq_idx], irq_grp);
+ if (ret) {
+ ath12k_err(ab, "failed request_irq for %d\n",
+ irq);
+ }
+ }
+ }
+
+ return 0;
+}
+
+static int ath12k_ahb_config_irq(struct ath12k_base *ab)
+{
+ int irq, irq_idx, i;
+ int ret;
+
+ /* Configure CE irqs */
+ for (i = 0; i < ab->hw_params->ce_count; i++) {
+ struct ath12k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i];
+
+ if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR)
+ continue;
+
+ irq_idx = ATH12K_IRQ_CE0_OFFSET + i;
+
+ INIT_WORK(&ce_pipe->intr_wq, ath12k_ahb_ce_workqueue);
+ irq = platform_get_irq_byname(ab->pdev, irq_name[irq_idx]);
+ ret = request_irq(irq, ath12k_ahb_ce_interrupt_handler,
+ IRQF_TRIGGER_RISING, irq_name[irq_idx],
+ ce_pipe);
+ if (ret)
+ return ret;
+
+ ab->irq_num[irq_idx] = irq;
+ }
+
+ /* Configure external interrupts */
+ ret = ath12k_ahb_config_ext_irq(ab);
+
+ return ret;
+}
+
+static int ath12k_ahb_map_service_to_pipe(struct ath12k_base *ab, u16 service_id,
+ u8 *ul_pipe, u8 *dl_pipe)
+{
+ const struct service_to_pipe *entry;
+ bool ul_set = false, dl_set = false;
+ int i;
+
+ for (i = 0; i < ab->hw_params->svc_to_ce_map_len; i++) {
+ entry = &ab->hw_params->svc_to_ce_map[i];
+
+ if (__le32_to_cpu(entry->service_id) != service_id)
+ continue;
+
+ switch (__le32_to_cpu(entry->pipedir)) {
+ case PIPEDIR_NONE:
+ break;
+ case PIPEDIR_IN:
+ WARN_ON(dl_set);
+ *dl_pipe = __le32_to_cpu(entry->pipenum);
+ dl_set = true;
+ break;
+ case PIPEDIR_OUT:
+ WARN_ON(ul_set);
+ *ul_pipe = __le32_to_cpu(entry->pipenum);
+ ul_set = true;
+ break;
+ case PIPEDIR_INOUT:
+ WARN_ON(dl_set);
+ WARN_ON(ul_set);
+ *dl_pipe = __le32_to_cpu(entry->pipenum);
+ *ul_pipe = __le32_to_cpu(entry->pipenum);
+ dl_set = true;
+ ul_set = true;
+ break;
+ }
+ }
+
+ if (WARN_ON(!ul_set || !dl_set))
+ return -ENOENT;
+
+ return 0;
+}
+
+static const struct ath12k_hif_ops ath12k_ahb_hif_ops_ipq5332 = {
+ .start = ath12k_ahb_start,
+ .stop = ath12k_ahb_stop,
+ .read32 = ath12k_ahb_read32,
+ .write32 = ath12k_ahb_write32,
+ .cmem_read32 = ath12k_ahb_cmem_read32,
+ .cmem_write32 = ath12k_ahb_cmem_write32,
+ .irq_enable = ath12k_ahb_ext_irq_enable,
+ .irq_disable = ath12k_ahb_ext_irq_disable,
+ .map_service_to_pipe = ath12k_ahb_map_service_to_pipe,
+ .power_down = ath12k_ahb_power_down,
+ .power_up = ath12k_ahb_power_up,
+};
+
+static int ath12k_core_get_rproc(struct ath12k_base *ab)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+ struct device *dev = ab->dev;
+ struct rproc *prproc;
+ phandle rproc_phandle;
+
+ if (of_property_read_u32(dev->of_node, "qcom,rproc", &rproc_phandle)) {
+ ath12k_err(ab, "failed to get q6_rproc handle\n");
+ return -ENOENT;
+ }
+
+ prproc = rproc_get_by_phandle(rproc_phandle);
+ if (!prproc) {
+ ath12k_err(ab, "failed to get rproc\n");
+ return -EINVAL;
+ }
+ ab_ahb->tgt_rproc = prproc;
+
+ return 0;
+}
+
+static int ath12k_ahb_clock_init(struct ath12k_base *ab)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+ int ret;
+
+ ab_ahb->xo_clk = devm_clk_get(ab->dev, "gcc_xo_clk");
+ if (IS_ERR_OR_NULL(ab_ahb->xo_clk)) {
+ ath12k_err(ab, "failed to get gcc_xo_clk: %d\n",
+ PTR_ERR_OR_ZERO(ab_ahb->xo_clk));
+ ret = ab_ahb->xo_clk ? PTR_ERR(ab_ahb->xo_clk) : -ENODEV;
+ goto out;
+ }
+
+ ab_ahb->sleep_clk = devm_clk_get(ab->dev, "gcc_im_sleep_clk");
+ if (IS_ERR_OR_NULL(ab_ahb->sleep_clk)) {
+ ath12k_err(ab, "failed to get gcc_im_sleep_clk: %d\n",
+ PTR_ERR_OR_ZERO(ab_ahb->sleep_clk));
+ ret = ab_ahb->sleep_clk ? PTR_ERR(ab_ahb->sleep_clk) : -ENODEV;
+ goto err_im_sleep_clk;
+ }
+
+ return 0;
+
+err_im_sleep_clk:
+ ab_ahb->sleep_clk = NULL;
+ devm_clk_put(ab->dev, ab_ahb->xo_clk);
+
+out:
+ ab_ahb->xo_clk = NULL;
+ return ret;
+}
+
+static void ath12k_ahb_clock_deinit(struct ath12k_base *ab)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+
+ devm_clk_put(ab->dev, ab_ahb->xo_clk);
+ ab_ahb->xo_clk = NULL;
+
+ devm_clk_put(ab->dev, ab_ahb->sleep_clk);
+ ab_ahb->sleep_clk = NULL;
+}
+
+static int ath12k_ahb_clock_enable(struct ath12k_base *ab)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+ int ret;
+
+ if (IS_ERR_OR_NULL(ab_ahb->xo_clk) ||
+ IS_ERR_OR_NULL(ab_ahb->sleep_clk)) {
+ ath12k_err(ab, "clock is not initialized\n");
+ ret = -EIO;
+ goto out;
+ }
+
+ ret = clk_prepare_enable(ab_ahb->xo_clk);
+ if (ret) {
+ ath12k_err(ab, "failed to enable gcc_xo_clk: %d\n", ret);
+ goto out;
+ }
+
+ ret = clk_prepare_enable(ab_ahb->sleep_clk);
+ if (ret) {
+ ath12k_err(ab, "failed to enable im_sleep_clk: %d\n", ret);
+ goto err_xo_clk_disable;
+ }
+
+ return 0;
+
+err_xo_clk_disable:
+ clk_disable_unprepare(ab_ahb->xo_clk);
+
+out:
+ return ret;
+}
+
+static void ath12k_ahb_clock_disable(struct ath12k_base *ab)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+
+ clk_disable_unprepare(ab_ahb->xo_clk);
+ clk_disable_unprepare(ab_ahb->sleep_clk);
+}
+
+static int ath12k_ahb_resource_init(struct ath12k_base *ab)
+{
+ struct platform_device *pdev = ab->pdev;
+ struct resource *mem_res;
+ void __iomem *mem;
+ int ret;
+
+ mem = devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res);
+ if (IS_ERR(mem)) {
+ dev_err(&pdev->dev, "ioremap error\n");
+ ret = PTR_ERR(mem);
+ goto out;
+ }
+
+ ab->mem = mem;
+ ab->mem_len = resource_size(mem_res);
+
+ if (ab->hw_params->ce_remap) {
+ const struct ce_remap *ce_remap = ab->hw_params->ce_remap;
+ /* ce register space is moved out of wcss and the space is not
+ * contiguous, hence remapping the CE registers to a new space
+ * for accessing them.
+ */
+ ab->mem_ce = ioremap(ce_remap->base, ce_remap->size);
+ if (IS_ERR(ab->mem_ce)) {
+ dev_err(&pdev->dev, "ce ioremap error\n");
+ ret = -ENOMEM;
+ goto err_mem_unmap;
+ }
+ ab->ce_remap = true;
+ ab->ce_remap_base_addr = HAL_IPQ5332_CE_WFSS_REG_BASE;
+ }
+
+ if (ab->hw_params->cmem_remap) {
+ const struct cmem_remap *cmem_remap = ab->hw_params->cmem_remap;
+ /* For device like IPQ5332 CMEM region is outside WCSS block.
+ * Allocate separate I/O remap to access CMEM address.
+ */
+ ab->mem_cmem = ioremap(cmem_remap->base, cmem_remap->size);
+ if (IS_ERR(ab->mem_cmem)) {
+ dev_err(&pdev->dev, "cmem ioremap error\n");
+ ret = -ENOMEM;
+ goto err_mem_ce_unmap;
+ }
+ }
+
+ ret = ath12k_ahb_clock_init(ab);
+ if (ret)
+ goto err_mem_cmem_unmap;
+
+ ret = ath12k_ahb_clock_enable(ab);
+ if (ret)
+ goto err_clock_deinit;
+
+ return 0;
+
+err_clock_deinit:
+ ath12k_ahb_clock_deinit(ab);
+
+err_mem_cmem_unmap:
+ if (ab->hw_params->cmem_remap)
+ iounmap(ab->mem_cmem);
+
+err_mem_ce_unmap:
+ ab->mem_cmem = NULL;
+ if (ab->hw_params->ce_remap)
+ iounmap(ab->mem_ce);
+
+err_mem_unmap:
+ ab->mem_ce = NULL;
+ devm_iounmap(ab->dev, ab->mem);
+
+out:
+ ab->mem = NULL;
+ return ret;
+}
+
+static void ath12k_ahb_resource_deinit(struct ath12k_base *ab)
+{
+ if (ab->mem)
+ devm_iounmap(ab->dev, ab->mem);
+
+ if (ab->mem_ce)
+ iounmap(ab->mem_ce);
+
+ if (ab->mem_cmem)
+ iounmap(ab->mem_cmem);
+
+ ab->mem = NULL;
+ ab->mem_ce = NULL;
+ ab->mem_cmem = NULL;
+
+ ath12k_ahb_clock_disable(ab);
+ ath12k_ahb_clock_deinit(ab);
+}
+
+static int ath12k_ahb_probe(struct platform_device *pdev)
+{
+ struct ath12k_base *ab;
+ const struct of_device_id *of_id;
+ const struct ath12k_hif_ops *hif_ops;
+ struct device_node *mem_node;
+ enum ath12k_hw_rev hw_rev;
+ u32 addr;
+ int ret;
+
+ of_id = of_match_device(ath12k_ahb_of_match, &pdev->dev);
+ if (!of_id) {
+ dev_err(&pdev->dev, "Failed to find matching device tree id\n");
+ return -EINVAL;
+ }
+
+ hw_rev = (enum ath12k_hw_rev)of_id->data;
+
+ switch (hw_rev) {
+ case ATH12K_HW_IPQ5332_HW10:
+ hif_ops = &ath12k_ahb_hif_ops_ipq5332;
+ break;
+ default:
+ dev_err(&pdev->dev, "Unsupported device type %d\n", hw_rev);
+ return -EOPNOTSUPP;
+ }
+
+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to set 32-bit consistent dma\n");
+ return ret;
+ }
+
+ ab = ath12k_core_alloc(&pdev->dev, sizeof(struct ath12k_ahb),
+ ATH12K_BUS_AHB);
+ if (!ab) {
+ dev_err(&pdev->dev, "failed to allocate ath12k base\n");
+ return -ENOMEM;
+ }
+
+ ab->hif.ops = hif_ops;
+ ab->pdev = pdev;
+ ab->hw_rev = hw_rev;
+ platform_set_drvdata(pdev, ab);
+
+ /* Set fixed_mem_region to true for platforms that support fixed memory
+ * reservation from DT. If memory is reserved from DT for FW, ath12k driver
+ * need not to allocate memory.
+ */
+ if (!of_property_read_u32(ab->dev->of_node, "memory-region", &addr)) {
+ set_bit(ATH12K_FLAG_FIXED_MEM_REGION, &ab->dev_flags);
+ mem_node = of_find_node_by_name(NULL, "mlo_global_mem_0");
+ if (!mem_node)
+ ab->mlo_capable_flags = 0;
+ }
+
+ ret = ath12k_core_pre_init(ab);
+ if (ret)
+ goto err_core_free;
+
+ ret = ath12k_ahb_resource_init(ab);
+ if (ret)
+ goto err_core_free;
+
+ ret = ath12k_hal_srng_init(ab);
+ if (ret)
+ goto err_resource_deinit;
+
+ ret = ath12k_ce_alloc_pipes(ab);
+ if (ret) {
+ ath12k_err(ab, "failed to allocate ce pipes: %d\n", ret);
+ goto err_hal_srng_deinit;
+ }
+
+ ath12k_ahb_init_qmi_ce_config(ab);
+
+ ret = ath12k_core_get_rproc(ab);
+ if (ret) {
+ ath12k_err(ab, "failed to get rproc: %d\n", ret);
+ goto err_ce_free;
+ }
+
+ ret = ath12k_ahb_config_irq(ab);
+ if (ret) {
+ ath12k_err(ab, "failed to configure irq: %d\n", ret);
+ goto err_ce_free;
+ }
+
+ ret = ath12k_core_init(ab);
+ if (ret) {
+ ath12k_err(ab, "failed to init core: %d\n", ret);
+ goto err_ce_free;
+ }
+
+ return 0;
+
+err_ce_free:
+ ath12k_ce_free_pipes(ab);
+
+err_hal_srng_deinit:
+ ath12k_hal_srng_deinit(ab);
+
+err_resource_deinit:
+ ath12k_ahb_resource_deinit(ab);
+
+err_core_free:
+ ath12k_core_free(ab);
+ platform_set_drvdata(pdev, NULL);
+
+ return ret;
+}
+
+static void ath12k_ahb_remove_prepare(struct ath12k_base *ab)
+{
+ unsigned long left;
+
+ if (test_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags)) {
+ left = wait_for_completion_timeout(&ab->driver_recovery,
+ ATH12K_AHB_RECOVERY_TIMEOUT);
+ if (!left)
+ ath12k_warn(ab, "failed to receive recovery response completion\n");
+ }
+
+ set_bit(ATH12K_FLAG_UNREGISTERING, &ab->dev_flags);
+ cancel_work_sync(&ab->restart_work);
+ cancel_work_sync(&ab->qmi.event_work);
+}
+
+static void ath12k_ahb_free_resources(struct ath12k_base *ab)
+{
+ struct platform_device *pdev = ab->pdev;
+
+ ath12k_ahb_free_irq(ab);
+ ath12k_hal_srng_deinit(ab);
+ ath12k_ce_free_pipes(ab);
+ ath12k_ahb_resource_deinit(ab);
+ ath12k_core_free(ab);
+ platform_set_drvdata(pdev, NULL);
+}
+
+static void ath12k_ahb_remove(struct platform_device *pdev)
+{
+ struct ath12k_base *ab = platform_get_drvdata(pdev);
+
+ if (test_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags)) {
+ ath12k_ahb_power_down(ab, false);
+ ath12k_qmi_deinit_service(ab);
+ goto qmi_fail;
+ }
+
+ ath12k_ahb_remove_prepare(ab);
+ ath12k_core_deinit(ab);
+
+qmi_fail:
+ ath12k_ahb_free_resources(ab);
+}
+
+static void ath12k_ahb_shutdown(struct platform_device *pdev)
+{
+ struct ath12k_base *ab = platform_get_drvdata(pdev);
+
+ /* platform shutdown() & remove() are mutually exclusive.
+ * remove() is invoked during rmmod & shutdown() during
+ * system reboot/shutdown.
+ */
+ ath12k_ahb_remove_prepare(ab);
+
+ if (!(test_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags)))
+ goto free_resources;
+
+ ath12k_core_deinit(ab);
+
+free_resources:
+ ath12k_ahb_free_resources(ab);
+}
+
+static struct platform_driver ath12k_ahb_driver = {
+ .driver = {
+ .name = "ath12k_ahb",
+ .of_match_table = ath12k_ahb_of_match,
+ },
+ .probe = ath12k_ahb_probe,
+ .remove = ath12k_ahb_remove,
+ .shutdown = ath12k_ahb_shutdown,
+};
+
+int ath12k_ahb_init(void)
+{
+ return platform_driver_register(&ath12k_ahb_driver);
+}
+
+void ath12k_ahb_exit(void)
+{
+ platform_driver_unregister(&ath12k_ahb_driver);
+}
diff --git a/drivers/net/wireless/ath/ath12k/ahb.h b/drivers/net/wireless/ath/ath12k/ahb.h
new file mode 100644
index 000000000000..4a17e041c13a
--- /dev/null
+++ b/drivers/net/wireless/ath/ath12k/ahb.h
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: BSD-3-Clause-Clear */
+/*
+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#ifndef ATH12K_AHB_H
+#define ATH12K_AHB_H
+
+#include <linux/clk.h>
+#include "core.h"
+
+#define ATH12K_AHB_RECOVERY_TIMEOUT (3 * HZ)
+
+#define ATH12K_AHB_SMP2P_SMEM_MSG GENMASK(15, 0)
+#define ATH12K_AHB_SMP2P_SMEM_SEQ_NO GENMASK(31, 16)
+#define ATH12K_AHB_SMP2P_SMEM_VALUE_MASK 0xFFFFFFFF
+#define ATH12K_PCI_CE_WAKE_IRQ 2
+#define ATH12K_PCI_IRQ_CE0_OFFSET 3
+
+enum ath12k_ahb_smp2p_msg_id {
+ ATH12K_AHB_POWER_SAVE_ENTER = 1,
+ ATH12K_AHB_POWER_SAVE_EXIT,
+};
+
+struct ath12k_base;
+
+struct ath12k_ahb {
+ struct rproc *tgt_rproc;
+ struct clk *xo_clk;
+ struct clk *sleep_clk;
+};
+
+static inline struct ath12k_ahb *ath12k_ab_to_ahb(struct ath12k_base *ab)
+{
+ return (struct ath12k_ahb *)ab->drv_priv;
+}
+
+#endif
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index e766e5616ee5..7d3868aadc21 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -142,6 +142,7 @@ enum ath12k_firmware_mode {
#define ATH12K_IRQ_NUM_MAX 57
#define ATH12K_EXT_IRQ_NUM_MAX 16
+#define ATH12K_MAX_TCL_RING_NUM 3
struct ath12k_ext_irq_grp {
struct ath12k_base *ab;
@@ -149,6 +150,7 @@ struct ath12k_ext_irq_grp {
u32 num_irq;
u32 grp_id;
u64 timestamp;
+ bool napi_enabled;
struct napi_struct napi;
struct net_device *napi_ndev;
};
@@ -1060,6 +1062,8 @@ static inline const char *ath12k_bus_str(enum ath12k_bus bus)
switch (bus) {
case ATH12K_BUS_PCI:
return "pci";
+ case ATH12K_BUS_AHB:
+ return "ahb";
}
return "unknown";
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index 580c7be109e0..e753a976fac3 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -121,6 +121,7 @@ enum ath12k_hw_rate_ofdm {
enum ath12k_bus {
ATH12K_BUS_PCI,
+ ATH12K_BUS_AHB,
};
#define ATH12K_EXT_IRQ_GRP_NUM_MAX 11
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [RFC PATCH 18/18] wifi: ath12k: enable ath12k AHB support
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
` (16 preceding siblings ...)
2024-08-14 9:43 ` [RFC PATCH 17/18] wifi: ath12k: add AHB driver support for IPQ5332 Raj Kumar Bhagat
@ 2024-08-14 9:43 ` Raj Kumar Bhagat
17 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-08-14 9:43 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, Balamurugan S, P Praneesh, Raj Kumar Bhagat
From: Balamurugan S <quic_bselvara@quicinc.com>
Currently only PCI devices is supported in Ath12k driver. Refactor
Ath12k module_init and module_exit to include Ath12k AHB support.
Add Ath12k AHB support in Kconfig with dependency on Remoteproc
driver. Ath12k AHB support relies on remoteproc driver for firmware
download, power up/down etc.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/Kconfig | 6 ++++
drivers/net/wireless/ath/ath12k/Makefile | 1 +
drivers/net/wireless/ath/ath12k/ahb.h | 12 ++++++++
drivers/net/wireless/ath/ath12k/core.c | 35 ++++++++++++++++++++++--
drivers/net/wireless/ath/ath12k/pci.c | 12 ++------
drivers/net/wireless/ath/ath12k/pci.h | 2 ++
6 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/Kconfig b/drivers/net/wireless/ath/ath12k/Kconfig
index f64e7c322216..f787bfe4b3a4 100644
--- a/drivers/net/wireless/ath/ath12k/Kconfig
+++ b/drivers/net/wireless/ath/ath12k/Kconfig
@@ -15,6 +15,12 @@ config ATH12K
If you choose to build a module, it'll be called ath12k.
+config ATH12K_AHB
+ bool "QTI ath12k AHB support"
+ depends on ATH12K && REMOTEPROC
+ help
+ Enable support for Ath12k AHB bus chipsets, example IPQ5332.
+
config ATH12K_DEBUG
bool "ath12k debugging"
depends on ATH12K
diff --git a/drivers/net/wireless/ath/ath12k/Makefile b/drivers/net/wireless/ath/ath12k/Makefile
index 5a1ed20d730e..4b7b9404d0c6 100644
--- a/drivers/net/wireless/ath/ath12k/Makefile
+++ b/drivers/net/wireless/ath/ath12k/Makefile
@@ -23,6 +23,7 @@ ath12k-y += core.o \
fw.o \
p2p.o
+ath12k-$(CONFIG_ATH12K_AHB) += ahb.o
ath12k-$(CONFIG_ATH12K_DEBUGFS) += debugfs.o debugfs_htt_stats.o
ath12k-$(CONFIG_ACPI) += acpi.o
ath12k-$(CONFIG_ATH12K_TRACING) += trace.o
diff --git a/drivers/net/wireless/ath/ath12k/ahb.h b/drivers/net/wireless/ath/ath12k/ahb.h
index 4a17e041c13a..4fdb493753d7 100644
--- a/drivers/net/wireless/ath/ath12k/ahb.h
+++ b/drivers/net/wireless/ath/ath12k/ahb.h
@@ -35,4 +35,16 @@ static inline struct ath12k_ahb *ath12k_ab_to_ahb(struct ath12k_base *ab)
return (struct ath12k_ahb *)ab->drv_priv;
}
+#ifdef CONFIG_ATH12K_AHB
+int ath12k_ahb_init(void);
+void ath12k_ahb_exit(void);
+#else
+static inline int ath12k_ahb_init(void)
+{
+ return 0;
+}
+
+static inline void ath12k_ahb_exit(void) {};
+#endif
+
#endif
diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c
index 51252e8bc1ae..a10f0dd295bc 100644
--- a/drivers/net/wireless/ath/ath12k/core.c
+++ b/drivers/net/wireless/ath/ath12k/core.c
@@ -9,15 +9,18 @@
#include <linux/remoteproc.h>
#include <linux/firmware.h>
#include <linux/of.h>
+#include "ahb.h"
#include "core.h"
#include "dp_tx.h"
#include "dp_rx.h"
#include "debug.h"
-#include "hif.h"
-#include "fw.h"
#include "debugfs.h"
+#include "fw.h"
+#include "hif.h"
+#include "pci.h"
#include "wow.h"
+static int ahb_err, pci_err;
unsigned int ath12k_debug_mask;
module_param_named(debug_mask, ath12k_debug_mask, uint, 0644);
MODULE_PARM_DESC(debug_mask, "Debugging mask");
@@ -1342,5 +1345,31 @@ struct ath12k_base *ath12k_core_alloc(struct device *dev, size_t priv_size,
return NULL;
}
-MODULE_DESCRIPTION("Core module for Qualcomm Atheros 802.11be wireless LAN cards.");
+static int ath12k_init(void)
+{
+ ahb_err = ath12k_ahb_init();
+ if (ahb_err)
+ pr_warn("Failed to initialize ath12k AHB device: %d\n", ahb_err);
+
+ pci_err = ath12k_pci_init();
+ if (pci_err)
+ pr_warn("Failed to initialize ath12k PCI device: %d\n", pci_err);
+
+ /* If both failed, return one of the failures (arbitrary) */
+ return ahb_err && pci_err ? ahb_err : 0;
+}
+
+static void ath12k_exit(void)
+{
+ if (!pci_err)
+ ath12k_pci_exit();
+
+ if (!ahb_err)
+ ath12k_ahb_exit();
+}
+
+module_init(ath12k_init)
+module_exit(ath12k_exit)
+
+MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11be WLAN devices");
MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c
index 9a50d813e9b4..f4a868c2275e 100644
--- a/drivers/net/wireless/ath/ath12k/pci.c
+++ b/drivers/net/wireless/ath/ath12k/pci.c
@@ -1627,7 +1627,7 @@ static struct pci_driver ath12k_pci_driver = {
.driver.pm = &ath12k_pci_pm_ops,
};
-static int ath12k_pci_init(void)
+int ath12k_pci_init(void)
{
int ret;
@@ -1638,16 +1638,10 @@ static int ath12k_pci_init(void)
return ret;
}
- return 0;
+ return ret;
}
-module_init(ath12k_pci_init);
-static void ath12k_pci_exit(void)
+void ath12k_pci_exit(void)
{
pci_unregister_driver(&ath12k_pci_driver);
}
-
-module_exit(ath12k_pci_exit);
-
-MODULE_DESCRIPTION("Driver support for Qualcomm Technologies PCIe 802.11be WLAN devices");
-MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/net/wireless/ath/ath12k/pci.h b/drivers/net/wireless/ath/ath12k/pci.h
index 31584a7ad80e..18648ca11dfc 100644
--- a/drivers/net/wireless/ath/ath12k/pci.h
+++ b/drivers/net/wireless/ath/ath12k/pci.h
@@ -145,4 +145,6 @@ void ath12k_pci_stop(struct ath12k_base *ab);
int ath12k_pci_start(struct ath12k_base *ab);
int ath12k_pci_power_up(struct ath12k_base *ab);
void ath12k_pci_power_down(struct ath12k_base *ab, bool is_suspend);
+int ath12k_pci_init(void);
+void ath12k_pci_exit(void);
#endif /* ATH12K_PCI_H */
--
2.34.1
^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module
2024-08-14 9:43 ` [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module Raj Kumar Bhagat
@ 2024-08-16 5:42 ` Krzysztof Kozlowski
2024-09-04 7:23 ` Raj Kumar Bhagat
2024-08-16 5:44 ` Krzysztof Kozlowski
1 sibling, 1 reply; 29+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-16 5:42 UTC (permalink / raw)
To: Raj Kumar Bhagat, ath12k; +Cc: linux-wireless
On 14/08/2024 11:43, Raj Kumar Bhagat wrote:
> Add device-tree bindings for the ATH12K module found in the IPQ5332
> device.
>
> Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
<form letter>
Please use scripts/get_maintainers.pl to get a list of necessary people
and lists to CC. It might happen, that command when run on an older
kernel, gives you outdated entries. Therefore please be sure you base
your patches on recent Linux kernel.
Tools like b4 or scripts/get_maintainer.pl provide you proper list of
people, so fix your workflow. Tools might also fail if you work on some
ancient tree (don't, instead use mainline) or work on fork of kernel
(don't, instead use mainline). Just use b4 and everything should be
fine, although remember about `b4 prep --auto-to-cc` if you added new
patches to the patchset.
You missed at least devicetree list (maybe more), so this won't be
tested by automated tooling. Performing review on untested code might be
a waste of time.
Please kindly resend and include all necessary To/Cc entries.
</form letter>
> ---
> .../net/wireless/qcom,ath12k-ahb.yaml | 325 ++++++++++++++++++
> 1 file changed, 325 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
>
> diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
> new file mode 100644
> index 000000000000..8cecc50b6341
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
> @@ -0,0 +1,325 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +# Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/net/wireless/qcom,ath12k-ahb.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm Technologies ath12k wireless devices (AHB)
> +
> +maintainers:
> + - Kalle Valo <kvalo@kernel.org>
> + - Jeff Johnson <jjohnson@kernel.org>
> +
> +description:
> + Qualcomm Technologies IEEE 802.11be AHB devices.
> +
> +properties:
> + compatible:
> + enum:
> + - qcom,ipq5332-wifi
> +
> + reg:
> + maxItems: 1
> +
> + clocks:
> + minItems: 1
> + maxItems: 2
> +
> + clock-names:
> + minItems: 1
> + maxItems: 2
> +
> + interrupts:
> + minItems: 32
> + maxItems: 56
> +
> + interrupt-names:
> + minItems: 32
> + maxItems: 56
> +
> + memory-region:
> + minItems: 1
> + description:
> + phandle to a node describing reserved memory (System RAM memory)
> + used by ath12k firmware (see bindings/reserved-memory/reserved-memory.txt)
> +
> + qcom,bdf-addr:
> + $ref: /schemas/types.yaml#/definitions/uint32
> + description:
> + System RAM memory address reserved for board data.
> +
> + qcom,board_id:
> + $ref: /schemas/types.yaml#/definitions/uint32
> + description:
> + Board id value, it identifies the variant of ath12k WiFi device.
Please do not upstream whatever you have in your vendor tree... You even
copied its style! There is no such property in upstream.
NAK, you are duplicating compatibles.
> +
> + qcom,rproc:
> + $ref: /schemas/types.yaml#/definitions/phandle
> + description:
> + DT entry of a WCSS node. WCSS node is the child node of q6 remoteproc driver.
> + (see bindings/remoteproc/qcom,multipd-pil.yaml)
> +
> +required:
> + - compatible
> + - reg
> + - memory-region
> + - qcom,board_id
> + - qcom,rproc
> +
> +additionalProperties: false
> +
> +allOf:
> + - $ref: ieee80211.yaml#
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - qcom,ipq5332-wifi
Why? You have only one variant, why this if?
> + then:
> + properties:
> + clocks:
> + items:
> + - description: gcc_xo_clk used for copy engine
> + - description: gcc_im_sleep_clk used for q6.
> +
> + clock-names:
> + items:
> + - const: gcc_xo_clk
> + - const: gcc_im_sleep_clk
> +
> + interrupts:
> + items:
> + - description: misc-pulse1 interrupt events
> + - description: misc-latch interrupt events
> + - description: sw exception interrupt events
> + - description: interrupt event for ring CE0
> + - description: interrupt event for ring CE1
> + - description: interrupt event for ring CE2
> + - description: interrupt event for ring CE3
> + - description: interrupt event for ring CE4
> + - description: interrupt event for ring CE5
> + - description: interrupt event for ring CE6
> + - description: interrupt event for ring CE7
> + - description: interrupt event for ring CE8
> + - description: interrupt event for ring CE9
> + - description: interrupt event for ring CE10
> + - description: interrupt event for ring CE11
> + - description: interrupt event for ring host2wbm-desc-feed
> + - description: interrupt event for ring host2reo-re-injection
> + - description: interrupt event for ring host2reo-command
> + - description: interrupt event for ring host2rxdma-monitor-ring1
> + - description: interrupt event for ring reo2ost-exception
> + - description: interrupt event for ring wbm2host-rx-release
> + - description: interrupt event for ring reo2host-status
> + - description: interrupt event for ring reo2host-destination-ring4
> + - description: interrupt event for ring reo2host-destination-ring3
> + - description: interrupt event for ring reo2host-destination-ring2
> + - description: interrupt event for ring reo2host-destination-ring1
> + - description: interrupt event for ring rxdma2host-monitor-destination-mac3
> + - description: interrupt event for ring rxdma2host-monitor-destination-mac2
> + - description: interrupt event for ring rxdma2host-monitor-destination-mac1
> + - description: interrupt event for ring host2rxdma-host-buf-ring-mac3
> + - description: interrupt event for ring host2rxdma-host-buf-ring-mac2
> + - description: interrupt event for ring host2rxdma-host-buf-ring-mac1
> + - description: interrupt event for ring host2tcl-input-ring4
> + - description: interrupt event for ring host2tcl-input-ring3
> + - description: interrupt event for ring host2tcl-input-ring2
> + - description: interrupt event for ring host2tcl-input-ring1
> + - description: interrupt event for ring wbm2host-tx-completions-ring4
> + - description: interrupt event for ring wbm2host-tx-completions-ring3
> + - description: interrupt event for ring wbm2host-tx-completions-ring2
> + - description: interrupt event for ring wbm2host-tx-completions-ring1
> + - description: interrupt event for ring host2tx-monitor-ring1
> + - description: interrupt event for ring txmon2host-monitor-destination-mac3
> + - description: interrupt event for ring txmon2host-monitor-destination-mac2
> + - description: interrupt event for ring txmon2host-monitor-destination-mac1
> + - description: interrupt event for umac_reset
> + interrupt-names:
> + items:
> + - const: misc-pulse1
> + - const: misc-latch
> + - const: sw-exception
> + - const: ce0
> + - const: ce1
> + - const: ce2
> + - const: ce3
> + - const: ce4
> + - const: ce5
> + - const: ce6
> + - const: ce7
> + - const: ce8
> + - const: ce9
> + - const: ce10
> + - const: ce11
> + - const: host2wbm-desc-feed
> + - const: host2reo-re-injection
> + - const: host2reo-command
> + - const: host2rxdma-monitor-ring1
> + - const: reo2ost-exception
> + - const: wbm2host-rx-release
> + - const: reo2host-status
> + - const: reo2host-destination-ring4
> + - const: reo2host-destination-ring3
> + - const: reo2host-destination-ring2
> + - const: reo2host-destination-ring1
> + - const: rxdma2host-monitor-destination-mac3
> + - const: rxdma2host-monitor-destination-mac2
> + - const: rxdma2host-monitor-destination-mac1
> + - const: host2rxdma-host-buf-ring-mac3
> + - const: host2rxdma-host-buf-ring-mac2
> + - const: host2rxdma-host-buf-ring-mac1
> + - const: host2tcl-input-ring4
> + - const: host2tcl-input-ring3
> + - const: host2tcl-input-ring2
> + - const: host2tcl-input-ring1
> + - const: wbm2host-tx-completions-ring4
> + - const: wbm2host-tx-completions-ring3
> + - const: wbm2host-tx-completions-ring2
> + - const: wbm2host-tx-completions-ring1
> + - const: host2tx-monitor-ring1
> + - const: txmon2host-monitor-destination-mac3
> + - const: txmon2host-monitor-destination-mac2
> + - const: txmon2host-monitor-destination-mac1
> + - const: umac_reset
> +
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - qcom,ipq5332-wifi
> + then:
> + required:
> + - clocks
> + - clock-names
> + - interrupts
> + - interrupt-names
> + - qcom,bdf-addr
> +
> +examples:
> + - |
> +
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + #include <dt-bindings/clock/qcom,ipq5332-gcc.h>
> +
> + reserved-memory {
> + #address-cells = <2>;
> + #size-cells = <2>;
> +
> + q6_region: wcnss@4a900000 {
> + no-map;
> + reg = <0x0 0x4a900000 0x0 0x02300000>;
> + };
> +
> + m3_dump: m3_dump@4cc00000 {
> + no-map;
> + reg = <0x0 0x4CC00000 0x0 0x100000>;
> + };
> + };
Drop
> +
> + wifi0: wifi@c0000000 {
> + compatible = "qcom,ipq5332-wifi";
> + reg = <0xc000000 0x1000000>;
> + clocks = <&gcc GCC_XO_CLK>,
> + <&gcc GCC_IM_SLEEP_CLK>;
> + clock-names = "gcc_xo_clk",
> + "gcc_im_sleep_clk";
> + interrupts = <GIC_SPI 559 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 560 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 561 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 422 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 423 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 424 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 425 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 426 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 427 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 428 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 429 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 430 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 431 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 432 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 433 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 491 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 495 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 493 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 544 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 457 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 466 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 497 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 454 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 453 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 452 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 451 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 488 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 488 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 484 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 554 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 554 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 549 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 507 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 500 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 499 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 498 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 450 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 448 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 447 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 543 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 486 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 486 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 482 IRQ_TYPE_EDGE_RISING>,
> + <GIC_SPI 419 IRQ_TYPE_EDGE_RISING>;
> + interrupt-names = "misc-pulse1",
> + "misc-latch",
> + "sw-exception",
> + "ce0",
> + "ce1",
> + "ce2",
> + "ce3",
> + "ce4",
> + "ce5",
> + "ce6",
> + "ce7",
> + "ce8",
> + "ce9",
> + "ce10",
> + "ce11",
> + "host2wbm-desc-feed",
> + "host2reo-re-injection",
> + "host2reo-command",
> + "host2rxdma-monitor-ring1",
> + "reo2ost-exception",
> + "wbm2host-rx-release",
> + "reo2host-status",
> + "reo2host-destination-ring4",
> + "reo2host-destination-ring3",
> + "reo2host-destination-ring2",
> + "reo2host-destination-ring1",
> + "rxdma2host-monitor-destination-mac3",
> + "rxdma2host-monitor-destination-mac2",
> + "rxdma2host-monitor-destination-mac1",
> + "host2rxdma-host-buf-ring-mac3",
> + "host2rxdma-host-buf-ring-mac2",
> + "host2rxdma-host-buf-ring-mac1",
> + "host2tcl-input-ring4",
> + "host2tcl-input-ring3",
> + "host2tcl-input-ring2",
> + "host2tcl-input-ring1",
> + "wbm2host-tx-completions-ring4",
> + "wbm2host-tx-completions-ring3",
> + "wbm2host-tx-completions-ring2",
> + "wbm2host-tx-completions-ring1",
> + "host2tx-monitor-ring1",
> + "txmon2host-monitor-destination-mac3",
> + "txmon2host-monitor-destination-mac2",
> + "txmon2host-monitor-destination-mac1",
> + "umac_reset";
> +
> + memory-region = <&q6_region>;
> + qcom,bdf-addr = <0x4B500000>;
> + qcom,board_id = <0x12>;
> + qcom,rproc = <&q6_wcss_pd1>;
> + status = "okay";
Drop
> + };
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module
2024-08-14 9:43 ` [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module Raj Kumar Bhagat
2024-08-16 5:42 ` Krzysztof Kozlowski
@ 2024-08-16 5:44 ` Krzysztof Kozlowski
2024-09-04 7:27 ` Raj Kumar Bhagat
1 sibling, 1 reply; 29+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-16 5:44 UTC (permalink / raw)
To: Raj Kumar Bhagat, ath12k; +Cc: linux-wireless
On 14/08/2024 11:43, Raj Kumar Bhagat wrote:
> + qcom,bdf-addr:
> + $ref: /schemas/types.yaml#/definitions/uint32
> + description:
> + System RAM memory address reserved for board data.
Also drop. We do not store RAM offsets in DT.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 02/18] arm64: dts: qcom: add wifi node for IPQ5332 based RDP441
2024-08-14 9:43 ` [RFC PATCH 02/18] arm64: dts: qcom: add wifi node for IPQ5332 based RDP441 Raj Kumar Bhagat
@ 2024-08-16 5:44 ` Krzysztof Kozlowski
0 siblings, 0 replies; 29+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-16 5:44 UTC (permalink / raw)
To: Raj Kumar Bhagat, ath12k; +Cc: linux-wireless
On 14/08/2024 11:43, Raj Kumar Bhagat wrote:
> +
> + /* Default Profile
> + * +============+==============+=====================+
> + * | | | |
> + * | Region | Start Offset | Size |
> + * | | | |
> + * +------------+--------------+---------------------+
> + * | | | |
> + * | | | |
> + * | | | |
> + * | WLAN Q6 | 0x4A900000 | 35MB |
> + * | | | |
> + * | | | |
> + * +------------+--------------+---------------------+
> + * | M3 Dump | 0x4CC00000 | 1MB |
> + * +============+==============+=====================+
> + * | |
> + * | |
> + * | |
> + * | Rest of memory for Linux |
> + * | |
> + * | |
> + * | |
> + * +=================================================+
> + */
> +
> + reserved-memory {
> + #address-cells = <2>;
> + #size-cells = <2>;
> + ranges;
> +
> + q6_region: wcnss@4a900000 {
> + no-map;
> + reg = <0x0 0x4a900000 0x0 0x02300000>;
> + };
> +
> + m3_dump: m3_dump@4cc00000 {
Follow DTS coding style.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 17/18] wifi: ath12k: add AHB driver support for IPQ5332
2024-08-14 9:43 ` [RFC PATCH 17/18] wifi: ath12k: add AHB driver support for IPQ5332 Raj Kumar Bhagat
@ 2024-08-16 5:47 ` Krzysztof Kozlowski
0 siblings, 0 replies; 29+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-16 5:47 UTC (permalink / raw)
To: Raj Kumar Bhagat, ath12k; +Cc: linux-wireless, Balamurugan S, P Praneesh
On 14/08/2024 11:43, Raj Kumar Bhagat wrote:
> From: Balamurugan S <quic_bselvara@quicinc.com>
>
> Add Initial Ath12k AHB driver support for IPQ5332. IPQ5332 is AHB
> based IEEE802.11be 2 GHz 2x2 WiFi device.
>
> Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
>
> Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
> Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
> Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
> Co-developed-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
> Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
> ---
...
> +
> + of_id = of_match_device(ath12k_ahb_of_match, &pdev->dev);
> + if (!of_id) {
> + dev_err(&pdev->dev, "Failed to find matching device tree id\n");
> + return -EINVAL;
> + }
> +
> + hw_rev = (enum ath12k_hw_rev)of_id->data;
Just use wrapper to get match data.
> +
> + switch (hw_rev) {
> + case ATH12K_HW_IPQ5332_HW10:
> + hif_ops = &ath12k_ahb_hif_ops_ipq5332;
> + break;
> + default:
> + dev_err(&pdev->dev, "Unsupported device type %d\n", hw_rev);
> + return -EOPNOTSUPP;
> + }
> +
> + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> + if (ret) {
> + dev_err(&pdev->dev, "Failed to set 32-bit consistent dma\n");
> + return ret;
> + }
> +
> + ab = ath12k_core_alloc(&pdev->dev, sizeof(struct ath12k_ahb),
> + ATH12K_BUS_AHB);
> + if (!ab) {
> + dev_err(&pdev->dev, "failed to allocate ath12k base\n");
> + return -ENOMEM;
> + }
> +
> + ab->hif.ops = hif_ops;
> + ab->pdev = pdev;
> + ab->hw_rev = hw_rev;
> + platform_set_drvdata(pdev, ab);
> +
> + /* Set fixed_mem_region to true for platforms that support fixed memory
> + * reservation from DT. If memory is reserved from DT for FW, ath12k driver
> + * need not to allocate memory.
> + */
> + if (!of_property_read_u32(ab->dev->of_node, "memory-region", &addr)) {
> + set_bit(ATH12K_FLAG_FIXED_MEM_REGION, &ab->dev_flags);
> + mem_node = of_find_node_by_name(NULL, "mlo_global_mem_0");
> + if (!mem_node)
> + ab->mlo_capable_flags = 0;
> + }
> +
> + ret = ath12k_core_pre_init(ab);
> + if (ret)
> + goto err_core_free;
> +
> + ret = ath12k_ahb_resource_init(ab);
> + if (ret)
> + goto err_core_free;
> +
> + ret = ath12k_hal_srng_init(ab);
> + if (ret)
> + goto err_resource_deinit;
> +
> + ret = ath12k_ce_alloc_pipes(ab);
> + if (ret) {
> + ath12k_err(ab, "failed to allocate ce pipes: %d\n", ret);
> + goto err_hal_srng_deinit;
> + }
> +
> + ath12k_ahb_init_qmi_ce_config(ab);
> +
> + ret = ath12k_core_get_rproc(ab);
> + if (ret) {
> + ath12k_err(ab, "failed to get rproc: %d\n", ret);
> + goto err_ce_free;
> + }
> +
> + ret = ath12k_ahb_config_irq(ab);
> + if (ret) {
> + ath12k_err(ab, "failed to configure irq: %d\n", ret);
> + goto err_ce_free;
> + }
> +
> + ret = ath12k_core_init(ab);
> + if (ret) {
> + ath12k_err(ab, "failed to init core: %d\n", ret);
> + goto err_ce_free;
> + }
> +
> + return 0;
> +
> +err_ce_free:
> + ath12k_ce_free_pipes(ab);
> +
> +err_hal_srng_deinit:
> + ath12k_hal_srng_deinit(ab);
> +
> +err_resource_deinit:
> + ath12k_ahb_resource_deinit(ab);
> +
> +err_core_free:
> + ath12k_core_free(ab);
> + platform_set_drvdata(pdev, NULL);
> +
> + return ret;
> +}
> +
> +static void ath12k_ahb_remove_prepare(struct ath12k_base *ab)
> +{
> + unsigned long left;
> +
> + if (test_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags)) {
> + left = wait_for_completion_timeout(&ab->driver_recovery,
> + ATH12K_AHB_RECOVERY_TIMEOUT);
> + if (!left)
> + ath12k_warn(ab, "failed to receive recovery response completion\n");
> + }
> +
> + set_bit(ATH12K_FLAG_UNREGISTERING, &ab->dev_flags);
> + cancel_work_sync(&ab->restart_work);
> + cancel_work_sync(&ab->qmi.event_work);
> +}
> +
> +static void ath12k_ahb_free_resources(struct ath12k_base *ab)
> +{
> + struct platform_device *pdev = ab->pdev;
> +
> + ath12k_ahb_free_irq(ab);
> + ath12k_hal_srng_deinit(ab);
> + ath12k_ce_free_pipes(ab);
> + ath12k_ahb_resource_deinit(ab);
> + ath12k_core_free(ab);
> + platform_set_drvdata(pdev, NULL);
> +}
> +
> +static void ath12k_ahb_remove(struct platform_device *pdev)
> +{
> + struct ath12k_base *ab = platform_get_drvdata(pdev);
> +
> + if (test_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags)) {
> + ath12k_ahb_power_down(ab, false);
> + ath12k_qmi_deinit_service(ab);
> + goto qmi_fail;
> + }
> +
> + ath12k_ahb_remove_prepare(ab);
> + ath12k_core_deinit(ab);
> +
> +qmi_fail:
> + ath12k_ahb_free_resources(ab);
> +}
> +
> +static void ath12k_ahb_shutdown(struct platform_device *pdev)
> +{
> + struct ath12k_base *ab = platform_get_drvdata(pdev);
> +
> + /* platform shutdown() & remove() are mutually exclusive.
> + * remove() is invoked during rmmod & shutdown() during
> + * system reboot/shutdown.
> + */
> + ath12k_ahb_remove_prepare(ab);
> +
> + if (!(test_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags)))
> + goto free_resources;
> +
> + ath12k_core_deinit(ab);
> +
> +free_resources:
> + ath12k_ahb_free_resources(ab);
Why? It's shutdown, we do not care about cleanup. Why do you need this
shutdown callback in the first place?
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module
2024-08-16 5:42 ` Krzysztof Kozlowski
@ 2024-09-04 7:23 ` Raj Kumar Bhagat
2024-09-04 7:38 ` Krzysztof Kozlowski
0 siblings, 1 reply; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-09-04 7:23 UTC (permalink / raw)
To: Krzysztof Kozlowski, ath12k; +Cc: linux-wireless
On 8/16/2024 11:12 AM, Krzysztof Kozlowski wrote:
> On 14/08/2024 11:43, Raj Kumar Bhagat wrote:
>> Add device-tree bindings for the ATH12K module found in the IPQ5332
>> device.
>>
>> Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
>
> <form letter>
> Please use scripts/get_maintainers.pl to get a list of necessary people
> and lists to CC. It might happen, that command when run on an older
> kernel, gives you outdated entries. Therefore please be sure you base
> your patches on recent Linux kernel.
>
> Tools like b4 or scripts/get_maintainer.pl provide you proper list of
> people, so fix your workflow. Tools might also fail if you work on some
> ancient tree (don't, instead use mainline) or work on fork of kernel
> (don't, instead use mainline). Just use b4 and everything should be
> fine, although remember about `b4 prep --auto-to-cc` if you added new
> patches to the patchset.
>
> You missed at least devicetree list (maybe more), so this won't be
> tested by automated tooling. Performing review on untested code might be
> a waste of time.
>
> Please kindly resend and include all necessary To/Cc entries.
> </form letter>
>
Thanks for the information. In next version we will use the script
"scripts/get_maintainers.pl" to get the list.
>> ---
>> .../net/wireless/qcom,ath12k-ahb.yaml | 325 ++++++++++++++++++
>> 1 file changed, 325 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
>>
>> diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
>> new file mode 100644
>> index 000000000000..8cecc50b6341
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k-ahb.yaml
>> @@ -0,0 +1,325 @@
>> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>> +# Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/net/wireless/qcom,ath12k-ahb.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Qualcomm Technologies ath12k wireless devices (AHB)
>> +
>> +maintainers:
>> + - Kalle Valo <kvalo@kernel.org>
>> + - Jeff Johnson <jjohnson@kernel.org>
>> +
>> +description:
>> + Qualcomm Technologies IEEE 802.11be AHB devices.
>> +
>> +properties:
>> + compatible:
>> + enum:
>> + - qcom,ipq5332-wifi
>> +
>> + reg:
>> + maxItems: 1
>> +
>> + clocks:
>> + minItems: 1
>> + maxItems: 2
>> +
>> + clock-names:
>> + minItems: 1
>> + maxItems: 2
>> +
>> + interrupts:
>> + minItems: 32
>> + maxItems: 56
>> +
>> + interrupt-names:
>> + minItems: 32
>> + maxItems: 56
>> +
>> + memory-region:
>> + minItems: 1
>> + description:
>> + phandle to a node describing reserved memory (System RAM memory)
>> + used by ath12k firmware (see bindings/reserved-memory/reserved-memory.txt)
>> +
>> + qcom,bdf-addr:
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + description:
>> + System RAM memory address reserved for board data.
>> +
>> + qcom,board_id:
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + description:
>> + Board id value, it identifies the variant of ath12k WiFi device.
>
> Please do not upstream whatever you have in your vendor tree... You even
> copied its style! There is no such property in upstream.
>
> NAK, you are duplicating compatibles.
>
>
qcom,board_id is a new parameter introduced to distinguish between different variants
of ath12k devices that share the same compatible value. This differentiation is crucial
as these variants have different qcom,board_id values (with the same compatible) based
on WiFi frequency bands capability. For example, 2 GHz, 5 GHz, 6 GHz, or multi-band
variants of ath12k devices have different qcom,board_id values.
In the next version, I will include the above information in the qcom,board_id
description.
>
>> +
>> + qcom,rproc:
>> + $ref: /schemas/types.yaml#/definitions/phandle
>> + description:
>> + DT entry of a WCSS node. WCSS node is the child node of q6 remoteproc driver.
>> + (see bindings/remoteproc/qcom,multipd-pil.yaml)
>> +
>> +required:
>> + - compatible
>> + - reg
>> + - memory-region
>> + - qcom,board_id
>> + - qcom,rproc
>> +
>> +additionalProperties: false
>> +
>> +allOf:
>> + - $ref: ieee80211.yaml#
>> + - if:
>> + properties:
>> + compatible:
>> + contains:
>> + enum:
>> + - qcom,ipq5332-wifi
>
> Why? You have only one variant, why this if?
sure, in next version we will remove the if handing as we are currently
adding only one compatible.
>> + then:
>> + properties:
>> + clocks:
>> + items:
>> + - description: gcc_xo_clk used for copy engine
>> + - description: gcc_im_sleep_clk used for q6.
>> +
>> + clock-names:
>> + items:
>> + - const: gcc_xo_clk
>> + - const: gcc_im_sleep_clk
>> +
>> + interrupts:
>> + items:
>> + - description: misc-pulse1 interrupt events
>> + - description: misc-latch interrupt events
>> + - description: sw exception interrupt events
>> + - description: interrupt event for ring CE0
>> + - description: interrupt event for ring CE1
>> + - description: interrupt event for ring CE2
>> + - description: interrupt event for ring CE3
>> + - description: interrupt event for ring CE4
>> + - description: interrupt event for ring CE5
>> + - description: interrupt event for ring CE6
>> + - description: interrupt event for ring CE7
>> + - description: interrupt event for ring CE8
>> + - description: interrupt event for ring CE9
>> + - description: interrupt event for ring CE10
>> + - description: interrupt event for ring CE11
>> + - description: interrupt event for ring host2wbm-desc-feed
>> + - description: interrupt event for ring host2reo-re-injection
>> + - description: interrupt event for ring host2reo-command
>> + - description: interrupt event for ring host2rxdma-monitor-ring1
>> + - description: interrupt event for ring reo2ost-exception
>> + - description: interrupt event for ring wbm2host-rx-release
>> + - description: interrupt event for ring reo2host-status
>> + - description: interrupt event for ring reo2host-destination-ring4
>> + - description: interrupt event for ring reo2host-destination-ring3
>> + - description: interrupt event for ring reo2host-destination-ring2
>> + - description: interrupt event for ring reo2host-destination-ring1
>> + - description: interrupt event for ring rxdma2host-monitor-destination-mac3
>> + - description: interrupt event for ring rxdma2host-monitor-destination-mac2
>> + - description: interrupt event for ring rxdma2host-monitor-destination-mac1
>> + - description: interrupt event for ring host2rxdma-host-buf-ring-mac3
>> + - description: interrupt event for ring host2rxdma-host-buf-ring-mac2
>> + - description: interrupt event for ring host2rxdma-host-buf-ring-mac1
>> + - description: interrupt event for ring host2tcl-input-ring4
>> + - description: interrupt event for ring host2tcl-input-ring3
>> + - description: interrupt event for ring host2tcl-input-ring2
>> + - description: interrupt event for ring host2tcl-input-ring1
>> + - description: interrupt event for ring wbm2host-tx-completions-ring4
>> + - description: interrupt event for ring wbm2host-tx-completions-ring3
>> + - description: interrupt event for ring wbm2host-tx-completions-ring2
>> + - description: interrupt event for ring wbm2host-tx-completions-ring1
>> + - description: interrupt event for ring host2tx-monitor-ring1
>> + - description: interrupt event for ring txmon2host-monitor-destination-mac3
>> + - description: interrupt event for ring txmon2host-monitor-destination-mac2
>> + - description: interrupt event for ring txmon2host-monitor-destination-mac1
>> + - description: interrupt event for umac_reset
>> + interrupt-names:
>> + items:
>> + - const: misc-pulse1
>> + - const: misc-latch
>> + - const: sw-exception
>> + - const: ce0
>> + - const: ce1
>> + - const: ce2
>> + - const: ce3
>> + - const: ce4
>> + - const: ce5
>> + - const: ce6
>> + - const: ce7
>> + - const: ce8
>> + - const: ce9
>> + - const: ce10
>> + - const: ce11
>> + - const: host2wbm-desc-feed
>> + - const: host2reo-re-injection
>> + - const: host2reo-command
>> + - const: host2rxdma-monitor-ring1
>> + - const: reo2ost-exception
>> + - const: wbm2host-rx-release
>> + - const: reo2host-status
>> + - const: reo2host-destination-ring4
>> + - const: reo2host-destination-ring3
>> + - const: reo2host-destination-ring2
>> + - const: reo2host-destination-ring1
>> + - const: rxdma2host-monitor-destination-mac3
>> + - const: rxdma2host-monitor-destination-mac2
>> + - const: rxdma2host-monitor-destination-mac1
>> + - const: host2rxdma-host-buf-ring-mac3
>> + - const: host2rxdma-host-buf-ring-mac2
>> + - const: host2rxdma-host-buf-ring-mac1
>> + - const: host2tcl-input-ring4
>> + - const: host2tcl-input-ring3
>> + - const: host2tcl-input-ring2
>> + - const: host2tcl-input-ring1
>> + - const: wbm2host-tx-completions-ring4
>> + - const: wbm2host-tx-completions-ring3
>> + - const: wbm2host-tx-completions-ring2
>> + - const: wbm2host-tx-completions-ring1
>> + - const: host2tx-monitor-ring1
>> + - const: txmon2host-monitor-destination-mac3
>> + - const: txmon2host-monitor-destination-mac2
>> + - const: txmon2host-monitor-destination-mac1
>> + - const: umac_reset
>> +
>> + - if:
>> + properties:
>> + compatible:
>> + contains:
>> + enum:
>> + - qcom,ipq5332-wifi
>> + then:
>> + required:
>> + - clocks
>> + - clock-names
>> + - interrupts
>> + - interrupt-names
>> + - qcom,bdf-addr
>> +
>> +examples:
>> + - |
>> +
>> + #include <dt-bindings/interrupt-controller/arm-gic.h>
>> + #include <dt-bindings/clock/qcom,ipq5332-gcc.h>
>> +
>> + reserved-memory {
>> + #address-cells = <2>;
>> + #size-cells = <2>;
>> +
>> + q6_region: wcnss@4a900000 {
>> + no-map;
>> + reg = <0x0 0x4a900000 0x0 0x02300000>;
>> + };
>> +
>> + m3_dump: m3_dump@4cc00000 {
>> + no-map;
>> + reg = <0x0 0x4CC00000 0x0 0x100000>;
>> + };
>> + };
>
> Drop
>
Sure, will drop reserved-memory for example.
>> +
>> + wifi0: wifi@c0000000 {
>> + compatible = "qcom,ipq5332-wifi";
>> + reg = <0xc000000 0x1000000>;
>> + clocks = <&gcc GCC_XO_CLK>,
>> + <&gcc GCC_IM_SLEEP_CLK>;
>> + clock-names = "gcc_xo_clk",
>> + "gcc_im_sleep_clk";
>> + interrupts = <GIC_SPI 559 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 560 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 561 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 422 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 423 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 424 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 425 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 426 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 427 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 428 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 429 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 430 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 431 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 432 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 433 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 491 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 495 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 493 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 544 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 457 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 466 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 497 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 454 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 453 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 452 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 451 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 488 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 488 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 484 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 554 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 554 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 549 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 507 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 500 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 499 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 498 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 450 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 448 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 447 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 543 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 486 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 486 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 482 IRQ_TYPE_EDGE_RISING>,
>> + <GIC_SPI 419 IRQ_TYPE_EDGE_RISING>;
>> + interrupt-names = "misc-pulse1",
>> + "misc-latch",
>> + "sw-exception",
>> + "ce0",
>> + "ce1",
>> + "ce2",
>> + "ce3",
>> + "ce4",
>> + "ce5",
>> + "ce6",
>> + "ce7",
>> + "ce8",
>> + "ce9",
>> + "ce10",
>> + "ce11",
>> + "host2wbm-desc-feed",
>> + "host2reo-re-injection",
>> + "host2reo-command",
>> + "host2rxdma-monitor-ring1",
>> + "reo2ost-exception",
>> + "wbm2host-rx-release",
>> + "reo2host-status",
>> + "reo2host-destination-ring4",
>> + "reo2host-destination-ring3",
>> + "reo2host-destination-ring2",
>> + "reo2host-destination-ring1",
>> + "rxdma2host-monitor-destination-mac3",
>> + "rxdma2host-monitor-destination-mac2",
>> + "rxdma2host-monitor-destination-mac1",
>> + "host2rxdma-host-buf-ring-mac3",
>> + "host2rxdma-host-buf-ring-mac2",
>> + "host2rxdma-host-buf-ring-mac1",
>> + "host2tcl-input-ring4",
>> + "host2tcl-input-ring3",
>> + "host2tcl-input-ring2",
>> + "host2tcl-input-ring1",
>> + "wbm2host-tx-completions-ring4",
>> + "wbm2host-tx-completions-ring3",
>> + "wbm2host-tx-completions-ring2",
>> + "wbm2host-tx-completions-ring1",
>> + "host2tx-monitor-ring1",
>> + "txmon2host-monitor-destination-mac3",
>> + "txmon2host-monitor-destination-mac2",
>> + "txmon2host-monitor-destination-mac1",
>> + "umac_reset";
>> +
>> + memory-region = <&q6_region>;
>> + qcom,bdf-addr = <0x4B500000>;
>> + qcom,board_id = <0x12>;
>> + qcom,rproc = <&q6_wcss_pd1>;
>> + status = "okay";
>
> Drop
>
sure will drop the status.
>> + };
>
> Best regards,
> Krzysztof
>
>
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module
2024-08-16 5:44 ` Krzysztof Kozlowski
@ 2024-09-04 7:27 ` Raj Kumar Bhagat
0 siblings, 0 replies; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-09-04 7:27 UTC (permalink / raw)
To: Krzysztof Kozlowski, ath12k; +Cc: linux-wireless
On 8/16/2024 11:14 AM, Krzysztof Kozlowski wrote:
> On 14/08/2024 11:43, Raj Kumar Bhagat wrote:
>> + qcom,bdf-addr:
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + description:
>> + System RAM memory address reserved for board data.
>
> Also drop. We do not store RAM offsets in DT.
>
Sure, we will move this to driver hardware parameter.
> Best regards,
> Krzysztof
>
>
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module
2024-09-04 7:23 ` Raj Kumar Bhagat
@ 2024-09-04 7:38 ` Krzysztof Kozlowski
2024-09-04 11:28 ` Raj Kumar Bhagat
0 siblings, 1 reply; 29+ messages in thread
From: Krzysztof Kozlowski @ 2024-09-04 7:38 UTC (permalink / raw)
To: Raj Kumar Bhagat, ath12k; +Cc: linux-wireless
On 04/09/2024 09:23, Raj Kumar Bhagat wrote:
>>> + qcom,board_id:
>>> + $ref: /schemas/types.yaml#/definitions/uint32
>>> + description:
>>> + Board id value, it identifies the variant of ath12k WiFi device.
>>
>> Please do not upstream whatever you have in your vendor tree... You even
>> copied its style! There is no such property in upstream.
>>
>> NAK, you are duplicating compatibles.
>>
>>
>
> qcom,board_id is a new parameter introduced to distinguish between different variants
> of ath12k devices that share the same compatible value. This differentiation is crucial
> as these variants have different qcom,board_id values (with the same compatible) based
You must explain why compatible cannot be used for that.
> on WiFi frequency bands capability. For example, 2 GHz, 5 GHz, 6 GHz, or multi-band
> variants of ath12k devices have different qcom,board_id values.
>
> In the next version, I will include the above information in the qcom,board_id
> description.
Please follow DTS coding style. And style of existing properties like
this. Did you look for them? I claim you just sent whatever you had in
downstream.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module
2024-09-04 7:38 ` Krzysztof Kozlowski
@ 2024-09-04 11:28 ` Raj Kumar Bhagat
2024-09-04 11:42 ` Krzysztof Kozlowski
0 siblings, 1 reply; 29+ messages in thread
From: Raj Kumar Bhagat @ 2024-09-04 11:28 UTC (permalink / raw)
To: Krzysztof Kozlowski, ath12k; +Cc: linux-wireless
On 9/4/2024 1:08 PM, Krzysztof Kozlowski wrote:
> On 04/09/2024 09:23, Raj Kumar Bhagat wrote:
>>>> + qcom,board_id:
>>>> + $ref: /schemas/types.yaml#/definitions/uint32
>>>> + description:
>>>> + Board id value, it identifies the variant of ath12k WiFi device.
>>>
>>> Please do not upstream whatever you have in your vendor tree... You even
>>> copied its style! There is no such property in upstream.
>>>
>>> NAK, you are duplicating compatibles.
>>>
>>>
>>
>> qcom,board_id is a new parameter introduced to distinguish between different variants
>> of ath12k devices that share the same compatible value. This differentiation is crucial
>> as these variants have different qcom,board_id values (with the same compatible) based
>
> You must explain why compatible cannot be used for that.
>
The compatible property is used to define the variant of the Ath12k device. However, the
Ath12k device variant does not change with different capabilities or configurations
(e.g., operating band). The qcom,board_id parameter is introduced to define these
configurations, not the device variant itself.
>> on WiFi frequency bands capability. For example, 2 GHz, 5 GHz, 6 GHz, or multi-band
>> variants of ath12k devices have different qcom,board_id values.
>>
>> In the next version, I will include the above information in the qcom,board_id
>> description.
>
> Please follow DTS coding style. And style of existing properties like
> this. Did you look for them? I claim you just sent whatever you had in
> downstream.
>
Checked "Devicetree Specification, Release v0.4", section 4.1.1,
seems "_" to be avoided for property name and hyphen "-" to be used. Also, qcom,board-id
is already taken in "Documentation/devicetree/bindings/arm/qcom.yaml". In the next
version will change this property name.
>
> Best regards,
> Krzysztof
>
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module
2024-09-04 11:28 ` Raj Kumar Bhagat
@ 2024-09-04 11:42 ` Krzysztof Kozlowski
2024-09-05 18:33 ` Kalle Valo
0 siblings, 1 reply; 29+ messages in thread
From: Krzysztof Kozlowski @ 2024-09-04 11:42 UTC (permalink / raw)
To: Raj Kumar Bhagat, ath12k; +Cc: linux-wireless
On 04/09/2024 13:28, Raj Kumar Bhagat wrote:
> On 9/4/2024 1:08 PM, Krzysztof Kozlowski wrote:
>> On 04/09/2024 09:23, Raj Kumar Bhagat wrote:
>>>>> + qcom,board_id:
>>>>> + $ref: /schemas/types.yaml#/definitions/uint32
>>>>> + description:
>>>>> + Board id value, it identifies the variant of ath12k WiFi device.
>>>>
>>>> Please do not upstream whatever you have in your vendor tree... You even
>>>> copied its style! There is no such property in upstream.
>>>>
>>>> NAK, you are duplicating compatibles.
>>>>
>>>>
>>>
>>> qcom,board_id is a new parameter introduced to distinguish between different variants
>>> of ath12k devices that share the same compatible value. This differentiation is crucial
>>> as these variants have different qcom,board_id values (with the same compatible) based
>>
>> You must explain why compatible cannot be used for that.
>>
>
> The compatible property is used to define the variant of the Ath12k device. However, the
> Ath12k device variant does not change with different capabilities or configurations
> (e.g., operating band). The qcom,board_id parameter is introduced to define these
> configurations, not the device variant itself.
operating aspects are run-time, so not suitable here. It's all still
vague for me.
>
>>> on WiFi frequency bands capability. For example, 2 GHz, 5 GHz, 6 GHz, or multi-band
>>> variants of ath12k devices have different qcom,board_id values.
>>>
>>> In the next version, I will include the above information in the qcom,board_id
>>> description.
>>
>> Please follow DTS coding style. And style of existing properties like
>> this. Did you look for them? I claim you just sent whatever you had in
>> downstream.
>>
>
> Checked "Devicetree Specification, Release v0.4", section 4.1.1,
> seems "_" to be avoided for property name and hyphen "-" to be used. Also, qcom,board-id
> is already taken in "Documentation/devicetree/bindings/arm/qcom.yaml". In the next
> version will change this property name.
Look at existing bindings and see how they are doing it. Sorry, you
still did not give any good rationale why compatibles cannot be used. If
this is board specific implementation, then the board compatible defines
differences.
You need to be specific, not so vague, about problem you are solving.
Don't answer with half-baked explanations just to get rid of reviewer.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module
2024-09-04 11:42 ` Krzysztof Kozlowski
@ 2024-09-05 18:33 ` Kalle Valo
0 siblings, 0 replies; 29+ messages in thread
From: Kalle Valo @ 2024-09-05 18:33 UTC (permalink / raw)
To: Krzysztof Kozlowski; +Cc: Raj Kumar Bhagat, ath12k, linux-wireless
Krzysztof Kozlowski <krzk@kernel.org> writes:
> On 04/09/2024 13:28, Raj Kumar Bhagat wrote:
>
>> On 9/4/2024 1:08 PM, Krzysztof Kozlowski wrote:
>>> On 04/09/2024 09:23, Raj Kumar Bhagat wrote:
>>>>>> + qcom,board_id:
>>>>>> + $ref: /schemas/types.yaml#/definitions/uint32
>>>>>> + description:
>>>>>> + Board id value, it identifies the variant of ath12k WiFi device.
>>>>>
>>>>> Please do not upstream whatever you have in your vendor tree... You even
>>>>> copied its style! There is no such property in upstream.
>>>>>
>>>>> NAK, you are duplicating compatibles.
>>>>>
>>>>>
>>>>
>>>> qcom,board_id is a new parameter introduced to distinguish between different variants
>>>> of ath12k devices that share the same compatible value. This differentiation is crucial
>>>> as these variants have different qcom,board_id values (with the same compatible) based
>>>
>>> You must explain why compatible cannot be used for that.
>>>
>>
>> The compatible property is used to define the variant of the Ath12k device. However, the
>> Ath12k device variant does not change with different capabilities or configurations
>> (e.g., operating band). The qcom,board_id parameter is introduced to define these
>> configurations, not the device variant itself.
>
> operating aspects are run-time, so not suitable here. It's all still
> vague for me.
Yeah, this is weird and I would hope there is a better way to do it.
Unfortunately I'm not able to study this in detail right now but, like
you said, most likely this is just directly copied from QSDK (their
downstream).
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2024-09-05 18:33 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-14 9:43 [RFC PATCH 00/18] wifi: ath12k: add Ath12k AHB driver support for IPQ5332 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 01/18] dt-bindings: net: wireless: describe the ath12k AHB module Raj Kumar Bhagat
2024-08-16 5:42 ` Krzysztof Kozlowski
2024-09-04 7:23 ` Raj Kumar Bhagat
2024-09-04 7:38 ` Krzysztof Kozlowski
2024-09-04 11:28 ` Raj Kumar Bhagat
2024-09-04 11:42 ` Krzysztof Kozlowski
2024-09-05 18:33 ` Kalle Valo
2024-08-16 5:44 ` Krzysztof Kozlowski
2024-09-04 7:27 ` Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 02/18] arm64: dts: qcom: add wifi node for IPQ5332 based RDP441 Raj Kumar Bhagat
2024-08-16 5:44 ` Krzysztof Kozlowski
2024-08-14 9:43 ` [RFC PATCH 03/18] wifi: ath12k: add ath12k_hw_params for IPQ5332 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 04/18] wifi: ath12k: refactor ath12k_hw_regs structure Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 05/18] wifi: ath12k: add ath12k_hw_regs for IPQ5332 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 06/18] wifi: ath12k: add ath12k_hw_ring_mask " Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 07/18] wifi: ath12k: add CE configurations " Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 08/18] wifi: ath12k: add ath12k_hw_hal_params " Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 09/18] wifi: ath12k: avoid m3 firmware download in AHB device IPQ5332 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 10/18] wifi: ath12k: add new CMEM read-write ath12k_hif_ops Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 11/18] wifi: ath12k: remap CMEM register space for IPQ5332 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 12/18] wifi: ath12k: fix incorrect CE addresses Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 13/18] wifi: ath12k: remap CE register space for IPQ5332 Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 14/18] wifi: ath12k: add support for fixed QMI firmware memory Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 15/18] wifi: ath12k: add support to read board_id from device-tree Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 16/18] wifi: ath12k: convert tasklet to BH workqueue for CE interrupts Raj Kumar Bhagat
2024-08-14 9:43 ` [RFC PATCH 17/18] wifi: ath12k: add AHB driver support for IPQ5332 Raj Kumar Bhagat
2024-08-16 5:47 ` Krzysztof Kozlowski
2024-08-14 9:43 ` [RFC PATCH 18/18] wifi: ath12k: enable ath12k AHB support Raj Kumar Bhagat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).