Merge "haven: rm: Add support to get hypervisor resources" (8841bd70) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/virt/haven/hh_dbl.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -518,7 +518,7 @@ int hh_dbl_populate_cap_info(enum hh_dbl_label label, u64 cap_id,
		switch (direction) {
		case HH_DBL_DIRECTION_TX:
		/* No interrupt should associated with Tx doorbell*/
		if (rx_irq >= 0) {
		if (rx_irq > 0) {
		pr_err("%s: No IRQ associated for Tx doorbell!\n",
		__func__);
		ret = -ENXIO;
		@@ -526,7 +526,7 @@ int hh_dbl_populate_cap_info(enum hh_dbl_label label, u64 cap_id,
		}
		cap_table_entry->tx_cap_id = cap_id;
		pr_debug("%s: label: %d; tx_cap_id: %llu; dir: %d; rx_irq: %d\n",
		label, cap_id, direction, rx_irq);
		__func__, label, cap_id, direction, rx_irq);
		break;
		case HH_DBL_DIRECTION_RX:
		if (rx_irq <= 0) {
		@@ -538,7 +538,7 @@ int hh_dbl_populate_cap_info(enum hh_dbl_label label, u64 cap_id,
		cap_table_entry->rx_cap_id = cap_id;
		cap_table_entry->rx_irq = rx_irq;
		pr_debug("%s: label: %d; rx_cap_id: %llu; dir: %d; rx_irq: %d\n",
		label, cap_id, direction, rx_irq);
		__func__, label, cap_id, direction, rx_irq);
		break;
		default:
		pr_err("%s: Invalid direction(%d) for doorbell\n",

drivers/virt/haven/hh_msgq.c

+50 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		#include <linux/slab.h>
		#include <linux/wait.h>
		#include <linux/module.h>
		#include <linux/of.h>
		#include <linux/spinlock.h>
		#include <linux/interrupt.h>
		#include <linux/ratelimit.h>
		@@ -475,6 +476,55 @@ int hh_msgq_populate_cap_info(enum hh_msgq_label label, u64 cap_id,
		}
		EXPORT_SYMBOL(hh_msgq_populate_cap_info);

		static int hh_msgq_probe_direction(struct platform_device *pdev,
		enum hh_msgq_label label, int direction, int idx)
		{
		int irq, ret;
		u64 capid;

		irq = platform_get_irq(pdev, idx);
		if (irq < 0) {
		dev_err(&pdev->dev, "Failed to get the IRQ%d. ret: %d\n",
		idx, irq);
		return irq;
		}

		ret = of_property_read_u64_index(pdev->dev.of_node, "reg", idx, &capid);
		if (ret) {
		dev_err(&pdev->dev, "Failed to get capid[%d]\n", idx);
		return ret;
		}

		return hh_msgq_populate_cap_info(label, capid, direction, irq);
		}

		int hh_msgq_probe(struct platform_device *pdev, enum hh_msgq_label label)
		{
		int ret, idx = 0;
		struct device_node *node = pdev->dev.of_node;
		bool duplex;

		duplex = of_property_read_bool(node, "qcom,is-full-duplex");

		if (duplex \|\| of_property_read_bool(node, "qcom,is-sender")) {
		ret = hh_msgq_probe_direction(pdev, label, HH_MSGQ_DIRECTION_TX,
		idx);
		if (ret)
		return ret;
		idx++;
		}

		if (duplex \|\| of_property_read_bool(node, "qcom,is-receiver")) {
		ret = hh_msgq_probe_direction(pdev, label, HH_MSGQ_DIRECTION_RX,
		idx);
		if (ret)
		return ret;
		}

		return 0;
		}
		EXPORT_SYMBOL(hh_msgq_probe);

		static void hh_msgq_cleanup(int begin_idx)
		{
		struct hh_msgq_cap_table *cap_table_entry;

drivers/virt/haven/hh_rm_core.c

+96 −60

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <linux/sched.h>
		#include <dt-bindings/interrupt-controller/arm-gic.h>

		#include <linux/haven/hh_dbl.h>
		#include <linux/haven/hh_msgq.h>
		#include <linux/haven/hh_errno.h>
		#include <linux/haven/hh_common.h>
		@@ -65,7 +66,7 @@ SRCU_NOTIFIER_HEAD_STATIC(hh_rm_notifier);
		static void hh_rm_get_svm_res_work_fn(struct work_struct *work);
		static DECLARE_WORK(hh_rm_get_svm_res_work, hh_rm_get_svm_res_work_fn);

		static int hh_rm_populate_hyp_res(void);
		static int hh_rm_populate_hyp_res(hh_vmid_t vmid);

		static struct hh_rm_connection *hh_rm_alloc_connection(u32 msg_id)
		{
		@@ -133,7 +134,7 @@ static int hh_rm_process_notif_vm_status(void *recv_buff, size_t recv_buff_size)
		* populate to other entities such as MessageQ and DBL
		*/
		if (vm_status_payload->vm_status == HH_RM_OS_STATUS_BOOT)
		return hh_rm_populate_hyp_res();
		return hh_rm_populate_hyp_res(vm_status_payload->vmid);

		return 0;
		}
		@@ -661,7 +662,7 @@ static int hh_rm_get_irq(struct hh_vm_get_hyp_res_resp_entry *res_entry)
		/* For resources, such as DBL source, there's no IRQ. The virq_handle
		* wouldn't be defined for such cases. Hence ignore such cases
		*/
		if (!res_entry->virq_handle)
		if (!res_entry->virq_handle && !virq)
		return 0;

		/* Allocate and bind a new IRQ if RM-VM hasn't already done already */
		@@ -675,20 +676,29 @@ static int hh_rm_get_irq(struct hh_vm_get_hyp_res_resp_entry *res_entry)
		if (ret < 0)
		return ret;

		/* Add 32 offset to make interrupt as hwirq */
		virq += 32;

		/* Bind the vIRQ */
		ret = hh_rm_vm_irq_accept(res_entry->virq_handle, virq);
		if (ret < 0)
		goto err;
		} else if ((virq - 32) < 0) {
		/* Sanity check to make sure hypervisor is passing the correct
		* interrupt numbers.
		*/
		return -EINVAL;
		}

		return hh_rm_virq_to_linux_irq(virq, GIC_SPI, IRQ_TYPE_LEVEL_HIGH);
		return hh_rm_virq_to_linux_irq(virq - 32, GIC_SPI,
		IRQ_TYPE_EDGE_RISING);

		err:
		ida_free(&hh_rm_free_virq_ida, virq);
		ida_free(&hh_rm_free_virq_ida, virq - 32);
		return ret;
		}

		static int hh_rm_populate_hyp_res(void)
		static int hh_rm_populate_hyp_res(hh_vmid_t vmid)
		{
		struct hh_vm_get_hyp_res_resp_entry *res_entries = NULL;
		int linux_irq, ret = 0;
		@@ -696,11 +706,25 @@ static int hh_rm_populate_hyp_res(void)
		hh_label_t label;
		u32 n_res, i;

		res_entries = hh_rm_vm_get_hyp_res(0, &n_res);
		res_entries = hh_rm_vm_get_hyp_res(vmid, &n_res);
		if (IS_ERR_OR_NULL(res_entries))
		return PTR_ERR(res_entries);

		pr_debug("%s: %d Resources are associated with vmid %d\n",
		__func__, n_res, vmid);

		for (i = 0; i < n_res; i++) {
		pr_debug("%s: idx:%d res_entries.res_type = 0x%x, res_entries.partner_vmid = 0x%x, res_entries.resource_handle = 0x%x, res_entries.resource_label = 0x%x, res_entries.cap_id_low = 0x%x, res_entries.cap_id_high = 0x%x, res_entries.virq_handle = 0x%x, res_entries.virq = 0x%x\n",
		__func__, i,
		res_entries[i].res_type,
		res_entries[i].partner_vmid,
		res_entries[i].resource_handle,
		res_entries[i].resource_label,
		res_entries[i].cap_id_low,
		res_entries[i].cap_id_high,
		res_entries[i].virq_handle,
		res_entries[i].virq);

		ret = linux_irq = hh_rm_get_irq(&res_entries[i]);
		if (ret < 0)
		goto out;
		@@ -710,7 +734,6 @@ static int hh_rm_populate_hyp_res(void)
		label = res_entries[i].resource_label;

		/* Populate MessageQ & DBL's cap tables */
		/* TODO: Handle DBL */
		switch (res_entries[i].res_type) {
		case HH_RM_RES_TYPE_MQ_TX:
		ret = hh_msgq_populate_cap_info(label, cap_id,
		@@ -724,8 +747,12 @@ static int hh_rm_populate_hyp_res(void)
		ret = hh_vcpu_populate_affinity_info(label, cap_id);
		break;
		case HH_RM_RES_TYPE_DB_TX:
		ret = hh_dbl_populate_cap_info(label, cap_id,
		HH_MSGQ_DIRECTION_TX, linux_irq);
		break;
		case HH_RM_RES_TYPE_DB_RX:
		ret = hh_dbl_populate_cap_info(label, cap_id,
		HH_MSGQ_DIRECTION_RX, linux_irq);
		break;
		default:
		pr_err("%s: Unknown resource type: %u\n",
		@@ -744,70 +771,83 @@ static int hh_rm_populate_hyp_res(void)

		static void hh_rm_get_svm_res_work_fn(struct work_struct *work)
		{
		hh_rm_populate_hyp_res();
		}
		hh_vmid_t vmid;
		int ret;

		static const struct of_device_id hh_rm_drv_of_match[] = {
		{ .compatible = "qcom,haven-resource-manager-1-0" },
		{ }
		};
		ret = hh_rm_get_vmid(HH_PRIMARY_VM, &vmid);
		if (ret)
		pr_err("%s: Unable to get VMID for VM label %d\n",
		__func__, HH_PRIMARY_VM);
		else
		hh_rm_populate_hyp_res(vmid);
		}

		static int hh_rm_drv_probe(struct platform_device *pdev)
		static int hh_vm_probe(struct device dev, struct device_node hyp_root)
		{
		struct device_node *node = pdev->dev.of_node;
		hh_capid_t tx_cap_id, rx_cap_id;
		int tx_irq, rx_irq;
		u32 owner_vmid;
		int ret;
		struct device_node *node;
		struct hh_vm_property temp_property;
		int vmid, owner_vmid, ret;

		node = of_find_compatible_node(hyp_root, NULL, "qcom,haven-vm-id-1.0");
		if (IS_ERR_OR_NULL(node)) {
		dev_err(dev, "Could not find vm-id node\n");
		return -ENODEV;
		}

		ret = of_property_read_u64(node, "qcom,tx-cap", &tx_cap_id);
		ret = of_property_read_u32(node, "qcom,vmid", &vmid);
		if (ret) {
		dev_err(&pdev->dev, "Failed to get the Tx cap-id\n");
		return -EINVAL;
		dev_err(dev, "Could not read vmid: %d\n", ret);
		return ret;
		}

		ret = of_property_read_u64(node, "qcom,rx-cap", &rx_cap_id);
		ret = of_property_read_u32(node, "qcom,owner-vmid", &owner_vmid);
		if (ret) {
		dev_err(&pdev->dev, "Failed to get the Rx cap-id\n");
		return -EINVAL;
		/* We must be HH_PRIMARY_VM */
		temp_property.vmid = vmid;
		hh_update_vm_prop_table(HH_PRIMARY_VM, &temp_property);
		} else {
		/* We must be HH_TRUSTED_VM */
		temp_property.vmid = vmid;
		hh_update_vm_prop_table(HH_TRUSTED_VM, &temp_property);
		temp_property.vmid = owner_vmid;
		hh_update_vm_prop_table(HH_PRIMARY_VM, &temp_property);

		/* Query RM for available resources */
		schedule_work(&hh_rm_get_svm_res_work);
		}

		tx_irq = platform_get_irq_byname(pdev, "rm-tx-irq");
		if (tx_irq < 0) {
		dev_err(&pdev->dev, "Failed to get the Tx IRQ. ret: %d\n",
		tx_irq);
		return tx_irq;
		return 0;
		}

		rx_irq = platform_get_irq_byname(pdev, "rm-rx-irq");
		if (rx_irq < 0) {
		dev_err(&pdev->dev, "Failed to get the Rx IRQ. ret: %d\n",
		rx_irq);
		return rx_irq;
		static const struct of_device_id hh_rm_drv_of_match[] = {
		{ .compatible = "qcom,resource-manager-1-0" },
		{ }
		};

		static int hh_rm_drv_probe(struct platform_device *pdev)
		{
		struct device *dev = &pdev->dev;
		struct device_node *node = dev->of_node;
		int ret;

		ret = hh_msgq_probe(pdev, HH_MSGQ_LABEL_RM);
		if (ret) {
		dev_err(dev, "Failed to probe message queue: %d\n", ret);
		return ret;
		}

		if (of_property_read_u32(pdev->dev.of_node, "qcom,virq-base",
		if (of_property_read_u32(node, "qcom,free-irq-start",
		&hh_rm_base_virq)) {
		dev_err(&pdev->dev, "Failed to get the vIRQ base\n");
		dev_err(dev, "Failed to get the vIRQ base\n");
		return -ENXIO;
		}

		hh_rm_intc = of_irq_find_parent(pdev->dev.of_node);
		hh_rm_intc = of_irq_find_parent(node);
		if (!hh_rm_intc) {
		dev_err(&pdev->dev, "Failed to get the IRQ parent node\n");
		dev_err(dev, "Failed to get the IRQ parent node\n");
		return -ENXIO;
		}

		ret = hh_msgq_populate_cap_info(HH_MSGQ_LABEL_RM, tx_cap_id,
		HH_MSGQ_DIRECTION_TX, tx_irq);
		if (ret)
		return ret;

		ret = hh_msgq_populate_cap_info(HH_MSGQ_LABEL_RM, rx_cap_id,
		HH_MSGQ_DIRECTION_RX, rx_irq);
		if (ret)
		return ret;

		hh_rm_msgq_desc = hh_msgq_register(HH_MSGQ_LABEL_RM);
		if (IS_ERR_OR_NULL(hh_rm_msgq_desc))
		return PTR_ERR(hh_rm_msgq_desc);
		@@ -822,14 +862,10 @@ static int hh_rm_drv_probe(struct platform_device *pdev)
		goto err_recv_task;
		}

		/* If the node has a "qcom,owner-vmid" property, it means that it's
		* a secondary-VM. Gain the info about it's resources here as there
		* won't be any explicit notification from the primary-VM.
		*/
		if (!of_property_read_u32(pdev->dev.of_node, "qcom,owner-vmid",
		&owner_vmid)) {
		schedule_work(&hh_rm_get_svm_res_work);
		}
		/* Probe the vmid */
		ret = hh_vm_probe(dev, node->parent);
		if (ret < 0 && ret != -ENODEV)
		goto err_recv_task;

		return 0;

include/linux/haven/hh_msgq.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		#define __HH_MSGQ_H

		#include <linux/types.h>
		#include <linux/platform_device.h>

		#include "hh_common.h"

		@@ -37,6 +38,7 @@ int hh_msgq_recv(void *msgq_client_desc,

		int hh_msgq_populate_cap_info(enum hh_msgq_label label, u64 cap_id,
		int direction, int irq);
		int hh_msgq_probe(struct platform_device *pdev, enum hh_msgq_label label);
		#else
		static inline void *hh_msgq_register(enum hh_msgq_label label)
		{
		@@ -68,5 +70,11 @@ static inline int hh_msgq_populate_cap_info(enum hh_msgq_label label,
		{
		return -EINVAL;
		}

		static inline int hh_msgq_probe(struct platform_device *pdev,
		enum hh_msgq_label label)
		{
		return -ENODEV;
		}
		#endif
		#endif