[PATCH] RISC-V: move riscv_cbom_block_size to the correct #ifdef block

[Anup Patel]

On Wed, Sep 14, 2022 at 8:24 PM <Conor.Dooley at microchip.com> wrote:
>
> On 14/09/2022 15:46, Anup Patel wrote:
> > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> >
> > On Wed, Sep 14, 2022 at 8:07 PM Heiko Stuebner <heiko at sntech.de> wrote:
> >>
> >> riscv_cbom_block_size is used by all current non-coherent dma operations,
> >> not only the zicbom variant. So move it over the block also containing
> >> the riscv_noncoherent_supported() prototype.
> >
> > At the moment, only non-coherent DMA operations use riscv_cbom_block_size
> > but soon we have other parties using it as well. For example, the RISC-V PMEM
> > support and KVM RISC-V Zicbom support.
> >
> > I am not sure if this is the right thing to do.
>
> This is a fix for a current error reported by LKP.
> When said future users need to use it - they can move it to a better location
> IMO.

Why don't we move it to a better location now itself ?

Regards,
Anup

>
> Thanks,
> Conor.
>
> >
> > Regards,
> > Anup
> >
> >>
> >> Fixes: 8f7e001e0325 ("RISC-V: Clean up the Zicbom block size probing")
> >> Reported-by: kernel test robot <lkp at intel.com>
> >> Signed-off-by: Heiko Stuebner <heiko at sntech.de>
> >> ---
> >>   arch/riscv/include/asm/cacheflush.h | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h
> >> index a89c005b4bbf..5c16d901d3da 100644
> >> --- a/arch/riscv/include/asm/cacheflush.h
> >> +++ b/arch/riscv/include/asm/cacheflush.h
> >> @@ -43,13 +43,13 @@ void flush_icache_mm(struct mm_struct *mm, bool local);
> >>   #endif /* CONFIG_SMP */
> >>
> >>   #ifdef CONFIG_RISCV_ISA_ZICBOM
> >> -extern unsigned int riscv_cbom_block_size;
> >>   void riscv_init_cbom_blocksize(void);
> >>   #else
> >>   static inline void riscv_init_cbom_blocksize(void) { }
> >>   #endif
> >>
> >>   #ifdef CONFIG_RISCV_DMA_NONCOHERENT
> >> +extern unsigned int riscv_cbom_block_size;
> >>   void riscv_noncoherent_supported(void);
> >>   #endif
> >>
> >> --
> >> 2.35.1
> >>
> >>
> >> _______________________________________________
> >> linux-riscv mailing list
> >> linux-riscv at lists.infradead.org
> >> http://lists.infradead.org/mailman/listinfo/linux-riscv
> >
> > _______________________________________________
> > linux-riscv mailing list
> > linux-riscv at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-riscv
>