rpms/kernel/F-9 patch-2.6.27.6.bz2.sign, NONE, 1.1 .cvsignore, 1.832, 1.833 config-x86-generic, 1.37, 1.38 config-x86_64-generic, 1.36, 1.37 kernel.spec, 1.855, 1.856 linux-2.6-netdev-r8169-2.6.28.patch, 1.1, 1.2 sources, 1.793, 1.794 upstream, 1.712, 1.713 linux-2.6-acpi-dock-avoid-check-sta-method.patch, 1.1, NONE linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch, 1.1, NONE patch-2.6.27.5.bz2.sign, 1.1, NONE
Chuck Ebbert
cebbert at fedoraproject.org
Mon Nov 17 15:12:38 UTC 2008
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6960
Modified Files:
.cvsignore config-x86-generic config-x86_64-generic
kernel.spec linux-2.6-netdev-r8169-2.6.28.patch sources
upstream
Added Files:
patch-2.6.27.6.bz2.sign
Removed Files:
linux-2.6-acpi-dock-avoid-check-sta-method.patch
linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
patch-2.6.27.5.bz2.sign
Log Message:
Linux 2.6.27.6
Dropped patches:
linux-2.6-acpi-dock-avoid-check-sta-method.patch
linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
Updated patch:
linux-2.6-netdev-r8169-2.6.28.patch
New config variable:
CONFIG_X86_RESERVE_LOW_64K=y
--- NEW FILE patch-2.6.27.6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBJHHXtyGugalF9Dw4RAiL9AJ49pYlaHMiK/WSZCYd0LBCYYDT1TQCfTGys
Q/tS5KgY+SfL8u2qw/p/XRc=
=2f1x
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -r1.832 -r1.833
--- .cvsignore 7 Nov 2008 22:20:15 -0000 1.832
+++ .cvsignore 17 Nov 2008 15:12:06 -0000 1.833
@@ -4,4 +4,4 @@
temp-*
kernel-2.6.27
linux-2.6.27.tar.bz2
-patch-2.6.27.5.bz2
+patch-2.6.27.6.bz2
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-x86-generic,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- config-x86-generic 30 Oct 2008 04:41:11 -0000 1.37
+++ config-x86-generic 17 Nov 2008 15:12:06 -0000 1.38
@@ -76,6 +76,7 @@
CONFIG_MTRR=y
CONFIG_X86_PAT=y
CONFIG_X86_PM_TIMER=y
+CONFIG_X86_RESERVE_LOW_64K=y
CONFIG_EFI=y
CONFIG_EFI_VARS=y
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/config-x86_64-generic,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- config-x86_64-generic 30 Oct 2008 04:41:11 -0000 1.36
+++ config-x86_64-generic 17 Nov 2008 15:12:07 -0000 1.37
@@ -295,6 +295,7 @@
# FIXME: These should be 32bit only
# CONFIG_FB_N411 is not set
CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_RESERVE_LOW_64K=y
CONFIG_DIRECT_GBPAGES=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.855
retrieving revision 1.856
diff -u -r1.855 -r1.856
--- kernel.spec 14 Nov 2008 01:10:27 -0000 1.855
+++ kernel.spec 17 Nov 2008 15:12:07 -0000 1.856
@@ -36,7 +36,7 @@
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 5
+%define stable_update 6
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -635,7 +635,6 @@
Patch384: linux-2.6-pci-fix-pciehp-irq0.patch
Patch390: linux-2.6-acpi-ignore-ae_not_found-error-of-ec-reg-method.patch
-Patch391: linux-2.6-acpi-dock-avoid-check-sta-method.patch
Patch392: linux-2.6-acpi-dock-fix-eject-request-process.patch
Patch400: linux-2.6-scsi-cpqarray-set-master.patch
@@ -712,9 +711,6 @@
Patch2900: linux-2.6.27-ext4-2.6.28-rc3-git6.patch
Patch2901: linux-2.6.27-ext4-2.6.28-backport-fixups.patch
-# cciss sysfs links are broken
-Patch3000: linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
-
# Sony Vaio suspend fix
Patch3100: linux-2.6.27-sony-laptop-suspend-fix.patch
@@ -1143,7 +1139,6 @@
# fix cpu detection (f10#435653)
ApplyPatch linux-2.6-acpi-ignore-ae_not_found-error-of-ec-reg-method.patch
# fix dock bugs
-ApplyPatch linux-2.6-acpi-dock-avoid-check-sta-method.patch
ApplyPatch linux-2.6-acpi-dock-fix-eject-request-process.patch
# mm
@@ -1232,9 +1227,6 @@
# Fix libata on 1.5GB disks
ApplyPatch linux-2.6-libata-avoid-overflow-with-large-disks.patch
-# cciss sysfs links are broken
-ApplyPatch linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
-
# make jarod's iwl4965 not panic near N APs, hopefully
ApplyPatch linux-2.6-iwlagn-downgrade-BUG_ON-in-interrupt.patch
# iwl3945 fix for stable ad-hoc mode connections (#459401)
@@ -1898,6 +1890,16 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Mon Nov 17 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.6-43
+- Linux 2.6.27.6
+ Dropped patches:
+ linux-2.6-acpi-dock-avoid-check-sta-method.patch
+ linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
+ Updated patch:
+ linux-2.6-netdev-r8169-2.6.28.patch
+ New config variable:
+ CONFIG_X86_RESERVE_LOW_64K=y
+
* Thu Nov 13 2008 Dave Jones <davej at redhat.com> 2.6.27.5-42
- Revert recent CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR change.
linux-2.6-netdev-r8169-2.6.28.patch:
Index: linux-2.6-netdev-r8169-2.6.28.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-netdev-r8169-2.6.28.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-netdev-r8169-2.6.28.patch 5 Nov 2008 20:24:57 -0000 1.1
+++ linux-2.6-netdev-r8169-2.6.28.patch 17 Nov 2008 15:12:07 -0000 1.2
@@ -1,4 +1,4 @@
- diff between r8169 in 2.6.27 and 2.6.28-rc as of 2008-11-05
+ Diff r8169.c 2.6.27.4 vs. upstream 2008-11-17
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -11,7 +11,7 @@
}
#define dprintk(fmt, args...) \
do { printk(KERN_DEBUG PFX fmt, ## args); } while (0)
-@@ -61,6 +61,7 @@
+@@ -61,6 +61,7 @@ static const int multicast_filter_limit
/* MAC address length */
#define MAC_ADDR_LEN 6
@@ -19,7 +19,7 @@
#define RX_FIFO_THRESH 7 /* 7 means NO threshold, Rx buffer level before first PCI xfer. */
#define RX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */
#define TX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */
-@@ -80,6 +81,10 @@
+@@ -80,6 +81,10 @@ static const int multicast_filter_limit
#define RTL8169_TX_TIMEOUT (6*HZ)
#define RTL8169_PHY_TIMEOUT (10*HZ)
@@ -30,7 +30,7 @@
/* write/read MMIO register */
#define RTL_W8(reg, val8) writeb ((val8), ioaddr + (reg))
#define RTL_W16(reg, val16) writew ((val16), ioaddr + (reg))
-@@ -95,6 +100,10 @@
+@@ -95,6 +100,10 @@ enum mac_version {
RTL_GIGA_MAC_VER_04 = 0x04, // 8169SB
RTL_GIGA_MAC_VER_05 = 0x05, // 8110SCd
RTL_GIGA_MAC_VER_06 = 0x06, // 8110SCe
@@ -41,7 +41,7 @@
RTL_GIGA_MAC_VER_11 = 0x0b, // 8168Bb
RTL_GIGA_MAC_VER_12 = 0x0c, // 8168Be
RTL_GIGA_MAC_VER_13 = 0x0d, // 8101Eb
-@@ -104,7 +113,12 @@
+@@ -104,7 +113,12 @@ enum mac_version {
RTL_GIGA_MAC_VER_17 = 0x10, // 8168Bf
RTL_GIGA_MAC_VER_18 = 0x12, // 8168CP
RTL_GIGA_MAC_VER_19 = 0x13, // 8168C
@@ -55,7 +55,7 @@
};
#define _R(NAME,MAC,MASK) \
-@@ -121,6 +135,10 @@
+@@ -121,6 +135,10 @@ static const struct {
_R("RTL8169sb/8110sb", RTL_GIGA_MAC_VER_04, 0xff7e1880), // 8169SB
_R("RTL8169sc/8110sc", RTL_GIGA_MAC_VER_05, 0xff7e1880), // 8110SCd
_R("RTL8169sc/8110sc", RTL_GIGA_MAC_VER_06, 0xff7e1880), // 8110SCe
@@ -66,7 +66,7 @@
_R("RTL8168b/8111b", RTL_GIGA_MAC_VER_11, 0xff7e1880), // PCI-E
_R("RTL8168b/8111b", RTL_GIGA_MAC_VER_12, 0xff7e1880), // PCI-E
_R("RTL8101e", RTL_GIGA_MAC_VER_13, 0xff7e1880), // PCI-E 8139
-@@ -130,7 +148,12 @@
+@@ -130,7 +148,12 @@ static const struct {
_R("RTL8101e", RTL_GIGA_MAC_VER_16, 0xff7e1880), // PCI-E
_R("RTL8168cp/8111cp", RTL_GIGA_MAC_VER_18, 0xff7e1880), // PCI-E
_R("RTL8168c/8111c", RTL_GIGA_MAC_VER_19, 0xff7e1880), // PCI-E
@@ -80,7 +80,7 @@
};
#undef _R
-@@ -196,9 +219,6 @@
+@@ -196,9 +219,6 @@ enum rtl_registers {
Config5 = 0x56,
MultiIntr = 0x5c,
PHYAR = 0x60,
@@ -90,7 +90,7 @@
PHYstatus = 0x6c,
RxMaxSize = 0xda,
CPlusCmd = 0xe0,
-@@ -212,6 +232,32 @@
+@@ -212,6 +232,32 @@ enum rtl_registers {
FuncForceEvent = 0xfc,
};
@@ -123,7 +123,7 @@
enum rtl_register_content {
/* InterruptStatusBits */
SYSErr = 0x8000,
-@@ -265,7 +311,13 @@
+@@ -265,7 +311,13 @@ enum rtl_register_content {
TxDMAShift = 8, /* DMA burst value (0-7) is shift this many bits */
/* Config1 register p.24 */
@@ -137,7 +137,7 @@
PMEnable = (1 << 0), /* Power Management Enable */
/* Config2 register p. 25 */
-@@ -275,6 +327,7 @@
+@@ -275,6 +327,7 @@ enum rtl_register_content {
/* Config3 register p.25 */
MagicPacket = (1 << 5), /* Wake up when receives a Magic Packet */
LinkUp = (1 << 4), /* Wake up when the cable connection is re-established */
@@ -145,7 +145,7 @@
/* Config5 register p.27 */
BWF = (1 << 6), /* Accept Broadcast wakeup frame */
-@@ -292,7 +345,16 @@
+@@ -292,7 +345,16 @@ enum rtl_register_content {
TBINwComplete = 0x01000000,
/* CPlusCmd p.31 */
@@ -163,37 +163,15 @@
RxVlan = (1 << 6),
RxChkSum = (1 << 5),
PCIDAC = (1 << 4),
-@@ -370,8 +432,9 @@
- };
-
- enum features {
-- RTL_FEATURE_WOL = (1 << 0),
-- RTL_FEATURE_MSI = (1 << 1),
-+ RTL_FEATURE_WOL = (1 << 0),
-+ RTL_FEATURE_MSI = (1 << 1),
-+ RTL_FEATURE_GMII = (1 << 2),
- };
-
- struct rtl8169_private {
-@@ -406,13 +469,16 @@
- struct vlan_group *vlgrp;
- #endif
- int (*set_speed)(struct net_device *, u8 autoneg, u16 speed, u8 duplex);
-- void (*get_settings)(struct net_device *, struct ethtool_cmd *);
-+ int (*get_settings)(struct net_device *, struct ethtool_cmd *);
- void (*phy_reset_enable)(void __iomem *);
+@@ -412,6 +474,7 @@ struct rtl8169_private {
void (*hw_start)(struct net_device *);
unsigned int (*phy_reset_pending)(void __iomem *);
unsigned int (*link_ok)(void __iomem *);
+ int pcie_cap;
struct delayed_work task;
unsigned features;
-+
-+ struct mii_if_info mii;
- };
- MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev at vger.kernel.org>");
-@@ -482,6 +548,94 @@
+@@ -485,6 +548,11 @@ static int mdio_read(void __iomem *ioadd
return value;
}
@@ -202,23 +180,13 @@
+ mdio_write(ioaddr, reg_addr, mdio_read(ioaddr, reg_addr) | value);
+}
+
-+static void rtl_mdio_write(struct net_device *dev, int phy_id, int location,
-+ int val)
-+{
-+ struct rtl8169_private *tp = netdev_priv(dev);
-+ void __iomem *ioaddr = tp->mmio_addr;
-+
-+ mdio_write(ioaddr, location, val);
-+}
-+
-+static int rtl_mdio_read(struct net_device *dev, int phy_id, int location)
-+{
-+ struct rtl8169_private *tp = netdev_priv(dev);
-+ void __iomem *ioaddr = tp->mmio_addr;
-+
-+ return mdio_read(ioaddr, location);
-+}
-+
+ static void rtl_mdio_write(struct net_device *dev, int phy_id, int location,
+ int val)
+ {
+@@ -502,6 +570,72 @@ static int rtl_mdio_read(struct net_devi
+ return mdio_read(ioaddr, location);
+ }
+
+static void rtl_ephy_write(void __iomem *ioaddr, int reg_addr, int value)
+{
+ unsigned int i;
@@ -288,7 +256,7 @@
static void rtl8169_irq_mask_and_ack(void __iomem *ioaddr)
{
RTL_W16(IntrMask, 0x0000);
-@@ -619,6 +773,7 @@
+@@ -639,6 +773,7 @@ static int rtl8169_set_wol(struct net_de
tp->features |= RTL_FEATURE_WOL;
else
tp->features &= ~RTL_FEATURE_WOL;
@@ -296,7 +264,7 @@
spin_unlock_irq(&tp->lock);
-@@ -705,8 +860,12 @@
+@@ -725,8 +860,12 @@ static int rtl8169_set_speed_xmii(struct
}
}
@@ -311,106 +279,7 @@
(tp->mac_version == RTL_GIGA_MAC_VER_14) ||
(tp->mac_version == RTL_GIGA_MAC_VER_15) ||
(tp->mac_version == RTL_GIGA_MAC_VER_16)) {
-@@ -720,9 +879,13 @@
-
- auto_nego |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
-
-- if ((tp->mac_version == RTL_GIGA_MAC_VER_12) ||
-- (tp->mac_version == RTL_GIGA_MAC_VER_17)) {
-- /* Vendor specific (0x1f) and reserved (0x0e) MII registers. */
-+ if ((tp->mac_version == RTL_GIGA_MAC_VER_11) ||
-+ (tp->mac_version == RTL_GIGA_MAC_VER_12) ||
-+ (tp->mac_version >= RTL_GIGA_MAC_VER_17)) {
-+ /*
-+ * Wake up the PHY.
-+ * Vendor specific (0x1f) and reserved (0x0e) MII registers.
-+ */
- mdio_write(ioaddr, 0x1f, 0x0000);
- mdio_write(ioaddr, 0x0e, 0x0000);
- }
-@@ -850,7 +1013,7 @@
-
- #endif
-
--static void rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
-+static int rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
- {
- struct rtl8169_private *tp = netdev_priv(dev);
- void __iomem *ioaddr = tp->mmio_addr;
-@@ -867,65 +1030,29 @@
-
- cmd->speed = SPEED_1000;
- cmd->duplex = DUPLEX_FULL; /* Always set */
-+
-+ return 0;
- }
-
--static void rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd)
-+static int rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd)
- {
- struct rtl8169_private *tp = netdev_priv(dev);
-- void __iomem *ioaddr = tp->mmio_addr;
-- u8 status;
--
-- cmd->supported = SUPPORTED_10baseT_Half |
-- SUPPORTED_10baseT_Full |
-- SUPPORTED_100baseT_Half |
-- SUPPORTED_100baseT_Full |
-- SUPPORTED_1000baseT_Full |
-- SUPPORTED_Autoneg |
-- SUPPORTED_TP;
--
-- cmd->autoneg = 1;
-- cmd->advertising = ADVERTISED_TP | ADVERTISED_Autoneg;
--
-- if (tp->phy_auto_nego_reg & ADVERTISE_10HALF)
-- cmd->advertising |= ADVERTISED_10baseT_Half;
-- if (tp->phy_auto_nego_reg & ADVERTISE_10FULL)
-- cmd->advertising |= ADVERTISED_10baseT_Full;
-- if (tp->phy_auto_nego_reg & ADVERTISE_100HALF)
-- cmd->advertising |= ADVERTISED_100baseT_Half;
-- if (tp->phy_auto_nego_reg & ADVERTISE_100FULL)
-- cmd->advertising |= ADVERTISED_100baseT_Full;
-- if (tp->phy_1000_ctrl_reg & ADVERTISE_1000FULL)
-- cmd->advertising |= ADVERTISED_1000baseT_Full;
--
-- status = RTL_R8(PHYstatus);
--
-- if (status & _1000bpsF)
-- cmd->speed = SPEED_1000;
-- else if (status & _100bps)
-- cmd->speed = SPEED_100;
-- else if (status & _10bps)
-- cmd->speed = SPEED_10;
--
-- if (status & TxFlowCtrl)
-- cmd->advertising |= ADVERTISED_Asym_Pause;
-- if (status & RxFlowCtrl)
-- cmd->advertising |= ADVERTISED_Pause;
-
-- cmd->duplex = ((status & _1000bpsF) || (status & FullDup)) ?
-- DUPLEX_FULL : DUPLEX_HALF;
-+ return mii_ethtool_gset(&tp->mii, cmd);
- }
-
- static int rtl8169_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
- {
- struct rtl8169_private *tp = netdev_priv(dev);
- unsigned long flags;
-+ int rc;
-
- spin_lock_irqsave(&tp->lock, flags);
-
-- tp->get_settings(dev, cmd);
-+ rc = tp->get_settings(dev, cmd);
-
- spin_unlock_irqrestore(&tp->lock, flags);
-- return 0;
-+ return rc;
- }
-
- static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs,
-@@ -1103,11 +1230,19 @@
+@@ -1091,11 +1230,19 @@ static void rtl8169_get_mac_version(stru
u32 val;
int mac_version;
} mac_info[] = {
@@ -433,7 +302,7 @@
/* 8168B family. */
{ 0x7cf00000, 0x38000000, RTL_GIGA_MAC_VER_12 },
-@@ -1116,8 +1251,17 @@
+@@ -1104,8 +1251,17 @@ static void rtl8169_get_mac_version(stru
{ 0x7c800000, 0x30000000, RTL_GIGA_MAC_VER_11 },
/* 8101 family. */
@@ -451,7 +320,7 @@
{ 0x7c800000, 0x34000000, RTL_GIGA_MAC_VER_16 },
/* FIXME: where did these entries come from ? -- FR */
{ 0xfc800000, 0x38800000, RTL_GIGA_MAC_VER_15 },
-@@ -1228,7 +1372,31 @@
+@@ -1216,7 +1372,31 @@ static void rtl8169sb_hw_phy_config(void
rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
}
@@ -484,7 +353,7 @@
{
struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0000 },
-@@ -1241,7 +1409,22 @@
+@@ -1229,7 +1409,22 @@ static void rtl8168cp_hw_phy_config(void
rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
}
@@ -508,7 +377,7 @@
{
struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0001 },
-@@ -1257,26 +1440,158 @@
+@@ -1245,25 +1440,157 @@ static void rtl8168c_hw_phy_config(void
{ 0x1f, 0x0003 },
{ 0x12, 0xc096 },
{ 0x16, 0x000a },
@@ -568,10 +437,10 @@
+ { 0x06, 0x5461 },
+ { 0x1f, 0x0003 },
+ { 0x16, 0x0f0a },
- { 0x1f, 0x0000 }
- };
-
- rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
++ { 0x1f, 0x0000 }
++ };
++
++ rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+
+ mdio_patch(ioaddr, 0x16, 1 << 0);
+ mdio_patch(ioaddr, 0x14, 1 << 5);
@@ -660,18 +529,17 @@
+ { 0x1f, 0x0003 },
+ { 0x08, 0x441d },
+ { 0x01, 0x9100 },
-+ { 0x1f, 0x0000 }
-+ };
-+
+ { 0x1f, 0x0000 }
+ };
+
+ mdio_write(ioaddr, 0x1f, 0x0000);
+ mdio_patch(ioaddr, 0x11, 1 << 12);
+ mdio_patch(ioaddr, 0x19, 1 << 13);
+
-+ rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+ rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
}
- static void rtl_hw_phy_config(struct net_device *dev)
-@@ -1296,15 +1611,43 @@
+@@ -1284,15 +1611,43 @@ static void rtl_hw_phy_config(struct net
case RTL_GIGA_MAC_VER_04:
rtl8169sb_hw_phy_config(ioaddr);
break;
@@ -718,75 +586,7 @@
default:
break;
}
-@@ -1513,7 +1856,7 @@
- unsigned int align;
- u16 intr_event;
- u16 napi_event;
-- unsigned msi;
-+ unsigned features;
- } rtl_cfg_infos [] = {
- [RTL_CFG_0] = {
- .hw_start = rtl_hw_start_8169,
-@@ -1522,7 +1865,7 @@
- .intr_event = SYSErr | LinkChg | RxOverflow |
- RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
- .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
-- .msi = 0
-+ .features = RTL_FEATURE_GMII
- },
- [RTL_CFG_1] = {
- .hw_start = rtl_hw_start_8168,
-@@ -1531,7 +1874,7 @@
- .intr_event = SYSErr | LinkChg | RxOverflow |
- TxErr | TxOK | RxOK | RxErr,
- .napi_event = TxErr | TxOK | RxOK | RxOverflow,
-- .msi = RTL_FEATURE_MSI
-+ .features = RTL_FEATURE_GMII | RTL_FEATURE_MSI
- },
- [RTL_CFG_2] = {
- .hw_start = rtl_hw_start_8101,
-@@ -1540,7 +1883,7 @@
- .intr_event = SYSErr | LinkChg | RxOverflow | PCSTimeout |
- RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
- .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
-- .msi = RTL_FEATURE_MSI
-+ .features = RTL_FEATURE_MSI
- }
- };
-
-@@ -1552,7 +1895,7 @@
- u8 cfg2;
-
- cfg2 = RTL_R8(Config2) & ~MSIEnable;
-- if (cfg->msi) {
-+ if (cfg->features & RTL_FEATURE_MSI) {
- if (pci_enable_msi(pdev)) {
- dev_info(&pdev->dev, "no MSI. Back to INTx.\n");
- } else {
-@@ -1578,6 +1921,7 @@
- const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
- const unsigned int region = cfg->region;
- struct rtl8169_private *tp;
-+ struct mii_if_info *mii;
- struct net_device *dev;
- void __iomem *ioaddr;
- unsigned int i;
-@@ -1602,6 +1946,14 @@
- tp->pci_dev = pdev;
- tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT);
-
-+ mii = &tp->mii;
-+ mii->dev = dev;
-+ mii->mdio_read = rtl_mdio_read;
-+ mii->mdio_write = rtl_mdio_write;
-+ mii->phy_id_mask = 0x1f;
-+ mii->reg_num_mask = 0x1f;
-+ mii->supports_gmii = !!(cfg->features & RTL_FEATURE_GMII);
-+
- /* enable device (incl. PCI PM wakeup and hotplug setup) */
- rc = pci_enable_device(pdev);
- if (rc < 0) {
-@@ -1670,6 +2022,10 @@
+@@ -1667,6 +2022,10 @@ rtl8169_init_one(struct pci_dev *pdev, c
goto err_out_free_res_4;
}
@@ -797,7 +597,7 @@
/* Unneeded ? Don't mess with Mrs. Murphy. */
rtl8169_irq_mask_and_ack(ioaddr);
-@@ -1706,6 +2062,10 @@
+@@ -1703,6 +2062,10 @@ rtl8169_init_one(struct pci_dev *pdev, c
RTL_W8(Cfg9346, Cfg9346_Unlock);
RTL_W8(Config1, RTL_R8(Config1) | PMEnable);
RTL_W8(Config5, RTL_R8(Config5) & PMEStatus);
@@ -808,7 +608,7 @@
tp->features |= rtl_try_msi(pdev, ioaddr, cfg);
RTL_W8(Cfg9346, Cfg9346_Lock);
-@@ -1728,7 +2088,11 @@
+@@ -1725,7 +2088,11 @@ rtl8169_init_one(struct pci_dev *pdev, c
dev->do_ioctl = rtl8169_ioctl;
}
@@ -821,7 +621,7 @@
for (i = 0; i < MAC_ADDR_LEN; i++)
dev->dev_addr[i] = RTL_R8(MAC0 + i);
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-@@ -1758,7 +2122,6 @@
+@@ -1755,7 +2122,6 @@ rtl8169_init_one(struct pci_dev *pdev, c
#endif
tp->intr_mask = 0xffff;
@@ -829,7 +629,7 @@
tp->align = cfg->align;
tp->hw_start = cfg->hw_start;
tp->intr_event = cfg->intr_event;
-@@ -1768,8 +2131,6 @@
+@@ -1765,8 +2131,6 @@ rtl8169_init_one(struct pci_dev *pdev, c
tp->timer.data = (unsigned long) dev;
tp->timer.function = rtl8169_phy_timer;
@@ -838,7 +638,7 @@
rc = register_netdev(dev);
if (rc < 0)
goto err_out_msi_5;
-@@ -1791,6 +2152,7 @@
+@@ -1788,6 +2152,7 @@ rtl8169_init_one(struct pci_dev *pdev, c
}
rtl8169_init_phy(dev, tp);
@@ -846,7 +646,7 @@
out:
return rc;
-@@ -2061,12 +2423,209 @@
+@@ -2058,12 +2423,209 @@ static void rtl_hw_start_8169(struct net
RTL_W16(IntrMask, tp->intr_event);
}
@@ -1057,7 +857,7 @@
RTL_W8(Cfg9346, Cfg9346_Unlock);
-@@ -2074,17 +2633,10 @@
+@@ -2071,17 +2633,10 @@ static void rtl_hw_start_8168(struct net
rtl_set_rx_max_size(ioaddr);
@@ -1075,7 +875,7 @@
RTL_W16(IntrMitigate, 0x5151);
/* Work around for RxFIFO overflow. */
-@@ -2095,21 +2647,134 @@
+@@ -2092,19 +2647,134 @@ static void rtl_hw_start_8168(struct net
rtl_set_rx_tx_desc_registers(tp, ioaddr);
@@ -1087,7 +887,7 @@
RTL_R8(IntrMask);
-- RTL_W32(RxMissed, 0);
+- rtl_set_rx_mode(dev);
+ switch (tp->mac_version) {
+ case RTL_GIGA_MAC_VER_11:
+ rtl_hw_start_8168bb(ioaddr, pdev);
@@ -1097,8 +897,7 @@
+ case RTL_GIGA_MAC_VER_17:
+ rtl_hw_start_8168bef(ioaddr, pdev);
+ break;
-
-- rtl_set_rx_mode(dev);
++
+ case RTL_GIGA_MAC_VER_18:
+ rtl_hw_start_8168cp_1(ioaddr, pdev);
+ break;
@@ -1213,7 +1012,7 @@
static void rtl_hw_start_8101(struct net_device *dev)
{
struct rtl8169_private *tp = netdev_priv(dev);
-@@ -2118,8 +2783,26 @@
+@@ -2113,8 +2783,26 @@ static void rtl_hw_start_8101(struct net
if ((tp->mac_version == RTL_GIGA_MAC_VER_13) ||
(tp->mac_version == RTL_GIGA_MAC_VER_16)) {
@@ -1242,65 +1041,7 @@
}
RTL_W8(Cfg9346, Cfg9346_Unlock);
-@@ -2143,8 +2826,6 @@
-
- RTL_R8(IntrMask);
-
-- RTL_W32(RxMissed, 0);
--
- rtl_set_rx_mode(dev);
-
- RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
-@@ -2922,6 +3603,17 @@
- return work_done;
- }
-
-+static void rtl8169_rx_missed(struct net_device *dev, void __iomem *ioaddr)
-+{
-+ struct rtl8169_private *tp = netdev_priv(dev);
-+
-+ if (tp->mac_version > RTL_GIGA_MAC_VER_06)
-+ return;
-+
-+ dev->stats.rx_missed_errors += (RTL_R32(RxMissed) & 0xffffff);
-+ RTL_W32(RxMissed, 0);
-+}
-+
- static void rtl8169_down(struct net_device *dev)
- {
- struct rtl8169_private *tp = netdev_priv(dev);
-@@ -2939,9 +3631,7 @@
-
- rtl8169_asic_down(ioaddr);
-
-- /* Update the error counts. */
-- dev->stats.rx_missed_errors += RTL_R32(RxMissed);
-- RTL_W32(RxMissed, 0);
-+ rtl8169_rx_missed(dev, ioaddr);
-
- spin_unlock_irq(&tp->lock);
-
-@@ -3063,8 +3753,7 @@
-
- if (netif_running(dev)) {
- spin_lock_irqsave(&tp->lock, flags);
-- dev->stats.rx_missed_errors += RTL_R32(RxMissed);
-- RTL_W32(RxMissed, 0);
-+ rtl8169_rx_missed(dev, ioaddr);
- spin_unlock_irqrestore(&tp->lock, flags);
- }
-
-@@ -3089,8 +3778,7 @@
-
- rtl8169_asic_down(ioaddr);
-
-- dev->stats.rx_missed_errors += RTL_R32(RxMissed);
-- RTL_W32(RxMissed, 0);
-+ rtl8169_rx_missed(dev, ioaddr);
-
- spin_unlock_irq(&tp->lock);
-
-@@ -3121,6 +3809,11 @@
+@@ -3121,6 +3809,11 @@ out:
return 0;
}
@@ -1312,7 +1053,7 @@
#endif /* CONFIG_PM */
static struct pci_driver rtl8169_pci_driver = {
-@@ -3131,6 +3824,7 @@
+@@ -3131,6 +3824,7 @@ static struct pci_driver rtl8169_pci_dri
#ifdef CONFIG_PM
.suspend = rtl8169_suspend,
.resume = rtl8169_resume,
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.793
retrieving revision 1.794
diff -u -r1.793 -r1.794
--- sources 7 Nov 2008 22:20:15 -0000 1.793
+++ sources 17 Nov 2008 15:12:07 -0000 1.794
@@ -1,2 +1,2 @@
b3e78977aa79d3754cb7f8143d7ddabd linux-2.6.27.tar.bz2
-5ae2b4af08b35b9ecc3653c8fc6c1905 patch-2.6.27.5.bz2
+beec5a958abb1045c0b723dc1f195f7e patch-2.6.27.6.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.712
retrieving revision 1.713
diff -u -r1.712 -r1.713
--- upstream 7 Nov 2008 22:20:16 -0000 1.712
+++ upstream 17 Nov 2008 15:12:08 -0000 1.713
@@ -1,2 +1,2 @@
linux-2.6.27.tar.bz2
-patch-2.6.27.5.bz2
+patch-2.6.27.6.bz2
--- linux-2.6-acpi-dock-avoid-check-sta-method.patch DELETED ---
--- linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch DELETED ---
--- patch-2.6.27.5.bz2.sign DELETED ---
More information about the scm-commits
mailing list