netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: Santwona.Behera@Sun.COM
Cc: netdev@vger.kernel.org, Matheos.Worku@Sun.COM
Subject: Re: PATCH[1/1] NIU: Add Sun CP3260 ATCA blade support
Date: Fri, 14 Nov 2008 14:45:21 -0800 (PST)	[thread overview]
Message-ID: <20081114.144521.56971719.davem@davemloft.net> (raw)
In-Reply-To: <491DB3B4.5010805@Sun.COM>

From: Santwona.Behera@Sun.COM
Date: Fri, 14 Nov 2008 09:21:56 -0800

> This patch adds support for the Sun CP3260 ATCA blade which is
> a N2 based ATCA blade with 2 NIU ports. The NIU ports do not
> have on-board PHY.

This patch looks great.

I've made some extremely minor coding style fixups, and applied
this patch to net-2.6  Interdiff is below.

Thank you!

--- drivers/net/niu.c~	2008-11-14 14:36:52.000000000 -0800
+++ drivers/net/niu.c	2008-11-14 14:40:33.000000000 -0800
@@ -446,12 +446,12 @@ static int serdes_init_niu_10g_fiber(str
 static int serdes_init_niu_1g_serdes(struct niu *np)
 {
 	struct niu_link_config *lp = &np->link_config;
-	u32 tx_cfg, rx_cfg;
 	u16 pll_cfg, pll_sts;
+	int max_retry = 100;
+	u64 sig, mask, val;
+	u32 tx_cfg, rx_cfg;
 	unsigned long i;
 	int err;
-	u64 sig, mask, val;
-	int max_retry = 100;
 
 	tx_cfg = (PLL_TX_CFG_ENTX | PLL_TX_CFG_SWING_1375MV |
 		  PLL_TX_CFG_RATE_HALF);
@@ -545,12 +545,11 @@ static int serdes_init_niu_1g_serdes(str
 static int serdes_init_niu_10g_serdes(struct niu *np)
 {
 	struct niu_link_config *lp = &np->link_config;
-	u32 tx_cfg, rx_cfg;
-	u32 pll_cfg, pll_sts;
+	u32 tx_cfg, rx_cfg, pll_cfg, pll_sts;
+	int max_retry = 100;
+	u64 sig, mask, val;
 	unsigned long i;
 	int err;
-	u64 sig, mask, val;
-	int max_retry = 100;
 
 	tx_cfg = (PLL_TX_CFG_ENTX | PLL_TX_CFG_SWING_1375MV);
 	rx_cfg = (PLL_RX_CFG_ENRX | PLL_RX_CFG_TERM_0P8VDDT |
@@ -643,7 +642,6 @@ static int serdes_init_niu_10g_serdes(st
 	}
 
 	if ((sig & mask) != val) {
-
 		pr_info(PFX "NIU Port %u signal bits [%08x] are not "
 			"[%08x] for 10G...trying 1G\n",
 			np->port, (int) (sig & mask), (int) val);
@@ -2428,11 +2426,11 @@ static int niu_determine_phy_disposition
 		case NIU_FLAGS_10G | NIU_FLAGS_XCVR_SERDES:
 			/* 10G Serdes */
 			tp = &phy_template_niu_10g_serdes;
-		      break;
+			break;
 		case NIU_FLAGS_XCVR_SERDES:
 			/* 1G Serdes */
 			tp = &phy_template_niu_1g_serdes;
-		      break;
+			break;
 		case NIU_FLAGS_10G | NIU_FLAGS_FIBER:
 			/* 10G Fiber */
 		default:

      reply	other threads:[~2008-11-14 22:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-14 17:21 PATCH[1/1] NIU: Add Sun CP3260 ATCA blade support Santwona.Behera
2008-11-14 22:45 ` David Miller [this message]

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=20081114.144521.56971719.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=Matheos.Worku@Sun.COM \
    --cc=Santwona.Behera@Sun.COM \
    --cc=netdev@vger.kernel.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 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).