| Message ID | 20170118132541.8989-12-fu.wei@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2017/1/18 21:25, fu.wei@linaro.org wrote: > From: Fu Wei <fu.wei@linaro.org> > > The patch introduce two new structs: arch_timer_mem, arch_timer_mem_frame. > And also introduce a new define: ARCH_TIMER_MEM_MAX_FRAMES > > These will be used for refactoring the memory-mapped timer init code to > prepare for GTDT > > Signed-off-by: Fu Wei <fu.wei@linaro.org> > --- > include/clocksource/arm_arch_timer.h | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h > index 4a98c06..b7dd185 100644 > --- a/include/clocksource/arm_arch_timer.h > +++ b/include/clocksource/arm_arch_timer.h > @@ -57,6 +57,8 @@ enum arch_timer_spi_nr { > #define ARCH_TIMER_MEM_PHYS_ACCESS 2 > #define ARCH_TIMER_MEM_VIRT_ACCESS 3 > > +#define ARCH_TIMER_MEM_MAX_FRAMES 8 > + > #define ARCH_TIMER_USR_PCT_ACCESS_EN (1 << 0) /* physical counter */ > #define ARCH_TIMER_USR_VCT_ACCESS_EN (1 << 1) /* virtual counter */ > #define ARCH_TIMER_VIRT_EVT_EN (1 << 2) > @@ -72,6 +74,21 @@ struct arch_timer_kvm_info { > int virtual_irq; > }; > > +struct arch_timer_mem_frame { > + int frame_nr; > + phys_addr_t cntbase; > + size_t size; > + int phys_irq; > + int virt_irq; > +}; > + > +struct arch_timer_mem { > + phys_addr_t cntctlbase; > + size_t size; > + int num_frames; > + struct arch_timer_mem_frame frame[ARCH_TIMER_MEM_MAX_FRAMES]; > +}; Since struct is introduced but not used in this patch, how about squash it with patch 12/17? Thanks Hanjun
Hi Hanjun, On 19 January 2017 at 16:28, Hanjun Guo <hanjun.guo@linaro.org> wrote: > On 2017/1/18 21:25, fu.wei@linaro.org wrote: >> >> From: Fu Wei <fu.wei@linaro.org> >> >> The patch introduce two new structs: arch_timer_mem, arch_timer_mem_frame. >> And also introduce a new define: ARCH_TIMER_MEM_MAX_FRAMES >> >> These will be used for refactoring the memory-mapped timer init code to >> prepare for GTDT >> >> Signed-off-by: Fu Wei <fu.wei@linaro.org> >> --- >> include/clocksource/arm_arch_timer.h | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/include/clocksource/arm_arch_timer.h >> b/include/clocksource/arm_arch_timer.h >> index 4a98c06..b7dd185 100644 >> --- a/include/clocksource/arm_arch_timer.h >> +++ b/include/clocksource/arm_arch_timer.h >> @@ -57,6 +57,8 @@ enum arch_timer_spi_nr { >> #define ARCH_TIMER_MEM_PHYS_ACCESS 2 >> #define ARCH_TIMER_MEM_VIRT_ACCESS 3 >> >> +#define ARCH_TIMER_MEM_MAX_FRAMES 8 >> + >> #define ARCH_TIMER_USR_PCT_ACCESS_EN (1 << 0) /* physical counter */ >> #define ARCH_TIMER_USR_VCT_ACCESS_EN (1 << 1) /* virtual counter */ >> #define ARCH_TIMER_VIRT_EVT_EN (1 << 2) >> @@ -72,6 +74,21 @@ struct arch_timer_kvm_info { >> int virtual_irq; >> }; >> >> +struct arch_timer_mem_frame { >> + int frame_nr; >> + phys_addr_t cntbase; >> + size_t size; >> + int phys_irq; >> + int virt_irq; >> +}; >> + >> +struct arch_timer_mem { >> + phys_addr_t cntctlbase; >> + size_t size; >> + int num_frames; >> + struct arch_timer_mem_frame frame[ARCH_TIMER_MEM_MAX_FRAMES]; >> +}; > > > Since struct is introduced but not used in this patch, how about > squash it with patch 12/17? In the previous patchset, I have been suggested that I should split it out. > > Thanks > Hanjun
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 4a98c06..b7dd185 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -57,6 +57,8 @@ enum arch_timer_spi_nr { #define ARCH_TIMER_MEM_PHYS_ACCESS 2 #define ARCH_TIMER_MEM_VIRT_ACCESS 3 +#define ARCH_TIMER_MEM_MAX_FRAMES 8 + #define ARCH_TIMER_USR_PCT_ACCESS_EN (1 << 0) /* physical counter */ #define ARCH_TIMER_USR_VCT_ACCESS_EN (1 << 1) /* virtual counter */ #define ARCH_TIMER_VIRT_EVT_EN (1 << 2) @@ -72,6 +74,21 @@ struct arch_timer_kvm_info { int virtual_irq; }; +struct arch_timer_mem_frame { + int frame_nr; + phys_addr_t cntbase; + size_t size; + int phys_irq; + int virt_irq; +}; + +struct arch_timer_mem { + phys_addr_t cntctlbase; + size_t size; + int num_frames; + struct arch_timer_mem_frame frame[ARCH_TIMER_MEM_MAX_FRAMES]; +}; + #ifdef CONFIG_ARM_ARCH_TIMER extern u32 arch_timer_get_rate(void);