Messages in this thread | | | Date | Sun, 2 Jan 2022 16:23:08 +0000 | From | Wei Liu <> | Subject | Re: [PATCH] Swiotlb: Add CONFIG_HAS_IOMEM check around memremap() in the swiotlb_mem_remap() |
| |
On Fri, Dec 31, 2021 at 11:56:40AM -0500, Tianyu Lan wrote: > From: Tianyu Lan <Tianyu.Lan@microsoft.com> > > HAS_IOMEM option may not be selected on some platforms(e.g, s390) and this > will cause compile error due to miss memremap() implementation. Fix it via
miss -> missingk
> adding HAS_IOMEM check around memremap() in the swiotlb.c. > > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Tianyu Lan <Tianyu.Lan@microsoft.com>
Hi Christoph
Are you happy with this fix?
Thanks, Wei.
> --- > kernel/dma/swiotlb.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c > index b36c1cdd0c4f..3de651ba38cc 100644 > --- a/kernel/dma/swiotlb.c > +++ b/kernel/dma/swiotlb.c > @@ -167,6 +167,7 @@ static void *swiotlb_mem_remap(struct io_tlb_mem *mem, unsigned long bytes) > { > void *vaddr = NULL; > > +#ifdef CONFIG_HAS_IOMEM > if (swiotlb_unencrypted_base) { > phys_addr_t paddr = mem->start + swiotlb_unencrypted_base; > > @@ -175,6 +176,7 @@ static void *swiotlb_mem_remap(struct io_tlb_mem *mem, unsigned long bytes) > pr_err("Failed to map the unencrypted memory %pa size %lx.\n", > &paddr, bytes); > } > +#endif > > return vaddr; > } > -- > 2.25.1 >
| |