plat: Migrate gic to drivers/ukintctlr

[rares-miculescu]

Prerequisite checklist

• Read the contribution guidelines regarding submitting new changes to the project;
• Tested your changes against relevant architectures and platforms;
• Ran the checkpatch.uk on your commit series before opening this PR;
• Updated relevant documentation.

Description of changes

GIC (Generic Interrupt Controller) is moved into drivers/ukintctlr/, and the API for the interrupt controller into llib/ukintctlr.

GitHub-Depends-On: #1023

[razvanvirtan]

Thanks for this, @rares-miculescu!
In order to remove the Draft state, please follow the steps in the PR prerequisites checklist and mark them as done. Also, see my comments regarding the commits in this PR, they also apply here.

[StefanJum]

Thank you @rares-miculescu. Please sign-off you commits and add a / at the end of directory names (i.e. plat/drivers/).

[michpappas]

@rares-miculescu besides the comments below, there are many files that need their headers to be updated:

• drivers/ukrtc/pl031/pl031.c
• plat/common/arm/generic_timer.c
• plat/common/arm/lcpu.c
• plat/common/arm/time.c
• plat/common/arm/traps_arm64.c
• plat/common/platform_bus.c
• plat/drivers/virtio/virtio_mmio.c

In all these you need to update#include <gic/gic-v2.h> to #include <uk/intctlr/gic-v2.h> and so on.

Similarly in plat/kvm/arm/setup.c:

diff --git a/plat/kvm/arm/setup.c b/plat/kvm/arm/setup.c
index 452e35cf..bb60db6d 100644
--- a/plat/kvm/arm/setup.c
+++ b/plat/kvm/arm/setup.c
@@ -32,7 +32,7 @@
 #include <uk/rtc/pl031.h>
 #endif /* CONFIG_LIBUKRTC_PL031 */
 #include <uk/assert.h>
-#include <kvm/intctrl.h>
+#include <uk/intctlr.h>
 #include <arm/cpu.h>
 #include <arm/arm64/cpu.h>
 #include <arm/smccc.h>

In addition, please also add exportsyms.uk in both the driver and the library.

[michpappas]

Hi @rares-miculescu just a few more changes, almost there!

Besides the comments below, please do:

• Rebase to staging
• Add exportsyms.uk to lib/ukintctlr. Except from the public functions, don't forget to add the gic global that is defined in arch/arm/intctlr.c
• Enable libukintctlr for x86 in plat/kvm/Config.uk:

diff --git a/plat/kvm/Config.uk b/plat/kvm/Config.uk
index 2c497c62..ffa2ced8 100644
--- a/plat/kvm/Config.uk
+++ b/plat/kvm/Config.uk
@@ -10,6 +10,7 @@ menuconfig PLAT_KVM
        select ELF64_TO_32 if ARCH_X86_64
        select LIBUKRELOC if OPTIMIZE_PIE
        select LIBUKOFW if ARCH_ARM_64
+       select LIBUKINTCTLR if ARCH_X86_64
        help
                 Create a Unikraft image that runs as a KVM guest

For ARCH_ARM_64 we don't need to do that, as we select that library from drivers/ukintctlr/gic/Config.uk.

[michpappas]

Looks good, thanks @rares-miculescu 👍🏼

The API still uses the old scheme (intctrl_ vs uk_intctlr) but this is out of scope until we finalize how we handle commits that affect multiple libraries. Hopefully that will happen in the next maintanier's call.

Reviewed-by: Michalis Pappas michalis@unikraft.io

[StefanJum]

All good, thanks.
Reviewed-by: Stefan Jumarea stefanjumarea02@gmail.com

[unikraft-bot]

✅ Checkpatch passed

Beep boop! I ran Unikraft's checkpatch.pl support script on your pull request and it all looks good!

SHA	commit	checkpatch
f186521	lib: Add ukintctlr as library	✅
bfc3501	drivers: Move GIC to drivers/ukintctlr	✅
5f3c068	plat: Move GIC from plat/drivers	✅

[razvand]

Approved-by: Razvan Deaconescu razvand@unikraft.io