Author: apatard
Date: Wed Feb 7 17:18:31 2007
New Revision: 117244
Added:
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/DN91_sis190_sis968.patch
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/DN92_sis190_eeprom_mac.patch
Modified:
packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec
Log:
Add support for 968 bridges to the SiS190 driver
Added:
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/DN91_sis190_sis968.patch
==============================================================================
--- (empty file)
+++
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/DN91_sis190_sis968.patch
Wed Feb 7 17:18:31 2007
@@ -0,0 +1,43 @@
+Add support for reading mac adress from apc on 968 bridges
+
+
+Rtp
+---
+ drivers/net/sis190.c | 16 9 + 7 - 0 !
+ 1 files changed, 9 insertions(+), 7 deletions(-)
+
+Index: linux-2.6.17/drivers/net/sis190.c
+===================================================================
+--- linux-2.6.17.orig/drivers/net/sis190.c 2006-12-20 14:24:46.000000000
+0100
++++ linux-2.6.17/drivers/net/sis190.c 2006-12-20 14:37:37.000000000 +0100
+@@ -1588,6 +1588,7 @@ static int __devinit sis190_get_mac_addr
+ struct net_device *dev)
+ {
+ struct sis190_private *tp = netdev_priv(dev);
++ int isa_bridges_id[] = { 0x965, 0x966, 0x968 };
+ struct pci_dev *isa_bridge;
+ u8 reg, tmp8;
+ int i;
+@@ -1595,14 +1596,15 @@ static int __devinit sis190_get_mac_addr
+ net_probe(tp, KERN_INFO "%s: Read MAC address from APC.\n",
+ pci_name(pdev));
+
+- isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0965, NULL);
++ for (i = 0; i < ARRAY_SIZE(isa_bridges_id); i++) {
++ isa_bridge = pci_get_device(PCI_VENDOR_ID_SI,
isa_bridges_id[i], NULL);
++ if (isa_bridge)
++ break;
++ }
++
+ if (!isa_bridge) {
+- isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0966, NULL);
+- if (!isa_bridge) {
+- net_probe(tp, KERN_INFO "%s: Can not find ISA
bridge.\n",
+- pci_name(pdev));
+- return -EIO;
+- }
++ net_probe(tp, KERN_INFO "%s: Can not find ISA bridge.\n",
pci_name(pdev));
++ return -EIO;
+ }
+
+ /* Enable port 78h & 79h to access APC Registers. */
Added:
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/DN92_sis190_eeprom_mac.patch
==============================================================================
--- (empty file)
+++
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/DN92_sis190_eeprom_mac.patch
Wed Feb 7 17:18:31 2007
@@ -0,0 +1,30 @@
+commit 7939aae0c08412138a827e0af6f16fc19c346353
+Author: Francois Romieu <[EMAIL PROTECTED]>
+Date: Thu Jan 18 23:22:23 2007 +0100
+
+ sis190: failure to set the MAC address from EEPROM
+
+ Fix from http://bugzilla.kernel.org/show_bug.cgi?id=7747
+
+ Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
+ Cc: <[EMAIL PROTECTED]>
+ Signed-off-by: Francois Romieu <[EMAIL PROTECTED]>
+ Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
+
+---
+ drivers/net/sis190.c | 2 1 + 1 - 0 !
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.17/drivers/net/sis190.c
+===================================================================
+--- linux-2.6.17.orig/drivers/net/sis190.c 2007-01-24 18:02:02.000000000
+0100
++++ linux-2.6.17/drivers/net/sis190.c 2007-01-25 11:35:33.000000000 +0100
+@@ -1567,7 +1567,7 @@ static int __devinit sis190_get_mac_addr
+ for (i = 0; i < MAC_ADDR_LEN / 2; i++) {
+ __le16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i);
+
+- ((u16 *)dev->dev_addr)[0] = le16_to_cpu(w);
++ ((u16 *)dev->dev_addr)[i] = le16_to_cpu(w);
+ }
+
+ sis190_set_rgmii(tp, sis190_read_eeprom(ioaddr, EEPROMInfo));
Modified: packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec
==============================================================================
--- packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec
(original)
+++ packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec Wed Feb
7 17:18:31 2007
@@ -1027,7 +1027,8 @@
%changelog
* Wed Feb 07 2007 Arnaud Patard <[EMAIL PROTECTED]> 2.6.17-11.uc1mdv2007.0
o Arnaud Patard <[EMAIL PROTECTED]>
- - Fix SiS sata support for chips on 966/968 bridges.
+ - Fix SiS sata support for chips on 966/968 bridges
+ - Add support for SiS968 bridges to the sis190 bridge
* Fri Feb 02 2007 Luiz Capitulino <[EMAIL PROTECTED]> 2.6.17-10mdv2007.0
o Gwenole Beauchesne <[EMAIL PROTECTED]>
