[PATCH for 2.4 0/2] MIPS build fixes for v2.4

[PATCH for 2.4 0/2] MIPS build fixes for v2.4

[James Hogan]

These two patches fix build errors for the MIPS TCG backend and MIPS
KVM.

Please could they be applied for v2.4.

James Hogan (2):
  tcg/mips: Fix build error from merged memop+mmu_idx parameter
  mips/kvm: Sync with newer MIPS KVM headers

 target-mips/kvm.c     | 15 ++-------------
 tcg/mips/tcg-target.c |  4 ++--
 2 files changed, 4 insertions(+), 15 deletions(-)

Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org
-- 
2.3.6

[PATCH for 2.4 2/2] mips/kvm: Sync with newer MIPS KVM headers

[James Hogan]

The KVM_REG_MIPS_COUNT_* definitions are now included in
linux-headers/asm-mips/kvm.h since commit b061808d39fa ("linux-headers:
update linux headers to kvm/next"), therefore the duplicate definitions
in target-mips/kvm.c can now be dropped (the definitions were tweaked
slightly in commit 7a52ce8a1607 ("linux-headers: update") which
triggered the following build warnings turned errors):

target-mips/kvm.c:232:0: error: "KVM_REG_MIPS_COUNT_CTL" redefined [-Werror]
linux-headers/asm/kvm.h:129:0: note: this is the location of the previous definition
target-mips/kvm.c:236:0: error: "KVM_REG_MIPS_COUNT_RESUME" redefined [-Werror]
linux-headers/asm/kvm.h:141:0: note: this is the location of the previous definition
target-mips/kvm.c:239:0: error: "KVM_REG_MIPS_COUNT_HZ" redefined [-Werror]
linux-headers/asm/kvm.h:147:0: note: this is the location of the previous definition

Also update the MIPS_C0_{32,64} macros to utilise definitions more
recently added to the asm-mips/kvm.h header.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: kvm@vger.kernel.org
---
 target-mips/kvm.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/target-mips/kvm.c b/target-mips/kvm.c
index 7d2293d93492..bd64a70bcda0 100644
--- a/target-mips/kvm.c
+++ b/target-mips/kvm.c
@@ -212,10 +212,10 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level)
 }
 
 #define MIPS_CP0_32(_R, _S)                                     \
-    (KVM_REG_MIPS | KVM_REG_SIZE_U32 | 0x10000 | (8 * (_R) + (_S)))
+    (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U32 | (8 * (_R) + (_S)))
 
 #define MIPS_CP0_64(_R, _S)                                     \
-    (KVM_REG_MIPS | KVM_REG_SIZE_U64 | 0x10000 | (8 * (_R) + (_S)))
+    (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U64 | (8 * (_R) + (_S)))
 
 #define KVM_REG_MIPS_CP0_INDEX          MIPS_CP0_32(0, 0)
 #define KVM_REG_MIPS_CP0_CONTEXT        MIPS_CP0_64(4, 0)
@@ -232,17 +232,6 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level)
 #define KVM_REG_MIPS_CP0_EPC            MIPS_CP0_64(14, 0)
 #define KVM_REG_MIPS_CP0_ERROREPC       MIPS_CP0_64(30, 0)
 
-/* CP0_Count control */
-#define KVM_REG_MIPS_COUNT_CTL          (KVM_REG_MIPS | KVM_REG_SIZE_U64 | \
-                                         0x20000 | 0)
-#define KVM_REG_MIPS_COUNT_CTL_DC       0x00000001      /* master disable */
-/* CP0_Count resume monotonic nanoseconds */
-#define KVM_REG_MIPS_COUNT_RESUME       (KVM_REG_MIPS | KVM_REG_SIZE_U64 | \
-                                         0x20000 | 1)
-/* CP0_Count rate in Hz */
-#define KVM_REG_MIPS_COUNT_HZ           (KVM_REG_MIPS | KVM_REG_SIZE_U64 | \
-                                         0x20000 | 2)
-
 static inline int kvm_mips_put_one_reg(CPUState *cs, uint64_t reg_id,
                                        int32_t *addr)
 {
-- 
2.3.6

Re: [PATCH for 2.4 0/2] MIPS build fixes for v2.4

[Leon Alrae]

On 09/07/2015 10:17, James Hogan wrote:
> These two patches fix build errors for the MIPS TCG backend and MIPS
> KVM.
> 
> Please could they be applied for v2.4.
> 
> James Hogan (2):
>   tcg/mips: Fix build error from merged memop+mmu_idx parameter
>   mips/kvm: Sync with newer MIPS KVM headers
> 
>  target-mips/kvm.c     | 15 ++-------------
>  tcg/mips/tcg-target.c |  4 ++--
>  2 files changed, 4 insertions(+), 15 deletions(-)

Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>

Peter, since these are build fixes, could they be squeezed into rc0?

Thanks,
Leon

Re: [PATCH for 2.4 0/2] MIPS build fixes for v2.4

[Peter Maydell]

On 9 July 2015 at 12:52, Leon Alrae <leon.alrae@imgtec.com> wrote:
> On 09/07/2015 10:17, James Hogan wrote:
>> These two patches fix build errors for the MIPS TCG backend and MIPS
>> KVM.
>>
>> Please could they be applied for v2.4.
>>
>> James Hogan (2):
>>   tcg/mips: Fix build error from merged memop+mmu_idx parameter
>>   mips/kvm: Sync with newer MIPS KVM headers
>>
>>  target-mips/kvm.c     | 15 ++-------------
>>  tcg/mips/tcg-target.c |  4 ++--
>>  2 files changed, 4 insertions(+), 15 deletions(-)
>
> Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
>
> Peter, since these are build fixes, could they be squeezed into rc0?

Applied to master, thanks.

-- PMM

Re: [PATCH for 2.4 0/2] MIPS build fixes for v2.4

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

On 09/07/15 14:59, Peter Maydell wrote:
> On 9 July 2015 at 12:52, Leon Alrae <leon.alrae@imgtec.com> wrote:
>> On 09/07/2015 10:17, James Hogan wrote:
>>> These two patches fix build errors for the MIPS TCG backend and MIPS
>>> KVM.
>>>
>>> Please could they be applied for v2.4.
>>>
>>> James Hogan (2):
>>>   tcg/mips: Fix build error from merged memop+mmu_idx parameter
>>>   mips/kvm: Sync with newer MIPS KVM headers
>>>
>>>  target-mips/kvm.c     | 15 ++-------------
>>>  tcg/mips/tcg-target.c |  4 ++--
>>>  2 files changed, 4 insertions(+), 15 deletions(-)
>>
>> Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
>>
>> Peter, since these are build fixes, could they be squeezed into rc0?
> 
> Applied to master, thanks.

Thanks guys!

James


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]