[Qemu-devel] [PATCH microblaze v1 0/6] Microblaze Cleanups

[Qemu-devel] [PATCH microblaze v1 0/6] Microblaze Cleanups

[Peter Crosthwaite]

Hi Edgar,

This is some code cleanup of Microblaze. Mainly unused code
deletion but also code share of the defconfig (P1).

Regards,
Peter

Peter Crosthwaite (6):
  defconfigs: Piggyback microblazeel on microblaze
  mb: mmu: Delete flip_um fn prototype
  mb: cpu: Remote unused cpu_get_pc
  mb: cpu: Remove unused CC_OP enum
  mb: cpu: Delete EXCP_NMI
  mb: cpu: delete unused cpu_interrupts_enabled

 default-configs/microblazeel-softmmu.mak | 10 +---------
 target-microblaze/cpu.h                  | 17 -----------------
 target-microblaze/mmu.h                  |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

-- 
1.9.1

[Qemu-devel] [PATCH microblaze v1 1/6] defconfigs: Piggyback microblazeel on microblaze

[Peter Crosthwaite]

Theres no difference in defconfig. Going forward microblazeel should
superset microblaze so use an include.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 default-configs/microblazeel-softmmu.mak | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/microblazeel-softmmu.mak
index acf22c5..2fcf442 100644
--- a/default-configs/microblazeel-softmmu.mak
+++ b/default-configs/microblazeel-softmmu.mak
@@ -1,11 +1,3 @@
 # Default configuration for microblazeel-softmmu
 
-CONFIG_PTIMER=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_SERIAL=y
-CONFIG_XILINX=y
-CONFIG_XILINX_AXI=y
-CONFIG_XILINX_SPI=y
-CONFIG_XILINX_ETHLITE=y
-CONFIG_SSI=y
-CONFIG_SSI_M25P80=y
+include microblaze-softmmu.mak
-- 
1.9.1

[Qemu-devel] [PATCH microblaze v1 2/6] mb: mmu: Delete flip_um fn prototype

[Peter Crosthwaite]

This is not implemented or used.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 target-microblaze/mmu.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target-microblaze/mmu.h b/target-microblaze/mmu.h
index 3f74dda..3b7a998 100644
--- a/target-microblaze/mmu.h
+++ b/target-microblaze/mmu.h
@@ -82,7 +82,6 @@ struct microblaze_mmu_lookup
     } err;
 };
 
-void mmu_flip_um(CPUMBState *env, unsigned int um);
 unsigned int mmu_translate(struct microblaze_mmu *mmu,
                            struct microblaze_mmu_lookup *lu,
                            target_ulong vaddr, int rw, int mmu_idx);
-- 
1.9.1

[Qemu-devel] [PATCH microblaze v1 3/6] mb: cpu: Remote unused cpu_get_pc

[Peter Crosthwaite]

This function is not used by anything. Remove.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 target-microblaze/cpu.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 7d06227..2c18b49 100644
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -333,11 +333,6 @@ static inline int cpu_interrupts_enabled(CPUMBState *env)
 
 #include "exec/cpu-all.h"
 
-static inline target_ulong cpu_get_pc(CPUMBState *env)
-{
-    return env->sregs[SR_PC];
-}
-
 static inline void cpu_get_tb_cpu_state(CPUMBState *env, target_ulong *pc,
                                         target_ulong *cs_base, int *flags)
 {
-- 
1.9.1

[Qemu-devel] [PATCH microblaze v1 4/6] mb: cpu: Remove unused CC_OP enum

[Peter Crosthwaite]

This enum is not used by anything. Remove.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 target-microblaze/cpu.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 2c18b49..f21da2f 100644
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -284,12 +284,6 @@ int cpu_mb_exec(CPUMBState *s);
 int cpu_mb_signal_handler(int host_signum, void *pinfo,
                           void *puc);
 
-enum {
-    CC_OP_DYNAMIC, /* Use env->cc_op  */
-    CC_OP_FLAGS,
-    CC_OP_CMP,
-};
-
 /* FIXME: MB uses variable pages down to 1K but linux only uses 4k.  */
 #define TARGET_PAGE_BITS 12
 #define MMAP_SHIFT TARGET_PAGE_BITS
-- 
1.9.1

[Qemu-devel] [PATCH microblaze v1 5/6] mb: cpu: Delete EXCP_NMI

[Peter Crosthwaite]

This define is unused. Remove.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 target-microblaze/cpu.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index f21da2f..6522af7 100644
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -36,7 +36,6 @@ typedef struct CPUMBState CPUMBState;
 
 #define ELF_MACHINE	EM_MICROBLAZE
 
-#define EXCP_NMI        1
 #define EXCP_MMU        2
 #define EXCP_IRQ        3
 #define EXCP_BREAK      4
-- 
1.9.1

[Qemu-devel] [PATCH microblaze v1 6/6] mb: cpu: delete unused cpu_interrupts_enabled

[Peter Crosthwaite]

This function is unused. Remove.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 target-microblaze/cpu.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 6522af7..56d3403 100644
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -319,11 +319,6 @@ static inline int cpu_mmu_index (CPUMBState *env)
 int mb_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw,
                             int mmu_idx);
 
