cleanup

Author: clemdiep

so3/arch/arm64/exception.S

@@ -314,7 +314,7 @@ ENTRY(pre_ret_to_el1)
 	mrs	x0, spsr_el2
 	str	x0, [sp, #OFFSET_PSTATE]
 
-	// Save userspace register. Use OFFSET_SP as it is not used on the stack frame.
+	// Save EL0 register. Use OFFSET_SP as it is not used on the stack frame.
 	mrs	x0, sp_el0
 	str	x0, [sp, #OFFSET_SP]
 	mrs	x0, tpidr_el0
@@ -340,7 +340,7 @@ ENTRY(pre_ret_to_el1)
 	ldr	x0, [sp, #OFFSET_PSTATE]
 	msr	spsr_el2, x0
 
-	// Restore userspace register
+	// Restore EL0 register
 	ldr	x0, [sp, #OFFSET_SP]
 	msr	sp_el0, x0
 	ldr	x0, [sp, #OFFSET_TLS_USR]

so3/arch/arm64/virt64/include/mach/ipamap.h

@@ -28,19 +28,19 @@ ipamap_t agency_ipamap[] = {
 		.size = 0x3000000,
 	},
 	{
-		/* PCIe mapping */
+		/* PCIe configuration ranges */
 		.ipa_addr = 0x4010000000,
 		.phys_addr = 0x4010000000,
 		.size = 0x10000000
 	},
 	{
-		/* PCIe mapping */
+		/* PCIe devices IO and 32 bits memory ranges */
 		.ipa_addr = 0x10000000,
 		.phys_addr = 0x10000000,
-		.size = 0x40000000
+		.size = 0x2f000000
 	},
 	{
-		/* PCIe mapping */
+		/* PCIe devices 64 bits memory ranges */
 		.ipa_addr = 0x8000000000,
 		.phys_addr = 0x8000000000,
 		.size = 0x8000000000

so3/avz/include/avz/fbdev_gnt.h

@@ -4,7 +4,7 @@
 #include <soo/uapi/soo.h>
 
 void fbdev_set_pgtable(struct domain *d, int slotID);
-void fbdev_set_info(fbdev_info_t *fbdev, addr_t fake_pfn);
+void fbdev_set_info(fbdev_info_t *fbdev);
 void fbdev_change_focus(int new_slotID);
 addr_t fbdev_get_addr(void);
 

so3/avz/include/avz/gnttab.h

@@ -32,11 +32,6 @@ struct gnttab {
 	/* (Real) physical frame number to be granted */
 	addr_t pfn;
 
-	/* Page count to be granted, if set to 0 then normal granting is used
-	 * mapping one page.
-	 */
-	size_t page_count;
-
 	/* Unique ref ID used by the domain which refers to this page */
 	grant_ref_t ref;
 };

so3/avz/include/avz/injector.h

@@ -55,7 +55,7 @@ struct dom_context {
 	/* IPA reserved page frame numbers for granted pages */
 	grant_pfn_t grant_pfn[NR_GRANT_PFN];
 
-	/* IPA reserved page frame numbers for long granted pages */
+	/* IPA reserved start frame number for framebuffer */
 	addr_t fbdev_start_pfn;
 
 	/* Stack frame of this domain */

so3/avz/kernel/fbdev_gnt.c

@@ -1,13 +1,12 @@
+#include <heap.h>
 #include <avz/fbdev_gnt.h>
 #include <avz/domain.h>
 #include <avz/memslot.h>
 #include <avz/sched.h>
 
-#define MAX_FBDEV_PFN 8
-
 typedef struct {
 	fbdev_info_t fbdev;
-	addr_t fake_pfn;
+	void *fake_fbdev;
 	int current_slotID;
 } fbdev_priv_t;
 
@@ -24,29 +23,36 @@ static void __map_fbdev(struct domain *d, const fbdev_info_t *pfn_info)
 	pgtable = (void *)d->pagetable_vaddr;
 	ipa_addr = d->fbdev_start_pfn << PAGE_SHIFT;
 
-	for (i = 0; i < pfn_info->count; i++) {
-		phys_addr = pfn_info->pfn[i] << PAGE_SHIFT;
-		size = pfn_info->page_count[i] << PAGE_SHIFT;
+	/* Map all distincts ranges of the framebuffer to the capsule */
+	for (i = 0; i < pfn_info->pfn_count; i++) {
+		phys_addr = pfn_to_phys(pfn_info->pfn[i]);
+		size = pfn_info->page_count[i] * PAGE_SIZE;
 
 		__create_mapping(pgtable, ipa_addr, phys_addr, size, true, S2);
 
 		ipa_addr += size;
 	}
 }
 
-static void __map_fake_fbdev(struct domain *d, addr_t fake_pfn,
-			     const fbdev_info_t *real_fb)
+static void __map_fake_fbdev(struct domain *d, const fbdev_info_t *real_fb)
 {
 	size_t i, j;
 	addr_t phys_addr;
 	addr_t ipa_addr;
 	void *pgtable;
 
+	/* One time malloc of fake framebuffer page */
+	if (priv.fake_fbdev == NULL) {
+		priv.fake_fbdev = malloc(PAGE_SIZE);
+		BUG_ON(!priv.fake_fbdev);
+	}
+
 	pgtable = (void *)d->pagetable_vaddr;
-	ipa_addr = d->fbdev_start_pfn << PAGE_SHIFT;
-	phys_addr = fake_pfn << PAGE_SHIFT;
+	ipa_addr = pfn_to_phys(d->fbdev_start_pfn);
+	phys_addr = __pa(priv.fake_fbdev);
 
-	for (i = 0; i < real_fb->count; i++) {
+	/* Map the capsule framebuffer to the fake one */
+	for (i = 0; i < real_fb->pfn_count; i++) {
 		for (j = 0; j < real_fb->page_count[i]; j++) {
 			__create_mapping(pgtable, ipa_addr, phys_addr, PAGE_SIZE,
 					 true, S2);
@@ -58,40 +64,42 @@ static void __map_fake_fbdev(struct domain *d, addr_t fake_pfn,
 
 void fbdev_set_pgtable(struct domain *d, int slotID)
 {
-	if (slotID <= 1) {
+	/* Only capsules have virtual framebuffer */
+	if ((slotID < MEMSLOT_BASE) && !memslot[slotID].busy)
 		return;
-	}
 
-	if (slotID == priv.current_slotID) {
+	if (slotID == priv.current_slotID)
 		__map_fbdev(d, &priv.fbdev);
-	} else {
-		__map_fake_fbdev(d, priv.fake_pfn, &priv.fbdev);
-	}
+	else
+		__map_fake_fbdev(d, &priv.fbdev);
 }
 
-void fbdev_set_info(fbdev_info_t *fbdev, addr_t fake_pfn)
+void fbdev_set_info(fbdev_info_t *fbdev)
 {
+	int slotID;
+
 	memcpy(&priv.fbdev, fbdev, sizeof(*fbdev));
-	priv.fake_pfn = fake_pfn;
 
-	// TODO: check already existing capsule
+	/* Map framebuffer to all capsules. */
+	for (slotID = MEMSLOT_BASE; slotID < MEMSLOT_NR; slotID++)
+		if (memslot[slotID].busy)
+			fbdev_set_pgtable(domains[slotID], slotID);
 }
 
 void fbdev_change_focus(int new_slotID)
 {
-	if ((priv.current_slotID > 1) && memslot[priv.current_slotID].busy) {
-		__map_fake_fbdev(domains[priv.current_slotID], priv.fake_pfn,
-				 &priv.fbdev);
-	}
+	/* Remap old capsule to fake framebuffer */
+	if ((priv.current_slotID >= MEMSLOT_BASE) && memslot[priv.current_slotID].busy)
+		__map_fake_fbdev(domains[priv.current_slotID], &priv.fbdev);
 
-	if ((new_slotID > 1) && memslot[new_slotID].busy) {
+	/* Map the new capsule to the framebuffer */
+	if ((new_slotID >= MEMSLOT_BASE) && memslot[new_slotID].busy)
 		__map_fbdev(domains[new_slotID], &priv.fbdev);
-	}
 
 	priv.current_slotID = new_slotID;
 }
 
 addr_t fbdev_get_addr(void)
 {
-	return current_domain->fbdev_start_pfn << PAGE_SHIFT;
+	return pfn_to_phys(current_domain->fbdev_start_pfn);
 }

so3/avz/kernel/hypercalls.c

@@ -203,7 +203,7 @@ void do_avz_hypercall(void *__args)
 	}
 
 	case AVZ_FBDEV_SET_INFO:
-		fbdev_set_info(&args->u.avz_fbdev_info_args.fbdev, args->u.avz_fbdev_info_args.fake_pfn);
+		fbdev_set_info(&args->u.avz_fbdev_info_args.fbdev);
 		break;
 
 	case AVZ_FBDEV_CHANGE_FOCUS:

so3/dts/virt64_capsule.dts

@@ -115,6 +115,7 @@
 				status = "ok";
 			};
 
+			/* Enabling framebuffer support */
 			vfbdev {
 				compatible = "vfbdev,frontend";
 				status = "ok";

so3/soo/drivers/vfbdevfront/vfbdev.c

@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2026 Clément Dieperink <clement.dieperink@heig-vd.ch>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
 #if 0
 #define DEBUG
 #endif
@@ -30,12 +48,12 @@ typedef struct {
 
 	uint32_t hres;
 	uint32_t vres;
-	size_t size;
+	size_t memory_size;
 	addr_t fb_paddr;
 
 } vfbdev_priv_t;
 
-/* Our unique uart instance. */
+/* Our unique vfbdev instance. */
 static struct vbus_device *vfbdev_dev = NULL;
 
 irq_return_t vfbdev_interrupt(int irq, void *dev_id)
@@ -192,14 +210,14 @@ vdrvfront_t vfbdevdrv = { .probe = vfbdev_probe,
 			 .resume = vfbdev_resume,
 			 .connected = vfbdev_connected };
 
-static int retrieve_data(vfbdev_priv_t *priv)
+static void retrieve_data(vfbdev_priv_t *priv)
 {
 	vfbdev_request_t *ring_req;
 	vfbdev_response_t *ring_rsp;
 	avz_hyp_t hyp_args;
 
-	if (priv->size != 0) {
-		return 1;
+	if ((priv->memory_size != 0) && (priv->fb_paddr != 0)) {
+		return;
 	}
 
 	vdevfront_processing_begin(vfbdev_dev);
@@ -221,15 +239,13 @@ static int retrieve_data(vfbdev_priv_t *priv)
 
 	priv->hres = ring_rsp->hres;
 	priv->vres = ring_rsp->vres;
-	priv->size = ring_rsp->size;
+	priv->memory_size = ring_rsp->memory_size;
 
 	vdevfront_processing_end(vfbdev_dev);
 
 	hyp_args.cmd = AVZ_FBDEV_GET_ADDR;
 	avz_hypercall(&hyp_args);
 	priv->fb_paddr = hyp_args.u.avz_fbdev_addr_args.paddr;
-
-	return 1;
 }
 
 static int vfbdev_mmap(int fd, addr_t virt_addr, uint32_t page_count, off_t offset)
@@ -239,17 +255,23 @@ static int vfbdev_mmap(int fd, addr_t virt_addr, uint32_t page_count, off_t offs
 	vfbdev_priv_t *priv;
 
 	dev = devclass_by_fd(fd);
+	BUG_ON(!dev);
 	priv = devclass_get_priv(dev);
+	BUG_ON(!priv);
 
-	if (!retrieve_data(priv)) {
-		return -1;
+	retrieve_data(priv);
+
+	/* Ensure that we got a framebuffer */
+	if ((priv->memory_size == 0) || (priv->fb_paddr == 0)) {
+		return -ENODEV;
 	}
 
-	if (page_count > (priv->size / PAGE_SIZE)) {
-		return -1;
+	/* Ensure requested mapping size doesn't overflow actual framebuffer size */
+	if (page_count > (priv->memory_size / PAGE_SIZE)) {
+		return -EINVAL;
 	}
 
-	create_mapping(pcb->pgtable, virt_addr, priv->fb_paddr, priv->size, true);
+	create_mapping(pcb->pgtable, virt_addr, priv->fb_paddr, page_count * PAGE_SIZE, true);
 
 	return 0;
 }
@@ -260,11 +282,11 @@ static int vfbdev_ioctl(int fd, unsigned long cmd, unsigned long args)
 	vfbdev_priv_t *priv;
 
 	dev = devclass_by_fd(fd);
+	BUG_ON(!dev);
 	priv = devclass_get_priv(dev);
+	BUG_ON(!priv);
 
-	if (!retrieve_data(priv)) {
-		return -EINVAL;
-	}
+	retrieve_data(priv);
 
 	switch (cmd) {
 	case IOCTL_FB_HRES:
@@ -276,7 +298,7 @@ static int vfbdev_ioctl(int fd, unsigned long cmd, unsigned long args)
 		return 0;
 
 	case IOCTL_FB_SIZE:
-		*((uint32_t *) args) = priv->size;
+		*((uint32_t *) args) = priv->memory_size;
 		return 0;
 
 	default:
@@ -301,7 +323,6 @@ static int vfbdev_init(dev_t *dev, int fdt_offset)
 {
 	vfbdev_priv_t *vfbdev_priv;
 
-
 	vfbdev_priv = malloc(sizeof(vfbdev_priv_t));
 	BUG_ON(!vfbdev_priv);
 

so3/soo/include/soo/dev/vfbdev.h

@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2026 Clément Dieperink <clement.dieperink@heig-vd.ch>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
 #ifndef VFBDEV_H
 #define VFBDEV_H
 
@@ -15,7 +33,7 @@ typedef struct {
 typedef struct {
 	uint32_t hres;
 	uint32_t vres;
-	uint64_t size;
+	uint64_t memory_size;
 } vfbdev_response_t;
 
 DEFINE_RING_TYPES(vfbdev, vfbdev_request_t, vfbdev_response_t);