[v13] mips: Add Loongson-3 machine support

[PATCH V13 1/9] linux-headers: Update MIPS KVM type defintition

Posted by Huacai Chen 5 years, 4 months ago

Update MIPS KVM type defintition from Linux 5.9-rc6.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
 linux-headers/linux/kvm.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index 6683e2e..c138b2f 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -790,9 +790,10 @@ struct kvm_ppc_resize_hpt {
 #define KVM_VM_PPC_HV 1
 #define KVM_VM_PPC_PR 2
 
-/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */
-#define KVM_VM_MIPS_TE		0
+/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */
+#define KVM_VM_MIPS_AUTO	0
 #define KVM_VM_MIPS_VZ		1
+#define KVM_VM_MIPS_TE		2
 
 #define KVM_S390_SIE_PAGE_OFFSET 1
 
-- 
2.7.0

Re: [PATCH V13 1/9] linux-headers: Update MIPS KVM type defintition

Posted by Philippe Mathieu-Daudé 5 years, 4 months ago

On 10/7/20 10:39 AM, Huacai Chen wrote:
> Update MIPS KVM type defintition from Linux 5.9-rc6.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> 
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> ---
>   linux-headers/linux/kvm.h | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
> index 6683e2e..c138b2f 100644
> --- a/linux-headers/linux/kvm.h
> +++ b/linux-headers/linux/kvm.h
> @@ -790,9 +790,10 @@ struct kvm_ppc_resize_hpt {
>   #define KVM_VM_PPC_HV 1
>   #define KVM_VM_PPC_PR 2
>   
> -/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */
> -#define KVM_VM_MIPS_TE		0
> +/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */
> +#define KVM_VM_MIPS_AUTO	0
>   #define KVM_VM_MIPS_VZ		1
> +#define KVM_VM_MIPS_TE		2
>   
>   #define KVM_S390_SIE_PAGE_OFFSET 1
>   
>

Re: [PATCH V13 1/9] linux-headers: Update MIPS KVM type defintition

Posted by Peter Maydell 5 years, 4 months ago

On Wed, 7 Oct 2020 at 09:44, Huacai Chen <zltjiangshi@gmail.com> wrote:
>
> Update MIPS KVM type defintition from Linux 5.9-rc6.
>
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> ---

Is this a sync using scripts/update-linux-headers.sh ?

(I vaguely had the idea of adding a --make-commit option to
that script so it would automatically create a git commit
with a header message saying it was a sync against the
kernel git commit, but I never got round to it.)

thanks
-- PMM

Re: [PATCH V13 1/9] linux-headers: Update MIPS KVM type defintition

Posted by Philippe Mathieu-Daudé 5 years, 4 months ago

On 10/10/20 2:59 PM, Peter Maydell wrote:
> On Wed, 7 Oct 2020 at 09:44, Huacai Chen <zltjiangshi@gmail.com> wrote:
>>
>> Update MIPS KVM type defintition from Linux 5.9-rc6.
>>
>> Signed-off-by: Huacai Chen <chenhc@lemote.com>
>> ---
> 
> Is this a sync using scripts/update-linux-headers.sh ?
> 
> (I vaguely had the idea of adding a --make-commit option to
> that script so it would automatically create a git commit
> with a header message saying it was a sync against the
> kernel git commit, but I never got round to it.)

I just realized you merged this change as commit 94c7fefcb45
("linux headers: sync to 5.9-rc7") =)

> 
> thanks
> -- PMM
>