From 026bc864e74cffdea7061d66d53d74f682eaba95 Mon Sep 17 00:00:00 2001 From: Chris Lew Date: Fri, 12 Jun 2020 14:52:29 -0700 Subject: [PATCH] net: qrtr: haven: Read peer name from device tree Add support for the primary vm to read the vm peer name from device tree. This information is needed to share memory to the peer vm. Change-Id: Ied71d254975e08dcf6c1c51f49687aceced141a9 Signed-off-by: Chris Lew --- net/qrtr/haven.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/qrtr/haven.c b/net/qrtr/haven.c index 30bdaadaa3d6..15ad2fd0fd48 100644 --- a/net/qrtr/haven.c +++ b/net/qrtr/haven.c @@ -40,6 +40,7 @@ struct haven_pipe { * @base: Base of the shared fifo. * @size: fifo size. * @master: primary vm indicator. + * @peer_name: name of vm peer. * @label: label for haven resources * @tx_dbl: doorbell for tx notifications. * @rx_dbl: doorbell for rx notifications. @@ -54,6 +55,7 @@ struct qrtr_haven_dev { void *base; size_t size; bool master; + u32 peer_name; u32 label; void *tx_dbl; @@ -336,12 +338,19 @@ static int qrtr_haven_probe(struct platform_device *pdev) return ret; } qdev->master = of_property_read_bool(node, "qcom,master"); + ret = qrtr_haven_map_memory(qdev); if (ret) return ret; qrtr_haven_fifo_init(qdev); + if (qdev->master) { + ret = of_property_read_u32(node, "peer-name", &qdev->peer_name); + if (ret) + qdev->peer_name = HH_SELF_VM; + } + dbl_label = qdev->label; qdev->tx_dbl = hh_dbl_tx_register(dbl_label); if (IS_ERR_OR_NULL(qdev->tx_dbl)) {