[PATCH 0/3] sh_eth: optimize MDIO code

netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 0/3] sh_eth: optimize MDIO code
@ 2015-12-07 21:39 Sergei Shtylyov
  2015-12-07 21:40 ` [PATCH 1/3] sh_eth: remove mask fields from 'struct bb_info' Sergei Shtylyov
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Sergei Shtylyov @ 2015-12-07 21:39 UTC (permalink / raw)
  To: netdev; +Cc: linux-sh

Hello.

   Here's a set of 3 patches against DaveM's 'net-next.git' repo which gets rid
of ~35 LoCs in the MDIO bitbang methods.

[1/3] sh_eth: remove mask fields from 'struct bb_info'
[2/3] sh_eth: factor out common code from MDIO bitbang methods
[3/3] sh_eth: get rid of bb_{set|clr|read}()

MBR, Sergei

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/3] sh_eth: remove mask fields from 'struct bb_info'
  2015-12-07 21:39 [PATCH 0/3] sh_eth: optimize MDIO code Sergei Shtylyov
@ 2015-12-07 21:40 ` Sergei Shtylyov
  2015-12-08  0:42   ` Simon Horman
  2015-12-07 21:40 ` [PATCH 2/3] sh_eth: factor out common code from MDIO bitbang methods Sergei Shtylyov
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Sergei Shtylyov @ 2015-12-07 21:40 UTC (permalink / raw)
  To: netdev; +Cc: linux-sh

The MDIO control bits are always mapped to the same bits of the same register
(PIR), so there's no need to store their masks in the 'struct bb_info'...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
 drivers/net/ethernet/renesas/sh_eth.c |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net-next/drivers/net/ethernet/renesas/sh_eth.c
@@ -1013,10 +1013,6 @@ struct bb_info {
 	void (*set_gate)(void *addr);
 	struct mdiobb_ctrl ctrl;
 	void *addr;
-	u32 mmd_msk;/* MMD */
-	u32 mdo_msk;
-	u32 mdi_msk;
-	u32 mdc_msk;
 };
 
 /* PHY bit set */
@@ -1046,9 +1042,9 @@ static void sh_mmd_ctrl(struct mdiobb_ct
 		bitbang->set_gate(bitbang->addr);
 
 	if (bit)
-		bb_set(bitbang->addr, bitbang->mmd_msk);
+		bb_set(bitbang->addr, PIR_MMD);
 	else
-		bb_clr(bitbang->addr, bitbang->mmd_msk);
+		bb_clr(bitbang->addr, PIR_MMD);
 }
 
 /* Set bit data*/
@@ -1060,9 +1056,9 @@ static void sh_set_mdio(struct mdiobb_ct
 		bitbang->set_gate(bitbang->addr);
 
 	if (bit)
-		bb_set(bitbang->addr, bitbang->mdo_msk);
+		bb_set(bitbang->addr, PIR_MDO);
 	else
-		bb_clr(bitbang->addr, bitbang->mdo_msk);
+		bb_clr(bitbang->addr, PIR_MDO);
 }
 
 /* Get bit data*/
@@ -1073,7 +1069,7 @@ static int sh_get_mdio(struct mdiobb_ctr
 	if (bitbang->set_gate)
 		bitbang->set_gate(bitbang->addr);
 
-	return bb_read(bitbang->addr, bitbang->mdi_msk);
+	return bb_read(bitbang->addr, PIR_MDI);
 }
 
 /* MDC pin control */
@@ -1085,9 +1081,9 @@ static void sh_mdc_ctrl(struct mdiobb_ct
 		bitbang->set_gate(bitbang->addr);
 
 	if (bit)
-		bb_set(bitbang->addr, bitbang->mdc_msk);
+		bb_set(bitbang->addr, PIR_MDC);
 	else
-		bb_clr(bitbang->addr, bitbang->mdc_msk);
+		bb_clr(bitbang->addr, PIR_MDC);
 }
 
 /* mdio bus control struct */
@@ -2899,10 +2895,6 @@ static int sh_mdio_init(struct sh_eth_pr
 	/* bitbang init */
 	bitbang->addr = mdp->addr + mdp->reg_offset[PIR];
 	bitbang->set_gate = pd->set_mdio_gate;
-	bitbang->mdi_msk = PIR_MDI;
-	bitbang->mdo_msk = PIR_MDO;
-	bitbang->mmd_msk = PIR_MMD;
-	bitbang->mdc_msk = PIR_MDC;
 	bitbang->ctrl.ops = &bb_ops;
 
 	/* MII controller setting */

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/3] sh_eth: remove mask fields from 'struct bb_info'
  2015-12-07 21:40 ` [PATCH 1/3] sh_eth: remove mask fields from 'struct bb_info' Sergei Shtylyov
@ 2015-12-08  0:42   ` Simon Horman
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-12-08  0:42 UTC (permalink / raw)
  To: Sergei Shtylyov; +Cc: netdev, linux-sh

