From: lpoulain <[email protected]>
In the same way as Ethernet, gather the Bluetooth related bindings in
one file. Introduce the bluetooth-bd-address property which can be used
to store the assigned BD address.
Signed-off-by: lpoulain <[email protected]>
---
v2: Set device as unconfigured if default address detected
Add warning if BD addr retrieved from DT
v3: if no addr retrieved from DT, unconditionally set
the invalid BD addr flag.
swap and set bdaddr in the platform probe
v4: Add dt-bindings documentation
split patch in two parts (setup, dt prop)
use local-bd-address name instead of local-mac-address
v5: remove 2/3 merged in bluetooth-next tree
Add bluetooth.txt for common BT bindings
expect local-bd-address in little-endian format
Documentation/devicetree/bindings/net/bluetooth.txt | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt
diff --git a/Documentation/devicetree/bindings/net/bluetooth.txt b/Documentation/devicetree/bindings/net/bluetooth.txt
new file mode 100644
index 0000000..94797df
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/bluetooth.txt
@@ -0,0 +1,5 @@
+The following properties are common to the Bluetooth controllers:
+
+- local-bd-address: array of 6 bytes, specifies the BD address that was
+ uniquely assigned to the Bluetooth device, formatted with least significant
+ byte first (little-endian).
--
1.9.1
On Tue, Sep 05, 2017 at 08:58:42PM +0200, Loic Poulain wrote:
> Add optional local-bd-address property which is a 6-byte array
> storing the assigned BD address. Since having a unique BD address
> is critical, a per-device property value should be allocated.
> This property is usually added by the boot loader which has access
> to the provisioned data.
>
> Signed-off-by: Loic Poulain <[email protected]>
> ---
> v2: Set device as unconfigured if default address detected
> Add warning if BD addr retrieved from DT
> v3: if no addr retrieved from DT, unconditionally set
> the invalid BD addr flag.
> swap and set bdaddr in the platform probe
> v4: Add dt-bindings documentation
> split patch in two parts (setup, dt prop)
> use local-bd-address name instead of local-mac-address
> v5: remove 2/3 merged in bluetooth-next tree
> Add bluetooth.txt for common BT bindings
> expect local-bd-address in little-endian format
>
> Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt | 8 ++++++++
> 1 file changed, 8 insertions(+)
Acked-by: Rob Herring <[email protected]>
On Tue, Sep 05, 2017 at 08:58:41PM +0200, Loic Poulain wrote:
> From: lpoulain <[email protected]>
>
> In the same way as Ethernet, gather the Bluetooth related bindings in
> one file. Introduce the bluetooth-bd-address property which can be used
> to store the assigned BD address.
>
> Signed-off-by: lpoulain <[email protected]>
> ---
> v2: Set device as unconfigured if default address detected
> Add warning if BD addr retrieved from DT
> v3: if no addr retrieved from DT, unconditionally set
> the invalid BD addr flag.
> swap and set bdaddr in the platform probe
> v4: Add dt-bindings documentation
> split patch in two parts (setup, dt prop)
> use local-bd-address name instead of local-mac-address
> v5: remove 2/3 merged in bluetooth-next tree
> Add bluetooth.txt for common BT bindings
> expect local-bd-address in little-endian format
>
> Documentation/devicetree/bindings/net/bluetooth.txt | 5 +++++
> 1 file changed, 5 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt
Acked-by: Rob Herring <[email protected]>
On Wed, Sep 6, 2017 at 2:04 AM, Marcel Holtmann <[email protected]> wrote=
:
> Hi Rob,
>
>>> Retrieve BD address from the DT local-bd-address property.
>>> This address must be unique and is usually added in the DT
>>> by the bootloader which has access to the provisioned data.
>>>
>>> Signed-off-by: Loic Poulain <[email protected]>
[...]
>>> + /* The local-bd-address DT property is usually injected by the
>>> + * bootloader which has access to the allocated BD address.
>>> + */
>>> + bdaddr =3D of_get_property(pdev->dev.of_node, "local-bd-address=
", &ret);
>>> + if (bdaddr && ret =3D=3D sizeof(bdaddr_t)) {
>>> + BT_INFO("BD address %pMR retrieved from device-tree", b=
daddr);
>>> + bacpy(&btq->bdaddr, bdaddr);
>>> + }
>>
>> Can we put all this into a helper function before we get more
>> instances. And use the u8 array property function. We're trying to
>> make of_get_property an internal function.
>
> using of_property_read_u8_array seems sensible since that would shorten t=
his into
>
> if (!of_property_read_u8_array(pdev->dev.of_node, =E2=80=9Clocal-=
bd-address=E2=80=9D, &btq->bdaddr, 6))
> bt_dev_info(pdev->dev, =E2=80=9CBD address %pMR ..=E2=80=
=9D, &btq->bdaddr);
>
Yes.
> Creating a Bluetooth internal helper function seems rather pointless at t=
his stage. If more users appears, then we might need to move this into the =
Bluetooth core to deal with this. However as said before, I am not a big fa=
n of IEEE address assignment via DT since that forces to have the smarts in=
the boot loader and the boot loader doing the right thing. There are too m=
any boards and DT where this will not be true. In a lot of cases it would m=
ake more sense to store the BD address as part of your file system. Since w=
e do support this in a total generic fashion, I rather push for that method=
and have the QCOM SMD based SoC being the exception.
Okay, sounds reasonable and it's your call anyway.
Rob
BTW, your mails are always quoted-printable encoding which shouldn't
be used on lists AIUI.
Hi Rob,
>> Retrieve BD address from the DT local-bd-address property.
>> This address must be unique and is usually added in the DT
>> by the bootloader which has access to the provisioned data.
>>
>> Signed-off-by: Loic Poulain <[email protected]>
>> ---
>> v2: Set device as unconfigured if default address detected
>> Add warning if BD addr retrieved from DT
>> v3: if no addr retrieved from DT, unconditionally set
>> the invalid BD addr flag.
>> swap and set bdaddr in the platform probe
>> v4: Add dt-bindings documentation
>> split patch in two parts (setup, dt prop)
>> use local-bd-address name instead of local-mac-address
>> v5: remove 2/3 merged in bluetooth-next tree
>> Add bluetooth.txt for common BT bindings
>> expect local-bd-address in little-endian format
>>
>> drivers/bluetooth/btqcomsmd.c | 12 ++++++++++++
>> 1 file changed, 12 insertions(+)
>>
>> diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c
>> index bd810d0..c6d3fd9 100644
>> --- a/drivers/bluetooth/btqcomsmd.c
>> +++ b/drivers/bluetooth/btqcomsmd.c
>> @@ -15,6 +15,8 @@
>> #include <linux/module.h>
>> #include <linux/slab.h>
>> #include <linux/rpmsg.h>
>> +#include <linux/of.h>
>> +
>> #include <linux/soc/qcom/wcnss_ctrl.h>
>> #include <linux/platform_device.h>
>>
>> @@ -135,6 +137,7 @@ static int btqcomsmd_setup(struct hci_dev *hdev)
>>
>> static int btqcomsmd_probe(struct platform_device *pdev)
>> {
>> + const bdaddr_t *bdaddr;
>> struct btqcomsmd *btq;
>> struct hci_dev *hdev;
>> void *wcnss;
>> @@ -156,6 +159,15 @@ static int btqcomsmd_probe(struct platform_device *pdev)
>> if (IS_ERR(btq->cmd_channel))
>> return PTR_ERR(btq->cmd_channel);
>>
>> + /* The local-bd-address DT property is usually injected by the
>> + * bootloader which has access to the allocated BD address.
>> + */
>> + bdaddr = of_get_property(pdev->dev.of_node, "local-bd-address", &ret);
>> + if (bdaddr && ret == sizeof(bdaddr_t)) {
>> + BT_INFO("BD address %pMR retrieved from device-tree", bdaddr);
>> + bacpy(&btq->bdaddr, bdaddr);
>> + }
>
> Can we put all this into a helper function before we get more
> instances. And use the u8 array property function. We're trying to
> make of_get_property an internal function.
using of_property_read_u8_array seems sensible since that would shorten this into
if (!of_property_read_u8_array(pdev->dev.of_node, “local-bd-address”, &btq->bdaddr, 6))
bt_dev_info(pdev->dev, “BD address %pMR ..”, &btq->bdaddr);
Creating a Bluetooth internal helper function seems rather pointless at this stage. If more users appears, then we might need to move this into the Bluetooth core to deal with this. However as said before, I am not a big fan of IEEE address assignment via DT since that forces to have the smarts in the boot loader and the boot loader doing the right thing. There are too many boards and DT where this will not be true. In a lot of cases it would make more sense to store the BD address as part of your file system. Since we do support this in a total generic fashion, I rather push for that method and have the QCOM SMD based SoC being the exception.
Regards
Marcel
On Tue, Sep 5, 2017 at 1:58 PM, Loic Poulain <[email protected]> wrote:
> Retrieve BD address from the DT local-bd-address property.
> This address must be unique and is usually added in the DT
> by the bootloader which has access to the provisioned data.
>
> Signed-off-by: Loic Poulain <[email protected]>
> ---
> v2: Set device as unconfigured if default address detected
> Add warning if BD addr retrieved from DT
> v3: if no addr retrieved from DT, unconditionally set
> the invalid BD addr flag.
> swap and set bdaddr in the platform probe
> v4: Add dt-bindings documentation
> split patch in two parts (setup, dt prop)
> use local-bd-address name instead of local-mac-address
> v5: remove 2/3 merged in bluetooth-next tree
> Add bluetooth.txt for common BT bindings
> expect local-bd-address in little-endian format
>
> drivers/bluetooth/btqcomsmd.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c
> index bd810d0..c6d3fd9 100644
> --- a/drivers/bluetooth/btqcomsmd.c
> +++ b/drivers/bluetooth/btqcomsmd.c
> @@ -15,6 +15,8 @@
> #include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/rpmsg.h>
> +#include <linux/of.h>
> +
> #include <linux/soc/qcom/wcnss_ctrl.h>
> #include <linux/platform_device.h>
>
> @@ -135,6 +137,7 @@ static int btqcomsmd_setup(struct hci_dev *hdev)
>
> static int btqcomsmd_probe(struct platform_device *pdev)
> {
> + const bdaddr_t *bdaddr;
> struct btqcomsmd *btq;
> struct hci_dev *hdev;
> void *wcnss;
> @@ -156,6 +159,15 @@ static int btqcomsmd_probe(struct platform_device *pdev)
> if (IS_ERR(btq->cmd_channel))
> return PTR_ERR(btq->cmd_channel);
>
> + /* The local-bd-address DT property is usually injected by the
> + * bootloader which has access to the allocated BD address.
> + */
> + bdaddr = of_get_property(pdev->dev.of_node, "local-bd-address", &ret);
> + if (bdaddr && ret == sizeof(bdaddr_t)) {
> + BT_INFO("BD address %pMR retrieved from device-tree", bdaddr);
> + bacpy(&btq->bdaddr, bdaddr);
> + }
Can we put all this into a helper function before we get more
instances. And use the u8 array property function. We're trying to
make of_get_property an internal function.
Rob
Retrieve BD address from the DT local-bd-address property.
This address must be unique and is usually added in the DT
by the bootloader which has access to the provisioned data.
Signed-off-by: Loic Poulain <[email protected]>
---
v2: Set device as unconfigured if default address detected
Add warning if BD addr retrieved from DT
v3: if no addr retrieved from DT, unconditionally set
the invalid BD addr flag.
swap and set bdaddr in the platform probe
v4: Add dt-bindings documentation
split patch in two parts (setup, dt prop)
use local-bd-address name instead of local-mac-address
v5: remove 2/3 merged in bluetooth-next tree
Add bluetooth.txt for common BT bindings
expect local-bd-address in little-endian format
drivers/bluetooth/btqcomsmd.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c
index bd810d0..c6d3fd9 100644
--- a/drivers/bluetooth/btqcomsmd.c
+++ b/drivers/bluetooth/btqcomsmd.c
@@ -15,6 +15,8 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/rpmsg.h>
+#include <linux/of.h>
+
#include <linux/soc/qcom/wcnss_ctrl.h>
#include <linux/platform_device.h>
@@ -135,6 +137,7 @@ static int btqcomsmd_setup(struct hci_dev *hdev)
static int btqcomsmd_probe(struct platform_device *pdev)
{
+ const bdaddr_t *bdaddr;
struct btqcomsmd *btq;
struct hci_dev *hdev;
void *wcnss;
@@ -156,6 +159,15 @@ static int btqcomsmd_probe(struct platform_device *pdev)
if (IS_ERR(btq->cmd_channel))
return PTR_ERR(btq->cmd_channel);
+ /* The local-bd-address DT property is usually injected by the
+ * bootloader which has access to the allocated BD address.
+ */
+ bdaddr = of_get_property(pdev->dev.of_node, "local-bd-address", &ret);
+ if (bdaddr && ret == sizeof(bdaddr_t)) {
+ BT_INFO("BD address %pMR retrieved from device-tree", bdaddr);
+ bacpy(&btq->bdaddr, bdaddr);
+ }
+
hdev = hci_alloc_dev();
if (!hdev)
return -ENOMEM;
--
1.9.1
Add optional local-bd-address property which is a 6-byte array
storing the assigned BD address. Since having a unique BD address
is critical, a per-device property value should be allocated.
This property is usually added by the boot loader which has access
to the provisioned data.
Signed-off-by: Loic Poulain <[email protected]>
---
v2: Set device as unconfigured if default address detected
Add warning if BD addr retrieved from DT
v3: if no addr retrieved from DT, unconditionally set
the invalid BD addr flag.
swap and set bdaddr in the platform probe
v4: Add dt-bindings documentation
split patch in two parts (setup, dt prop)
use local-bd-address name instead of local-mac-address
v5: remove 2/3 merged in bluetooth-next tree
Add bluetooth.txt for common BT bindings
expect local-bd-address in little-endian format
Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt
index 4ea39e9..042a2e4 100644
--- a/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt
@@ -37,6 +37,11 @@ The following properties are defined to the bluetooth node:
Definition: must be:
"qcom,wcnss-bt"
+- local-bd-address:
+ Usage: optional
+ Value type: <u8 array>
+ Definition: see Documentation/devicetree/bindings/net/bluetooth.txt
+
== WiFi
The following properties are defined to the WiFi node:
@@ -91,6 +96,9 @@ smd {
bt {
compatible = "qcom,wcnss-bt";
+
+ /* BD address 00:11:22:33:44:55 */
+ local-bd-address = [ 55 44 33 22 11 00 ];
};
wlan {
--
1.9.1