From patchwork Wed Jan 7 16:40:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 17157 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 30D63DE3FA for ; Thu, 8 Jan 2009 03:40:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753093AbZAGQkp (ORCPT ); Wed, 7 Jan 2009 11:40:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752403AbZAGQkp (ORCPT ); Wed, 7 Jan 2009 11:40:45 -0500 Received: from fk-out-0910.google.com ([209.85.128.191]:56379 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752283AbZAGQko (ORCPT ); Wed, 7 Jan 2009 11:40:44 -0500 Received: by fk-out-0910.google.com with SMTP id 18so4220704fkq.5 for ; Wed, 07 Jan 2009 08:40:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:date:subject :mime-version:x-uid:x-length:to:content-type :content-transfer-encoding:content-disposition:message-id; bh=WD75VKdlBn7gdL42NYiJ2nKcciXOmgnQPE60kODozkk=; b=j54jddFRaLmV6Fen8+C/WConMpUt9RbIbDGFfk685X9CRDlTmTV0180V0ZYdWW5jPZ aB0eizTrW+6HVpCnkQSit7d75BAyWFnKklN4yZGT2kVkNhMYP/7uUdW+/2LsbwCvYwvH nYqm6EomaRZPU0uvxR5WgayqYuT266FM69AyE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:date:subject:mime-version:x-uid:x-length:to :content-type:content-transfer-encoding:content-disposition :message-id; b=xGqj7MRL4VfRNd4vCsvkFQvbb4m0TpiR2uv9+GVl83JUat9SuW08ZTRxa8ApMO2wA+ HKVNx4YlKdIcxwTPWI8OvNZ55G040t5EV7tJJjSb8q5+iOKrKo9dlWF9tvNZdV3IvKmT GO3U8M1nZL2D5eKVvJ0yW+U5D0Sbad7QnUhgk= Received: by 10.103.214.8 with SMTP id r8mr8353232muq.92.1231346441323; Wed, 07 Jan 2009 08:40:41 -0800 (PST) Received: from ?192.168.100.218? ([157.159.37.3]) by mx.google.com with ESMTPS id y6sm27362262mug.32.2009.01.07.08.40.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 07 Jan 2009 08:40:40 -0800 (PST) From: Florian Fainelli Date: Wed, 7 Jan 2009 17:40:37 +0100 Subject: [PATCH 2/4] r6040: check PHY status when bringing interface up MIME-Version: 1.0 X-UID: 23 X-Length: 1490 To: David Miller , Jeff Garzik , netdev@vger.kernel.org Content-Disposition: inline Message-Id: <200901071740.38060.florian@openwrt.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Florian Fainelli Subject: [PATCH 2/4] r6040: check PHY status when bringing interface up This patch makes the driver properly initialize the PHY status if not correctly set by the bootloader/BIOS. It prevents some boards to bring up the link on boot. Signed-off-by: Florian Fainelli --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 3e685d7..a59efbd 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -1107,6 +1107,10 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, err = -EIO; goto err_out_free_res; } + /* If PHY status change register is still set to zero it means the + * bootloader didn't initialize it */ + if (ioread16(ioaddr + PHY_CC) == 0) + iowrite16(0x9f07, ioaddr + PHY_CC); /* Init system & device */ lp->base = ioaddr;