From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Scott Wood <oss@buserror.net>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH] powerpc: sysdev: cpm1: Optimise gpio bit calculation
Date: Thu, 9 Mar 2017 10:42:06 +0100 (CET) [thread overview]
Message-ID: <20170309094206.A832167992@localhost.localdomain> (raw)
Help a bit the compiler to provide better code:
unsigned int f(int i)
{
return 1 << (31 - i);
}
unsigned int g(int i)
{
return 0x80000000 >> i;
}
Disassembly of section .text:
00000000 <f>:
0: 20 63 00 1f subfic r3,r3,31
4: 39 20 00 01 li r9,1
8: 7d 23 18 30 slw r3,r9,r3
c: 4e 80 00 20 blr
00000010 <g>:
10: 3d 20 80 00 lis r9,-32768
14: 7d 23 1c 30 srw r3,r9,r3
18: 4e 80 00 20 blr
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/sysdev/cpm1.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index dc3653da6dd1..2b0bb55612d2 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -307,7 +307,7 @@ struct cpm_ioport32e {
static void cpm1_set_pin32(int port, int pin, int flags)
{
struct cpm_ioport32e __iomem *iop;
- pin = 1 << (31 - pin);
+ pin = 0x80000000 >> pin;
if (port == CPM_PORTB)
iop = (struct cpm_ioport32e __iomem *)
@@ -351,7 +351,7 @@ static void cpm1_set_pin16(int port, int pin, int flags)
struct cpm_ioport16 __iomem *iop =
(struct cpm_ioport16 __iomem *)&mpc8xx_immr->im_ioport;
- pin = 1 << (15 - pin);
+ pin = 0x8000 >> pin;
if (port != 0)
iop += port - 1;
@@ -550,9 +550,7 @@ static int cpm1_gpio16_get(struct gpio_chip *gc, unsigned int gpio)
{
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
struct cpm_ioport16 __iomem *iop = mm_gc->regs;
- u16 pin_mask;
-
- pin_mask = 1 << (15 - gpio);
+ u16 pin_mask = pin_mask = 0x8000 >> gpio;
return !!(in_be16(&iop->dat) & pin_mask);
}
@@ -576,7 +574,7 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
struct cpm1_gpio16_chip *cpm1_gc = gpiochip_get_data(&mm_gc->gc);
unsigned long flags;
- u16 pin_mask = 1 << (15 - gpio);
+ u16 pin_mask = 0x8000 >> gpio;
spin_lock_irqsave(&cpm1_gc->lock, flags);
@@ -599,7 +597,7 @@ static int cpm1_gpio16_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
struct cpm1_gpio16_chip *cpm1_gc = gpiochip_get_data(&mm_gc->gc);
struct cpm_ioport16 __iomem *iop = mm_gc->regs;
unsigned long flags;
- u16 pin_mask = 1 << (15 - gpio);
+ u16 pin_mask = 0x8000 >> gpio;
spin_lock_irqsave(&cpm1_gc->lock, flags);
@@ -617,7 +615,7 @@ static int cpm1_gpio16_dir_in(struct gpio_chip *gc, unsigned int gpio)
struct cpm1_gpio16_chip *cpm1_gc = gpiochip_get_data(&mm_gc->gc);
struct cpm_ioport16 __iomem *iop = mm_gc->regs;
unsigned long flags;
- u16 pin_mask = 1 << (15 - gpio);
+ u16 pin_mask = 0x8000 >> gpio;
spin_lock_irqsave(&cpm1_gc->lock, flags);
@@ -684,9 +682,7 @@ static int cpm1_gpio32_get(struct gpio_chip *gc, unsigned int gpio)
{
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
struct cpm_ioport32b __iomem *iop = mm_gc->regs;
- u32 pin_mask;
-
- pin_mask = 1 << (31 - gpio);
+ u32 pin_mask = 0x80000000 >> gpio;
return !!(in_be32(&iop->dat) & pin_mask);
}
@@ -710,7 +706,7 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
struct cpm1_gpio32_chip *cpm1_gc = gpiochip_get_data(&mm_gc->gc);
unsigned long flags;
- u32 pin_mask = 1 << (31 - gpio);
+ u32 pin_mask = 0x80000000 >> gpio;
spin_lock_irqsave(&cpm1_gc->lock, flags);
@@ -725,7 +721,7 @@ static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
struct cpm1_gpio32_chip *cpm1_gc = gpiochip_get_data(&mm_gc->gc);
struct cpm_ioport32b __iomem *iop = mm_gc->regs;
unsigned long flags;
- u32 pin_mask = 1 << (31 - gpio);
+ u32 pin_mask = 0x80000000 >> gpio;
spin_lock_irqsave(&cpm1_gc->lock, flags);
@@ -743,7 +739,7 @@ static int cpm1_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio)
struct cpm1_gpio32_chip *cpm1_gc = gpiochip_get_data(&mm_gc->gc);
struct cpm_ioport32b __iomem *iop = mm_gc->regs;
unsigned long flags;
- u32 pin_mask = 1 << (31 - gpio);
+ u32 pin_mask = 0x80000000 >> gpio;
spin_lock_irqsave(&cpm1_gc->lock, flags);
--
2.12.0
next reply other threads:[~2017-03-09 9:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-09 9:42 Christophe Leroy [this message]
2017-03-10 8:41 ` [PATCH] powerpc: sysdev: cpm1: Optimise gpio bit calculation Michael Ellerman
2017-03-10 10:54 ` Christophe LEROY
2017-03-10 13:06 ` Segher Boessenkool
2017-03-10 14:04 ` Christophe LEROY
2017-03-10 14:32 ` Segher Boessenkool
2017-03-10 14:41 ` Christophe LEROY
2017-03-10 15:41 ` Segher Boessenkool
2017-03-21 15:04 ` Christophe LEROY
2017-03-10 13:02 ` Segher Boessenkool
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170309094206.A832167992@localhost.localdomain \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=oss@buserror.net \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.