On Tue, Dec 08, 2015 at 12:40:19AM +0300, Sergei Shtylyov wrote:
> The MDIO control bits are always mapped to the same bits of the same register
> (PIR), so there's no need to store their masks in the 'struct bb_info'...
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/3] sh_eth: factor out common code from MDIO bitbang methods
  2015-12-07 21:39 [PATCH 0/3] sh_eth: optimize MDIO code Sergei Shtylyov
  2015-12-07 21:40 ` [PATCH 1/3] sh_eth: remove mask fields from 'struct bb_info' Sergei Shtylyov
@ 2015-12-07 21:40 ` Sergei Shtylyov
  2015-12-08  0:42   ` Simon Horman
  2015-12-07 21:41 ` [PATCH 3/3] sh_eth: get rid of bb_{set|clr|read}() Sergei Shtylyov
  2015-12-09  2:56 ` [PATCH 0/3] sh_eth: optimize MDIO code David Miller
  3 siblings, 1 reply; 8+ messages in thread
From: Sergei Shtylyov @ 2015-12-07 21:40 UTC (permalink / raw)
  To: netdev; +Cc: linux-sh

sh_mm[cd]_ctrl()  and sh_set_mdio() all look mostly the same -- factor out
their common code and put it into sh_mdio_ctrl().

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
 drivers/net/ethernet/renesas/sh_eth.c |   35 +++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net-next/drivers/net/ethernet/renesas/sh_eth.c
@@ -1033,32 +1033,29 @@ static int bb_read(void *addr, u32 msk)
 	return (ioread32(addr) & msk) != 0;
 }
 
-/* Data I/O pin control */
-static void sh_mmd_ctrl(struct mdiobb_ctrl *ctrl, int bit)
+static void sh_mdio_ctrl(struct mdiobb_ctrl *ctrl, u32 mask, int set)
 {
 	struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl);
 
 	if (bitbang->set_gate)
 		bitbang->set_gate(bitbang->addr);
 
-	if (bit)
-		bb_set(bitbang->addr, PIR_MMD);
+	if (set)
+		bb_set(bitbang->addr, mask);
 	else
-		bb_clr(bitbang->addr, PIR_MMD);
+		bb_clr(bitbang->addr, mask);
+}
+
+/* Data I/O pin control */
+static void sh_mmd_ctrl(struct mdiobb_ctrl *ctrl, int bit)
+{
+	sh_mdio_ctrl(ctrl, PIR_MMD, bit);
 }
 
 /* Set bit data*/
 static void sh_set_mdio(struct mdiobb_ctrl *ctrl, int bit)
 {
-	struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl);
-
-	if (bitbang->set_gate)
-		bitbang->set_gate(bitbang->addr);
-
-	if (bit)
-		bb_set(bitbang->addr, PIR_MDO);
-	else
-		bb_clr(bitbang->addr, PIR_MDO);
+	sh_mdio_ctrl(ctrl, PIR_MDO, bit);
 }
 
 /* Get bit data*/
@@ -1075,15 +1072,7 @@ static int sh_get_mdio(struct mdiobb_ctr
 /* MDC pin control */
 static void sh_mdc_ctrl(struct mdiobb_ctrl *ctrl, int bit)
 {
-	struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl);
-
-	if (bitbang->set_gate)
-		bitbang->set_gate(bitbang->addr);
-
-	if (bit)
-		bb_set(bitbang->addr, PIR_MDC);
-	else
-		bb_clr(bitbang->addr, PIR_MDC);
+	sh_mdio_ctrl(ctrl, PIR_MDC, bit);
 }
 
 /* mdio bus control struct */


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/3] sh_eth: factor out common code from MDIO bitbang methods
  2015-12-07 21:40 ` [PATCH 2/3] sh_eth: factor out common code from MDIO bitbang methods Sergei Shtylyov
@ 2015-12-08  0:42   ` Simon Horman
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-12-08  0:42 UTC (permalink / raw)
  To: Sergei Shtylyov; +Cc: netdev, linux-sh

On Tue, Dec 08, 2015 at 12:40:57AM +0300, Sergei Shtylyov wrote:
> sh_mm[cd]_ctrl()  and sh_set_mdio() all look mostly the same -- factor out
> their common code and put it into sh_mdio_ctrl().
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Acked-by: Simon Horman <horms+renesas@verge.net.au>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 3/3] sh_eth: get rid of bb_{set|clr|read}()
  2015-12-07 21:39 [PATCH 0/3] sh_eth: optimize MDIO code Sergei Shtylyov
  2015-12-07 21:40 ` [PATCH 1/3] sh_eth: remove mask fields from 'struct bb_info' Sergei Shtylyov
  2015-12-07 21:40 ` [PATCH 2/3] sh_eth: factor out common code from MDIO bitbang methods Sergei Shtylyov
@ 2015-12-07 21:41 ` Sergei Shtylyov
  2015-12-08  0:42   ` Simon Horman
  2015-12-09  2:56 ` [PATCH 0/3] sh_eth: optimize MDIO code David Miller
  3 siblings, 1 reply; 8+ messages in thread
