From: Jens Wiklander <jens.wiklander@linaro.org> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sudeep Holla <sudeep.holla@arm.com> Cc: Marc Bonnici <marc.bonnici@arm.com>, Olivier Deprez <Olivier.Deprez@arm.com>, Lorenzo Pieralisi <lpieralisi@kernel.org>, Jens Wiklander <jens.wiklander@linaro.org> Subject: [PATCH] firmware: arm_ffa: support running as a guest in a vm Date: Thu, 7 Mar 2024 10:21:32 +0100 [thread overview] Message-ID: <20240307092132.943881-1-jens.wiklander@linaro.org> (raw) Add support for running the driver in a guest to a hypervisor. The main difference is that the notification interrupt is retrieved with FFA_FEAT_NOTIFICATION_PENDING_INT and that FFA_NOTIFICATION_BITMAP_CREATE doesn't need to be called. FFA_FEAT_NOTIFICATION_PENDING_INT gives the interrupt the hypervisor has chosen to notify its guest of pending notifications. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> --- drivers/firmware/arm_ffa/driver.c | 45 ++++++++++++++++++------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index f2556a8e9401..c183c7d39c0f 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -1306,17 +1306,28 @@ static void ffa_sched_recv_irq_work_fn(struct work_struct *work) ffa_notification_info_get(); } +static int ffa_get_notif_intid(int *intid) +{ + int ret; + + ret = ffa_features(FFA_FEAT_SCHEDULE_RECEIVER_INT, 0, intid, NULL); + if (!ret) + return 0; + ret = ffa_features(FFA_FEAT_NOTIFICATION_PENDING_INT, 0, intid, NULL); + if (!ret) + return 0; + + pr_err("Failed to retrieve one of scheduler Rx or notif pending interrupts\n"); + return ret; +} + static int ffa_sched_recv_irq_map(void) { - int ret, irq, sr_intid; + int ret, irq, intid; - /* The returned sr_intid is assumed to be SGI donated to NS world */ - ret = ffa_features(FFA_FEAT_SCHEDULE_RECEIVER_INT, 0, &sr_intid, NULL); - if (ret < 0) { - if (ret != -EOPNOTSUPP) - pr_err("Failed to retrieve scheduler Rx interrupt\n"); + ret = ffa_get_notif_intid(&intid); + if (ret) return ret; - } if (acpi_disabled) { struct of_phandle_args oirq = {}; @@ -1329,12 +1340,12 @@ static int ffa_sched_recv_irq_map(void) oirq.np = gic; oirq.args_count = 1; - oirq.args[0] = sr_intid; + oirq.args[0] = intid; irq = irq_create_of_mapping(&oirq); of_node_put(gic); #ifdef CONFIG_ACPI } else { - irq = acpi_register_gsi(NULL, sr_intid, ACPI_EDGE_SENSITIVE, + irq = acpi_register_gsi(NULL, intid, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_HIGH); #endif } @@ -1442,17 +1453,15 @@ static void ffa_notifications_setup(void) int ret, irq; ret = ffa_features(FFA_NOTIFICATION_BITMAP_CREATE, 0, NULL, NULL); - if (ret) { - pr_info("Notifications not supported, continuing with it ..\n"); - return; - } + if (!ret) { - ret = ffa_notification_bitmap_create(); - if (ret) { - pr_info("Notification bitmap create error %d\n", ret); - return; + ret = ffa_notification_bitmap_create(); + if (ret) { + pr_err("notification_bitmap_create error %d\n", ret); + return; + } + drv_info->bitmap_created = true; } - drv_info->bitmap_created = true; irq = ffa_sched_recv_irq_map(); if (irq <= 0) { -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Jens Wiklander <jens.wiklander@linaro.org> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sudeep Holla <sudeep.holla@arm.com> Cc: Marc Bonnici <marc.bonnici@arm.com>, Olivier Deprez <Olivier.Deprez@arm.com>, Lorenzo Pieralisi <lpieralisi@kernel.org>, Jens Wiklander <jens.wiklander@linaro.org> Subject: [PATCH] firmware: arm_ffa: support running as a guest in a vm Date: Thu, 7 Mar 2024 10:21:32 +0100 [thread overview] Message-ID: <20240307092132.943881-1-jens.wiklander@linaro.org> (raw) Add support for running the driver in a guest to a hypervisor. The main difference is that the notification interrupt is retrieved with FFA_FEAT_NOTIFICATION_PENDING_INT and that FFA_NOTIFICATION_BITMAP_CREATE doesn't need to be called. FFA_FEAT_NOTIFICATION_PENDING_INT gives the interrupt the hypervisor has chosen to notify its guest of pending notifications. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> --- drivers/firmware/arm_ffa/driver.c | 45 ++++++++++++++++++------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index f2556a8e9401..c183c7d39c0f 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -1306,17 +1306,28 @@ static void ffa_sched_recv_irq_work_fn(struct work_struct *work) ffa_notification_info_get(); } +static int ffa_get_notif_intid(int *intid) +{ + int ret; + + ret = ffa_features(FFA_FEAT_SCHEDULE_RECEIVER_INT, 0, intid, NULL); + if (!ret) + return 0; + ret = ffa_features(FFA_FEAT_NOTIFICATION_PENDING_INT, 0, intid, NULL); + if (!ret) + return 0; + + pr_err("Failed to retrieve one of scheduler Rx or notif pending interrupts\n"); + return ret; +} + static int ffa_sched_recv_irq_map(void) { - int ret, irq, sr_intid; + int ret, irq, intid; - /* The returned sr_intid is assumed to be SGI donated to NS world */ - ret = ffa_features(FFA_FEAT_SCHEDULE_RECEIVER_INT, 0, &sr_intid, NULL); - if (ret < 0) { - if (ret != -EOPNOTSUPP) - pr_err("Failed to retrieve scheduler Rx interrupt\n"); + ret = ffa_get_notif_intid(&intid); + if (ret) return ret; - } if (acpi_disabled) { struct of_phandle_args oirq = {}; @@ -1329,12 +1340,12 @@ static int ffa_sched_recv_irq_map(void) oirq.np = gic; oirq.args_count = 1; - oirq.args[0] = sr_intid; + oirq.args[0] = intid; irq = irq_create_of_mapping(&oirq); of_node_put(gic); #ifdef CONFIG_ACPI } else { - irq = acpi_register_gsi(NULL, sr_intid, ACPI_EDGE_SENSITIVE, + irq = acpi_register_gsi(NULL, intid, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_HIGH); #endif } @@ -1442,17 +1453,15 @@ static void ffa_notifications_setup(void) int ret, irq; ret = ffa_features(FFA_NOTIFICATION_BITMAP_CREATE, 0, NULL, NULL); - if (ret) { - pr_info("Notifications not supported, continuing with it ..\n"); - return; - } + if (!ret) { - ret = ffa_notification_bitmap_create(); - if (ret) { - pr_info("Notification bitmap create error %d\n", ret); - return; + ret = ffa_notification_bitmap_create(); + if (ret) { + pr_err("notification_bitmap_create error %d\n", ret); + return; + } + drv_info->bitmap_created = true; } - drv_info->bitmap_created = true; irq = ffa_sched_recv_irq_map(); if (irq <= 0) { -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2024-03-07 9:21 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-07 9:21 Jens Wiklander [this message] 2024-03-07 9:21 ` [PATCH] firmware: arm_ffa: support running as a guest in a vm Jens Wiklander 2024-03-08 9:44 ` Lorenzo Pieralisi 2024-03-08 9:44 ` Lorenzo Pieralisi 2024-03-08 12:35 ` Jens Wiklander 2024-03-08 12:35 ` Jens Wiklander 2024-03-19 14:20 ` Sudeep Holla 2024-03-19 14:20 ` Sudeep Holla 2024-03-19 17:26 ` Jens Wiklander 2024-03-19 17:26 ` Jens Wiklander
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240307092132.943881-1-jens.wiklander@linaro.org \ --to=jens.wiklander@linaro.org \ --cc=Olivier.Deprez@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lpieralisi@kernel.org \ --cc=marc.bonnici@arm.com \ --cc=sudeep.holla@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.