[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20081114.144521.56971719.davem@davemloft.net>
Date: Fri, 14 Nov 2008 14:45:21 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: Santwona.Behera@....COM
Cc: netdev@...r.kernel.org, Matheos.Worku@....COM
Subject: Re: PATCH[1/1] NIU: Add Sun CP3260 ATCA blade support
From: Santwona.Behera@....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:
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists