From: Guo Hongyu <guohongyu24@mails.ucas.ac.cn>

Refer to the link below for a description of the vldi instructions:

https://jia.je/unofficial-loongarch-intrinsics-guide/lsx/misc/#synopsis_88

Fixed errors in vldi instruction implementation.

Signed-off-by: Guo Hongyu <guohongyu24@mails.ucas.ac.cn>

Tested-by: Xianglai Li <lixianglai@loongson.cn>

Signed-off-by: Xianglai Li <lixianglai@loongson.cn>

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

Signed-off-by: Bibo Mao <maobibo@loongson.cn>

---

target/loongarch/tcg/insn_trans/trans_vec.c.inc | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/loongarch/tcg/insn_trans/trans_vec.c.inc b/target/loongarch/tcg/insn_trans/trans_vec.c.inc

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/tcg/insn_trans/trans_vec.c.inc

+++ b/target/loongarch/tcg/insn_trans/trans_vec.c.inc

@@ -XXX,XX +XXX,XX @@ static uint64_t vldi_get_value(DisasContext *ctx, uint32_t imm)

break;

case 1:

/* data: {2{16'0, imm[7:0], 8'0}} */

- data = (t << 24) | (t << 8);

+ data = (t << 40) | (t << 8);

break;

case 2:

/* data: {2{8'0, imm[7:0], 16'0}} */

--

2.43.5

Hardcoded 32 bytes is used for vbsrl emulation check, there is

problem when options lsx=on,lasx=off is used for vbsrl.v instruction

in TCG mode. It injects LASX exception rather LSX exception.

Here actual operand size is used.

Cc: qemu-stable@nongnu.org

Fixes: df97f338076 ("target/loongarch: Implement xvreplve xvinsve0 xvpickve")

Signed-off-by: Bibo Mao <maobibo@loongson.cn>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

---

target/loongarch/tcg/insn_trans/trans_vec.c.inc | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/loongarch/tcg/insn_trans/trans_vec.c.inc b/target/loongarch/tcg/insn_trans/trans_vec.c.inc

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/tcg/insn_trans/trans_vec.c.inc

+++ b/target/loongarch/tcg/insn_trans/trans_vec.c.inc

@@ -XXX,XX +XXX,XX @@ static bool do_vbsrl_v(DisasContext *ctx, arg_vv_i *a, uint32_t oprsz)

{

int i, ofs;

- if (!check_vec(ctx, 32)) {

+ if (!check_vec(ctx, oprsz)) {

return true;

}

--

2.43.5

- /* Add PCH PIC node */

- fdt_add_pch_pic_node(lvms, &eiointc_phandle, &pch_pic_phandle);

-

Like LBT feature, add type OnOffAuto for LSX feature setting. Also

add LSX feature detection with new VM ioctl command, fallback to old

method if it is not supported.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

---

target/loongarch/cpu.c | 38 +++++++++++++++------------

target/loongarch/cpu.h | 2 ++

target/loongarch/kvm/kvm.c | 54 ++++++++++++++++++++++++++++++++++++++

3 files changed, 77 insertions(+), 17 deletions(-)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/cpu.c

+++ b/target/loongarch/cpu.c

@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)

{

LoongArchCPU *cpu = LOONGARCH_CPU(obj);

CPULoongArchState *env = &cpu->env;

+ uint32_t data = 0;

int i;

for (i = 0; i < 21; i++) {

@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)

cpu->dtb_compatible = "loongarch,Loongson-3A5000";

env->cpucfg[0] = 0x14c010; /* PRID */

- uint32_t data = 0;

data = FIELD_DP32(data, CPUCFG1, ARCH, 2);

data = FIELD_DP32(data, CPUCFG1, PGMMU, 1);

data = FIELD_DP32(data, CPUCFG1, IOCSR, 1);

@@ -XXX,XX +XXX,XX @@ static void loongarch_la132_initfn(Object *obj)

{

LoongArchCPU *cpu = LOONGARCH_CPU(obj);

CPULoongArchState *env = &cpu->env;

-

+ uint32_t data = 0;

int i;

for (i = 0; i < 21; i++) {

@@ -XXX,XX +XXX,XX @@ static void loongarch_la132_initfn(Object *obj)

cpu->dtb_compatible = "loongarch,Loongson-1C103";

env->cpucfg[0] = 0x148042; /* PRID */

- uint32_t data = 0;

data = FIELD_DP32(data, CPUCFG1, ARCH, 1); /* LA32 */

data = FIELD_DP32(data, CPUCFG1, PGMMU, 1);

data = FIELD_DP32(data, CPUCFG1, IOCSR, 1);

@@ -XXX,XX +XXX,XX @@ static void loongarch_cpu_realizefn(DeviceState *dev, Error **errp)

static bool loongarch_get_lsx(Object *obj, Error **errp)

{

- LoongArchCPU *cpu = LOONGARCH_CPU(obj);

- bool ret;

-

- if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {

- ret = true;

- } else {

- ret = false;

- }

- return ret;

+ return LOONGARCH_CPU(obj)->lsx != ON_OFF_AUTO_OFF;

}

static void loongarch_set_lsx(Object *obj, bool value, Error **errp)

{

LoongArchCPU *cpu = LOONGARCH_CPU(obj);

+ uint32_t val;

- if (value) {

- cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1);

- } else {

- cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 0);

- cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 0);

+ cpu->lsx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;

+ if (kvm_enabled()) {

+ /* kvm feature detection in function kvm_arch_init_vcpu */

+ return;

}

+

+ /* LSX feature detection in TCG mode */

+ val = cpu->env.cpucfg[2];

+ if (cpu->lsx == ON_OFF_AUTO_ON) {

+ if (FIELD_EX32(val, CPUCFG2, LSX) == 0) {

+ error_setg(errp, "Failed to enable LSX in TCG mode");

+ return;

+ }

+ }

+

+ cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LSX, value);

}

static bool loongarch_get_lasx(Object *obj, Error **errp)

@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)

