#include <linux/virtio_ids.h>
#include <linux/virtio_config.h>
#include <linux/scatterlist.h>
+#include <linux/dma-direct.h>
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <linux/idr.h>
* location (in vmalloc or in kernel).
*/
static void
-rpmsg_sg_init(struct scatterlist *sg, void *cpu_addr, unsigned int len)
+rpmsg_sg_init(struct virtproc_info *vrp, struct scatterlist *sg,
+ void *cpu_addr, unsigned int len)
{
- if (is_vmalloc_addr(cpu_addr)) {
- sg_init_table(sg, 1);
- sg_set_page(sg, vmalloc_to_page(cpu_addr), len,
- offset_in_page(cpu_addr));
- } else {
- WARN_ON(!virt_addr_valid(cpu_addr));
- sg_init_one(sg, cpu_addr, len);
- }
+ unsigned int offset;
+ dma_addr_t dev_add = vrp->bufs_dma + (cpu_addr - vrp->rbufs);
+ struct page *page = pfn_to_page(PHYS_PFN(dma_to_phys(vrp->bufs_dev,
+ dev_add)));
+
+ offset = offset_in_page(cpu_addr);
+ sg_init_table(sg, 1);
+ sg_set_page(sg, page, len, offset);
}
/**
msg, sizeof(*msg) + msg->len, true);
#endif
- rpmsg_sg_init(&sg, msg, sizeof(*msg) + len);
+ rpmsg_sg_init(vrp, &sg, msg, sizeof(*msg) + len);
mutex_lock(&vrp->tx_lock);
dev_warn(dev, "msg received with no recipient\n");
/* publish the real size of the buffer */
- rpmsg_sg_init(&sg, msg, vrp->buf_size);
+ rpmsg_sg_init(vrp, &sg, msg, vrp->buf_size);
/* add the buffer back to the remote processor's virtqueue */
err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, msg, GFP_KERNEL);
struct scatterlist sg;
void *cpu_addr = vrp->rbufs + i * vrp->buf_size;
- rpmsg_sg_init(&sg, cpu_addr, vrp->buf_size);
+ rpmsg_sg_init(vrp, &sg, cpu_addr, vrp->buf_size);
err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, cpu_addr,
GFP_KERNEL);