|
@@ -190,6 +190,14 @@ static struct its_collection *valid_col(struct its_collection *col)
|
|
|
return col;
|
|
|
}
|
|
|
|
|
|
+static struct its_vpe *valid_vpe(struct its_node *its, struct its_vpe *vpe)
|
|
|
+{
|
|
|
+ if (valid_col(its->collections + vpe->col_idx))
|
|
|
+ return vpe;
|
|
|
+
|
|
|
+ return NULL;
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* ITS command descriptors - parameters to be encoded in a command
|
|
|
* block.
|
|
@@ -562,7 +570,7 @@ static struct its_vpe *its_build_vinvall_cmd(struct its_node *its,
|
|
|
|
|
|
its_fixup_cmd(cmd);
|
|
|
|
|
|
- return desc->its_vinvall_cmd.vpe;
|
|
|
+ return valid_vpe(its, desc->its_vinvall_cmd.vpe);
|
|
|
}
|
|
|
|
|
|
static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
|
|
@@ -584,7 +592,7 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
|
|
|
|
|
|
its_fixup_cmd(cmd);
|
|
|
|
|
|
- return desc->its_vmapp_cmd.vpe;
|
|
|
+ return valid_vpe(its, desc->its_vmapp_cmd.vpe);
|
|
|
}
|
|
|
|
|
|
static struct its_vpe *its_build_vmapti_cmd(struct its_node *its,
|
|
@@ -607,7 +615,7 @@ static struct its_vpe *its_build_vmapti_cmd(struct its_node *its,
|
|
|
|
|
|
its_fixup_cmd(cmd);
|
|
|
|
|
|
- return desc->its_vmapti_cmd.vpe;
|
|
|
+ return valid_vpe(its, desc->its_vmapti_cmd.vpe);
|
|
|
}
|
|
|
|
|
|
static struct its_vpe *its_build_vmovi_cmd(struct its_node *its,
|
|
@@ -630,7 +638,7 @@ static struct its_vpe *its_build_vmovi_cmd(struct its_node *its,
|
|
|
|
|
|
its_fixup_cmd(cmd);
|
|
|
|
|
|
- return desc->its_vmovi_cmd.vpe;
|
|
|
+ return valid_vpe(its, desc->its_vmovi_cmd.vpe);
|
|
|
}
|
|
|
|
|
|
static struct its_vpe *its_build_vmovp_cmd(struct its_node *its,
|
|
@@ -648,7 +656,7 @@ static struct its_vpe *its_build_vmovp_cmd(struct its_node *its,
|
|
|
|
|
|
its_fixup_cmd(cmd);
|
|
|
|
|
|
- return desc->its_vmovp_cmd.vpe;
|
|
|
+ return valid_vpe(its, desc->its_vmovp_cmd.vpe);
|
|
|
}
|
|
|
|
|
|
static u64 its_cmd_ptr_to_offset(struct its_node *its,
|