Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5052de8d authored by Bjorn Andersson's avatar Bjorn Andersson Committed by David S. Miller
Browse files

soc: qcom: smd: Transition client drivers from smd to rpmsg 



By moving these client drivers to use RPMSG instead of the direct SMD
API we can reuse them ontop of the newly added GLINK wire-protocol
support found in the 820 and 835 Qualcomm platforms.

As the new (RPMSG-based) and old SMD implementations are mutually
exclusive we have to change all client drivers in one commit, to make
sure we have a working system before and after this transition.

Acked-by: default avatarAndy Gross <andy.gross@linaro.org>
Acked-by: default avatarKalle Valo <kvalo@codeaurora.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent def499c9

drivers/bluetooth/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ config BT_WILINK 


config BT_QCOMSMD

	tristate "Qualcomm SMD based HCI support"

	depends on QCOM_SMD || (COMPILE_TEST && QCOM_SMD=n)

	depends on RPMSG || (COMPILE_TEST && RPMSG=n)

	depends on QCOM_WCNSS_CTRL || (COMPILE_TEST && QCOM_WCNSS_CTRL=n)

	select BT_QCA

	help

drivers/bluetooth/btqcomsmd.c

+16 −16
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include <linux/module.h>

#include <linux/slab.h>

#include <linux/soc/qcom/smd.h>

#include <linux/rpmsg.h>

#include <linux/soc/qcom/wcnss_ctrl.h>

#include <linux/platform_device.h>
@@ -26,8 +26,8 @@ 
struct btqcomsmd {

	struct hci_dev *hdev;



	struct qcom_smd_channel *acl_channel;

	struct qcom_smd_channel *cmd_channel;

	struct rpmsg_endpoint *acl_channel;

	struct rpmsg_endpoint *cmd_channel;

};



static int btqcomsmd_recv(struct hci_dev *hdev, unsigned int type,
@@ -48,19 +48,19 @@ static int btqcomsmd_recv(struct hci_dev *hdev, unsigned int type, 
	return hci_recv_frame(hdev, skb);

}



static int btqcomsmd_acl_callback(struct qcom_smd_channel *channel,

				  const void *data, size_t count)

static int btqcomsmd_acl_callback(struct rpmsg_device *rpdev, void *data,

				  int count, void *priv, u32 addr)

{

	struct btqcomsmd *btq = qcom_smd_get_drvdata(channel);

	struct btqcomsmd *btq = priv;



	btq->hdev->stat.byte_rx += count;

	return btqcomsmd_recv(btq->hdev, HCI_ACLDATA_PKT, data, count);

}



static int btqcomsmd_cmd_callback(struct qcom_smd_channel *channel,

				  const void *data, size_t count)

static int btqcomsmd_cmd_callback(struct rpmsg_device *rpdev, void *data,

				  int count, void *priv, u32 addr)

{

	struct btqcomsmd *btq = qcom_smd_get_drvdata(channel);

	struct btqcomsmd *btq = priv;



	return btqcomsmd_recv(btq->hdev, HCI_EVENT_PKT, data, count);

}
@@ -72,12 +72,12 @@ static int btqcomsmd_send(struct hci_dev *hdev, struct sk_buff *skb) 


	switch (hci_skb_pkt_type(skb)) {

	case HCI_ACLDATA_PKT:

		ret = qcom_smd_send(btq->acl_channel, skb->data, skb->len);

		ret = rpmsg_send(btq->acl_channel, skb->data, skb->len);

		hdev->stat.acl_tx++;

		hdev->stat.byte_tx += skb->len;

		break;

	case HCI_COMMAND_PKT:

		ret = qcom_smd_send(btq->cmd_channel, skb->data, skb->len);

		ret = rpmsg_send(btq->cmd_channel, skb->data, skb->len);

		hdev->stat.cmd_tx++;

		break;

	default:
@@ -114,18 +114,15 @@ static int btqcomsmd_probe(struct platform_device *pdev) 
	wcnss = dev_get_drvdata(pdev->dev.parent);



	btq->acl_channel = qcom_wcnss_open_channel(wcnss, "APPS_RIVA_BT_ACL",

						   btqcomsmd_acl_callback);

						   btqcomsmd_acl_callback, btq);

	if (IS_ERR(btq->acl_channel))

		return PTR_ERR(btq->acl_channel);



	btq->cmd_channel = qcom_wcnss_open_channel(wcnss, "APPS_RIVA_BT_CMD",

						   btqcomsmd_cmd_callback);

						   btqcomsmd_cmd_callback, btq);

	if (IS_ERR(btq->cmd_channel))

		return PTR_ERR(btq->cmd_channel);



	qcom_smd_set_drvdata(btq->acl_channel, btq);

	qcom_smd_set_drvdata(btq->cmd_channel, btq);



	hdev = hci_alloc_dev();

	if (!hdev)

		return -ENOMEM;