From: Sergei Shtylyov @ 2015-12-07 21:41 UTC (permalink / raw)
  To: netdev; +Cc: linux-sh

After the MDIO bitbang code consolidation, there's no need anymore for
bb_{set|clr}() as well as bb_read() -- just expand them inline, thus
saving more LoCs...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
 drivers/net/ethernet/renesas/sh_eth.c |   27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net-next/drivers/net/ethernet/renesas/sh_eth.c
@@ -1015,35 +1015,20 @@ struct bb_info {
 	void *addr;
 };
 
-/* PHY bit set */
-static void bb_set(void *addr, u32 msk)
-{
-	iowrite32(ioread32(addr) | msk, addr);
-}
-
-/* PHY bit clear */
-static void bb_clr(void *addr, u32 msk)
-{
-	iowrite32((ioread32(addr) & ~msk), addr);
-}
-
-/* PHY bit read */
-static int bb_read(void *addr, u32 msk)
-{
-	return (ioread32(addr) & msk) != 0;
-}
-
 static void sh_mdio_ctrl(struct mdiobb_ctrl *ctrl, u32 mask, int set)
 {
 	struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl);
+	u32 pir;
 
 	if (bitbang->set_gate)
 		bitbang->set_gate(bitbang->addr);
 
+	pir = ioread32(bitbang->addr);
 	if (set)
-		bb_set(bitbang->addr, mask);
+		pir |=  mask;
 	else
-		bb_clr(bitbang->addr, mask);
+		pir &= ~mask;
+	iowrite32(pir, bitbang->addr);
 }
 
 /* Data I/O pin control */
@@ -1066,7 +1051,7 @@ static int sh_get_mdio(struct mdiobb_ctr
 	if (bitbang->set_gate)
 		bitbang->set_gate(bitbang->addr);
 
-	return bb_read(bitbang->addr, PIR_MDI);
+	return (ioread32(bitbang->addr) & PIR_MDI) != 0;
 }
 
 /* MDC pin control */

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] sh_eth: get rid of bb_{set|clr|read}()
  2015-12-07 21:41 ` [PATCH 3/3] sh_eth: get rid of bb_{set|clr|read}() Sergei Shtylyov
@ 2015-12-08  0:42   ` Simon Horman
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-12-08  0:42 UTC (permalink / raw)
  To: Sergei Shtylyov; +Cc: netdev, linux-sh

On Tue, Dec 08, 2015 at 12:41:43AM +0300, Sergei Shtylyov wrote:
> After the MDIO bitbang code consolidation, there's no need anymore for
> bb_{set|clr}() as well as bb_read() -- just expand them inline, thus
> saving more LoCs...
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/3] sh_eth: optimize MDIO code
  2015-12-07 21:39 [PATCH 0/3] sh_eth: optimize MDIO code Sergei Shtylyov
                   ` (2 preceding siblings ...)
  2015-12-07 21:41 ` [PATCH 3/3] sh_eth: get rid of bb_{set|clr|read}() Sergei Shtylyov
@ 2015-12-09  2:56 ` David Miller
  3 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2015-12-09  2:56 UTC (permalink / raw)
  To: sergei.shtylyov; +Cc: netdev, linux-sh

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Tue, 08 Dec 2015 00:39:03 +0300

>    Here's a set of 3 patches against DaveM's 'net-next.git' repo
> which gets rid of ~35 LoCs in the MDIO bitbang methods.

Series applied, thanks!

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2015-12-09  2:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-07 21:39 [PATCH 0/3] sh_eth: optimize MDIO code Sergei Shtylyov
2015-12-07 21:40 ` [PATCH 1/3] sh_eth: remove mask fields from 'struct bb_info' Sergei Shtylyov
2015-12-08  0:42   ` Simon Horman
2015-12-07 21:40 ` [PATCH 2/3] sh_eth: factor out common code from MDIO bitbang methods Sergei Shtylyov
2015-12-08  0:42   ` Simon Horman
2015-12-07 21:41 ` [PATCH 3/3] sh_eth: get rid of bb_{set|clr|read}() Sergei Shtylyov
2015-12-08  0:42   ` Simon Horman
2015-12-09  2:56 ` [PATCH 0/3] sh_eth: optimize MDIO code David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).