Commit 8804ea9e authored by Sergey Matyukevich's avatar Sergey Matyukevich Committed by Kalle Valo

qtnfmac: drop redundant data copy in control path

Command responses and events from the firmware are copied twice in
control path: at first in shm core (qtnf_shm_handle_new_data) and
then in pcie bus drivers (qtnf_pcie_control_rx_callback). There
is no need to copy this data twice, it can be done only once
in rx callbacks.
Signed-off-by: default avatarSergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2525f188
...@@ -242,7 +242,8 @@ static int qtnf_pcie_init_memory(struct qtnf_pcie_bus_priv *priv) ...@@ -242,7 +242,8 @@ static int qtnf_pcie_init_memory(struct qtnf_pcie_bus_priv *priv)
return 0; return 0;
} }
static void qtnf_pcie_control_rx_callback(void *arg, const u8 *buf, size_t len) static void qtnf_pcie_control_rx_callback(void *arg, const u8 __iomem *buf,
size_t len)
{ {
struct qtnf_pcie_bus_priv *priv = arg; struct qtnf_pcie_bus_priv *priv = arg;
struct qtnf_bus *bus = pci_get_drvdata(priv->pdev); struct qtnf_bus *bus = pci_get_drvdata(priv->pdev);
...@@ -260,7 +261,7 @@ static void qtnf_pcie_control_rx_callback(void *arg, const u8 *buf, size_t len) ...@@ -260,7 +261,7 @@ static void qtnf_pcie_control_rx_callback(void *arg, const u8 *buf, size_t len)
return; return;
} }
skb_put_data(skb, buf, len); memcpy_fromio(skb_put(skb, len), buf, len);
qtnf_trans_handle_rx_ctl_packet(bus, skb); qtnf_trans_handle_rx_ctl_packet(bus, skb);
} }
......
...@@ -42,19 +42,18 @@ static void qtnf_shm_handle_new_data(struct qtnf_shm_ipc *ipc) ...@@ -42,19 +42,18 @@ static void qtnf_shm_handle_new_data(struct qtnf_shm_ipc *ipc)
if (unlikely(size == 0 || size > QTN_IPC_MAX_DATA_SZ)) { if (unlikely(size == 0 || size > QTN_IPC_MAX_DATA_SZ)) {
pr_err("wrong rx packet size: %zu\n", size); pr_err("wrong rx packet size: %zu\n", size);
rx_buff_ok = false; rx_buff_ok = false;
} else { }
memcpy_fromio(ipc->rx_data, ipc->shm_region->data, size);
if (likely(rx_buff_ok)) {
ipc->rx_packet_count++;
ipc->rx_callback.fn(ipc->rx_callback.arg,
ipc->shm_region->data, size);
} }
writel(QTNF_SHM_IPC_ACK, &shm_reg_hdr->flags); writel(QTNF_SHM_IPC_ACK, &shm_reg_hdr->flags);
readl(&shm_reg_hdr->flags); /* flush PCIe write */ readl(&shm_reg_hdr->flags); /* flush PCIe write */
ipc->interrupt.fn(ipc->interrupt.arg); ipc->interrupt.fn(ipc->interrupt.arg);
if (likely(rx_buff_ok)) {
ipc->rx_packet_count++;
ipc->rx_callback.fn(ipc->rx_callback.arg, ipc->rx_data, size);
}
} }
static void qtnf_shm_ipc_irq_work(struct work_struct *work) static void qtnf_shm_ipc_irq_work(struct work_struct *work)
......
...@@ -32,7 +32,7 @@ struct qtnf_shm_ipc_int { ...@@ -32,7 +32,7 @@ struct qtnf_shm_ipc_int {
}; };
struct qtnf_shm_ipc_rx_callback { struct qtnf_shm_ipc_rx_callback {
void (*fn)(void *arg, const u8 *buf, size_t len); void (*fn)(void *arg, const u8 __iomem *buf, size_t len);
void *arg; void *arg;
}; };
...@@ -51,8 +51,6 @@ struct qtnf_shm_ipc { ...@@ -51,8 +51,6 @@ struct qtnf_shm_ipc {
u8 waiting_for_ack; u8 waiting_for_ack;
u8 rx_data[QTN_IPC_MAX_DATA_SZ] __aligned(sizeof(u32));
struct qtnf_shm_ipc_int interrupt; struct qtnf_shm_ipc_int interrupt;
struct qtnf_shm_ipc_rx_callback rx_callback; struct qtnf_shm_ipc_rx_callback rx_callback;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment