Netdev List
 help / color / mirror / Atom feed
* Re: linux-next: manual merge of the security-testing tree with the net tree
From: James Morris @ 2011-01-09 22:48 UTC (permalink / raw)
  To: Casey Schaufler
  Cc: Stephen Rothwell, linux-next, linux-kernel, David Miller, netdev
In-Reply-To: <4D2666D0.9060802@schaufler-ca.com>

On Thu, 6 Jan 2011, Casey Schaufler wrote:

> On 1/6/2011 4:44 PM, Stephen Rothwell wrote:
> > Hi James,
> >
> > Today's linux-next merge of the security-testing tree got a conflict in
> > security/smack/smack_lsm.c between commit
> > 3610cda53f247e176bcbb7a7cca64bc53b12acdb ("af_unix: Avoid socket->sk NULL
> > OOPS in stream connect security hooks") from the net tree and commit
> > b4e0d5f0791bd6dd12a1c1edea0340969c7c1f90 ("Smack: UDS revision") from the
> > security-testing tree.
> >
> > I fixed it up (I think - see below) and can carry the fix as necessary.
> 
> The change looks like it addresses the change in interface. Thank you.

Thanks, applied.


-- 
James Morris
<jmorris@namei.org>

^ permalink raw reply

* Re: [PATCH] Cleanup include/net/tcp.h include-files and coding-style
From: Christoph Paasch @ 2011-01-09 23:06 UTC (permalink / raw)
  To: Alexey Dobriyan; +Cc: davem, netdev, linux-kernel
In-Reply-To: <201101092339.32378.christoph.paasch@uclouvain.be>


On Sunday, January 09, 2011 wrote Christoph Paasch:
> BTW: shouldn't linux/tcp.h include linux/dmaengine.h ? It has a reference
> to "struct dma_pinned_list"
Ups, sorry for that. The include is at line 209.

I just looked at the head of linux/tcp.h ;)

Christoph

--
Christoph Paasch
PhD Student

IP Networking Lab --- http://inl.info.ucl.ac.be
MultiPath TCP in the Linux Kernel --- http://inl.info.ucl.ac.be/mptcp
Université Catholique de Louvain

www.rollerbulls.be
--

^ permalink raw reply

* Re: [PATCH] Cleanup include/net/tcp.h include-files and coding-style
From: Ben Hutchings @ 2011-01-09 23:06 UTC (permalink / raw)
  To: christoph.paasch; +Cc: Randy Dunlap, davem, netdev, linux-kernel
In-Reply-To: <201101092333.19406.christoph.paasch@uclouvain.be>