@@ -158,6 +155,9 @@ static int btqcomsmd_remove(struct platform_device *pdev) 
	hci_unregister_dev(btq->hdev);

	hci_free_dev(btq->hdev);



	rpmsg_destroy_ept(btq->cmd_channel);

	rpmsg_destroy_ept(btq->acl_channel);



	return 0;

}

drivers/net/wireless/ath/wcn36xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ config WCN36XX 
	tristate "Qualcomm Atheros WCN3660/3680 support"

	depends on MAC80211 && HAS_DMA

	depends on QCOM_WCNSS_CTRL || QCOM_WCNSS_CTRL=n

	depends on QCOM_SMD || QCOM_SMD=n

	depends on RPMSG || RPMSG=n

	---help---

	  This module adds support for wireless adapters based on

	  Qualcomm Atheros WCN3660 and WCN3680 mobile chipsets.

drivers/net/wireless/ath/wcn36xx/main.c

+2 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/soc/qcom/smd.h>

#include <linux/rpmsg.h>

#include <linux/soc/qcom/smem_state.h>

#include <linux/soc/qcom/wcnss_ctrl.h>

#include "wcn36xx.h"
@@ -1218,15 +1218,13 @@ static int wcn36xx_probe(struct platform_device *pdev) 


	INIT_WORK(&wcn->scan_work, wcn36xx_hw_scan_worker);



	wcn->smd_channel = qcom_wcnss_open_channel(wcnss, "WLAN_CTRL", wcn36xx_smd_rsp_process);

	wcn->smd_channel = qcom_wcnss_open_channel(wcnss, "WLAN_CTRL", wcn36xx_smd_rsp_process, hw);

	if (IS_ERR(wcn->smd_channel)) {

		wcn36xx_err("failed to open WLAN_CTRL channel\n");

		ret = PTR_ERR(wcn->smd_channel);

		goto out_wq;

	}



	qcom_smd_set_drvdata(wcn->smd_channel, hw);



	addr = of_get_property(pdev->dev.of_node, "local-mac-address", &ret);

	if (addr && ret != ETH_ALEN) {

		wcn36xx_err("invalid local-mac-address\n");

drivers/net/wireless/ath/wcn36xx/smd.c

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/etherdevice.h>

#include <linux/firmware.h>

#include <linux/bitops.h>

#include <linux/soc/qcom/smd.h>

#include <linux/rpmsg.h>

#include "smd.h"



struct wcn36xx_cfg_val {
@@ -254,7 +254,7 @@ static int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len) 


	init_completion(&wcn->hal_rsp_compl);

	start = jiffies;

	ret = qcom_smd_send(wcn->smd_channel, wcn->hal_buf, len);

	ret = rpmsg_send(wcn->smd_channel, wcn->hal_buf, len);

	if (ret) {

		wcn36xx_err("HAL TX failed\n");

		goto out;
@@ -2205,11 +2205,11 @@ int wcn36xx_smd_set_mc_list(struct wcn36xx *wcn, 
	return ret;

}



int wcn36xx_smd_rsp_process(struct qcom_smd_channel *channel,

			    const void *buf, size_t len)

int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,

			    void *buf, int len, void *priv, u32 addr)

{

	const struct wcn36xx_hal_msg_header *msg_header = buf;

	struct ieee80211_hw *hw = qcom_smd_get_drvdata(channel);

	struct ieee80211_hw *hw = priv;

	struct wcn36xx *wcn = hw->priv;

	struct wcn36xx_hal_ind_msg *msg_ind;

	wcn36xx_dbg_dump(WCN36XX_DBG_SMD_DUMP, "SMD <<< ", buf, len);