Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[deliverable/linux.git] / virt / kvm / arm / vgic / vgic-its.c

diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index 996e3e19b53f7e5c8086185aaf8e697fb6020fda..07411cf967b98767bada3c6287fc1cc69c53a86a 100644 (file)
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -688,7 +688,7 @@ static void vgic_its_free_collection(struct vgic_its *its, u32 coll_id)
  * Must be called with its_lock mutex held.
  */
 static int vgic_its_cmd_handle_mapi(struct kvm *kvm, struct vgic_its *its,
-                                   u64 *its_cmd, u8 subcmd)
+                                   u64 *its_cmd)
 {
        u32 device_id = its_cmd_get_deviceid(its_cmd);
        u32 event_id = its_cmd_get_id(its_cmd);
@@ -697,36 +697,34 @@ static int vgic_its_cmd_handle_mapi(struct kvm *kvm, struct vgic_its *its,
        struct its_device *device;
        struct its_collection *collection, *new_coll = NULL;
        int lpi_nr;
-       int ret;
 
        device = find_its_device(its, device_id);
        if (!device)
                return E_ITS_MAPTI_UNMAPPED_DEVICE;
 
+       if (its_cmd_get_command(its_cmd) == GITS_CMD_MAPTI)
+               lpi_nr = its_cmd_get_physical_id(its_cmd);
+       else
+               lpi_nr = event_id;
+       if (lpi_nr < GIC_LPI_OFFSET ||
+           lpi_nr >= max_lpis_propbaser(kvm->arch.vgic.propbaser))
+               return E_ITS_MAPTI_PHYSICALID_OOR;
+
        collection = find_collection(its, coll_id);
        if (!collection) {
-               ret = vgic_its_alloc_collection(its, &collection, coll_id);
+               int ret = vgic_its_alloc_collection(its, &collection, coll_id);
                if (ret)
                        return ret;
                new_coll = collection;
        }
 
-       if (subcmd == GITS_CMD_MAPTI)
-               lpi_nr = its_cmd_get_physical_id(its_cmd);
-       else
-               lpi_nr = event_id;
-       if (lpi_nr < GIC_LPI_OFFSET ||
-           lpi_nr >= max_lpis_propbaser(kvm->arch.vgic.propbaser)) {
-               ret = E_ITS_MAPTI_PHYSICALID_OOR;
-               goto err;
-       }
-
        itte = find_itte(its, device_id, event_id);
        if (!itte) {
                itte = kzalloc(sizeof(struct its_itte), GFP_KERNEL);
                if (!itte) {
-                       ret = -ENOMEM;
-                       goto err;
+                       if (new_coll)
+                               vgic_its_free_collection(its, coll_id);
+                       return -ENOMEM;
                }
 
                itte->event_id  = event_id;
@@ -746,10 +744,6 @@ static int vgic_its_cmd_handle_mapi(struct kvm *kvm, struct vgic_its *its,
        update_lpi_config(kvm, itte->irq, NULL);
 
        return 0;
-err:
-       if (new_coll)
-               vgic_its_free_collection(its, coll_id);
-       return ret;
 }
 
 /* Requires the its_lock to be held. */
@@ -999,11 +993,10 @@ static int vgic_its_cmd_handle_int(struct kvm *kvm, struct vgic_its *its,
 static int vgic_its_handle_command(struct kvm *kvm, struct vgic_its *its,
                                   u64 *its_cmd)
 {
-       u8 cmd = its_cmd_get_command(its_cmd);
        int ret = -ENODEV;
 
        mutex_lock(&its->its_lock);
-       switch (cmd) {
+       switch (its_cmd_get_command(its_cmd)) {
        case GITS_CMD_MAPD:
                ret = vgic_its_cmd_handle_mapd(kvm, its, its_cmd);
                break;
@@ -1011,10 +1004,10 @@ static int vgic_its_handle_command(struct kvm *kvm, struct vgic_its *its,
                ret = vgic_its_cmd_handle_mapc(kvm, its, its_cmd);
                break;
        case GITS_CMD_MAPI:
-               ret = vgic_its_cmd_handle_mapi(kvm, its, its_cmd, cmd);
+               ret = vgic_its_cmd_handle_mapi(kvm, its, its_cmd);
                break;
        case GITS_CMD_MAPTI:
-               ret = vgic_its_cmd_handle_mapi(kvm, its, its_cmd, cmd);
+               ret = vgic_its_cmd_handle_mapi(kvm, its, its_cmd);
                break;
        case GITS_CMD_MOVI:
                ret = vgic_its_cmd_handle_movi(kvm, its, its_cmd);