* [PATCH 0/4] Add support for Amlogic HCI UART
@ 2024-07-05 11:20 Yang Li via B4 Relay
2024-07-05 11:20 ` [PATCH 1/4] dt-bindings: net: bluetooth: Add support for Amlogic Bluetooth Yang Li via B4 Relay
` (3 more replies)
0 siblings, 4 replies; 19+ messages in thread
From: Yang Li via B4 Relay @ 2024-07-05 11:20 UTC (permalink / raw)
To: Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon
Cc: linux-bluetooth, netdev, devicetree, linux-kernel,
linux-arm-kernel, Yang Li, Ye He
Add support for Amlogic HCI UART, including dt-binding, Amlogic Bluetooth driver
and enable HCIUART_AML in defconfig.
Signed-off-by: Yang Li <yang.li@amlogic.com>
---
Yang Li (4):
dt-bindings: net: bluetooth: Add support for Amlogic Bluetooth
Bluetooth: hci_uart: Add support for Amlogic HCI UART
arm64: defconfig: Enable hci_uart for Amlogic Bluetooth
MAINTAINERS: Add an entry for Amlogic HCI UART
.../bindings/net/bluetooth/amlogic,w155s2-bt.yaml | 62 ++
MAINTAINERS | 8 +
arch/arm64/configs/defconfig | 1 +
drivers/bluetooth/Kconfig | 13 +
drivers/bluetooth/Makefile | 1 +
drivers/bluetooth/hci_aml.c | 749 +++++++++++++++++++++
drivers/bluetooth/hci_ldisc.c | 8 +-
drivers/bluetooth/hci_uart.h | 8 +-
8 files changed, 847 insertions(+), 3 deletions(-)
---
base-commit: e3203b17771757fdcd259d6378673f1590e36694
change-id: 20240418-btaml-f9d7b19724ab
Best regards,
--
Yang Li <yang.li@amlogic.com>
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 1/4] dt-bindings: net: bluetooth: Add support for Amlogic Bluetooth 2024-07-05 11:20 [PATCH 0/4] Add support for Amlogic HCI UART Yang Li via B4 Relay @ 2024-07-05 11:20 ` Yang Li via B4 Relay 2024-07-07 13:08 ` Krzysztof Kozlowski 2024-07-05 11:20 ` [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART Yang Li via B4 Relay ` (2 subsequent siblings) 3 siblings, 1 reply; 19+ messages in thread From: Yang Li via B4 Relay @ 2024-07-05 11:20 UTC (permalink / raw) To: Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel, Yang Li From: Yang Li <yang.li@amlogic.com> Add binding document for Amlogic Bluetooth chipsets attached over UART. Signed-off-by: Yang Li <yang.li@amlogic.com> --- .../bindings/net/bluetooth/amlogic,w155s2-bt.yaml | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml b/Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml new file mode 100644 index 000000000000..d59e3206af62 --- /dev/null +++ b/Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml @@ -0,0 +1,62 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2024 Amlogic, Inc. All rights reserved +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/bluetooth/amlogic,w155s2-bt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Bluetooth chips + +description: + This binding describes UART-attached Amlogic bluetooth chips. + +maintainers: + - Yang Li <yang.li@amlogic.com> + +properties: + compatible: + oneOf: + - const: amlogic,w155s2-bt + - items: + - enum: + - amlogic,w265s1-bt + - amlogic,w265p1-bt + - amlogic,w265s2-bt + - const: amlogic,w155s2-bt + + amlogic,wcn-pwrseq: + default: 0 + description: specify the power sequence used to power on Bluetooth + $ref: /schemas/types.yaml#/definitions/uint32 + + amlogic,firmware: + description: specify the path of firmware bin to load + $ref: /schemas/types.yaml#/definitions/string-array + + amlogic,antenna-number: + default: 1 + description: number of antenna + $ref: /schemas/types.yaml#/definitions/uint32 + + amlogic,a2dp-sink-enable: + default: 0 + description: enable sink mode with controller + $ref: /schemas/types.yaml#/definitions/uint32 + +required: + - compatible + - amlogic,wcn-pwrseq + - amlogic,firmware + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + serial { + bluetooth { + compatible = "amlogic,w155s2-bt"; + amlogic,wcn-pwrseq = <1>; + amlogic,firmware = "amlogic/aml_w155s2_bt_uart.bin"; + }; + }; -- 2.42.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 1/4] dt-bindings: net: bluetooth: Add support for Amlogic Bluetooth 2024-07-05 11:20 ` [PATCH 1/4] dt-bindings: net: bluetooth: Add support for Amlogic Bluetooth Yang Li via B4 Relay @ 2024-07-07 13:08 ` Krzysztof Kozlowski 2024-07-11 10:58 ` Yang Li 0 siblings, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-07-07 13:08 UTC (permalink / raw) To: yang.li, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel On 05/07/2024 13:20, Yang Li via B4 Relay wrote: > From: Yang Li <yang.li@amlogic.com> > > Add binding document for Amlogic Bluetooth chipsets attached over UART. > > Signed-off-by: Yang Li <yang.li@amlogic.com> > --- > .../bindings/net/bluetooth/amlogic,w155s2-bt.yaml | 62 ++++++++++++++++++++++ > 1 file changed, 62 insertions(+) > > diff --git a/Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml b/Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml > new file mode 100644 > index 000000000000..d59e3206af62 > --- /dev/null > +++ b/Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml > @@ -0,0 +1,62 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +# Copyright (C) 2024 Amlogic, Inc. All rights reserved > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/net/bluetooth/amlogic,w155s2-bt.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Amlogic Bluetooth chips > + > +description: > + This binding describes UART-attached Amlogic bluetooth chips. Do not say that binding describes a binding. It is not helpful. Describe the hardware instead. > + > +maintainers: > + - Yang Li <yang.li@amlogic.com> > + > +properties: > + compatible: > + oneOf: > + - const: amlogic,w155s2-bt > + - items: > + - enum: > + - amlogic,w265s1-bt > + - amlogic,w265p1-bt > + - amlogic,w265s2-bt > + - const: amlogic,w155s2-bt > + > + amlogic,wcn-pwrseq: ?? > + default: 0 > + description: specify the power sequence used to power on Bluetooth > + $ref: /schemas/types.yaml#/definitions/uint32 What? I have no clue what is this and have no clue what to say here. Drop. > + > + amlogic,firmware: > + description: specify the path of firmware bin to load > + $ref: /schemas/types.yaml#/definitions/string-array Srsly, it's third case in your bindings. Do not re-invent the wheel but use existing, common properties. How to find them? Well, git grep or ask your colleagues... > + > + amlogic,antenna-number: > + default: 1 > + description: number of antenna Useless description. Do not repeat the property name but explain what is it and how it is used. Or drop the property. > + $ref: /schemas/types.yaml#/definitions/uint32 > + > + amlogic,a2dp-sink-enable: > + default: 0 > + description: enable sink mode with controller Again, not possible to figure out. NAK > + $ref: /schemas/types.yaml#/definitions/uint32 > + > +required: > + - compatible > + - amlogic,wcn-pwrseq > + - amlogic,firmware > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/gpio/gpio.h> > + serial { Drop > + bluetooth { > + compatible = "amlogic,w155s2-bt"; > + amlogic,wcn-pwrseq = <1>; Joking, right? Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/4] dt-bindings: net: bluetooth: Add support for Amlogic Bluetooth 2024-07-07 13:08 ` Krzysztof Kozlowski @ 2024-07-11 10:58 ` Yang Li 0 siblings, 0 replies; 19+ messages in thread From: Yang Li @ 2024-07-11 10:58 UTC (permalink / raw) To: Krzysztof Kozlowski, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel On 2024/7/7 21:08, Krzysztof Kozlowski wrote: > [你通常不会收到来自 krzk@kernel.org 的电子邮件。请访问 https://aka.ms/LearnAboutSenderIdentification，以了解这一点为什么很重要] > > [ EXTERNAL EMAIL ] > > On 05/07/2024 13:20, Yang Li via B4 Relay wrote: >> From: Yang Li <yang.li@amlogic.com> >> >> Add binding document for Amlogic Bluetooth chipsets attached over UART. >> >> Signed-off-by: Yang Li <yang.li@amlogic.com> >> --- >> .../bindings/net/bluetooth/amlogic,w155s2-bt.yaml | 62 ++++++++++++++++++++++ >> 1 file changed, 62 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml b/Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml >> new file mode 100644 >> index 000000000000..d59e3206af62 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml >> @@ -0,0 +1,62 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +# Copyright (C) 2024 Amlogic, Inc. All rights reserved >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/net/bluetooth/amlogic,w155s2-bt.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Amlogic Bluetooth chips >> + >> +description: >> + This binding describes UART-attached Amlogic bluetooth chips. > Do not say that binding describes a binding. It is not helpful. Describe > the hardware instead. Well do. > >> + >> +maintainers: >> + - Yang Li <yang.li@amlogic.com> >> + >> +properties: >> + compatible: >> + oneOf: >> + - const: amlogic,w155s2-bt >> + - items: >> + - enum: >> + - amlogic,w265s1-bt >> + - amlogic,w265p1-bt >> + - amlogic,w265s2-bt >> + - const: amlogic,w155s2-bt >> + >> + amlogic,wcn-pwrseq: > ?? I will remove this line, add regolator. > >> + default: 0 >> + description: specify the power sequence used to power on Bluetooth >> + $ref: /schemas/types.yaml#/definitions/uint32 > What? I have no clue what is this and have no clue what to say here. Drop. will do. >> + >> + amlogic,firmware: >> + description: specify the path of firmware bin to load >> + $ref: /schemas/types.yaml#/definitions/string-array > Srsly, it's third case in your bindings. Do not re-invent the wheel but > use existing, common properties. How to find them? Well, git grep or ask > your colleagues... I will change "amlogic,firmware" to " firmware-name". >> + >> + amlogic,antenna-number: >> + default: 1 >> + description: number of antenna > Useless description. Do not repeat the property name but explain what is > it and how it is used. > > Or drop the property. I will change the description. > >> + $ref: /schemas/types.yaml#/definitions/uint32 >> + >> + amlogic,a2dp-sink-enable: >> + default: 0 >> + description: enable sink mode with controller > Again, not possible to figure out. > > NAK Well do. > >> + $ref: /schemas/types.yaml#/definitions/uint32 >> + >> +required: >> + - compatible >> + - amlogic,wcn-pwrseq >> + - amlogic,firmware >> + >> +additionalProperties: false >> + >> +examples: >> + - | >> + #include <dt-bindings/gpio/gpio.h> >> + serial { > Drop Will do. > >> + bluetooth { >> + compatible = "amlogic,w155s2-bt"; >> + amlogic,wcn-pwrseq = <1>; > Joking, right? Well, I will remove it. > > > > Best regards, > Krzysztof > ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART 2024-07-05 11:20 [PATCH 0/4] Add support for Amlogic HCI UART Yang Li via B4 Relay 2024-07-05 11:20 ` [PATCH 1/4] dt-bindings: net: bluetooth: Add support for Amlogic Bluetooth Yang Li via B4 Relay @ 2024-07-05 11:20 ` Yang Li via B4 Relay 2024-07-07 13:10 ` Krzysztof Kozlowski 2024-07-09 14:41 ` Luiz Augusto von Dentz 2024-07-05 11:20 ` [PATCH 3/4] arm64: defconfig: Enable hci_uart for Amlogic Bluetooth Yang Li via B4 Relay 2024-07-05 11:20 ` [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART Yang Li via B4 Relay 3 siblings, 2 replies; 19+ messages in thread From: Yang Li via B4 Relay @ 2024-07-05 11:20 UTC (permalink / raw) To: Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel, Yang Li, Ye He From: Yang Li <yang.li@amlogic.com> This patch introduces support for Amlogic Bluetooth controller over UART. In order to send the final firmware at full speed. It is a pretty straight forward H4 driver with exception of actually having it's own setup address configuration. Co-developed-by: Ye He <ye.he@amlogic.com> Signed-off-by: Yang Li <yang.li@amlogic.com> --- drivers/bluetooth/Kconfig | 13 + drivers/bluetooth/Makefile | 1 + drivers/bluetooth/hci_aml.c | 749 ++++++++++++++++++++++++++++++++++++++++++ drivers/bluetooth/hci_ldisc.c | 8 +- drivers/bluetooth/hci_uart.h | 8 +- 5 files changed, 776 insertions(+), 3 deletions(-) diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 87484f5de8e3..634479e10cb7 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -273,6 +273,19 @@ config BT_HCIUART_MRVL Say Y here to compile support for HCI MRVL protocol. +config BT_HCIUART_AML + bool "Amlogic protocol support" + depends on BT_HCIUART + depends on BT_HCIUART_SERDEV + select BT_HCIUART_H4 + select FW_LOADER + select POWER_SEQUENCING_AML_WCN + help + The Amlogic protocol support enables Bluetooth HCI over serial + port interface for Amlogic Bluetooth controllers. + + Say Y here to compile support for HCI AML protocol. + config BT_HCIBCM203X tristate "HCI BCM203x USB driver" depends on USB diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index 0730d6684d1a..81856512ddd0 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile @@ -51,4 +51,5 @@ hci_uart-$(CONFIG_BT_HCIUART_BCM) += hci_bcm.o hci_uart-$(CONFIG_BT_HCIUART_QCA) += hci_qca.o hci_uart-$(CONFIG_BT_HCIUART_AG6XX) += hci_ag6xx.o hci_uart-$(CONFIG_BT_HCIUART_MRVL) += hci_mrvl.o +hci_uart-$(CONFIG_BT_HCIUART_AML) += hci_aml.o hci_uart-objs := $(hci_uart-y) diff --git a/drivers/bluetooth/hci_aml.c b/drivers/bluetooth/hci_aml.c new file mode 100644 index 000000000000..33a27a555343 --- /dev/null +++ b/drivers/bluetooth/hci_aml.c @@ -0,0 +1,749 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR MIT) +/* + * Copyright (C) 2024 Amlogic, Inc. All rights reserved + */ + +#include <linux/kernel.h> +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> +#include <linux/of.h> +#include <linux/serdev.h> +#include <linux/pwm.h> +#include <linux/clk.h> +#include <linux/mutex.h> +#include <asm/unaligned.h> +#include <linux/firmware.h> +#include <linux/vmalloc.h> +#include <linux/pwrseq/consumer.h> +#include <net/bluetooth/bluetooth.h> +#include <net/bluetooth/hci_core.h> +#include <net/bluetooth/hci.h> + +#include "hci_uart.h" + +#define AML_EVT_HEAD_SIZE 4 +#define AML_BDADDR_DEFAULT (&(bdaddr_t) {{ 0x00, 0xff, 0x00, 0x22, 0x2d, 0xae }}) + +#define AML_FIRMWARE_OPERATION_SIZE (248) +#define AML_FIRMWARE_MAX_SIZE (512 * 1024) + +/* waiting time (ms) */ +#define AML_WAIT_CHIP_START_UP (350) + +/* TCI command */ +#define AML_TCI_CMD_READ 0xFEF0 +#define AML_TCI_CMD_WRITE 0xFEF1 +#define AML_TCI_CMD_UPDATE_BAUDRATE 0xFEF2 +#define AML_TCI_CMD_HARDWARE_RESET 0xFEF2 +#define AML_TCI_CMD_DOWNLOAD_BT_FW 0xFEF3 +#define AML_BT_HCI_VENDOR_CMD 0xFC1A + +/* TCI operation parameter in controller chip */ +#define AML_OP_UART_MODE 0x00A30128 +#define AML_OP_EVT_ENABLE 0x00A70014 +#define AML_OP_MEM_HARD_TRANS_EN 0x00A7000C +#define AML_OP_RF_CFG 0x00F03040 +#define AML_OP_RAM_POWER_CTR 0x00F03050 +#define AML_OP_HARDWARE_RST 0x00F03058 +#define AML_OP_ICCM_RAM_BASE 0x00000000 +#define AML_OP_DCCM_RAM_BASE 0x00D00000 + +/* uart configuration */ +#define AML_UART_XMIT_EN BIT(12) +#define AML_UART_RECV_EN BIT(13) +#define AML_UART_TIMEOUT_INT_EN BIT(14) +#define AML_UART_CLK_SOURCE 40000000 + +/* controller event enable/disable */ +#define AML_EVT_EN BIT(24) + +/* RAM power down control */ +#define AML_RAM_POWER_ON (0) +#define AML_RAM_POWER_OFF (1) + +/* RF configuration */ +#define AML_RF_A2DP_SINK_EN BIT(25) +#define AML_RF_ANT_SINGLE BIT(28) +#define AML_RF_ANT_DOUBLE BIT(29) +#define AML_RF_ANT_BASE (28) +#define AML_BT_CTR_SET_ANT(ant_num) (BIT(((ant_num) - 1)) << AML_RF_ANT_BASE) + +/* memory control hard transaction */ +#define AML_MM_CTR_HARD_TRAS_EN BIT(27) + +/* controller hardware reset */ +#define AML_CTR_CPU_RESET BIT(8) +#define AML_CTR_MAC_RESET BIT(9) +#define AML_CTR_PHY_RESET BIT(10) + +enum { + FW_ICCM, + FW_DCCM +}; + +struct aml_fw_len { + u32 iccm_len; + u32 dccm_len; +}; + +struct aml_tci_rsp { + u8 num_cmd_packet; + u16 opcode; + u8 status; +} __packed; + +struct aml_rf_cfg { + u32 ant_number; + u32 a2dp_sink_en; +}; + +struct aml_serdev { + struct hci_uart serdev_hu; + struct device *dev; + struct aml_rf_cfg rf_cfg; + struct pwrseq_desc *pwrseq; + const char *firmware_name; + int iccm_offset; + int dccm_offset; +}; + +struct aml_data { + struct sk_buff *rx_skb; + struct sk_buff_head txq; +}; + +struct aml_device_data { + int iccm_offset; + int dccm_offset; +}; + +static const struct h4_recv_pkt aml_recv_pkts[] = { + {H4_RECV_ACL, .recv = hci_recv_frame}, + {H4_RECV_SCO, .recv = hci_recv_frame}, + {H4_RECV_EVENT, .recv = hci_recv_frame}, + {H4_RECV_ISO, .recv = hci_recv_frame}, +}; + +/* The TCI command is private of Amlogic, it is used to configure before BT chip + * startup, contains update baudrate, update firmware, set public addr ... + * op_code | op_len | op_addr | parameter | + * --------|-----------------------|---------|-------------| + * 2B | 1B len(addr+param) | 4B | len(param) | + */ +static int aml_send_tci_cmd(struct hci_dev *hdev, u16 op_code, u32 op_addr, + u32 *param, u32 param_len) +{ + struct sk_buff *skb = NULL; + struct aml_tci_rsp *rsp = NULL; + u8 *buf = NULL; + u32 buf_len = 0; + int err = 0; + + buf_len = sizeof(op_addr) + param_len; + buf = vmalloc(buf_len); + if (!buf) { + BT_ERR("Failed to alloc memory."); + err = -ENOMEM; + goto exit; + } + + memcpy(buf, &op_addr, sizeof(op_addr)); + if (param && param_len > 0) + memcpy(buf + sizeof(op_addr), param, param_len); + + skb = __hci_cmd_sync_ev(hdev, op_code, buf_len, buf, + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); + if (IS_ERR(skb)) { + err = PTR_ERR(skb); + skb = NULL; + BT_ERR("Failed to send TCI cmd:(%d)", err); + goto exit; + } + + rsp = (struct aml_tci_rsp *)(skb->data); + if (rsp->opcode != op_code || rsp->status != 0x00) { + BT_ERR("send TCI cmd(0x%04X), response(0x%04X):(%d)", + op_code, rsp->opcode, rsp->status); + err = -EINVAL; + goto exit; + } + +exit: + if (buf) + vfree(buf); + if (skb) + kfree_skb(skb); + return err; +} + +static int aml_update_chip_baudrate(struct hci_dev *hdev, u32 baud) +{ + u32 value; + + value = ((AML_UART_CLK_SOURCE / baud) - 1) & 0x0FFF; + value |= AML_UART_XMIT_EN | AML_UART_RECV_EN | AML_UART_TIMEOUT_INT_EN; + + return aml_send_tci_cmd(hdev, AML_TCI_CMD_UPDATE_BAUDRATE, + AML_OP_UART_MODE, &value, sizeof(value)); +} + +static int aml_start_chip(struct hci_dev *hdev) +{ + u32 value = 0; + int ret; + + value = AML_MM_CTR_HARD_TRAS_EN; + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, + AML_OP_MEM_HARD_TRANS_EN, + &value, sizeof(value)); + if (ret) + return ret; + + /* controller hardware reset. */ + value = AML_CTR_CPU_RESET | AML_CTR_MAC_RESET | AML_CTR_PHY_RESET; + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_HARDWARE_RESET, + AML_OP_HARDWARE_RST, + &value, sizeof(value)); + return ret; +} + +static int aml_send_firmware_segment(struct hci_dev *hdev, + u8 fw_type, + u8 *seg, + u32 seg_size, + u32 offset) +{ + u32 op_addr = 0; + + if (fw_type == FW_ICCM) + op_addr = AML_OP_ICCM_RAM_BASE + offset; + else if (fw_type == FW_DCCM) + op_addr = AML_OP_DCCM_RAM_BASE + offset; + + return aml_send_tci_cmd(hdev, AML_TCI_CMD_DOWNLOAD_BT_FW, + op_addr, (u32 *)seg, seg_size); +} + +static int aml_send_firmware(struct hci_dev *hdev, u8 fw_type, + u8 *fw, u32 fw_size, u32 offset) +{ + u32 seg_size = 0; + u32 seg_off = 0; + + if (fw_size > AML_FIRMWARE_MAX_SIZE) { + BT_ERR("fw_size error, fw_size:%d, max_size: %d", + fw_size, AML_FIRMWARE_MAX_SIZE); + return -EINVAL; + } + while (fw_size > 0) { + seg_size = (fw_size > AML_FIRMWARE_OPERATION_SIZE) ? + AML_FIRMWARE_OPERATION_SIZE : fw_size; + if (aml_send_firmware_segment(hdev, fw_type, (fw + seg_off), + seg_size, offset)) { + BT_ERR("Failed send firmware, type:%d, offset:0x%x", + fw_type, offset); + return -EINVAL; + } + seg_off += seg_size; + fw_size -= seg_size; + offset += seg_size; + } + return 0; +} + +static int aml_download_firmware(struct hci_dev *hdev, const char *fw_name) +{ + struct hci_uart *hu = hci_get_drvdata(hdev); + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); + const struct firmware *firmware = NULL; + struct aml_fw_len *fw_len = NULL; + u8 *iccm_start = NULL, *dccm_start = NULL; + u32 iccm_len, dccm_len; + u32 value = 0; + int ret = 0; + + /* enable firmware download event. */ + value = AML_EVT_EN; + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, + AML_OP_EVT_ENABLE, + &value, sizeof(value)); + if (ret) + goto exit; + + /* RAM power on */ + value = AML_RAM_POWER_ON; + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, + AML_OP_RAM_POWER_CTR, + &value, sizeof(value)); + if (ret) + goto exit; + + /* check RAM power status */ + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_READ, + AML_OP_RAM_POWER_CTR, NULL, 0); + if (ret) + goto exit; + + ret = request_firmware(&firmware, fw_name, &hdev->dev); + if (ret < 0) { + BT_ERR("Failed to load <%s>:(%d)", fw_name, ret); + goto exit; + } + + fw_len = (struct aml_fw_len *)firmware->data; + + /* download ICCM. */ + iccm_start = (u8 *)(firmware->data) + sizeof(struct aml_fw_len) + amldev->iccm_offset; + iccm_len = fw_len->iccm_len - amldev->iccm_offset; + ret = aml_send_firmware(hdev, FW_ICCM, iccm_start, iccm_len, amldev->iccm_offset); + if (ret) { + BT_ERR("Failed to send FW_ICCM"); + goto exit; + } + + /* download DCCM. */ + dccm_start = (u8 *)(firmware->data) + sizeof(struct aml_fw_len) + fw_len->iccm_len; + dccm_len = fw_len->dccm_len; + ret = aml_send_firmware(hdev, FW_DCCM, dccm_start, dccm_len, amldev->dccm_offset); + if (ret) { + BT_ERR("Failed to send FW_DCCM"); + goto exit; + } + + /* disable firmware download event. */ + value = 0; + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, + AML_OP_EVT_ENABLE, + &value, sizeof(value)); + if (ret) + goto exit; + +exit: + if (firmware) + release_firmware(firmware); + return ret; +} + +static int aml_send_reset(struct hci_dev *hdev) +{ + struct sk_buff *skb; + int err; + + skb = __hci_cmd_sync_ev(hdev, HCI_OP_RESET, 0, NULL, + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); + if (IS_ERR(skb)) { + err = PTR_ERR(skb); + BT_ERR("Failed to send hci reset cmd(%d)", err); + return err; + } + kfree_skb(skb); + return 0; +} + +static int aml_dump_fw_version(struct hci_dev *hdev) +{ + struct sk_buff *skb; + struct aml_tci_rsp *rsp = NULL; + u8 value[6] = {0}; + u8 *fw_ver = NULL; + int err = 0; + + skb = __hci_cmd_sync_ev(hdev, AML_BT_HCI_VENDOR_CMD, sizeof(value), value, + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); + if (IS_ERR(skb)) { + skb = NULL; + err = PTR_ERR(skb); + BT_ERR("Failed get fw version:(%d)", err); + goto exit; + } + + rsp = (struct aml_tci_rsp *)(skb->data); + if (rsp->opcode != AML_BT_HCI_VENDOR_CMD || rsp->status != 0x00) { + BT_ERR("dump version, error response (0x%04X):(%d)", + rsp->opcode, rsp->status); + err = -EINVAL; + goto exit; + } + + fw_ver = skb->data + AML_EVT_HEAD_SIZE; + BT_INFO("fw_version: date = %02x.%02x, number = 0x%02x%02x", + *(fw_ver + 1), *fw_ver, *(fw_ver + 3), *(fw_ver + 2)); + +exit: + if (skb) + kfree_skb(skb); + return err; +} + +static int aml_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) +{ + struct sk_buff *skb; + struct aml_tci_rsp *rsp = NULL; + int err = 0; + + BT_INFO("set bdaddr (%pM)", bdaddr); + skb = __hci_cmd_sync_ev(hdev, AML_BT_HCI_VENDOR_CMD, + sizeof(bdaddr_t), bdaddr, + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); + if (IS_ERR(skb)) { + skb = NULL; + err = PTR_ERR(skb); + BT_ERR("Failed to set bdaddr:(%d)", err); + goto exit; + } + + rsp = (struct aml_tci_rsp *)(skb->data); + if (rsp->opcode != AML_BT_HCI_VENDOR_CMD || rsp->status != 0x00) { + BT_ERR("error response (0x%x):(%d)", rsp->opcode, rsp->status); + err = -EINVAL; + goto exit; + } + +exit: + if (skb) + kfree_skb(skb); + return err; +} + +static int aml_check_bdaddr(struct hci_dev *hdev) +{ + struct hci_rp_read_bd_addr *paddr; + struct sk_buff *skb; + int err; + + if (bacmp(&hdev->public_addr, BDADDR_ANY)) + return 0; + + skb = __hci_cmd_sync(hdev, HCI_OP_READ_BD_ADDR, 0, NULL, + HCI_INIT_TIMEOUT); + if (IS_ERR(skb)) { + err = PTR_ERR(skb); + BT_ERR("Failed to read bdaddr:(%d)", err); + return err; + } + + if (skb->len != sizeof(*paddr)) { + BT_ERR("Device address length mismatch"); + kfree_skb(skb); + return -EIO; + } + + paddr = (struct hci_rp_read_bd_addr *)skb->data; + if (!bacmp(&paddr->bdaddr, AML_BDADDR_DEFAULT)) { + BT_INFO("amlbt using default bdaddr (%pM)", &paddr->bdaddr); + set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); + } + + kfree_skb(skb); + + return 0; +} + +static int aml_config_rf(struct hci_dev *hdev, struct aml_rf_cfg *cfg) +{ + u32 value = 0; + + if (cfg->a2dp_sink_en) + value |= AML_RF_A2DP_SINK_EN; + + if (cfg->ant_number > 0) + value |= AML_BT_CTR_SET_ANT(cfg->ant_number); + + return aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, + AML_OP_RF_CFG, + &value, sizeof(value)); +} + +static int aml_parse_resource(struct aml_serdev *amldev) +{ + struct device *pdev = amldev->dev; + + /* get firmware path*/ + if (of_property_read_string(pdev->of_node, "amlogic,firmware", + &amldev->firmware_name)) { + dev_err(pdev, "Failed to read firmware path"); + return -ENODEV; + } + BT_DBG("firmware path:%s", amldev->firmware_name); + + /* get controller config parameter */ + if (of_property_read_u32(pdev->of_node, "amlogic,antenna-number", + &amldev->rf_cfg.ant_number)) { + dev_info(pdev, "No antenna-number, using default value"); + amldev->rf_cfg.ant_number = 1; + } + + if (of_property_read_u32(pdev->of_node, "amlogic,a2dp-sink-enable", + &amldev->rf_cfg.a2dp_sink_en)) { + dev_info(pdev, "No a2dp-sink-enable, using default value"); + amldev->rf_cfg.a2dp_sink_en = 0; + } + BT_DBG("rf_config ant_num:%d, a2dp_sink_en:%d", + amldev->rf_cfg.ant_number, amldev->rf_cfg.a2dp_sink_en); + return 0; +} + +static int aml_set_baudrate(struct hci_uart *hu, unsigned int speed) +{ + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); + struct hci_dev *hdev = amldev->serdev_hu.hdev; + + /* update controller baudrate*/ + if (aml_update_chip_baudrate(hdev, speed) != 0) { + BT_ERR("Failed to update baud rate"); + return -EINVAL; + } + + /* update local baudrate*/ + serdev_device_set_baudrate(hu->serdev, speed); + + return 0; +} + +/* Initialize protocol */ +static int aml_open(struct hci_uart *hu) +{ + struct aml_data *aml_data; + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); + + if (aml_parse_resource(amldev)) { + BT_ERR("Failed to parse resource"); + return -EINVAL; + } + + if (pwrseq_power_on(amldev->pwrseq)) { + BT_ERR("Failed to power on chipset"); + return -EPERM; + } + + if (!hci_uart_has_flow_control(hu)) { + BT_ERR("no flow control"); + return -EOPNOTSUPP; + } + + aml_data = kzalloc(sizeof(*aml_data), GFP_KERNEL); + if (!aml_data) { + BT_ERR("Failed to kzalloc with aml_data"); + return -ENOMEM; + } + + skb_queue_head_init(&aml_data->txq); + + hu->priv = aml_data; + + return 0; +} + +/* Close protocol */ +static int aml_close(struct hci_uart *hu) +{ + struct aml_data *aml_data = hu->priv; + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); + + if (hu->serdev) + serdev_device_close(hu->serdev); + + skb_queue_purge(&aml_data->txq); + kfree_skb(aml_data->rx_skb); + kfree(aml_data); + + hu->priv = NULL; + + return pwrseq_power_off(amldev->pwrseq); +} + +static int aml_flush(struct hci_uart *hu) +{ + struct aml_data *aml_data = hu->priv; + + skb_queue_purge(&aml_data->txq); + + return 0; +} + +static int aml_setup(struct hci_uart *hu) +{ + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); + struct hci_dev *hdev = amldev->serdev_hu.hdev; + int err; + + /* Setup bdaddr */ + hdev->set_bdaddr = aml_set_bdaddr; + + err = aml_set_baudrate(hu, amldev->serdev_hu.proto->oper_speed); + if (err) + return err; + + err = aml_download_firmware(hdev, amldev->firmware_name); + if (err) + return err; + + err = aml_config_rf(hdev, &amldev->rf_cfg); + if (err) + return err; + + err = aml_start_chip(hdev); + if (err) + return err; + + /* wait 350ms for controller start up*/ + msleep(AML_WAIT_CHIP_START_UP); + + err = aml_dump_fw_version(hdev); + if (err) + return err; + + err = aml_send_reset(hdev); + if (err) + return err; + + err = aml_check_bdaddr(hdev); + if (err) + return err; + + return 0; +} + +static int aml_enqueue(struct hci_uart *hu, struct sk_buff *skb) +{ + struct aml_data *aml_data = hu->priv; + + skb_queue_tail(&aml_data->txq, skb); + + return 0; +} + +static struct sk_buff *aml_dequeue(struct hci_uart *hu) +{ + struct aml_data *aml_data = hu->priv; + struct sk_buff *skb; + + skb = skb_dequeue(&aml_data->txq); + + /* Prepend skb with frame type */ + if (skb) + memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); + + return skb; +} + +static int aml_recv(struct hci_uart *hu, const void *data, int count) +{ + struct aml_data *aml_data = hu->priv; + int err; + + aml_data->rx_skb = h4_recv_buf(hu->hdev, aml_data->rx_skb, data, count, + aml_recv_pkts, + ARRAY_SIZE(aml_recv_pkts)); + if (IS_ERR(aml_data->rx_skb)) { + err = PTR_ERR(aml_data->rx_skb); + bt_dev_err(hu->hdev, "Frame reassembly failed (%d)", err); + aml_data->rx_skb = NULL; + return err; + } + + return count; +} + +static const struct hci_uart_proto aml_hci_proto = { + .id = HCI_UART_AML, + .name = "AML", + .manufacturer = 50, + .init_speed = 115200, + .oper_speed = 4000000, + .open = aml_open, + .close = aml_close, + .setup = aml_setup, + .flush = aml_flush, + .recv = aml_recv, + .enqueue = aml_enqueue, + .dequeue = aml_dequeue, +}; + +static void aml_device_driver_shutdown(struct device *dev) +{ + struct aml_serdev *amldev = dev_get_drvdata(dev); + + pwrseq_power_off(amldev->pwrseq); +} + +static int aml_serdev_probe(struct serdev_device *serdev) +{ + struct aml_serdev *amldev; + const struct aml_device_data *data; + int err; + + amldev = devm_kzalloc(&serdev->dev, sizeof(*amldev), GFP_KERNEL); + if (!amldev) + return -ENOMEM; + + amldev->serdev_hu.serdev = serdev; + amldev->dev = &serdev->dev; + serdev_device_set_drvdata(serdev, amldev); + + amldev->pwrseq = devm_pwrseq_get(&serdev->dev, "bluetooth"); + if (IS_ERR(amldev->pwrseq)) + return dev_err_probe(amldev->dev, PTR_ERR(amldev->pwrseq), + "Failed to get pwrseq target"); + + err = hci_uart_register_device(&amldev->serdev_hu, &aml_hci_proto); + if (err) + return dev_err_probe(amldev->dev, err, + "Failed to register hci uart device"); + + data = device_get_match_data(&serdev->dev); + if (data) { + amldev->iccm_offset = data->iccm_offset; + amldev->dccm_offset = data->dccm_offset; + } + + return 0; +} + +static void aml_serdev_remove(struct serdev_device *serdev) +{ + struct aml_serdev *amldev = serdev_device_get_drvdata(serdev); + + hci_uart_unregister_device(&amldev->serdev_hu); +} + +static const struct aml_device_data data_w155s2 __maybe_unused = { + .iccm_offset = 256 * 1024, +}; + +static const struct aml_device_data data_w265s2 __maybe_unused = { + .iccm_offset = 384 * 1024, +}; + +static const struct of_device_id aml_bluetooth_of_match[] = { + { .compatible = "amlogic,w155s2-bt", .data = &data_w155s2 }, + { .compatible = "amlogic,w265s2-bt", .data = &data_w265s2 }, + { /* sentinel */ }, +}; + +static struct serdev_device_driver aml_serdev_driver = { + .probe = aml_serdev_probe, + .remove = aml_serdev_remove, + .driver = { + .name = "hci_uart_aml", + .of_match_table = of_match_ptr(aml_bluetooth_of_match), + .shutdown = aml_device_driver_shutdown, + }, +}; + +int __init aml_init(void) +{ + serdev_device_driver_register(&aml_serdev_driver); + + return hci_uart_register_proto(&aml_hci_proto); +} + +int __exit aml_deinit(void) +{ + serdev_device_driver_unregister(&aml_serdev_driver); + + return hci_uart_unregister_proto(&aml_hci_proto); +} diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 30192bb08354..d307c41a5470 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -870,7 +870,9 @@ static int __init hci_uart_init(void) #ifdef CONFIG_BT_HCIUART_MRVL mrvl_init(); #endif - +#ifdef CONFIG_BT_HCIUART_AML + aml_init(); +#endif return 0; } @@ -906,7 +908,9 @@ static void __exit hci_uart_exit(void) #ifdef CONFIG_BT_HCIUART_MRVL mrvl_deinit(); #endif - +#ifdef CONFIG_BT_HCIUART_AML + aml_deinit(); +#endif tty_unregister_ldisc(&hci_uart_ldisc); } diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h index 00bf7ae82c5b..fbf3079b92a5 100644 --- a/drivers/bluetooth/hci_uart.h +++ b/drivers/bluetooth/hci_uart.h @@ -20,7 +20,7 @@ #define HCIUARTGETFLAGS _IOR('U', 204, int) /* UART protocols */ -#define HCI_UART_MAX_PROTO 12 +#define HCI_UART_MAX_PROTO 13 #define HCI_UART_H4 0 #define HCI_UART_BCSP 1 @@ -34,6 +34,7 @@ #define HCI_UART_AG6XX 9 #define HCI_UART_NOKIA 10 #define HCI_UART_MRVL 11 +#define HCI_UART_AML 12 #define HCI_UART_RAW_DEVICE 0 #define HCI_UART_RESET_ON_INIT 1 @@ -209,3 +210,8 @@ int ag6xx_deinit(void); int mrvl_init(void); int mrvl_deinit(void); #endif + +#ifdef CONFIG_BT_HCIUART_AML +int aml_init(void); +int aml_deinit(void); +#endif -- 2.42.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART 2024-07-05 11:20 ` [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART Yang Li via B4 Relay @ 2024-07-07 13:10 ` Krzysztof Kozlowski 2024-07-11 10:33 ` Yang Li 2024-07-09 14:41 ` Luiz Augusto von Dentz 1 sibling, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-07-07 13:10 UTC (permalink / raw) To: yang.li, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel, Ye He On 05/07/2024 13:20, Yang Li via B4 Relay wrote: > From: Yang Li <yang.li@amlogic.com> > > This patch introduces support for Amlogic Bluetooth controller over > UART. In order to send the final firmware at full speed. It is a pretty > straight forward H4 driver with exception of actually having it's own > setup address configuration. > > Co-developed-by: Ye He <ye.he@amlogic.com> Read submitting patches. Missing SoB. > Signed-off-by: Yang Li <yang.li@amlogic.com> > --- > drivers/bluetooth/Kconfig | 13 + > + > +static void aml_serdev_remove(struct serdev_device *serdev) > +{ > + struct aml_serdev *amldev = serdev_device_get_drvdata(serdev); > + > + hci_uart_unregister_device(&amldev->serdev_hu); > +} > + > +static const struct aml_device_data data_w155s2 __maybe_unused = { > + .iccm_offset = 256 * 1024, > +}; > + > +static const struct aml_device_data data_w265s2 __maybe_unused = { How this can be "maybe_unused" while it is referenced always? This is buggy. Either everything in OF chain can be unused or not. Not half yes, half not. > + .iccm_offset = 384 * 1024, > +}; > + > +static const struct of_device_id aml_bluetooth_of_match[] = { > + { .compatible = "amlogic,w155s2-bt", .data = &data_w155s2 }, > + { .compatible = "amlogic,w265s2-bt", .data = &data_w265s2 }, > + { /* sentinel */ }, > +}; > + > +static struct serdev_device_driver aml_serdev_driver = { > + .probe = aml_serdev_probe, > + .remove = aml_serdev_remove, > + .driver = { > + .name = "hci_uart_aml", > + .of_match_table = of_match_ptr(aml_bluetooth_of_match), So now you have warnings... drop of_match_ptr. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART 2024-07-07 13:10 ` Krzysztof Kozlowski @ 2024-07-11 10:33 ` Yang Li 0 siblings, 0 replies; 19+ messages in thread From: Yang Li @ 2024-07-11 10:33 UTC (permalink / raw) To: Krzysztof Kozlowski, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel, Ye He On 2024/7/7 21:10, Krzysztof Kozlowski wrote: > [Some people who received this message don't often get email from krzk@kernel.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] > > > On 05/07/2024 13:20, Yang Li via B4 Relay wrote: >> From: Yang Li <yang.li@amlogic.com> >> >> This patch introduces support for Amlogic Bluetooth controller over >> UART. In order to send the final firmware at full speed. It is a pretty >> straight forward H4 driver with exception of actually having it's own >> setup address configuration. >> >> Co-developed-by: Ye He <ye.he@amlogic.com> > Read submitting patches. Missing SoB. Will do. > >> Signed-off-by: Yang Li <yang.li@amlogic.com> >> --- >> drivers/bluetooth/Kconfig | 13 + > > >> + >> +static void aml_serdev_remove(struct serdev_device *serdev) >> +{ >> + struct aml_serdev *amldev = serdev_device_get_drvdata(serdev); >> + >> + hci_uart_unregister_device(&amldev->serdev_hu); >> +} >> + >> +static const struct aml_device_data data_w155s2 __maybe_unused = { >> + .iccm_offset = 256 * 1024, >> +}; >> + >> +static const struct aml_device_data data_w265s2 __maybe_unused = { > How this can be "maybe_unused" while it is referenced always? This is > buggy. Either everything in OF chain can be unused or not. Not half yes, > half not. well, i will remove __maybe_unused. > >> + .iccm_offset = 384 * 1024, >> +}; >> + >> +static const struct of_device_id aml_bluetooth_of_match[] = { >> + { .compatible = "amlogic,w155s2-bt", .data = &data_w155s2 }, >> + { .compatible = "amlogic,w265s2-bt", .data = &data_w265s2 }, >> + { /* sentinel */ }, >> +}; >> + >> +static struct serdev_device_driver aml_serdev_driver = { >> + .probe = aml_serdev_probe, >> + .remove = aml_serdev_remove, >> + .driver = { >> + .name = "hci_uart_aml", >> + .of_match_table = of_match_ptr(aml_bluetooth_of_match), > So now you have warnings... drop of_match_ptr. Will do. > > Best regards, > Krzysztof > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART 2024-07-05 11:20 ` [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART Yang Li via B4 Relay 2024-07-07 13:10 ` Krzysztof Kozlowski @ 2024-07-09 14:41 ` Luiz Augusto von Dentz 2024-07-11 11:59 ` Yang Li 1 sibling, 1 reply; 19+ messages in thread From: Luiz Augusto von Dentz @ 2024-07-09 14:41 UTC (permalink / raw) To: yang.li Cc: Marcel Holtmann, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon, linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel, Ye He Hi, On Fri, Jul 5, 2024 at 7:21 AM Yang Li via B4 Relay <devnull+yang.li.amlogic.com@kernel.org> wrote: > > From: Yang Li <yang.li@amlogic.com> > > This patch introduces support for Amlogic Bluetooth controller over > UART. In order to send the final firmware at full speed. It is a pretty > straight forward H4 driver with exception of actually having it's own > setup address configuration. > > Co-developed-by: Ye He <ye.he@amlogic.com> > Signed-off-by: Yang Li <yang.li@amlogic.com> > --- > drivers/bluetooth/Kconfig | 13 + > drivers/bluetooth/Makefile | 1 + > drivers/bluetooth/hci_aml.c | 749 ++++++++++++++++++++++++++++++++++++++++++ > drivers/bluetooth/hci_ldisc.c | 8 +- > drivers/bluetooth/hci_uart.h | 8 +- > 5 files changed, 776 insertions(+), 3 deletions(-) > > diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig > index 87484f5de8e3..634479e10cb7 100644 > --- a/drivers/bluetooth/Kconfig > +++ b/drivers/bluetooth/Kconfig > @@ -273,6 +273,19 @@ config BT_HCIUART_MRVL > > Say Y here to compile support for HCI MRVL protocol. > > +config BT_HCIUART_AML > + bool "Amlogic protocol support" > + depends on BT_HCIUART > + depends on BT_HCIUART_SERDEV > + select BT_HCIUART_H4 > + select FW_LOADER > + select POWER_SEQUENCING_AML_WCN > + help > + The Amlogic protocol support enables Bluetooth HCI over serial > + port interface for Amlogic Bluetooth controllers. > + > + Say Y here to compile support for HCI AML protocol. > + > config BT_HCIBCM203X > tristate "HCI BCM203x USB driver" > depends on USB > diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile > index 0730d6684d1a..81856512ddd0 100644 > --- a/drivers/bluetooth/Makefile > +++ b/drivers/bluetooth/Makefile > @@ -51,4 +51,5 @@ hci_uart-$(CONFIG_BT_HCIUART_BCM) += hci_bcm.o > hci_uart-$(CONFIG_BT_HCIUART_QCA) += hci_qca.o > hci_uart-$(CONFIG_BT_HCIUART_AG6XX) += hci_ag6xx.o > hci_uart-$(CONFIG_BT_HCIUART_MRVL) += hci_mrvl.o > +hci_uart-$(CONFIG_BT_HCIUART_AML) += hci_aml.o > hci_uart-objs := $(hci_uart-y) > diff --git a/drivers/bluetooth/hci_aml.c b/drivers/bluetooth/hci_aml.c > new file mode 100644 > index 000000000000..33a27a555343 > --- /dev/null > +++ b/drivers/bluetooth/hci_aml.c > @@ -0,0 +1,749 @@ > +// SPDX-License-Identifier: (GPL-2.0-only OR MIT) > +/* > + * Copyright (C) 2024 Amlogic, Inc. All rights reserved > + */ > + > +#include <linux/kernel.h> > +#include <linux/delay.h> > +#include <linux/device.h> > +#include <linux/module.h> > +#include <linux/gpio.h> > +#include <linux/of_gpio.h> > +#include <linux/of.h> > +#include <linux/serdev.h> > +#include <linux/pwm.h> > +#include <linux/clk.h> > +#include <linux/mutex.h> > +#include <asm/unaligned.h> > +#include <linux/firmware.h> > +#include <linux/vmalloc.h> > +#include <linux/pwrseq/consumer.h> > +#include <net/bluetooth/bluetooth.h> > +#include <net/bluetooth/hci_core.h> > +#include <net/bluetooth/hci.h> > + > +#include "hci_uart.h" > + > +#define AML_EVT_HEAD_SIZE 4 > +#define AML_BDADDR_DEFAULT (&(bdaddr_t) {{ 0x00, 0xff, 0x00, 0x22, 0x2d, 0xae }}) > + > +#define AML_FIRMWARE_OPERATION_SIZE (248) > +#define AML_FIRMWARE_MAX_SIZE (512 * 1024) > + > +/* waiting time (ms) */ > +#define AML_WAIT_CHIP_START_UP (350) > + > +/* TCI command */ > +#define AML_TCI_CMD_READ 0xFEF0 > +#define AML_TCI_CMD_WRITE 0xFEF1 > +#define AML_TCI_CMD_UPDATE_BAUDRATE 0xFEF2 > +#define AML_TCI_CMD_HARDWARE_RESET 0xFEF2 > +#define AML_TCI_CMD_DOWNLOAD_BT_FW 0xFEF3 > +#define AML_BT_HCI_VENDOR_CMD 0xFC1A > + > +/* TCI operation parameter in controller chip */ > +#define AML_OP_UART_MODE 0x00A30128 > +#define AML_OP_EVT_ENABLE 0x00A70014 > +#define AML_OP_MEM_HARD_TRANS_EN 0x00A7000C > +#define AML_OP_RF_CFG 0x00F03040 > +#define AML_OP_RAM_POWER_CTR 0x00F03050 > +#define AML_OP_HARDWARE_RST 0x00F03058 > +#define AML_OP_ICCM_RAM_BASE 0x00000000 > +#define AML_OP_DCCM_RAM_BASE 0x00D00000 > + > +/* uart configuration */ > +#define AML_UART_XMIT_EN BIT(12) > +#define AML_UART_RECV_EN BIT(13) > +#define AML_UART_TIMEOUT_INT_EN BIT(14) > +#define AML_UART_CLK_SOURCE 40000000 > + > +/* controller event enable/disable */ > +#define AML_EVT_EN BIT(24) > + > +/* RAM power down control */ > +#define AML_RAM_POWER_ON (0) > +#define AML_RAM_POWER_OFF (1) > + > +/* RF configuration */ > +#define AML_RF_A2DP_SINK_EN BIT(25) > +#define AML_RF_ANT_SINGLE BIT(28) > +#define AML_RF_ANT_DOUBLE BIT(29) > +#define AML_RF_ANT_BASE (28) > +#define AML_BT_CTR_SET_ANT(ant_num) (BIT(((ant_num) - 1)) << AML_RF_ANT_BASE) > + > +/* memory control hard transaction */ > +#define AML_MM_CTR_HARD_TRAS_EN BIT(27) > + > +/* controller hardware reset */ > +#define AML_CTR_CPU_RESET BIT(8) > +#define AML_CTR_MAC_RESET BIT(9) > +#define AML_CTR_PHY_RESET BIT(10) > + > +enum { > + FW_ICCM, > + FW_DCCM > +}; > + > +struct aml_fw_len { > + u32 iccm_len; > + u32 dccm_len; > +}; > + > +struct aml_tci_rsp { > + u8 num_cmd_packet; > + u16 opcode; > + u8 status; > +} __packed; > + > +struct aml_rf_cfg { > + u32 ant_number; > + u32 a2dp_sink_en; > +}; > + > +struct aml_serdev { > + struct hci_uart serdev_hu; > + struct device *dev; > + struct aml_rf_cfg rf_cfg; > + struct pwrseq_desc *pwrseq; > + const char *firmware_name; > + int iccm_offset; > + int dccm_offset; > +}; > + > +struct aml_data { > + struct sk_buff *rx_skb; > + struct sk_buff_head txq; > +}; > + > +struct aml_device_data { > + int iccm_offset; > + int dccm_offset; > +}; > + > +static const struct h4_recv_pkt aml_recv_pkts[] = { > + {H4_RECV_ACL, .recv = hci_recv_frame}, > + {H4_RECV_SCO, .recv = hci_recv_frame}, > + {H4_RECV_EVENT, .recv = hci_recv_frame}, > + {H4_RECV_ISO, .recv = hci_recv_frame}, > +}; > + > +/* The TCI command is private of Amlogic, it is used to configure before BT chip > + * startup, contains update baudrate, update firmware, set public addr ... > + * op_code | op_len | op_addr | parameter | > + * --------|-----------------------|---------|-------------| > + * 2B | 1B len(addr+param) | 4B | len(param) | > + */ > +static int aml_send_tci_cmd(struct hci_dev *hdev, u16 op_code, u32 op_addr, > + u32 *param, u32 param_len) > +{ > + struct sk_buff *skb = NULL; > + struct aml_tci_rsp *rsp = NULL; > + u8 *buf = NULL; > + u32 buf_len = 0; > + int err = 0; > + > + buf_len = sizeof(op_addr) + param_len; > + buf = vmalloc(buf_len); > + if (!buf) { > + BT_ERR("Failed to alloc memory."); > + err = -ENOMEM; > + goto exit; > + } > + > + memcpy(buf, &op_addr, sizeof(op_addr)); > + if (param && param_len > 0) > + memcpy(buf + sizeof(op_addr), param, param_len); > + > + skb = __hci_cmd_sync_ev(hdev, op_code, buf_len, buf, > + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); > + if (IS_ERR(skb)) { > + err = PTR_ERR(skb); > + skb = NULL; > + BT_ERR("Failed to send TCI cmd:(%d)", err); > + goto exit; > + } > + > + rsp = (struct aml_tci_rsp *)(skb->data); > + if (rsp->opcode != op_code || rsp->status != 0x00) { > + BT_ERR("send TCI cmd(0x%04X), response(0x%04X):(%d)", > + op_code, rsp->opcode, rsp->status); > + err = -EINVAL; > + goto exit; > + } > + > +exit: > + if (buf) > + vfree(buf); > + if (skb) > + kfree_skb(skb); > + return err; > +} > + > +static int aml_update_chip_baudrate(struct hci_dev *hdev, u32 baud) > +{ > + u32 value; > + > + value = ((AML_UART_CLK_SOURCE / baud) - 1) & 0x0FFF; > + value |= AML_UART_XMIT_EN | AML_UART_RECV_EN | AML_UART_TIMEOUT_INT_EN; > + > + return aml_send_tci_cmd(hdev, AML_TCI_CMD_UPDATE_BAUDRATE, > + AML_OP_UART_MODE, &value, sizeof(value)); > +} > + > +static int aml_start_chip(struct hci_dev *hdev) > +{ > + u32 value = 0; > + int ret; > + > + value = AML_MM_CTR_HARD_TRAS_EN; > + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, > + AML_OP_MEM_HARD_TRANS_EN, > + &value, sizeof(value)); > + if (ret) > + return ret; > + > + /* controller hardware reset. */ > + value = AML_CTR_CPU_RESET | AML_CTR_MAC_RESET | AML_CTR_PHY_RESET; > + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_HARDWARE_RESET, > + AML_OP_HARDWARE_RST, > + &value, sizeof(value)); > + return ret; > +} > + > +static int aml_send_firmware_segment(struct hci_dev *hdev, > + u8 fw_type, > + u8 *seg, > + u32 seg_size, > + u32 offset) > +{ > + u32 op_addr = 0; > + > + if (fw_type == FW_ICCM) > + op_addr = AML_OP_ICCM_RAM_BASE + offset; > + else if (fw_type == FW_DCCM) > + op_addr = AML_OP_DCCM_RAM_BASE + offset; > + > + return aml_send_tci_cmd(hdev, AML_TCI_CMD_DOWNLOAD_BT_FW, > + op_addr, (u32 *)seg, seg_size); > +} > + > +static int aml_send_firmware(struct hci_dev *hdev, u8 fw_type, > + u8 *fw, u32 fw_size, u32 offset) > +{ > + u32 seg_size = 0; > + u32 seg_off = 0; > + > + if (fw_size > AML_FIRMWARE_MAX_SIZE) { > + BT_ERR("fw_size error, fw_size:%d, max_size: %d", > + fw_size, AML_FIRMWARE_MAX_SIZE); > + return -EINVAL; > + } > + while (fw_size > 0) { > + seg_size = (fw_size > AML_FIRMWARE_OPERATION_SIZE) ? > + AML_FIRMWARE_OPERATION_SIZE : fw_size; > + if (aml_send_firmware_segment(hdev, fw_type, (fw + seg_off), > + seg_size, offset)) { > + BT_ERR("Failed send firmware, type:%d, offset:0x%x", > + fw_type, offset); > + return -EINVAL; > + } > + seg_off += seg_size; > + fw_size -= seg_size; > + offset += seg_size; > + } > + return 0; > +} > + > +static int aml_download_firmware(struct hci_dev *hdev, const char *fw_name) > +{ > + struct hci_uart *hu = hci_get_drvdata(hdev); > + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); > + const struct firmware *firmware = NULL; > + struct aml_fw_len *fw_len = NULL; > + u8 *iccm_start = NULL, *dccm_start = NULL; > + u32 iccm_len, dccm_len; > + u32 value = 0; > + int ret = 0; > + > + /* enable firmware download event. */ > + value = AML_EVT_EN; > + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, > + AML_OP_EVT_ENABLE, > + &value, sizeof(value)); > + if (ret) > + goto exit; > + > + /* RAM power on */ > + value = AML_RAM_POWER_ON; > + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, > + AML_OP_RAM_POWER_CTR, > + &value, sizeof(value)); > + if (ret) > + goto exit; > + > + /* check RAM power status */ > + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_READ, > + AML_OP_RAM_POWER_CTR, NULL, 0); > + if (ret) > + goto exit; > + > + ret = request_firmware(&firmware, fw_name, &hdev->dev); > + if (ret < 0) { > + BT_ERR("Failed to load <%s>:(%d)", fw_name, ret); > + goto exit; > + } > + > + fw_len = (struct aml_fw_len *)firmware->data; > + > + /* download ICCM. */ > + iccm_start = (u8 *)(firmware->data) + sizeof(struct aml_fw_len) + amldev->iccm_offset; > + iccm_len = fw_len->iccm_len - amldev->iccm_offset; > + ret = aml_send_firmware(hdev, FW_ICCM, iccm_start, iccm_len, amldev->iccm_offset); > + if (ret) { > + BT_ERR("Failed to send FW_ICCM"); > + goto exit; > + } > + > + /* download DCCM. */ > + dccm_start = (u8 *)(firmware->data) + sizeof(struct aml_fw_len) + fw_len->iccm_len; > + dccm_len = fw_len->dccm_len; > + ret = aml_send_firmware(hdev, FW_DCCM, dccm_start, dccm_len, amldev->dccm_offset); > + if (ret) { > + BT_ERR("Failed to send FW_DCCM"); > + goto exit; > + } > + > + /* disable firmware download event. */ > + value = 0; > + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, > + AML_OP_EVT_ENABLE, > + &value, sizeof(value)); > + if (ret) > + goto exit; > + > +exit: > + if (firmware) > + release_firmware(firmware); > + return ret; > +} > + > +static int aml_send_reset(struct hci_dev *hdev) > +{ > + struct sk_buff *skb; > + int err; > + > + skb = __hci_cmd_sync_ev(hdev, HCI_OP_RESET, 0, NULL, > + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); > + if (IS_ERR(skb)) { > + err = PTR_ERR(skb); > + BT_ERR("Failed to send hci reset cmd(%d)", err); > + return err; > + } > + kfree_skb(skb); > + return 0; > +} > + > +static int aml_dump_fw_version(struct hci_dev *hdev) > +{ > + struct sk_buff *skb; > + struct aml_tci_rsp *rsp = NULL; > + u8 value[6] = {0}; > + u8 *fw_ver = NULL; > + int err = 0; > + > + skb = __hci_cmd_sync_ev(hdev, AML_BT_HCI_VENDOR_CMD, sizeof(value), value, > + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); > + if (IS_ERR(skb)) { > + skb = NULL; > + err = PTR_ERR(skb); > + BT_ERR("Failed get fw version:(%d)", err); > + goto exit; > + } > + > + rsp = (struct aml_tci_rsp *)(skb->data); > + if (rsp->opcode != AML_BT_HCI_VENDOR_CMD || rsp->status != 0x00) { > + BT_ERR("dump version, error response (0x%04X):(%d)", > + rsp->opcode, rsp->status); > + err = -EINVAL; > + goto exit; > + } > + > + fw_ver = skb->data + AML_EVT_HEAD_SIZE; > + BT_INFO("fw_version: date = %02x.%02x, number = 0x%02x%02x", > + *(fw_ver + 1), *fw_ver, *(fw_ver + 3), *(fw_ver + 2)); > + > +exit: > + if (skb) > + kfree_skb(skb); > + return err; > +} > + > +static int aml_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) > +{ > + struct sk_buff *skb; > + struct aml_tci_rsp *rsp = NULL; > + int err = 0; > + > + BT_INFO("set bdaddr (%pM)", bdaddr); > + skb = __hci_cmd_sync_ev(hdev, AML_BT_HCI_VENDOR_CMD, > + sizeof(bdaddr_t), bdaddr, > + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); > + if (IS_ERR(skb)) { > + skb = NULL; > + err = PTR_ERR(skb); > + BT_ERR("Failed to set bdaddr:(%d)", err); > + goto exit; > + } > + > + rsp = (struct aml_tci_rsp *)(skb->data); > + if (rsp->opcode != AML_BT_HCI_VENDOR_CMD || rsp->status != 0x00) { > + BT_ERR("error response (0x%x):(%d)", rsp->opcode, rsp->status); > + err = -EINVAL; > + goto exit; > + } > + > +exit: > + if (skb) > + kfree_skb(skb); > + return err; > +} > + > +static int aml_check_bdaddr(struct hci_dev *hdev) > +{ > + struct hci_rp_read_bd_addr *paddr; > + struct sk_buff *skb; > + int err; > + > + if (bacmp(&hdev->public_addr, BDADDR_ANY)) > + return 0; > + > + skb = __hci_cmd_sync(hdev, HCI_OP_READ_BD_ADDR, 0, NULL, > + HCI_INIT_TIMEOUT); > + if (IS_ERR(skb)) { > + err = PTR_ERR(skb); > + BT_ERR("Failed to read bdaddr:(%d)", err); > + return err; > + } > + > + if (skb->len != sizeof(*paddr)) { > + BT_ERR("Device address length mismatch"); > + kfree_skb(skb); > + return -EIO; > + } > + > + paddr = (struct hci_rp_read_bd_addr *)skb->data; > + if (!bacmp(&paddr->bdaddr, AML_BDADDR_DEFAULT)) { > + BT_INFO("amlbt using default bdaddr (%pM)", &paddr->bdaddr); > + set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); > + } > + > + kfree_skb(skb); > + > + return 0; > +} > + > +static int aml_config_rf(struct hci_dev *hdev, struct aml_rf_cfg *cfg) > +{ > + u32 value = 0; > + > + if (cfg->a2dp_sink_en) > + value |= AML_RF_A2DP_SINK_EN; > + > + if (cfg->ant_number > 0) > + value |= AML_BT_CTR_SET_ANT(cfg->ant_number); > + > + return aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, > + AML_OP_RF_CFG, > + &value, sizeof(value)); > +} > + > +static int aml_parse_resource(struct aml_serdev *amldev) > +{ > + struct device *pdev = amldev->dev; > + > + /* get firmware path*/ > + if (of_property_read_string(pdev->of_node, "amlogic,firmware", > + &amldev->firmware_name)) { > + dev_err(pdev, "Failed to read firmware path"); > + return -ENODEV; > + } > + BT_DBG("firmware path:%s", amldev->firmware_name); Please replace uses of BT_DBG with bt_dev_dbg. > + /* get controller config parameter */ > + if (of_property_read_u32(pdev->of_node, "amlogic,antenna-number", > + &amldev->rf_cfg.ant_number)) { > + dev_info(pdev, "No antenna-number, using default value"); > + amldev->rf_cfg.ant_number = 1; > + } > + > + if (of_property_read_u32(pdev->of_node, "amlogic,a2dp-sink-enable", > + &amldev->rf_cfg.a2dp_sink_en)) { > + dev_info(pdev, "No a2dp-sink-enable, using default value"); > + amldev->rf_cfg.a2dp_sink_en = 0; > + } > + BT_DBG("rf_config ant_num:%d, a2dp_sink_en:%d", > + amldev->rf_cfg.ant_number, amldev->rf_cfg.a2dp_sink_en); > + return 0; > +} > + > +static int aml_set_baudrate(struct hci_uart *hu, unsigned int speed) > +{ > + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); > + struct hci_dev *hdev = amldev->serdev_hu.hdev; > + > + /* update controller baudrate*/ > + if (aml_update_chip_baudrate(hdev, speed) != 0) { > + BT_ERR("Failed to update baud rate"); Replace instances of BT_ERR with bt_dev_err. > + return -EINVAL; > + } > + > + /* update local baudrate*/ > + serdev_device_set_baudrate(hu->serdev, speed); > + > + return 0; > +} > + > +/* Initialize protocol */ > +static int aml_open(struct hci_uart *hu) > +{ > + struct aml_data *aml_data; > + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); > + > + if (aml_parse_resource(amldev)) { > + BT_ERR("Failed to parse resource"); > + return -EINVAL; > + } > + > + if (pwrseq_power_on(amldev->pwrseq)) { > + BT_ERR("Failed to power on chipset"); > + return -EPERM; > + } > + > + if (!hci_uart_has_flow_control(hu)) { > + BT_ERR("no flow control"); > + return -EOPNOTSUPP; > + } > + > + aml_data = kzalloc(sizeof(*aml_data), GFP_KERNEL); > + if (!aml_data) { > + BT_ERR("Failed to kzalloc with aml_data"); > + return -ENOMEM; > + } > + > + skb_queue_head_init(&aml_data->txq); > + > + hu->priv = aml_data; > + > + return 0; > +} > + > +/* Close protocol */ > +static int aml_close(struct hci_uart *hu) > +{ > + struct aml_data *aml_data = hu->priv; > + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); > + > + if (hu->serdev) > + serdev_device_close(hu->serdev); > + > + skb_queue_purge(&aml_data->txq); > + kfree_skb(aml_data->rx_skb); > + kfree(aml_data); > + > + hu->priv = NULL; > + > + return pwrseq_power_off(amldev->pwrseq); > +} > + > +static int aml_flush(struct hci_uart *hu) > +{ > + struct aml_data *aml_data = hu->priv; > + > + skb_queue_purge(&aml_data->txq); > + > + return 0; > +} > + > +static int aml_setup(struct hci_uart *hu) > +{ > + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); > + struct hci_dev *hdev = amldev->serdev_hu.hdev; > + int err; > + > + /* Setup bdaddr */ > + hdev->set_bdaddr = aml_set_bdaddr; > + > + err = aml_set_baudrate(hu, amldev->serdev_hu.proto->oper_speed); > + if (err) > + return err; > + > + err = aml_download_firmware(hdev, amldev->firmware_name); > + if (err) > + return err; > + > + err = aml_config_rf(hdev, &amldev->rf_cfg); > + if (err) > + return err; > + > + err = aml_start_chip(hdev); > + if (err) > + return err; > + > + /* wait 350ms for controller start up*/ > + msleep(AML_WAIT_CHIP_START_UP); > + > + err = aml_dump_fw_version(hdev); > + if (err) > + return err; > + > + err = aml_send_reset(hdev); > + if (err) > + return err; > + > + err = aml_check_bdaddr(hdev); > + if (err) > + return err; > + > + return 0; > +} > + > +static int aml_enqueue(struct hci_uart *hu, struct sk_buff *skb) > +{ > + struct aml_data *aml_data = hu->priv; > + > + skb_queue_tail(&aml_data->txq, skb); > + > + return 0; > +} > + > +static struct sk_buff *aml_dequeue(struct hci_uart *hu) > +{ > + struct aml_data *aml_data = hu->priv; > + struct sk_buff *skb; > + > + skb = skb_dequeue(&aml_data->txq); > + > + /* Prepend skb with frame type */ > + if (skb) > + memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); > + > + return skb; > +} > + > +static int aml_recv(struct hci_uart *hu, const void *data, int count) > +{ > + struct aml_data *aml_data = hu->priv; > + int err; > + > + aml_data->rx_skb = h4_recv_buf(hu->hdev, aml_data->rx_skb, data, count, > + aml_recv_pkts, > + ARRAY_SIZE(aml_recv_pkts)); > + if (IS_ERR(aml_data->rx_skb)) { > + err = PTR_ERR(aml_data->rx_skb); > + bt_dev_err(hu->hdev, "Frame reassembly failed (%d)", err); > + aml_data->rx_skb = NULL; > + return err; > + } > + > + return count; > +} > + > +static const struct hci_uart_proto aml_hci_proto = { > + .id = HCI_UART_AML, > + .name = "AML", > + .manufacturer = 50, > + .init_speed = 115200, > + .oper_speed = 4000000, > + .open = aml_open, > + .close = aml_close, > + .setup = aml_setup, > + .flush = aml_flush, > + .recv = aml_recv, > + .enqueue = aml_enqueue, > + .dequeue = aml_dequeue, > +}; > + > +static void aml_device_driver_shutdown(struct device *dev) > +{ > + struct aml_serdev *amldev = dev_get_drvdata(dev); > + > + pwrseq_power_off(amldev->pwrseq); > +} > + > +static int aml_serdev_probe(struct serdev_device *serdev) > +{ > + struct aml_serdev *amldev; > + const struct aml_device_data *data; > + int err; > + > + amldev = devm_kzalloc(&serdev->dev, sizeof(*amldev), GFP_KERNEL); > + if (!amldev) > + return -ENOMEM; > + > + amldev->serdev_hu.serdev = serdev; > + amldev->dev = &serdev->dev; > + serdev_device_set_drvdata(serdev, amldev); > + > + amldev->pwrseq = devm_pwrseq_get(&serdev->dev, "bluetooth"); > + if (IS_ERR(amldev->pwrseq)) > + return dev_err_probe(amldev->dev, PTR_ERR(amldev->pwrseq), > + "Failed to get pwrseq target"); > + > + err = hci_uart_register_device(&amldev->serdev_hu, &aml_hci_proto); > + if (err) > + return dev_err_probe(amldev->dev, err, > + "Failed to register hci uart device"); > + > + data = device_get_match_data(&serdev->dev); > + if (data) { > + amldev->iccm_offset = data->iccm_offset; > + amldev->dccm_offset = data->dccm_offset; > + } > + > + return 0; > +} > + > +static void aml_serdev_remove(struct serdev_device *serdev) > +{ > + struct aml_serdev *amldev = serdev_device_get_drvdata(serdev); > + > + hci_uart_unregister_device(&amldev->serdev_hu); > +} > + > +static const struct aml_device_data data_w155s2 __maybe_unused = { > + .iccm_offset = 256 * 1024, > +}; > + > +static const struct aml_device_data data_w265s2 __maybe_unused = { > + .iccm_offset = 384 * 1024, > +}; > + > +static const struct of_device_id aml_bluetooth_of_match[] = { > + { .compatible = "amlogic,w155s2-bt", .data = &data_w155s2 }, > + { .compatible = "amlogic,w265s2-bt", .data = &data_w265s2 }, > + { /* sentinel */ }, > +}; > + > +static struct serdev_device_driver aml_serdev_driver = { > + .probe = aml_serdev_probe, > + .remove = aml_serdev_remove, > + .driver = { > + .name = "hci_uart_aml", > + .of_match_table = of_match_ptr(aml_bluetooth_of_match), > + .shutdown = aml_device_driver_shutdown, > + }, > +}; > + > +int __init aml_init(void) > +{ > + serdev_device_driver_register(&aml_serdev_driver); > + > + return hci_uart_register_proto(&aml_hci_proto); > +} > + > +int __exit aml_deinit(void) > +{ > + serdev_device_driver_unregister(&aml_serdev_driver); > + > + return hci_uart_unregister_proto(&aml_hci_proto); > +} > diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c > index 30192bb08354..d307c41a5470 100644 > --- a/drivers/bluetooth/hci_ldisc.c > +++ b/drivers/bluetooth/hci_ldisc.c > @@ -870,7 +870,9 @@ static int __init hci_uart_init(void) > #ifdef CONFIG_BT_HCIUART_MRVL > mrvl_init(); > #endif > - > +#ifdef CONFIG_BT_HCIUART_AML > + aml_init(); > +#endif > return 0; > } > > @@ -906,7 +908,9 @@ static void __exit hci_uart_exit(void) > #ifdef CONFIG_BT_HCIUART_MRVL > mrvl_deinit(); > #endif > - > +#ifdef CONFIG_BT_HCIUART_AML > + aml_deinit(); > +#endif > tty_unregister_ldisc(&hci_uart_ldisc); > } > > diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h > index 00bf7ae82c5b..fbf3079b92a5 100644 > --- a/drivers/bluetooth/hci_uart.h > +++ b/drivers/bluetooth/hci_uart.h > @@ -20,7 +20,7 @@ > #define HCIUARTGETFLAGS _IOR('U', 204, int) > > /* UART protocols */ > -#define HCI_UART_MAX_PROTO 12 > +#define HCI_UART_MAX_PROTO 13 > > #define HCI_UART_H4 0 > #define HCI_UART_BCSP 1 > @@ -34,6 +34,7 @@ > #define HCI_UART_AG6XX 9 > #define HCI_UART_NOKIA 10 > #define HCI_UART_MRVL 11 > +#define HCI_UART_AML 12 > > #define HCI_UART_RAW_DEVICE 0 > #define HCI_UART_RESET_ON_INIT 1 > @@ -209,3 +210,8 @@ int ag6xx_deinit(void); > int mrvl_init(void); > int mrvl_deinit(void); > #endif > + > +#ifdef CONFIG_BT_HCIUART_AML > +int aml_init(void); > +int aml_deinit(void); > +#endif > > -- > 2.42.0 > > -- Luiz Augusto von Dentz ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART 2024-07-09 14:41 ` Luiz Augusto von Dentz @ 2024-07-11 11:59 ` Yang Li 0 siblings, 0 replies; 19+ messages in thread From: Yang Li @ 2024-07-11 11:59 UTC (permalink / raw) To: Luiz Augusto von Dentz Cc: Marcel Holtmann, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon, linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel, Ye He Hi, Luiz Thanks. On 2024/7/9 22:41, Luiz Augusto von Dentz wrote: > Hi, > > On Fri, Jul 5, 2024 at 7:21 AM Yang Li via B4 Relay > <devnull+yang.li.amlogic.com@kernel.org> wrote: >> From: Yang Li <yang.li@amlogic.com> >> >> This patch introduces support for Amlogic Bluetooth controller over >> UART. In order to send the final firmware at full speed. It is a pretty >> straight forward H4 driver with exception of actually having it's own >> setup address configuration. >> >> Co-developed-by: Ye He <ye.he@amlogic.com> >> Signed-off-by: Yang Li <yang.li@amlogic.com> >> --- >> drivers/bluetooth/Kconfig | 13 + >> drivers/bluetooth/Makefile | 1 + >> drivers/bluetooth/hci_aml.c | 749 ++++++++++++++++++++++++++++++++++++++++++ >> drivers/bluetooth/hci_ldisc.c | 8 +- >> drivers/bluetooth/hci_uart.h | 8 +- >> 5 files changed, 776 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig >> index 87484f5de8e3..634479e10cb7 100644 >> --- a/drivers/bluetooth/Kconfig >> +++ b/drivers/bluetooth/Kconfig >> @@ -273,6 +273,19 @@ config BT_HCIUART_MRVL >> >> Say Y here to compile support for HCI MRVL protocol. >> >> +config BT_HCIUART_AML >> + bool "Amlogic protocol support" >> + depends on BT_HCIUART >> + depends on BT_HCIUART_SERDEV >> + select BT_HCIUART_H4 >> + select FW_LOADER >> + select POWER_SEQUENCING_AML_WCN >> + help >> + The Amlogic protocol support enables Bluetooth HCI over serial >> + port interface for Amlogic Bluetooth controllers. >> + >> + Say Y here to compile support for HCI AML protocol. >> + >> config BT_HCIBCM203X >> tristate "HCI BCM203x USB driver" >> depends on USB >> diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile >> index 0730d6684d1a..81856512ddd0 100644 >> --- a/drivers/bluetooth/Makefile >> +++ b/drivers/bluetooth/Makefile >> @@ -51,4 +51,5 @@ hci_uart-$(CONFIG_BT_HCIUART_BCM) += hci_bcm.o >> hci_uart-$(CONFIG_BT_HCIUART_QCA) += hci_qca.o >> hci_uart-$(CONFIG_BT_HCIUART_AG6XX) += hci_ag6xx.o >> hci_uart-$(CONFIG_BT_HCIUART_MRVL) += hci_mrvl.o >> +hci_uart-$(CONFIG_BT_HCIUART_AML) += hci_aml.o >> hci_uart-objs := $(hci_uart-y) >> diff --git a/drivers/bluetooth/hci_aml.c b/drivers/bluetooth/hci_aml.c >> new file mode 100644 >> index 000000000000..33a27a555343 >> --- /dev/null >> +++ b/drivers/bluetooth/hci_aml.c >> @@ -0,0 +1,749 @@ >> +// SPDX-License-Identifier: (GPL-2.0-only OR MIT) >> +/* >> + * Copyright (C) 2024 Amlogic, Inc. All rights reserved >> + */ >> + >> +#include <linux/kernel.h> >> +#include <linux/delay.h> >> +#include <linux/device.h> >> +#include <linux/module.h> >> +#include <linux/gpio.h> >> +#include <linux/of_gpio.h> >> +#include <linux/of.h> >> +#include <linux/serdev.h> >> +#include <linux/pwm.h> >> +#include <linux/clk.h> >> +#include <linux/mutex.h> >> +#include <asm/unaligned.h> >> +#include <linux/firmware.h> >> +#include <linux/vmalloc.h> >> +#include <linux/pwrseq/consumer.h> >> +#include <net/bluetooth/bluetooth.h> >> +#include <net/bluetooth/hci_core.h> >> +#include <net/bluetooth/hci.h> >> + >> +#include "hci_uart.h" >> + >> +#define AML_EVT_HEAD_SIZE 4 >> +#define AML_BDADDR_DEFAULT (&(bdaddr_t) {{ 0x00, 0xff, 0x00, 0x22, 0x2d, 0xae }}) >> + >> +#define AML_FIRMWARE_OPERATION_SIZE (248) >> +#define AML_FIRMWARE_MAX_SIZE (512 * 1024) >> + >> +/* waiting time (ms) */ >> +#define AML_WAIT_CHIP_START_UP (350) >> + >> +/* TCI command */ >> +#define AML_TCI_CMD_READ 0xFEF0 >> +#define AML_TCI_CMD_WRITE 0xFEF1 >> +#define AML_TCI_CMD_UPDATE_BAUDRATE 0xFEF2 >> +#define AML_TCI_CMD_HARDWARE_RESET 0xFEF2 >> +#define AML_TCI_CMD_DOWNLOAD_BT_FW 0xFEF3 >> +#define AML_BT_HCI_VENDOR_CMD 0xFC1A >> + >> +/* TCI operation parameter in controller chip */ >> +#define AML_OP_UART_MODE 0x00A30128 >> +#define AML_OP_EVT_ENABLE 0x00A70014 >> +#define AML_OP_MEM_HARD_TRANS_EN 0x00A7000C >> +#define AML_OP_RF_CFG 0x00F03040 >> +#define AML_OP_RAM_POWER_CTR 0x00F03050 >> +#define AML_OP_HARDWARE_RST 0x00F03058 >> +#define AML_OP_ICCM_RAM_BASE 0x00000000 >> +#define AML_OP_DCCM_RAM_BASE 0x00D00000 >> + >> +/* uart configuration */ >> +#define AML_UART_XMIT_EN BIT(12) >> +#define AML_UART_RECV_EN BIT(13) >> +#define AML_UART_TIMEOUT_INT_EN BIT(14) >> +#define AML_UART_CLK_SOURCE 40000000 >> + >> +/* controller event enable/disable */ >> +#define AML_EVT_EN BIT(24) >> + >> +/* RAM power down control */ >> +#define AML_RAM_POWER_ON (0) >> +#define AML_RAM_POWER_OFF (1) >> + >> +/* RF configuration */ >> +#define AML_RF_A2DP_SINK_EN BIT(25) >> +#define AML_RF_ANT_SINGLE BIT(28) >> +#define AML_RF_ANT_DOUBLE BIT(29) >> +#define AML_RF_ANT_BASE (28) >> +#define AML_BT_CTR_SET_ANT(ant_num) (BIT(((ant_num) - 1)) << AML_RF_ANT_BASE) >> + >> +/* memory control hard transaction */ >> +#define AML_MM_CTR_HARD_TRAS_EN BIT(27) >> + >> +/* controller hardware reset */ >> +#define AML_CTR_CPU_RESET BIT(8) >> +#define AML_CTR_MAC_RESET BIT(9) >> +#define AML_CTR_PHY_RESET BIT(10) >> + >> +enum { >> + FW_ICCM, >> + FW_DCCM >> +}; >> + >> +struct aml_fw_len { >> + u32 iccm_len; >> + u32 dccm_len; >> +}; >> + >> +struct aml_tci_rsp { >> + u8 num_cmd_packet; >> + u16 opcode; >> + u8 status; >> +} __packed; >> + >> +struct aml_rf_cfg { >> + u32 ant_number; >> + u32 a2dp_sink_en; >> +}; >> + >> +struct aml_serdev { >> + struct hci_uart serdev_hu; >> + struct device *dev; >> + struct aml_rf_cfg rf_cfg; >> + struct pwrseq_desc *pwrseq; >> + const char *firmware_name; >> + int iccm_offset; >> + int dccm_offset; >> +}; >> + >> +struct aml_data { >> + struct sk_buff *rx_skb; >> + struct sk_buff_head txq; >> +}; >> + >> +struct aml_device_data { >> + int iccm_offset; >> + int dccm_offset; >> +}; >> + >> +static const struct h4_recv_pkt aml_recv_pkts[] = { >> + {H4_RECV_ACL, .recv = hci_recv_frame}, >> + {H4_RECV_SCO, .recv = hci_recv_frame}, >> + {H4_RECV_EVENT, .recv = hci_recv_frame}, >> + {H4_RECV_ISO, .recv = hci_recv_frame}, >> +}; >> + >> +/* The TCI command is private of Amlogic, it is used to configure before BT chip >> + * startup, contains update baudrate, update firmware, set public addr ... >> + * op_code | op_len | op_addr | parameter | >> + * --------|-----------------------|---------|-------------| >> + * 2B | 1B len(addr+param) | 4B | len(param) | >> + */ >> +static int aml_send_tci_cmd(struct hci_dev *hdev, u16 op_code, u32 op_addr, >> + u32 *param, u32 param_len) >> +{ >> + struct sk_buff *skb = NULL; >> + struct aml_tci_rsp *rsp = NULL; >> + u8 *buf = NULL; >> + u32 buf_len = 0; >> + int err = 0; >> + >> + buf_len = sizeof(op_addr) + param_len; >> + buf = vmalloc(buf_len); >> + if (!buf) { >> + BT_ERR("Failed to alloc memory."); >> + err = -ENOMEM; >> + goto exit; >> + } >> + >> + memcpy(buf, &op_addr, sizeof(op_addr)); >> + if (param && param_len > 0) >> + memcpy(buf + sizeof(op_addr), param, param_len); >> + >> + skb = __hci_cmd_sync_ev(hdev, op_code, buf_len, buf, >> + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); >> + if (IS_ERR(skb)) { >> + err = PTR_ERR(skb); >> + skb = NULL; >> + BT_ERR("Failed to send TCI cmd:(%d)", err); >> + goto exit; >> + } >> + >> + rsp = (struct aml_tci_rsp *)(skb->data); >> + if (rsp->opcode != op_code || rsp->status != 0x00) { >> + BT_ERR("send TCI cmd(0x%04X), response(0x%04X):(%d)", >> + op_code, rsp->opcode, rsp->status); >> + err = -EINVAL; >> + goto exit; >> + } >> + >> +exit: >> + if (buf) >> + vfree(buf); >> + if (skb) >> + kfree_skb(skb); >> + return err; >> +} >> + >> +static int aml_update_chip_baudrate(struct hci_dev *hdev, u32 baud) >> +{ >> + u32 value; >> + >> + value = ((AML_UART_CLK_SOURCE / baud) - 1) & 0x0FFF; >> + value |= AML_UART_XMIT_EN | AML_UART_RECV_EN | AML_UART_TIMEOUT_INT_EN; >> + >> + return aml_send_tci_cmd(hdev, AML_TCI_CMD_UPDATE_BAUDRATE, >> + AML_OP_UART_MODE, &value, sizeof(value)); >> +} >> + >> +static int aml_start_chip(struct hci_dev *hdev) >> +{ >> + u32 value = 0; >> + int ret; >> + >> + value = AML_MM_CTR_HARD_TRAS_EN; >> + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, >> + AML_OP_MEM_HARD_TRANS_EN, >> + &value, sizeof(value)); >> + if (ret) >> + return ret; >> + >> + /* controller hardware reset. */ >> + value = AML_CTR_CPU_RESET | AML_CTR_MAC_RESET | AML_CTR_PHY_RESET; >> + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_HARDWARE_RESET, >> + AML_OP_HARDWARE_RST, >> + &value, sizeof(value)); >> + return ret; >> +} >> + >> +static int aml_send_firmware_segment(struct hci_dev *hdev, >> + u8 fw_type, >> + u8 *seg, >> + u32 seg_size, >> + u32 offset) >> +{ >> + u32 op_addr = 0; >> + >> + if (fw_type == FW_ICCM) >> + op_addr = AML_OP_ICCM_RAM_BASE + offset; >> + else if (fw_type == FW_DCCM) >> + op_addr = AML_OP_DCCM_RAM_BASE + offset; >> + >> + return aml_send_tci_cmd(hdev, AML_TCI_CMD_DOWNLOAD_BT_FW, >> + op_addr, (u32 *)seg, seg_size); >> +} >> + >> +static int aml_send_firmware(struct hci_dev *hdev, u8 fw_type, >> + u8 *fw, u32 fw_size, u32 offset) >> +{ >> + u32 seg_size = 0; >> + u32 seg_off = 0; >> + >> + if (fw_size > AML_FIRMWARE_MAX_SIZE) { >> + BT_ERR("fw_size error, fw_size:%d, max_size: %d", >> + fw_size, AML_FIRMWARE_MAX_SIZE); >> + return -EINVAL; >> + } >> + while (fw_size > 0) { >> + seg_size = (fw_size > AML_FIRMWARE_OPERATION_SIZE) ? >> + AML_FIRMWARE_OPERATION_SIZE : fw_size; >> + if (aml_send_firmware_segment(hdev, fw_type, (fw + seg_off), >> + seg_size, offset)) { >> + BT_ERR("Failed send firmware, type:%d, offset:0x%x", >> + fw_type, offset); >> + return -EINVAL; >> + } >> + seg_off += seg_size; >> + fw_size -= seg_size; >> + offset += seg_size; >> + } >> + return 0; >> +} >> + >> +static int aml_download_firmware(struct hci_dev *hdev, const char *fw_name) >> +{ >> + struct hci_uart *hu = hci_get_drvdata(hdev); >> + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); >> + const struct firmware *firmware = NULL; >> + struct aml_fw_len *fw_len = NULL; >> + u8 *iccm_start = NULL, *dccm_start = NULL; >> + u32 iccm_len, dccm_len; >> + u32 value = 0; >> + int ret = 0; >> + >> + /* enable firmware download event. */ >> + value = AML_EVT_EN; >> + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, >> + AML_OP_EVT_ENABLE, >> + &value, sizeof(value)); >> + if (ret) >> + goto exit; >> + >> + /* RAM power on */ >> + value = AML_RAM_POWER_ON; >> + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, >> + AML_OP_RAM_POWER_CTR, >> + &value, sizeof(value)); >> + if (ret) >> + goto exit; >> + >> + /* check RAM power status */ >> + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_READ, >> + AML_OP_RAM_POWER_CTR, NULL, 0); >> + if (ret) >> + goto exit; >> + >> + ret = request_firmware(&firmware, fw_name, &hdev->dev); >> + if (ret < 0) { >> + BT_ERR("Failed to load <%s>:(%d)", fw_name, ret); >> + goto exit; >> + } >> + >> + fw_len = (struct aml_fw_len *)firmware->data; >> + >> + /* download ICCM. */ >> + iccm_start = (u8 *)(firmware->data) + sizeof(struct aml_fw_len) + amldev->iccm_offset; >> + iccm_len = fw_len->iccm_len - amldev->iccm_offset; >> + ret = aml_send_firmware(hdev, FW_ICCM, iccm_start, iccm_len, amldev->iccm_offset); >> + if (ret) { >> + BT_ERR("Failed to send FW_ICCM"); >> + goto exit; >> + } >> + >> + /* download DCCM. */ >> + dccm_start = (u8 *)(firmware->data) + sizeof(struct aml_fw_len) + fw_len->iccm_len; >> + dccm_len = fw_len->dccm_len; >> + ret = aml_send_firmware(hdev, FW_DCCM, dccm_start, dccm_len, amldev->dccm_offset); >> + if (ret) { >> + BT_ERR("Failed to send FW_DCCM"); >> + goto exit; >> + } >> + >> + /* disable firmware download event. */ >> + value = 0; >> + ret = aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, >> + AML_OP_EVT_ENABLE, >> + &value, sizeof(value)); >> + if (ret) >> + goto exit; >> + >> +exit: >> + if (firmware) >> + release_firmware(firmware); >> + return ret; >> +} >> + >> +static int aml_send_reset(struct hci_dev *hdev) >> +{ >> + struct sk_buff *skb; >> + int err; >> + >> + skb = __hci_cmd_sync_ev(hdev, HCI_OP_RESET, 0, NULL, >> + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); >> + if (IS_ERR(skb)) { >> + err = PTR_ERR(skb); >> + BT_ERR("Failed to send hci reset cmd(%d)", err); >> + return err; >> + } >> + kfree_skb(skb); >> + return 0; >> +} >> + >> +static int aml_dump_fw_version(struct hci_dev *hdev) >> +{ >> + struct sk_buff *skb; >> + struct aml_tci_rsp *rsp = NULL; >> + u8 value[6] = {0}; >> + u8 *fw_ver = NULL; >> + int err = 0; >> + >> + skb = __hci_cmd_sync_ev(hdev, AML_BT_HCI_VENDOR_CMD, sizeof(value), value, >> + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); >> + if (IS_ERR(skb)) { >> + skb = NULL; >> + err = PTR_ERR(skb); >> + BT_ERR("Failed get fw version:(%d)", err); >> + goto exit; >> + } >> + >> + rsp = (struct aml_tci_rsp *)(skb->data); >> + if (rsp->opcode != AML_BT_HCI_VENDOR_CMD || rsp->status != 0x00) { >> + BT_ERR("dump version, error response (0x%04X):(%d)", >> + rsp->opcode, rsp->status); >> + err = -EINVAL; >> + goto exit; >> + } >> + >> + fw_ver = skb->data + AML_EVT_HEAD_SIZE; >> + BT_INFO("fw_version: date = %02x.%02x, number = 0x%02x%02x", >> + *(fw_ver + 1), *fw_ver, *(fw_ver + 3), *(fw_ver + 2)); >> + >> +exit: >> + if (skb) >> + kfree_skb(skb); >> + return err; >> +} >> + >> +static int aml_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) >> +{ >> + struct sk_buff *skb; >> + struct aml_tci_rsp *rsp = NULL; >> + int err = 0; >> + >> + BT_INFO("set bdaddr (%pM)", bdaddr); >> + skb = __hci_cmd_sync_ev(hdev, AML_BT_HCI_VENDOR_CMD, >> + sizeof(bdaddr_t), bdaddr, >> + HCI_EV_CMD_COMPLETE, HCI_INIT_TIMEOUT); >> + if (IS_ERR(skb)) { >> + skb = NULL; >> + err = PTR_ERR(skb); >> + BT_ERR("Failed to set bdaddr:(%d)", err); >> + goto exit; >> + } >> + >> + rsp = (struct aml_tci_rsp *)(skb->data); >> + if (rsp->opcode != AML_BT_HCI_VENDOR_CMD || rsp->status != 0x00) { >> + BT_ERR("error response (0x%x):(%d)", rsp->opcode, rsp->status); >> + err = -EINVAL; >> + goto exit; >> + } >> + >> +exit: >> + if (skb) >> + kfree_skb(skb); >> + return err; >> +} >> + >> +static int aml_check_bdaddr(struct hci_dev *hdev) >> +{ >> + struct hci_rp_read_bd_addr *paddr; >> + struct sk_buff *skb; >> + int err; >> + >> + if (bacmp(&hdev->public_addr, BDADDR_ANY)) >> + return 0; >> + >> + skb = __hci_cmd_sync(hdev, HCI_OP_READ_BD_ADDR, 0, NULL, >> + HCI_INIT_TIMEOUT); >> + if (IS_ERR(skb)) { >> + err = PTR_ERR(skb); >> + BT_ERR("Failed to read bdaddr:(%d)", err); >> + return err; >> + } >> + >> + if (skb->len != sizeof(*paddr)) { >> + BT_ERR("Device address length mismatch"); >> + kfree_skb(skb); >> + return -EIO; >> + } >> + >> + paddr = (struct hci_rp_read_bd_addr *)skb->data; >> + if (!bacmp(&paddr->bdaddr, AML_BDADDR_DEFAULT)) { >> + BT_INFO("amlbt using default bdaddr (%pM)", &paddr->bdaddr); >> + set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); >> + } >> + >> + kfree_skb(skb); >> + >> + return 0; >> +} >> + >> +static int aml_config_rf(struct hci_dev *hdev, struct aml_rf_cfg *cfg) >> +{ >> + u32 value = 0; >> + >> + if (cfg->a2dp_sink_en) >> + value |= AML_RF_A2DP_SINK_EN; >> + >> + if (cfg->ant_number > 0) >> + value |= AML_BT_CTR_SET_ANT(cfg->ant_number); >> + >> + return aml_send_tci_cmd(hdev, AML_TCI_CMD_WRITE, >> + AML_OP_RF_CFG, >> + &value, sizeof(value)); >> +} >> + >> +static int aml_parse_resource(struct aml_serdev *amldev) >> +{ >> + struct device *pdev = amldev->dev; >> + >> + /* get firmware path*/ >> + if (of_property_read_string(pdev->of_node, "amlogic,firmware", >> + &amldev->firmware_name)) { >> + dev_err(pdev, "Failed to read firmware path"); >> + return -ENODEV; >> + } >> + BT_DBG("firmware path:%s", amldev->firmware_name); > Please replace uses of BT_DBG with bt_dev_dbg. Well, I got it. > >> + /* get controller config parameter */ >> + if (of_property_read_u32(pdev->of_node, "amlogic,antenna-number", >> + &amldev->rf_cfg.ant_number)) { >> + dev_info(pdev, "No antenna-number, using default value"); >> + amldev->rf_cfg.ant_number = 1; >> + } >> + >> + if (of_property_read_u32(pdev->of_node, "amlogic,a2dp-sink-enable", >> + &amldev->rf_cfg.a2dp_sink_en)) { >> + dev_info(pdev, "No a2dp-sink-enable, using default value"); >> + amldev->rf_cfg.a2dp_sink_en = 0; >> + } >> + BT_DBG("rf_config ant_num:%d, a2dp_sink_en:%d", >> + amldev->rf_cfg.ant_number, amldev->rf_cfg.a2dp_sink_en); >> + return 0; >> +} >> + >> +static int aml_set_baudrate(struct hci_uart *hu, unsigned int speed) >> +{ >> + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); >> + struct hci_dev *hdev = amldev->serdev_hu.hdev; >> + >> + /* update controller baudrate*/ >> + if (aml_update_chip_baudrate(hdev, speed) != 0) { >> + BT_ERR("Failed to update baud rate"); > Replace instances of BT_ERR with bt_dev_err. Well, I got it. > >> + return -EINVAL; >> + } >> + >> + /* update local baudrate*/ >> + serdev_device_set_baudrate(hu->serdev, speed); >> + >> + return 0; >> +} >> + >> +/* Initialize protocol */ >> +static int aml_open(struct hci_uart *hu) >> +{ >> + struct aml_data *aml_data; >> + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); >> + >> + if (aml_parse_resource(amldev)) { >> + BT_ERR("Failed to parse resource"); >> + return -EINVAL; >> + } >> + >> + if (pwrseq_power_on(amldev->pwrseq)) { >> + BT_ERR("Failed to power on chipset"); >> + return -EPERM; >> + } >> + >> + if (!hci_uart_has_flow_control(hu)) { >> + BT_ERR("no flow control"); >> + return -EOPNOTSUPP; >> + } >> + >> + aml_data = kzalloc(sizeof(*aml_data), GFP_KERNEL); >> + if (!aml_data) { >> + BT_ERR("Failed to kzalloc with aml_data"); >> + return -ENOMEM; >> + } >> + >> + skb_queue_head_init(&aml_data->txq); >> + >> + hu->priv = aml_data; >> + >> + return 0; >> +} >> + >> +/* Close protocol */ >> +static int aml_close(struct hci_uart *hu) >> +{ >> + struct aml_data *aml_data = hu->priv; >> + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); >> + >> + if (hu->serdev) >> + serdev_device_close(hu->serdev); >> + >> + skb_queue_purge(&aml_data->txq); >> + kfree_skb(aml_data->rx_skb); >> + kfree(aml_data); >> + >> + hu->priv = NULL; >> + >> + return pwrseq_power_off(amldev->pwrseq); >> +} >> + >> +static int aml_flush(struct hci_uart *hu) >> +{ >> + struct aml_data *aml_data = hu->priv; >> + >> + skb_queue_purge(&aml_data->txq); >> + >> + return 0; >> +} >> + >> +static int aml_setup(struct hci_uart *hu) >> +{ >> + struct aml_serdev *amldev = serdev_device_get_drvdata(hu->serdev); >> + struct hci_dev *hdev = amldev->serdev_hu.hdev; >> + int err; >> + >> + /* Setup bdaddr */ >> + hdev->set_bdaddr = aml_set_bdaddr; >> + >> + err = aml_set_baudrate(hu, amldev->serdev_hu.proto->oper_speed); >> + if (err) >> + return err; >> + >> + err = aml_download_firmware(hdev, amldev->firmware_name); >> + if (err) >> + return err; >> + >> + err = aml_config_rf(hdev, &amldev->rf_cfg); >> + if (err) >> + return err; >> + >> + err = aml_start_chip(hdev); >> + if (err) >> + return err; >> + >> + /* wait 350ms for controller start up*/ >> + msleep(AML_WAIT_CHIP_START_UP); >> + >> + err = aml_dump_fw_version(hdev); >> + if (err) >> + return err; >> + >> + err = aml_send_reset(hdev); >> + if (err) >> + return err; >> + >> + err = aml_check_bdaddr(hdev); >> + if (err) >> + return err; >> + >> + return 0; >> +} >> + >> +static int aml_enqueue(struct hci_uart *hu, struct sk_buff *skb) >> +{ >> + struct aml_data *aml_data = hu->priv; >> + >> + skb_queue_tail(&aml_data->txq, skb); >> + >> + return 0; >> +} >> + >> +static struct sk_buff *aml_dequeue(struct hci_uart *hu) >> +{ >> + struct aml_data *aml_data = hu->priv; >> + struct sk_buff *skb; >> + >> + skb = skb_dequeue(&aml_data->txq); >> + >> + /* Prepend skb with frame type */ >> + if (skb) >> + memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); >> + >> + return skb; >> +} >> + >> +static int aml_recv(struct hci_uart *hu, const void *data, int count) >> +{ >> + struct aml_data *aml_data = hu->priv; >> + int err; >> + >> + aml_data->rx_skb = h4_recv_buf(hu->hdev, aml_data->rx_skb, data, count, >> + aml_recv_pkts, >> + ARRAY_SIZE(aml_recv_pkts)); >> + if (IS_ERR(aml_data->rx_skb)) { >> + err = PTR_ERR(aml_data->rx_skb); >> + bt_dev_err(hu->hdev, "Frame reassembly failed (%d)", err); >> + aml_data->rx_skb = NULL; >> + return err; >> + } >> + >> + return count; >> +} >> + >> +static const struct hci_uart_proto aml_hci_proto = { >> + .id = HCI_UART_AML, >> + .name = "AML", >> + .manufacturer = 50, >> + .init_speed = 115200, >> + .oper_speed = 4000000, >> + .open = aml_open, >> + .close = aml_close, >> + .setup = aml_setup, >> + .flush = aml_flush, >> + .recv = aml_recv, >> + .enqueue = aml_enqueue, >> + .dequeue = aml_dequeue, >> +}; >> + >> +static void aml_device_driver_shutdown(struct device *dev) >> +{ >> + struct aml_serdev *amldev = dev_get_drvdata(dev); >> + >> + pwrseq_power_off(amldev->pwrseq); >> +} >> + >> +static int aml_serdev_probe(struct serdev_device *serdev) >> +{ >> + struct aml_serdev *amldev; >> + const struct aml_device_data *data; >> + int err; >> + >> + amldev = devm_kzalloc(&serdev->dev, sizeof(*amldev), GFP_KERNEL); >> + if (!amldev) >> + return -ENOMEM; >> + >> + amldev->serdev_hu.serdev = serdev; >> + amldev->dev = &serdev->dev; >> + serdev_device_set_drvdata(serdev, amldev); >> + >> + amldev->pwrseq = devm_pwrseq_get(&serdev->dev, "bluetooth"); >> + if (IS_ERR(amldev->pwrseq)) >> + return dev_err_probe(amldev->dev, PTR_ERR(amldev->pwrseq), >> + "Failed to get pwrseq target"); >> + >> + err = hci_uart_register_device(&amldev->serdev_hu, &aml_hci_proto); >> + if (err) >> + return dev_err_probe(amldev->dev, err, >> + "Failed to register hci uart device"); >> + >> + data = device_get_match_data(&serdev->dev); >> + if (data) { >> + amldev->iccm_offset = data->iccm_offset; >> + amldev->dccm_offset = data->dccm_offset; >> + } >> + >> + return 0; >> +} >> + >> +static void aml_serdev_remove(struct serdev_device *serdev) >> +{ >> + struct aml_serdev *amldev = serdev_device_get_drvdata(serdev); >> + >> + hci_uart_unregister_device(&amldev->serdev_hu); >> +} >> + >> +static const struct aml_device_data data_w155s2 __maybe_unused = { >> + .iccm_offset = 256 * 1024, >> +}; >> + >> +static const struct aml_device_data data_w265s2 __maybe_unused = { >> + .iccm_offset = 384 * 1024, >> +}; >> + >> +static const struct of_device_id aml_bluetooth_of_match[] = { >> + { .compatible = "amlogic,w155s2-bt", .data = &data_w155s2 }, >> + { .compatible = "amlogic,w265s2-bt", .data = &data_w265s2 }, >> + { /* sentinel */ }, >> +}; >> + >> +static struct serdev_device_driver aml_serdev_driver = { >> + .probe = aml_serdev_probe, >> + .remove = aml_serdev_remove, >> + .driver = { >> + .name = "hci_uart_aml", >> + .of_match_table = of_match_ptr(aml_bluetooth_of_match), >> + .shutdown = aml_device_driver_shutdown, >> + }, >> +}; >> + >> +int __init aml_init(void) >> +{ >> + serdev_device_driver_register(&aml_serdev_driver); >> + >> + return hci_uart_register_proto(&aml_hci_proto); >> +} >> + >> +int __exit aml_deinit(void) >> +{ >> + serdev_device_driver_unregister(&aml_serdev_driver); >> + >> + return hci_uart_unregister_proto(&aml_hci_proto); >> +} >> diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c >> index 30192bb08354..d307c41a5470 100644 >> --- a/drivers/bluetooth/hci_ldisc.c >> +++ b/drivers/bluetooth/hci_ldisc.c >> @@ -870,7 +870,9 @@ static int __init hci_uart_init(void) >> #ifdef CONFIG_BT_HCIUART_MRVL >> mrvl_init(); >> #endif >> - >> +#ifdef CONFIG_BT_HCIUART_AML >> + aml_init(); >> +#endif >> return 0; >> } >> >> @@ -906,7 +908,9 @@ static void __exit hci_uart_exit(void) >> #ifdef CONFIG_BT_HCIUART_MRVL >> mrvl_deinit(); >> #endif >> - >> +#ifdef CONFIG_BT_HCIUART_AML >> + aml_deinit(); >> +#endif >> tty_unregister_ldisc(&hci_uart_ldisc); >> } >> >> diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h >> index 00bf7ae82c5b..fbf3079b92a5 100644 >> --- a/drivers/bluetooth/hci_uart.h >> +++ b/drivers/bluetooth/hci_uart.h >> @@ -20,7 +20,7 @@ >> #define HCIUARTGETFLAGS _IOR('U', 204, int) >> >> /* UART protocols */ >> -#define HCI_UART_MAX_PROTO 12 >> +#define HCI_UART_MAX_PROTO 13 >> >> #define HCI_UART_H4 0 >> #define HCI_UART_BCSP 1 >> @@ -34,6 +34,7 @@ >> #define HCI_UART_AG6XX 9 >> #define HCI_UART_NOKIA 10 >> #define HCI_UART_MRVL 11 >> +#define HCI_UART_AML 12 >> >> #define HCI_UART_RAW_DEVICE 0 >> #define HCI_UART_RESET_ON_INIT 1 >> @@ -209,3 +210,8 @@ int ag6xx_deinit(void); >> int mrvl_init(void); >> int mrvl_deinit(void); >> #endif >> + >> +#ifdef CONFIG_BT_HCIUART_AML >> +int aml_init(void); >> +int aml_deinit(void); >> +#endif >> >> -- >> 2.42.0 >> >> > > -- > Luiz Augusto von Dentz ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 3/4] arm64: defconfig: Enable hci_uart for Amlogic Bluetooth 2024-07-05 11:20 [PATCH 0/4] Add support for Amlogic HCI UART Yang Li via B4 Relay 2024-07-05 11:20 ` [PATCH 1/4] dt-bindings: net: bluetooth: Add support for Amlogic Bluetooth Yang Li via B4 Relay 2024-07-05 11:20 ` [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART Yang Li via B4 Relay @ 2024-07-05 11:20 ` Yang Li via B4 Relay 2024-07-07 13:08 ` Krzysztof Kozlowski 2024-07-05 11:20 ` [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART Yang Li via B4 Relay 3 siblings, 1 reply; 19+ messages in thread From: Yang Li via B4 Relay @ 2024-07-05 11:20 UTC (permalink / raw) To: Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel, Yang Li From: Yang Li <yang.li@amlogic.com> Enable the HCI protocol of Amlogitc Bluetooth. Signed-off-by: Yang Li <yang.li@amlogic.com> --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 57a9abe78ee4..11c4b5c532ca 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -192,6 +192,7 @@ CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_MRVL=y +CONFIG_BT_HCIUART_AML=y CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_QCOMSMD=m -- 2.42.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 3/4] arm64: defconfig: Enable hci_uart for Amlogic Bluetooth 2024-07-05 11:20 ` [PATCH 3/4] arm64: defconfig: Enable hci_uart for Amlogic Bluetooth Yang Li via B4 Relay @ 2024-07-07 13:08 ` Krzysztof Kozlowski 2024-07-11 11:40 ` Yang Li 0 siblings, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-07-07 13:08 UTC (permalink / raw) To: yang.li, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel On 05/07/2024 13:20, Yang Li via B4 Relay wrote: > From: Yang Li <yang.li@amlogic.com> > > Enable the HCI protocol of Amlogitc Bluetooth. Why? Commit msg MUST answer this. Also, this is supposed to be module. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/4] arm64: defconfig: Enable hci_uart for Amlogic Bluetooth 2024-07-07 13:08 ` Krzysztof Kozlowski @ 2024-07-11 11:40 ` Yang Li 2024-07-11 12:19 ` Krzysztof Kozlowski 0 siblings, 1 reply; 19+ messages in thread From: Yang Li @ 2024-07-11 11:40 UTC (permalink / raw) To: Krzysztof Kozlowski, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel On 2024/7/7 21:08, Krzysztof Kozlowski wrote: > On 05/07/2024 13:20, Yang Li via B4 Relay wrote: >> From: Yang Li <yang.li@amlogic.com> >> >> Enable the HCI protocol of Amlogitc Bluetooth. > Why? Commit msg MUST answer this. > > Also, this is supposed to be module. Yes, "hci_uart" is already set to module by "CONFIG_BT_HCIUART". "CONFIG_BT_HCIUART_AML" is the Bluetooth driver that specifically enables Amlogic support. I will change the commit msg to: arm64: defconfig: enable Amlogic bluetooth relevant drivers as modules CONFIG_BT_HCIUART_AML is the Bluetooth driver that enables support for Amlogic chips, including W155S2, W265S1, W265P1, and W265S2. > > Best regards, > Krzysztof > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/4] arm64: defconfig: Enable hci_uart for Amlogic Bluetooth 2024-07-11 11:40 ` Yang Li @ 2024-07-11 12:19 ` Krzysztof Kozlowski 2024-07-12 11:13 ` Yang Li 0 siblings, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-07-11 12:19 UTC (permalink / raw) To: Yang Li, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel On 11/07/2024 13:40, Yang Li wrote: > > arm64: defconfig: enable Amlogic bluetooth relevant drivers as modules > > CONFIG_BT_HCIUART_AML is the Bluetooth driver that enables support > for Amlogic chips, including W155S2, W265S1, W265P1, and W265S2. This still does not answer why we would like to have it in defconfig, e.g. which mainline board uses it or benefits from it. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/4] arm64: defconfig: Enable hci_uart for Amlogic Bluetooth 2024-07-11 12:19 ` Krzysztof Kozlowski @ 2024-07-12 11:13 ` Yang Li 0 siblings, 0 replies; 19+ messages in thread From: Yang Li @ 2024-07-12 11:13 UTC (permalink / raw) To: Krzysztof Kozlowski, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel Hi, On 2024/7/11 20:19, Krzysztof Kozlowski wrote: > On 11/07/2024 13:40, Yang Li wrote: >> arm64: defconfig: enable Amlogic bluetooth relevant drivers as modules >> >> CONFIG_BT_HCIUART_AML is the Bluetooth driver that enables support >> for Amlogic chips, including W155S2, W265S1, W265P1, and W265S2. > This still does not answer why we would like to have it in defconfig, > e.g. which mainline board uses it or benefits from it. Well, I understand. I plan to submit this patch after the mainline board is ready for contributions. Thanks！ > > Best regards, > Krzysztof > ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART 2024-07-05 11:20 [PATCH 0/4] Add support for Amlogic HCI UART Yang Li via B4 Relay ` (2 preceding siblings ...) 2024-07-05 11:20 ` [PATCH 3/4] arm64: defconfig: Enable hci_uart for Amlogic Bluetooth Yang Li via B4 Relay @ 2024-07-05 11:20 ` Yang Li via B4 Relay 2024-07-07 13:11 ` Krzysztof Kozlowski 2024-07-12 12:34 ` Paul Menzel 3 siblings, 2 replies; 19+ messages in thread From: Yang Li via B4 Relay @ 2024-07-05 11:20 UTC (permalink / raw) To: Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel, Yang Li From: Yang Li <yang.li@amlogic.com> Add Amlogic Bluetooth driver and driver document. Signed-off-by: Yang Li <yang.li@amlogic.com> --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index cd3277a98cfe..b81089290930 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1140,6 +1140,14 @@ S: Supported F: arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi F: drivers/net/ethernet/amd/xgbe/ +AMLOGIC BLUETOOTH DRIVER +M: Yang Li <yang.li@amlogic.com> +L: linux-bluetooth@vger.kernel.org +S: Maintained +W: http://www.amlogic.com +F: Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml +F: drivers/bluetooth/hci_aml.c + AMLOGIC DDR PMU DRIVER M: Jiucheng Xu <jiucheng.xu@amlogic.com> L: linux-amlogic@lists.infradead.org -- 2.42.0 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART 2024-07-05 11:20 ` [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART Yang Li via B4 Relay @ 2024-07-07 13:11 ` Krzysztof Kozlowski 2024-07-11 10:59 ` Yang Li 2024-07-12 12:34 ` Paul Menzel 1 sibling, 1 reply; 19+ messages in thread From: Krzysztof Kozlowski @ 2024-07-07 13:11 UTC (permalink / raw) To: yang.li, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel On 05/07/2024 13:20, Yang Li via B4 Relay wrote: > From: Yang Li <yang.li@amlogic.com> > > Add Amlogic Bluetooth driver and driver document. > > Signed-off-by: Yang Li <yang.li@amlogic.com> > --- > MAINTAINERS | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index cd3277a98cfe..b81089290930 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1140,6 +1140,14 @@ S: Supported > F: arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi > F: drivers/net/ethernet/amd/xgbe/ > > +AMLOGIC BLUETOOTH DRIVER > +M: Yang Li <yang.li@amlogic.com> > +L: linux-bluetooth@vger.kernel.org > +S: Maintained > +W: http://www.amlogic.com Same as in your other patches. Drop. It's not a place for marketing. Or provide useful link. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART 2024-07-07 13:11 ` Krzysztof Kozlowski @ 2024-07-11 10:59 ` Yang Li 0 siblings, 0 replies; 19+ messages in thread From: Yang Li @ 2024-07-11 10:59 UTC (permalink / raw) To: Krzysztof Kozlowski, Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel On 2024/7/7 21:11, Krzysztof Kozlowski wrote: > On 05/07/2024 13:20, Yang Li via B4 Relay wrote: >> From: Yang Li <yang.li@amlogic.com> >> >> Add Amlogic Bluetooth driver and driver document. >> >> Signed-off-by: Yang Li <yang.li@amlogic.com> >> --- >> MAINTAINERS | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index cd3277a98cfe..b81089290930 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1140,6 +1140,14 @@ S: Supported >> F: arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi >> F: drivers/net/ethernet/amd/xgbe/ >> >> +AMLOGIC BLUETOOTH DRIVER >> +M: Yang Li <yang.li@amlogic.com> >> +L: linux-bluetooth@vger.kernel.org >> +S: Maintained >> +W: http://www.amlogic.com > Same as in your other patches. Drop. It's not a place for marketing. Or > provide useful link. Will do. > > > Best regards, > Krzysztof > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART 2024-07-05 11:20 ` [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART Yang Li via B4 Relay 2024-07-07 13:11 ` Krzysztof Kozlowski @ 2024-07-12 12:34 ` Paul Menzel 2024-07-16 2:48 ` Yang Li 1 sibling, 1 reply; 19+ messages in thread From: Paul Menzel @ 2024-07-12 12:34 UTC (permalink / raw) To: Yang Li Cc: Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon, linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel Dear Yang, Thank you for the patch. `git log --oneline` does not contain the/your name, so people would need to look it up. Maybe: MAINTAINERS: Add Amlogic Bluetooth entry maintained by Yang Li or MAINTAINERS: Add Amlogic Bluetooth entry (M: Yang Li) Am 05.07.24 um 13:20 schrieb Yang Li via B4 Relay: > From: Yang Li <yang.li@amlogic.com> > > Add Amlogic Bluetooth driver and driver document. Does this match the change of `MAINTAINERS`? > Signed-off-by: Yang Li <yang.li@amlogic.com> > --- > MAINTAINERS | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index cd3277a98cfe..b81089290930 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1140,6 +1140,14 @@ S: Supported > F: arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi > F: drivers/net/ethernet/amd/xgbe/ > > +AMLOGIC BLUETOOTH DRIVER > +M: Yang Li <yang.li@amlogic.com> > +L: linux-bluetooth@vger.kernel.org > +S: Maintained > +W: http://www.amlogic.com > +F: Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml > +F: drivers/bluetooth/hci_aml.c > + > AMLOGIC DDR PMU DRIVER > M: Jiucheng Xu <jiucheng.xu@amlogic.com> > L: linux-amlogic@lists.infradead.org Acked-by: Paul Menzel <pmenzel@molgen.mpg.de> Kind regards, Paul ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART 2024-07-12 12:34 ` Paul Menzel @ 2024-07-16 2:48 ` Yang Li 0 siblings, 0 replies; 19+ messages in thread From: Yang Li @ 2024-07-16 2:48 UTC (permalink / raw) To: Paul Menzel Cc: Marcel Holtmann, Luiz Augusto von Dentz, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon, linux-bluetooth, netdev, devicetree, linux-kernel, linux-arm-kernel Dear Paul Thanks for your remind. On 2024/7/12 20:34, Paul Menzel wrote: > > Dear Yang, > > > Thank you for the patch. `git log --oneline` does not contain the/your > name, so people would need to look it up. Maybe: > > MAINTAINERS: Add Amlogic Bluetooth entry maintained by Yang Li > > or > > MAINTAINERS: Add Amlogic Bluetooth entry (M: Yang Li) Well, I got it. > > Am 05.07.24 um 13:20 schrieb Yang Li via B4 Relay: >> From: Yang Li <yang.li@amlogic.com> >> >> Add Amlogic Bluetooth driver and driver document. > > Does this match the change of `MAINTAINERS`? Well, I initially interpreted the 'driver document' as the device tree (dt) binding file, but this might be a misalignment. Therefore, I will revise it to: 'Add an Amlogic Bluetooth entry in the MAINTAINERS file to clarify the maintainers.' thanks~ > >> Signed-off-by: Yang Li <yang.li@amlogic.com> >> --- >> MAINTAINERS | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index cd3277a98cfe..b81089290930 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1140,6 +1140,14 @@ S: Supported >> F: arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi >> F: drivers/net/ethernet/amd/xgbe/ >> >> +AMLOGIC BLUETOOTH DRIVER >> +M: Yang Li <yang.li@amlogic.com> >> +L: linux-bluetooth@vger.kernel.org >> +S: Maintained >> +W: http://www.amlogic.com >> +F: >> Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml >> +F: drivers/bluetooth/hci_aml.c >> + >> AMLOGIC DDR PMU DRIVER >> M: Jiucheng Xu <jiucheng.xu@amlogic.com> >> L: linux-amlogic@lists.infradead.org > > Acked-by: Paul Menzel <pmenzel@molgen.mpg.de> > > > Kind regards, > > Paul ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-07-16 2:49 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-07-05 11:20 [PATCH 0/4] Add support for Amlogic HCI UART Yang Li via B4 Relay 2024-07-05 11:20 ` [PATCH 1/4] dt-bindings: net: bluetooth: Add support for Amlogic Bluetooth Yang Li via B4 Relay 2024-07-07 13:08 ` Krzysztof Kozlowski 2024-07-11 10:58 ` Yang Li 2024-07-05 11:20 ` [PATCH 2/4] Bluetooth: hci_uart: Add support for Amlogic HCI UART Yang Li via B4 Relay 2024-07-07 13:10 ` Krzysztof Kozlowski 2024-07-11 10:33 ` Yang Li 2024-07-09 14:41 ` Luiz Augusto von Dentz 2024-07-11 11:59 ` Yang Li 2024-07-05 11:20 ` [PATCH 3/4] arm64: defconfig: Enable hci_uart for Amlogic Bluetooth Yang Li via B4 Relay 2024-07-07 13:08 ` Krzysztof Kozlowski 2024-07-11 11:40 ` Yang Li 2024-07-11 12:19 ` Krzysztof Kozlowski 2024-07-12 11:13 ` Yang Li 2024-07-05 11:20 ` [PATCH 4/4] MAINTAINERS: Add an entry for Amlogic HCI UART Yang Li via B4 Relay 2024-07-07 13:11 ` Krzysztof Kozlowski 2024-07-11 10:59 ` Yang Li 2024-07-12 12:34 ` Paul Menzel 2024-07-16 2:48 ` Yang Li
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).