Merge "msm: scm-pas: Provide a strongly ordered buffer to the secure world"

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/clk.h>

#include <linux/dma-mapping.h>

#include <asm/cacheflush.h>

	} request;

	u32 scm_ret = 0;

	void *mdata_buf;

	dma_addr_t mdata_phys;

	DEFINE_DMA_ATTRS(attrs);

	ret = scm_pas_enable_bw();

	if (ret)

		return ret;

	/* Make memory physically contiguous */

	mdata_buf = kmemdup(metadata, size, GFP_KERNEL);

	if (!mdata_buf)

	dma_set_attr(DMA_ATTR_STRONGLY_ORDERED, &attrs);

	mdata_buf = dma_alloc_attrs(NULL, size, &mdata_phys, GFP_KERNEL,

					&attrs);

	if (!mdata_buf) {

		pr_err("Allocation for metadata failed.\n");

		return -ENOMEM;

	}

	request.proc = id;

	request.image_addr = virt_to_phys(mdata_buf);

	memcpy(mdata_buf, metadata, size);

	/* Flush metadata to ensure secure world doesn't read stale data */

	__cpuc_flush_dcache_area(mdata_buf, size);

	outer_flush_range(request.image_addr, request.image_addr + size);

	request.proc = id;

	request.image_addr = mdata_phys;

	ret = scm_call(SCM_SVC_PIL, PAS_INIT_IMAGE_CMD, &request,

			sizeof(request), &scm_ret, sizeof(scm_ret));

	kfree(mdata_buf);

	dma_free_attrs(NULL, size, mdata_buf, mdata_phys, &attrs);

	scm_pas_disable_bw();

	if (ret)