On Sun, 2011-01-09 at 23:33 +0100, Christoph Paasch wrote:
> On Sunday, January 09, 2011 wrote Ben Hutchings:
> > The cost of repeated inclusion is minimal.  GCC's preprocessor
> > recognises when the entire content of a file is conditional on #ifndef
> > FOO and will not even open it again if FOO is defined.
> Thanks, I did not knew about that.
> 
> > If a file directly references definitions that are supposed to be
> > provided by a certain header, changing it to rely on indirect inclusion
> > of that header generally does *not* aid maintenance.
> But then, to be coherent, we would need to add the following includes (and I'm 
> even not 100% sure if it's all we need):
> 
> linux/percpu_counter.h (needed for percpu_counter_sum_positive)

Yes.

> linux/mm_types.h (needed for struct page)
> linux/aio.h (needed for struct kiocb)
> net/inet_sock.h (needed for struct ip_options)
> linux/pipe_fs_i.h (needed for struct pipe_inode_info)
> linux/poll.h (needed for struct poll_table_struct)

Or declarations of those structs.

> linux/compiler.h (needed for __percpu)
[...]

Yes.

Ben.

-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

^ permalink raw reply

* GIT trees refreshed
From: David Miller @ 2011-01-09 23:39 UTC (permalink / raw)
  To: sparclinux; +Cc: netdev, linux-wireless, netfilter-devel


I've synchronized all of my GIT trees to be uptodate with Linus's
tree.

Right now net-2.6 and sparc-2.6 are active for bug fixes.

The "-next" trees will become active once Linus releases 2.6.38-rc1

^ permalink raw reply

* Re: [PATCH v4 00/10] net/fec: add dual fec support for i.MX28
From: David Miller @ 2011-01-09 23:44 UTC (permalink / raw)
  To: shawn.guo
  Cc: gerg, baruch, eric, bryan.wu, r64343, B32542, u.kleine-koenig, lw,
	w.sang, s.hauer, jamie, jamie, netdev, linux-arm-kernel
In-Reply-To: <1294297998-26930-1-git-send-email-shawn.guo@freescale.com>

From: Shawn Guo <shawn.guo@freescale.com>
Date: Thu, 6 Jan 2011 15:13:08 +0800

> This patch series is to add dual fec support for mx28, which is
> a mxs-based soc. Some code changes related to the following commits
> are also made in this patch set for some reasons.
> 
>  e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8
>  netdev/fec.c: add phylib supporting to enable carrier detection (v2)
> 
>  e3fe8558c7fc182972c3d947d88744482111f304
>  net/fec: fix pm to survive to suspend/resume
> 
> It's been tested on mx28 evk and mx51 babbage. For mx28, it has
> to work against the tree
> 
>  git://git.pengutronix.de/git/imx/linux-2.6.git imx-for-2.6.38
> 
> plus patch
> 
>  [PATCH v4] ARM: mxs: Change duart device to use amba-pl011
> 
> The 3 patches below preceding with * have changes since v3, and
> the detailed change log can be found in individual patch.

I've applied all of the "net/fec:" patches (#1 to #5) to net-2.6,
please push the ARM changes via the appropriate ARM tree.

Thanks.

^ permalink raw reply

* Re: [PATCH v2] Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory.
From: David Miller @ 2011-01-09 23:46 UTC (permalink / raw)
  To: jj; +Cc: chas, linux-atm-general, netdev, linux-kernel
In-Reply-To: <alpine.LNX.2.00.1101092229160.633@swampdragon.chaosbits.net>

From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 9 Jan 2011 22:32:38 +0100 (CET)

> Failure to call release_firmware() will result in memory leak in
> drivers/atm/ambassador.c::ucode_init().
> This patch makes sure we always call release_firmware() when needed, 
> thus removing the leak(s).
> 
> Yes, I know checkpatch complains about this patch, but it was either that 
> or completely mess up the existing style, so I opted to use the existing 
> style and live with the checkpatch related flak.
> 
> 
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>

Applied.

^ permalink raw reply

* Re: [PATCH] hamradio: Resolve memory leak due to missing firmware release in add_mcs()
From: David Miller @ 2011-01-09 23:46 UTC (permalink / raw)
  To: jj; +Cc: linux-kernel, netdev, linux-hams, jpr, frible, sailer
In-Reply-To: <alpine.LNX.2.00.1101062146430.13988@swampdragon.chaosbits.net>

From: Jesper Juhl <jj@chaosbits.net>
Date: Thu, 6 Jan 2011 21:50:29 +0100 (CET)

> 
> Failure to release_firmware() in drivers/net/hamradio/yam.c::add_mcs() 
> causes memory leak.
> This patch should fix it.
> 
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>

Applied.

^ permalink raw reply

* Re: [PATCH net-2.6 1/5] bnx2x: Don't prevent RSS configuration in INT#x and MSI interrupt modes.
From: David Miller @ 2011-01-09 23:49 UTC (permalink / raw)
  To: vladz; +Cc: netdev, eilong
In-Reply-To: <1294575580.31551.12.camel@lb-tlvb-vladz>

From: "Vladislav Zolotarov" <vladz@broadcom.com>
Date: Sun, 9 Jan 2011 14:19:40 +0200

> Don't prevent RSS configuration in INT#x and MSI interrupt modes. Otherwise
> Rx hash key won't be available.
> 
> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>

Applied.

^ permalink raw reply

* Re: [PATCH net-2.6 2/5] bnx2x: registers dump fixes
From: David Miller @ 2011-01-09 23:49 UTC (permalink / raw)
  To: vladz; +Cc: netdev, eilong
In-Reply-To: <1294575604.31551.16.camel@lb-tlvb-vladz>

From: "Vladislav Zolotarov" <vladz@broadcom.com>
Date: Sun, 9 Jan 2011 14:20:04 +0200

> Fixes in registers dump:
>         - Properly calculate dump length for 57712.
>         - Prevent HW blocks parity attentions when dumping registers in order to
> prevent false parity errors handling.
>         - Update the bnx2x_dump.h file: old one had a few bugs that could cause
> fatal HW error as a result of a registers dump.
> 
> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>

Applied.

^ permalink raw reply

* Re: [PATCH net-2.6 3/5] bnx2x: Move to D0 before clearing MSI/MSI-X configuration.
From: David Miller @ 2011-01-09 23:49 UTC (permalink / raw)
  To: vladz; +Cc: netdev, eilong
In-Reply-To: <1294575619.31551.17.camel@lb-tlvb-vladz>

From: "Vladislav Zolotarov" <vladz@broadcom.com>
Date: Sun, 9 Jan 2011 14:20:19 +0200

> Move to D0 before clearing MSI/MSI-X configuration. Otherwise MSI/MSI-X
> won't be cleared.
> 
> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>

Applied.

^ permalink raw reply

* Re: [PATCH net-2.6 4/5] bnx2x: Fix the race on bp->stats_pending.
From: David Miller @ 2011-01-09 23:49 UTC (permalink / raw)
  To: vladz; +Cc: netdev, eilong
In-Reply-To: <1294575634.31551.18.camel@lb-tlvb-vladz>

From: "Vladislav Zolotarov" <vladz@broadcom.com>
Date: Sun, 9 Jan 2011 14:20:34 +0200

> Fix the race on bp->stats_pending between the timer and a LINK_UP event
> handler.
> 
> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>

Applied.

^ permalink raw reply

* Re: [PATCH net-2.6 5/5] bnx2x: Update version to 1.60.01-1
From: David Miller @ 2011-01-09 23:50 UTC (permalink / raw)
  To: vladz; +Cc: netdev, eilong
In-Reply-To: <1294575646.31551.20.camel@lb-tlvb-vladz>

From: "Vladislav Zolotarov" <vladz@broadcom.com>
Date: Sun, 9 Jan 2011 14:20:46 +0200

> Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>

You made these patches against net-2.6 which was inactive for nearly
a full week as we were largely into the merge window.

I applied these, but since the version number of the driver is now
1.62.x I skipped this last patch.

^ permalink raw reply

* Re: [PATCH 1/2] sky2: fix limited auto negotiation
From: David Miller @ 2011-01-09 23:53 UTC (permalink / raw)
  To: shemminger; +Cc: m.hariri, netdev
In-Reply-To: <20110106204036.1e45e982@nehalam>

From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 6 Jan 2011 20:40:36 -0800

> The sky2 driver would always try all possible supported speeds even
> if the user only asked for a limited set of speed/duplex combinations.
> 
> Reported-by: Mohsen Hariri <m.hariri@gmail.com>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.

^ permalink raw reply

* Re: [PATCH 2/2] sky2: convert to new VLAN model (v0.2)
From: David Miller @ 2011-01-09 23:54 UTC (permalink / raw)
  To: jesse; +Cc: shemminger, netdev
In-Reply-To: <AANLkTimyfSJwgcDOQK2hpWdJ08CNCerLM=0+NBA6+VZd@mail.gmail.com>

From: Jesse Gross <jesse@nicira.com>
Date: Sun, 9 Jan 2011 11:13:31 -0500

> On Fri, Jan 7, 2011 at 11:13 PM, Stephen Hemminger
> <shemminger@vyatta.com> wrote:
>> This converts sky2 to new VLAN offload flags control via ethtool.
>> It also allows for transmit offload of vlan tagged frames which
>> was not possible before.
>>
>> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
>>
>> ---
>> Changed the setting of vlan_features in this version to keep
>> non-offload settings (GRO|HIGHDMA) even if vlan offload is not
>> enabled.
> 
> Thanks Stephen.
> 
> Reviewed-by: Jesse Gross <jesse@nicira.com>

Applied, thanks everyone.

^ permalink raw reply

* Re: net-next-2.6 [PATCH 0/3] dccp: several sequence-number validation fixes
From: David Miller @ 2011-01-10  0:17 UTC (permalink / raw)
  To: gerrit; +Cc: dccp, netdev
In-Reply-To: <1294400130-5604-1-git-send-email-gerrit@erg.abdn.ac.uk>

From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Fri,  7 Jan 2011 12:35:27 +0100

> Hi Dave,
> 
> please find attached 3 bug fixes which recently came up on dccp@vger.
> 
>  Patch #1: fixes a bug which wrongly classified sequence-invalid packets. 
>  Patch #2: fixes a bug in updating the Greatest Sequence number Received (GSR).
>  Patch #3: fixes an inconsistency in setting the sequence window on 32/64 bit.
> 
> I have also placed this in into a fresh (today's) copy of net-next-2.6, on
> 
>     git://eden-feed.erg.abdn.ac.uk/net-next-2.6        [subtree 'dccp']

Pulled, thanks a lot Gerrit.

^ permalink raw reply

* Re: [PATCH] forcedeth: Do not use legacy PCI power management
From: David Miller @ 2011-01-10  0:20 UTC (permalink / raw)
  To: rjw; +Cc: netdev, linux-kernel, linux-pm
In-Reply-To: <201101072212.05449.rjw@sisk.pl>

From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Fri, 7 Jan 2011 22:12:05 +0100

> Subject: forcedeth: Do not use legacy PCI power management (v2)
> 
> The forcedeth driver uses the legacy PCI power management, so it has
> to do PCI-specific things in its ->suspend() and ->resume() callbacks
> and some of them are not done correctly.
> 
> Convert forcedeth to the new PCI power management framework and make
> it let the PCI subsystem take care of all the PCI-specific aspects of
> device handling during system power transitions.
> 
> Tested with nVidia Corporation MCP55 Ethernet (rev a2).
> 
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

Applied, thanks.

^ permalink raw reply

* Re: [patch] Re: genetlink misinterprets NEW as GET
From: David Miller @ 2011-01-10  0:25 UTC (permalink / raw)
  To: pablo; +Cc: jengelh, blp, netfilter-devel, netdev
In-Reply-To: <4D271614.6000303@netfilter.org>

From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 07 Jan 2011 14:33:08 +0100

> On 07/01/11 14:15, Jan Engelhardt wrote:
>> netlink: test for all flags of the NLM_F_DUMP composite
>> 
>> Due to NLM_F_DUMP is composed of two bits, NLM_F_ROOT | NLM_F_MATCH,
>> when doing "if (x & NLM_F_DUMP)", it tests for _either_ of the bits
>> being set. Because NLM_F_MATCH's value overlaps with NLM_F_EXCL,
>> non-dump requests with NLM_F_EXCL set are mistaken as dump requests.
>> 
>> Substitute the condition to test for _all_ bits being set.
>> 
>> Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
> 
> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>

Applied, and queued up for -stable, thanks guys!

^ permalink raw reply

* Re: [PATCH 6/6] net: fix kernel-doc warning in core/filter.c
From: David Miller @ 2011-01-10  0:27 UTC (permalink / raw)
  To: randy.dunlap; +Cc: netdev, torvalds
In-Reply-To: <20110108194142.22a0c3d8.randy.dunlap@oracle.com>

From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Sat, 8 Jan 2011 19:41:42 -0800

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix new kernel-doc notation warning in net/core/filter.c:
> 
> Warning(net/core/filter.c:172): No description found for parameter 'fentry'
> Warning(net/core/filter.c:172): Excess function parameter 'filter' description in 'sk_run_filter'
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

Applied.

^ permalink raw reply

* Re: [PATCH 4/6] net/sock.h: make some fields private to fix kernel-doc warning(s)
From: David Miller @ 2011-01-10  0:27 UTC (permalink / raw)
  To: randy.dunlap; +Cc: linux-kernel, torvalds, netdev
In-Reply-To: <20110108193921.e03ca09e.randy.dunlap@oracle.com>

From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Sat, 8 Jan 2011 19:39:21 -0800

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix new kernel-doc notation warning in sock.h by annotating skc_dontcopy_*
> as private fields.
> 
> Warning(include/net/sock.h:163): No description found for parameter 'skc_dontcopy_end[0]'
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

Applied.

^ permalink raw reply

* Re: [patch] phonet: some signedness bugs
From: David Miller @ 2011-01-10  0:45 UTC (permalink / raw)
  To: error27; +Cc: remi.denis-courmont, netdev, kernel-janitors, dan.j.rosenberg
In-Reply-To: <20110107203755.GB1959@bicker>

From: Dan Carpenter <error27@gmail.com>
Date: Fri, 7 Jan 2011 23:37:55 +0300

> Dan Rosenberg pointed out that there were some signed comparison bugs
> in the phonet protocol.
> 
> http://marc.info/?l=full-disclosure&m=129424528425330&w=2
> 
> If you have already have CAP_SYS_ADMIN then you could use the bugs to
> get root, or someone could cause an oops by mistake.
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>

Applied and queued up for -stable, thanks Dan.

^ permalink raw reply

* Re: [patch] phonet: some signedness bugs
From: David Miller @ 2011-01-10  2:13 UTC (permalink / raw)
  To: error27; +Cc: remi.denis-courmont, netdev, kernel-janitors, dan.j.rosenberg
In-Reply-To: <20110109.164548.58428218.davem@davemloft.net>

From: David Miller <davem@davemloft.net>
Date: Sun, 09 Jan 2011 16:45:48 -0800 (PST)

> From: Dan Carpenter <error27@gmail.com>
> Date: Fri, 7 Jan 2011 23:37:55 +0300
> 
>> Dan Rosenberg pointed out that there were some signed comparison bugs
>> in the phonet protocol.
>> 
>> http://marc.info/?l=full-disclosure&m=129424528425330&w=2
>> 
>> If you have already have CAP_SYS_ADMIN then you could use the bugs to
>> get root, or someone could cause an oops by mistake.
>> 
>> Signed-off-by: Dan Carpenter <error27@gmail.com>
> 
> Applied and queued up for -stable, thanks Dan.

Actually I'm reverting this.

You can't change the prototype of pn_socket_create() because if you do
then it doesn't match up with the prototype required by
net_proto_family->create().

You didn't see this warning in your build?

net/phonet/af_phonet.c:124:2: warning: initialization from incompatible pointer type

^ permalink raw reply

* Re: [GIT] Networking
From: David Miller @ 2011-01-10  2:15 UTC (permalink / raw)
  To: romieu; +Cc: torvalds, benh, hayeswang, dwmw2, akpm, netdev, linux-kernel
In-Reply-To: <20110108121726.GA2216@electric-eye.fr.zoreil.com>

From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sat, 8 Jan 2011 13:17:26 +0100

> r8169: delay phy init until device opens.
> 
> It workarounds the 60s firmware load failure timeout for the
> non-modular case.
> 
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Applied, thanks.

^ permalink raw reply

* [PATCH] iwmc3200wifi: Return proper error for iwm_if_alloc
From: Axel Lin @ 2011-01-10  2:26 UTC (permalink / raw)
  To: linux-kernel
  Cc: Samuel Ortiz, Intel Linux Wireless, Zhu Yi, John W. Linville,
	linux-wireless, netdev

In the case of alloc_netdev_mq failure and kmalloc failure,
current implementation returns ERR_PTR(0).

As a result, the caller of iwm_if_alloc does not catch the error by IS_ERR
macro. Fix it by setting proper error code for ret variable in the failure
cases.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/net/wireless/iwmc3200wifi/netdev.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c
index 13a69eb..5091d77 100644
--- a/drivers/net/wireless/iwmc3200wifi/netdev.c
+++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
@@ -126,6 +126,7 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev,
 	ndev = alloc_netdev_mq(0, "wlan%d", ether_setup, IWM_TX_QUEUES);
 	if (!ndev) {
 		dev_err(dev, "no memory for network device instance\n");
+		ret = -ENOMEM;
 		goto out_priv;
 	}
 
@@ -138,6 +139,7 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev,
 				    GFP_KERNEL);
 	if (!iwm->umac_profile) {
 		dev_err(dev, "Couldn't alloc memory for profile\n");
+		ret = -ENOMEM;
 		goto out_profile;
 	}
 
-- 
1.7.2

^ permalink raw reply related

* RE: [PATCH] net/r8169: Update the function of parsing firmware
From: hayeswang @ 2011-01-10  2:25 UTC (permalink / raw)
  To: 'Ben Hutchings'; +Cc: romieu, netdev, linux-kernel
In-Reply-To: <20110107151755.GN3702@decadent.org.uk>

> From: Ben Hutchings [mailto:benh@debian.org] 
> Sent: Friday, January 07, 2011 11:18 PM
> To: Hayeswang
> Cc: romieu@fr.zoreil.com; netdev@vger.kernel.org; 
> linux-kernel@vger.kernel.org
> Subject: Re: [PATCH] net/r8169: Update the function of 
> parsing firmware
> 
> On Fri, 2011-01-07 at 17:45 +0800, Hayes Wang wrote:
> > Update rtl_phy_write_fw function. The new function could parse the 
> > complex firmware which is used by RTL8111E and later.
> > The new firmware may read data and do some operations, not just do 
> > writing only.
> > 
> > Signed-off-by: Hayes Wang <hayeswang@realtek.com>
> > ---
> >  drivers/net/r8169.c |  112 
> > ++++++++++++++++++++++++++++++++++++++++++++-------
> >  1 files changed, 97 insertions(+), 15 deletions(-)
> > 
> > diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 
> > 27a7c20..2115424 100644
> > --- a/drivers/net/r8169.c
> > +++ b/drivers/net/r8169.c
> [...] 
> > -	while (i-- != 0) {
> > -		u32 action = le32_to_cpu(*phytable);
> > -		u32 data = action & 0x0000ffff;
> > -		u32 reg = (action & 0x0fff0000) >> 16;
> > +	predata = 0;
> > +	count = 0;
> > +
> > +	for (index = 0; index < fw->size / sizeof(*phytable); ) {
> > +		u32 action = le32_to_cpu(phytable[index]);
> > +		u32 data = action & 0x0000FFFF;
> > +		u32 regno = (action & 0x0FFF0000) >> 16;
> > +
> > +		if (!action)
> > +			break;
> >  
> > -		switch(action & 0xf0000000) {
> > +		switch(action & 0xF0000000) {
> [...]
> > +		case PHY_BJMPN:
> > +			index -= regno;
> > +			break;
> [...]
> 
> I'm concerned that this is being extended from a firmware 
> upload interface to a quite general interpreter for PHY 
> initialisation.  I realise that this will make it easier to 
> fix PHY firmware bugs in future but it also allows you to 
> accidentally introduce infinite loops.
> The initialisation programs will obviously not be subject to 
> the same sort of review on netdev that new C code is.
> 
I know the situation which you worry. However, the real action is depend to the
status of the hardware, and it is hard that I couldn't assume any situation to
check the firmware. Thus, I just check if every commands are valid. I could only
promise that there is no infinite loop if the firmware is correct.

> > +		case PHY_DELAY_MS:
> > +			mdelay(data);
> > +			index++;
> > +			break;
> 
> Why mdelay() and not msleep()?  This is not an atomic context.
> 
Accounding to the document, the msleep have to larger than 10ms. It would run
more than 10ms if you set less than 10 for msleep. I think it takes more delay
than which I need. Beside, I don't sure if it would be run during atomic
context, so I think using mdelay is safer.

> > +		case PHY_READ_MAC_BYTE:
> > +		case PHY_WRITE_MAC_BYTE:
> > +		case PHY_WRITE_ERI_WORD:
> >  		default:
> >  			BUG();
> >  		}
> > +
> > +		if (index < 0)
> > +			BUG();
> [...]
> 
> index is unsigned so it can't be < 0.  It looks like the loop 
> condition should catch an out-of-range index, but really the 
> range-checking should be done in the first loop.
> 
I would try to fix this.

> Ben.
> 
> --
> Ben Hutchings
> We get into the habit of living before acquiring the habit of 
> thinking.
>                                                               
> - Albert Camus
> 
> 
> ------Please consider the environment before printing this e-mail. 
> 
> 


^ permalink raw reply

* Re: [PATCH v4 00/10] net/fec: add dual fec support for i.MX28
From: Shawn Guo @ 2011-01-10  3:08 UTC (permalink / raw)
  To: David Miller
  Cc: gerg, baruch, eric, bryan.wu, r64343, B32542, u.kleine-koenig, lw,
	w.sang, s.hauer, jamie, jamie, netdev, linux-arm-kernel
In-Reply-To: <20110109.154409.242134862.davem@davemloft.net>

On Sun, Jan 09, 2011 at 03:44:09PM -0800, David Miller wrote:
> From: Shawn Guo <shawn.guo@freescale.com>
> Date: Thu, 6 Jan 2011 15:13:08 +0800
> 
> > This patch series is to add dual fec support for mx28, which is
> > a mxs-based soc. Some code changes related to the following commits
> > are also made in this patch set for some reasons.
> > 
> >  e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8
> >  netdev/fec.c: add phylib supporting to enable carrier detection (v2)
> > 
> >  e3fe8558c7fc182972c3d947d88744482111f304
> >  net/fec: fix pm to survive to suspend/resume
> > 
> > It's been tested on mx28 evk and mx51 babbage. For mx28, it has
> > to work against the tree
> > 
> >  git://git.pengutronix.de/git/imx/linux-2.6.git imx-for-2.6.38
> > 
> > plus patch
> > 
> >  [PATCH v4] ARM: mxs: Change duart device to use amba-pl011
> > 
> > The 3 patches below preceding with * have changes since v3, and
> > the detailed change log can be found in individual patch.
> 
> I've applied all of the "net/fec:" patches (#1 to #5) to net-2.6,
> please push the ARM changes via the appropriate ARM tree.
> 
> Thanks.
> 
Thanks, David.  I will ping Sascha for ARM changes.

-- 
Regards,
Shawn


^ permalink raw reply


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox