From mboxrd@z Thu Jan 1 00:00:00 1970 From: catalin.marinas@arm.com (Catalin Marinas) Date: Wed, 1 Jun 2016 11:43:26 +0100 Subject: [PATCH 1/3] efi: Introduce *_continue efi_memory_desc iterators In-Reply-To: <20160601103446.GC9280@leverpostej> References: <1464707672-21882-1-git-send-email-catalin.marinas@arm.com> <1464707672-21882-2-git-send-email-catalin.marinas@arm.com> <20160601103446.GC9280@leverpostej> Message-ID: <20160601104326.GA24749@e104818-lin.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Jun 01, 2016 at 11:34:47AM +0100, Mark Rutland wrote: > On Tue, May 31, 2016 at 04:14:30PM +0100, Catalin Marinas wrote: > > The for_each_efi_memory_desc_continue() macro and corresponding > > "_in_map" allow iterating over an efi_memory_map from a given position. > > For code reuse between the existing iterator and the _continue variant, > > this patch also introduces efi_memory_desc_next_entry_map(). > > > > Cc: Matt Fleming > > Signed-off-by: Catalin Marinas > > --- > > include/linux/efi.h | 19 +++++++++++++++++-- > > 1 file changed, 17 insertions(+), 2 deletions(-) > > > > diff --git a/include/linux/efi.h b/include/linux/efi.h > > index c2db3ca22217..4b0d880f1cd7 100644 > > --- a/include/linux/efi.h > > +++ b/include/linux/efi.h > > @@ -1002,11 +1002,16 @@ extern int efi_memattr_init(void); > > extern int efi_memattr_apply_permissions(struct mm_struct *mm, > > efi_memattr_perm_setter fn); > > > > +/* Find next entry in an efi_memory_map or NULL if md is last */ > > +#define efi_memory_desc_next_entry_map(m, md) \ > > + ((md) == (efi_memory_desc_t *)((m)->map_end - (m)->desc_size) \ > > + ? NULL : (void *)(md) + (m)->desc_size) > > + > > /* Iterate through an efi_memory_map */ > > #define for_each_efi_memory_desc_in_map(m, md) \ > > for ((md) = (m)->map; \ > > - (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \ > > - (md) = (void *)(md) + (m)->desc_size) > > + (md); \ > > + (md) = efi_memory_desc_next_entry_map(m, md)) > > As a heads-up, this will conflict with the efi/urgent branch [1], due to > commit ee92562e33c516dd ("efi: Fix for_each_efi_memory_desc_in_map() for > empty memmaps"). A pull went out for that yesterday [2]. Thanks for the heads up. I'll rebase the patches after -rc2 but anyway I plan to merge them in 4.8 via the arm64 tree, including the patch above if Matt acks it. So there is enough time to fix the conflicts. -- Catalin