{

LoongArchCPU *cpu = LOONGARCH_CPU(obj);

+ cpu->lsx = ON_OFF_AUTO_AUTO;

object_property_add_bool(obj, "lsx", loongarch_get_lsx,

loongarch_set_lsx);

object_property_add_bool(obj, "lasx", loongarch_get_lasx,

@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)

} else {

cpu->lbt = ON_OFF_AUTO_OFF;

+ cpu->pmu = ON_OFF_AUTO_OFF;

}

}

diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/cpu.h

+++ b/target/loongarch/cpu.h

@@ -XXX,XX +XXX,XX @@ typedef struct LoongArchTLB LoongArchTLB;

#endif

enum loongarch_features {

+ LOONGARCH_FEATURE_LSX,

LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */

LOONGARCH_FEATURE_PMU,

};

@@ -XXX,XX +XXX,XX @@ struct ArchCPU {

uint32_t phy_id;

OnOffAuto lbt;

OnOffAuto pmu;

+ OnOffAuto lsx;

/* 'compatible' string for this CPU for Linux device trees */

const char *dtb_compatible;

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/kvm/kvm.c

+++ b/target/loongarch/kvm/kvm.c

@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)

{

int ret;

struct kvm_device_attr attr;

+ uint64_t val;

switch (feature) {

+ case LOONGARCH_FEATURE_LSX:

+ attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;

+ attr.attr = KVM_LOONGARCH_VM_FEAT_LSX;

+ ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);

+ if (ret == 0) {

+ return true;

+ }

+

+ /* Fallback to old kernel detect interface */

+ val = 0;

+ attr.group = KVM_LOONGARCH_VCPU_CPUCFG;

+ /* Cpucfg2 */

+ attr.attr = 2;

+ attr.addr = (uint64_t)&val;

+ ret = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, &attr);

+ if (!ret) {

+ ret = kvm_vcpu_ioctl(cs, KVM_GET_DEVICE_ATTR, &attr);

+ if (ret) {

+ return false;

+ }

+

+ ret = FIELD_EX32((uint32_t)val, CPUCFG2, LSX);

+ return (ret != 0);

+ }

+ return false;

+

case LOONGARCH_FEATURE_LBT:

/*

* Return all if all the LBT features are supported such as:

@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)

return false;

}

+static int kvm_cpu_check_lsx(CPUState *cs, Error **errp)

+{

+ CPULoongArchState *env = cpu_env(cs);

+ LoongArchCPU *cpu = LOONGARCH_CPU(cs);

+ bool kvm_supported;

+

+ kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_LSX);

+ env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 0);

+ if (cpu->lsx == ON_OFF_AUTO_ON) {

+ if (kvm_supported) {

+ env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 1);

+ } else {

+ error_setg(errp, "'lsx' feature not supported by KVM on this host");

+ return -ENOTSUP;

+ }

+ } else if ((cpu->lsx == ON_OFF_AUTO_AUTO) && kvm_supported) {

+ env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 1);

+ }

+

+ return 0;

+}

+

static int kvm_cpu_check_lbt(CPUState *cs, Error **errp)

{

CPULoongArchState *env = cpu_env(cs);

@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)

brk_insn = val;

}

+ ret = kvm_cpu_check_lsx(cs, &local_err);

+ if (ret < 0) {

+ error_report_err(local_err);

+ }

+

ret = kvm_cpu_check_lbt(cs, &local_err);

if (ret < 0) {

error_report_err(local_err);

--

2.43.5