-static inline int cpu_interrupts_enabled(CPUMBState *env)
-{
-    return env->sregs[SR_MSR] & MSR_IE;
-}
-
 #include "exec/cpu-all.h"
 
 static inline void cpu_get_tb_cpu_state(CPUMBState *env, target_ulong *pc,
-- 
1.9.1

Re: [Qemu-devel] [PATCH microblaze v1 5/6] mb: cpu: Delete EXCP_NMI

[Edgar E. Iglesias]

On Sun, Apr 26, 2015 at 12:10:23PM -0700, Peter Crosthwaite wrote:
> This define is unused. Remove.
> 
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>

Hi,

Any reason not to shift down the numbering?

Otherwise the whole series looks good to me.

Thanks,
Edgar


> ---
>  target-microblaze/cpu.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
> index f21da2f..6522af7 100644
> --- a/target-microblaze/cpu.h
> +++ b/target-microblaze/cpu.h
> @@ -36,7 +36,6 @@ typedef struct CPUMBState CPUMBState;
>  
>  #define ELF_MACHINE	EM_MICROBLAZE
>  
> -#define EXCP_NMI        1
>  #define EXCP_MMU        2
>  #define EXCP_IRQ        3
>  #define EXCP_BREAK      4
> -- 
> 1.9.1
> 
> 

Re: [Qemu-devel] [PATCH microblaze v1 5/6] mb: cpu: Delete EXCP_NMI

[Michael Tokarev]

27.04.2015 12:28, Edgar E. Iglesias wrote:
> On Sun, Apr 26, 2015 at 12:10:23PM -0700, Peter Crosthwaite wrote:
>> This define is unused. Remove.
>>
>> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> 
> Hi,
> 
> Any reason not to shift down the numbering?
> 
> Otherwise the whole series looks good to me.

What does this mean, "looks good", is it your R-b? :)

>> @@ -36,7 +36,6 @@ typedef struct CPUMBState CPUMBState;
>>  
>>  #define ELF_MACHINE	EM_MICROBLAZE
>>  
>> -#define EXCP_NMI        1
>>  #define EXCP_MMU        2
>>  #define EXCP_IRQ        3
>>  #define EXCP_BREAK      4

I can renumber this on commit just fine, there's no need
to resend whole thing, is it okay with you Peter?

Thanks,

/mjt

Re: [Qemu-devel] [PATCH microblaze v1 5/6] mb: cpu: Delete EXCP_NMI

[Peter Crosthwaite]

On Mon, Apr 27, 2015 at 6:41 AM, Michael Tokarev <mjt@tls.msk.ru> wrote:
> 27.04.2015 12:28, Edgar E. Iglesias wrote:
>> On Sun, Apr 26, 2015 at 12:10:23PM -0700, Peter Crosthwaite wrote:
>>> This define is unused. Remove.
>>>
>>> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
>>
>> Hi,
>>
>> Any reason not to shift down the numbering?

None. Although my goal was to make no code change in the trivial patch series.

