| Message ID | 1398959381-8126-2-git-send-email-ard.biesheuvel@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 01, 2014 at 04:49:33PM +0100, Ard Biesheuvel wrote: > Switch the default unaligned access method to 'hardware implemented' > if HAVE_EFFICIENT_UNALIGNED_ACCESS is set. > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Acked-by: Arnd Bergmann <arnd@arndb.de> > --- > include/asm-generic/unaligned.h | 21 +++++++++++++-------- > 1 file changed, 13 insertions(+), 8 deletions(-) I'm happy to take this patch via the arm64 tree. But arm is affected as well, so it would be good to know if Russell has any objections (cc'ed). Patch below for reference. Thanks. Catalin > diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h > index 03cf5936bad6..1ac097279db1 100644 > --- a/include/asm-generic/unaligned.h > +++ b/include/asm-generic/unaligned.h > @@ -4,22 +4,27 @@ > /* > * This is the most generic implementation of unaligned accesses > * and should work almost anywhere. > - * > - * If an architecture can handle unaligned accesses in hardware, > - * it may want to use the linux/unaligned/access_ok.h implementation > - * instead. > */ > #include <asm/byteorder.h> > > +/* Set by the arch if it can handle unaligned accesses in hardware. */ > +#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS > +# include <linux/unaligned/access_ok.h> > +#endif > + > #if defined(__LITTLE_ENDIAN) > -# include <linux/unaligned/le_struct.h> > -# include <linux/unaligned/be_byteshift.h> > +# ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS > +# include <linux/unaligned/le_struct.h> > +# include <linux/unaligned/be_byteshift.h> > +# endif > # include <linux/unaligned/generic.h> > # define get_unaligned __get_unaligned_le > # define put_unaligned __put_unaligned_le > #elif defined(__BIG_ENDIAN) > -# include <linux/unaligned/be_struct.h> > -# include <linux/unaligned/le_byteshift.h> > +# ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS > +# include <linux/unaligned/be_struct.h> > +# include <linux/unaligned/le_byteshift.h> > +# endif > # include <linux/unaligned/generic.h> > # define get_unaligned __get_unaligned_be > # define put_unaligned __put_unaligned_be > -- > 1.8.3.2
On 6 May 2014 16:31, Catalin Marinas <catalin.marinas@arm.com> wrote: > On Thu, May 01, 2014 at 04:49:33PM +0100, Ard Biesheuvel wrote: >> Switch the default unaligned access method to 'hardware implemented' >> if HAVE_EFFICIENT_UNALIGNED_ACCESS is set. >> >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> Acked-by: Arnd Bergmann <arnd@arndb.de> >> --- >> include/asm-generic/unaligned.h | 21 +++++++++++++-------- >> 1 file changed, 13 insertions(+), 8 deletions(-) > > I'm happy to take this patch via the arm64 tree. But arm is affected as > well, so it would be good to know if Russell has any objections (cc'ed). > > Patch below for reference. Thanks. > Russell has already replied to that: http://marc.info/?l=linux-arm-kernel&m=139696976302889&w=2 Regards, Ard. >> diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h >> index 03cf5936bad6..1ac097279db1 100644 >> --- a/include/asm-generic/unaligned.h >> +++ b/include/asm-generic/unaligned.h >> @@ -4,22 +4,27 @@ >> /* >> * This is the most generic implementation of unaligned accesses >> * and should work almost anywhere. >> - * >> - * If an architecture can handle unaligned accesses in hardware, >> - * it may want to use the linux/unaligned/access_ok.h implementation >> - * instead. >> */ >> #include <asm/byteorder.h> >> >> +/* Set by the arch if it can handle unaligned accesses in hardware. */ >> +#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS >> +# include <linux/unaligned/access_ok.h> >> +#endif >> + >> #if defined(__LITTLE_ENDIAN) >> -# include <linux/unaligned/le_struct.h> >> -# include <linux/unaligned/be_byteshift.h> >> +# ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS >> +# include <linux/unaligned/le_struct.h> >> +# include <linux/unaligned/be_byteshift.h> >> +# endif >> # include <linux/unaligned/generic.h> >> # define get_unaligned __get_unaligned_le >> # define put_unaligned __put_unaligned_le >> #elif defined(__BIG_ENDIAN) >> -# include <linux/unaligned/be_struct.h> >> -# include <linux/unaligned/le_byteshift.h> >> +# ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS >> +# include <linux/unaligned/be_struct.h> >> +# include <linux/unaligned/le_byteshift.h> >> +# endif >> # include <linux/unaligned/generic.h> >> # define get_unaligned __get_unaligned_be >> # define put_unaligned __put_unaligned_be >> -- >> 1.8.3.2
On Tue, May 06, 2014 at 03:34:23PM +0100, Ard Biesheuvel wrote: > On 6 May 2014 16:31, Catalin Marinas <catalin.marinas@arm.com> wrote: > > On Thu, May 01, 2014 at 04:49:33PM +0100, Ard Biesheuvel wrote: > >> Switch the default unaligned access method to 'hardware implemented' > >> if HAVE_EFFICIENT_UNALIGNED_ACCESS is set. > >> > >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > >> Acked-by: Arnd Bergmann <arnd@arndb.de> > >> --- > >> include/asm-generic/unaligned.h | 21 +++++++++++++-------- > >> 1 file changed, 13 insertions(+), 8 deletions(-) > > > > I'm happy to take this patch via the arm64 tree. But arm is affected as > > well, so it would be good to know if Russell has any objections (cc'ed). > > > > Patch below for reference. Thanks. > > > > Russell has already replied to that: > http://marc.info/?l=linux-arm-kernel&m=139696976302889&w=2 Thanks.
diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h index 03cf5936bad6..1ac097279db1 100644 --- a/include/asm-generic/unaligned.h +++ b/include/asm-generic/unaligned.h @@ -4,22 +4,27 @@ /* * This is the most generic implementation of unaligned accesses * and should work almost anywhere. - * - * If an architecture can handle unaligned accesses in hardware, - * it may want to use the linux/unaligned/access_ok.h implementation - * instead. */ #include <asm/byteorder.h> +/* Set by the arch if it can handle unaligned accesses in hardware. */ +#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS +# include <linux/unaligned/access_ok.h> +#endif + #if defined(__LITTLE_ENDIAN) -# include <linux/unaligned/le_struct.h> -# include <linux/unaligned/be_byteshift.h> +# ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS +# include <linux/unaligned/le_struct.h> +# include <linux/unaligned/be_byteshift.h> +# endif # include <linux/unaligned/generic.h> # define get_unaligned __get_unaligned_le # define put_unaligned __put_unaligned_le #elif defined(__BIG_ENDIAN) -# include <linux/unaligned/be_struct.h> -# include <linux/unaligned/le_byteshift.h> +# ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS +# include <linux/unaligned/be_struct.h> +# include <linux/unaligned/le_byteshift.h> +# endif # include <linux/unaligned/generic.h> # define get_unaligned __get_unaligned_be # define put_unaligned __put_unaligned_be