|
@@ -20,6 +20,7 @@
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
*/
|
|
|
|
|
|
+#include <linux/bsearch.h>
|
|
|
#include <linux/kvm_host.h>
|
|
|
#include <linux/mm.h>
|
|
|
#include <linux/uaccess.h>
|
|
@@ -1453,29 +1454,32 @@ static const struct sys_reg_desc *get_target_table(unsigned target,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+#define reg_to_match_value(x) \
|
|
|
+ ({ \
|
|
|
+ unsigned long val; \
|
|
|
+ val = (x)->Op0 << 14; \
|
|
|
+ val |= (x)->Op1 << 11; \
|
|
|
+ val |= (x)->CRn << 7; \
|
|
|
+ val |= (x)->CRm << 3; \
|
|
|
+ val |= (x)->Op2; \
|
|
|
+ val; \
|
|
|
+ })
|
|
|
+
|
|
|
+static int match_sys_reg(const void *key, const void *elt)
|
|
|
+{
|
|
|
+ const unsigned long pval = (unsigned long)key;
|
|
|
+ const struct sys_reg_desc *r = elt;
|
|
|
+
|
|
|
+ return pval - reg_to_match_value(r);
|
|
|
+}
|
|
|
+
|
|
|
static const struct sys_reg_desc *find_reg(const struct sys_reg_params *params,
|
|
|
const struct sys_reg_desc table[],
|
|
|
unsigned int num)
|
|
|
{
|
|
|
- unsigned int i;
|
|
|
-
|
|
|
- for (i = 0; i < num; i++) {
|
|
|
- const struct sys_reg_desc *r = &table[i];
|
|
|
+ unsigned long pval = reg_to_match_value(params);
|
|
|
|
|
|
- if (params->Op0 != r->Op0)
|
|
|
- continue;
|
|
|
- if (params->Op1 != r->Op1)
|
|
|
- continue;
|
|
|
- if (params->CRn != r->CRn)
|
|
|
- continue;
|
|
|
- if (params->CRm != r->CRm)
|
|
|
- continue;
|
|
|
- if (params->Op2 != r->Op2)
|
|
|
- continue;
|
|
|
-
|
|
|
- return r;
|
|
|
- }
|
|
|
- return NULL;
|
|
|
+ return bsearch((void *)pval, table, num, sizeof(table[0]), match_sys_reg);
|
|
|
}
|
|
|
|
|
|
int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu, struct kvm_run *run)
|