>>
>> Otherwise the whole series looks good to me.
>
> What does this mean, "looks good", is it your R-b? :)
>
>>> @@ -36,7 +36,6 @@ typedef struct CPUMBState CPUMBState;
>>>
>>>  #define ELF_MACHINE EM_MICROBLAZE
>>>
>>> -#define EXCP_NMI        1
>>>  #define EXCP_MMU        2
>>>  #define EXCP_IRQ        3
>>>  #define EXCP_BREAK      4
>
> I can renumber this on commit just fine, there's no need
> to resend whole thing, is it okay with you Peter?
>

It's ok with me. Thanks.

Regards,
Peter

> Thanks,
>
> /mjt
>

Re: [Qemu-devel] [PATCH microblaze v1 0/6] Microblaze Cleanups

[Michael Tokarev]

26.04.2015 22:10, Peter Crosthwaite wrote:
> Hi Edgar,
> 
> This is some code cleanup of Microblaze. Mainly unused code
> deletion but also code share of the defconfig (P1).

Applied all 6 to -trivial, as is, since the whole series
does not perform any code changes.  Renumbering EXCP_*
constants can be done later.

Thanks,

/mjt

Re: [Qemu-devel] [PATCH microblaze v1 5/6] mb: cpu: Delete EXCP_NMI

[Edgar E. Iglesias]

On Mon, Apr 27, 2015 at 04:41:13PM +0300, Michael Tokarev wrote:
> 27.04.2015 12:28, Edgar E. Iglesias wrote:
> > On Sun, Apr 26, 2015 at 12:10:23PM -0700, Peter Crosthwaite wrote:
> >> This define is unused. Remove.
> >>
> >> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> > 
> > Hi,
> > 
> > Any reason not to shift down the numbering?
> > 
> > Otherwise the whole series looks good to me.
> 
> What does this mean, "looks good", is it your R-b? :)

Sure, with the change:

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>

> 
> >> @@ -36,7 +36,6 @@ typedef struct CPUMBState CPUMBState;
> >>  
> >>  #define ELF_MACHINE	EM_MICROBLAZE
> >>  
> >> -#define EXCP_NMI        1
> >>  #define EXCP_MMU        2
> >>  #define EXCP_IRQ        3
> >>  #define EXCP_BREAK      4
> 
> I can renumber this on commit just fine, there's no need
> to resend whole thing, is it okay with you Peter?
> 
> Thanks,
> 
> /mjt

Re: [Qemu-devel] [PATCH microblaze v1 0/6] Microblaze Cleanups

[Michael Tokarev]

27.04.2015 17:47, Michael Tokarev wrote:
> 26.04.2015 22:10, Peter Crosthwaite wrote:
>> Hi Edgar,
>>
>> This is some code cleanup of Microblaze. Mainly unused code
>> deletion but also code share of the defconfig (P1).
> 
> Applied all 6 to -trivial, as is, since the whole series
> does not perform any code changes.  Renumbering EXCP_*
> constants can be done later.

(Just sent the renumbering change separately, to hopefully
get final R-b from Edgar ;)

But one more thing.  I'd like to rename "mb:" in subjects
to be "microblaze:", since the top message (this 0/6) wont
be in git and "mb:" prefix is somewhat too short ;)

Thanks,

/mjt

Re: [Qemu-devel] [PATCH microblaze v1 3/6] mb: cpu: Remote unused cpu_get_pc

[Alex Bennée]

Peter Crosthwaite <crosthwaitepeter@gmail.com> writes:

> This function is not used by anything. Remove.
>
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> ---
>  target-microblaze/cpu.h | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
> index 7d06227..2c18b49 100644
> --- a/target-microblaze/cpu.h
> +++ b/target-microblaze/cpu.h
> @@ -333,11 +333,6 @@ static inline int cpu_interrupts_enabled(CPUMBState *env)
>  
>  #include "exec/cpu-all.h"
>  
> -static inline target_ulong cpu_get_pc(CPUMBState *env)
> -{
> -    return env->sregs[SR_PC];
> -}
> -
>  static inline void cpu_get_tb_cpu_state(CPUMBState *env, target_ulong *pc,
>                                          target_ulong *cs_base, int *flags)
>  {

Ahh I see that now ;-)

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


-- 
Alex Bennée