rpms/kernel/FC-6 linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch, NONE, 1.1 linux-2.6-net-atl1-fix-typo-in-dma-setup.patch, NONE, 1.1 linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch, NONE, 1.1 kernel-2.6.spec, 1.2997, 1.2998 linux-2.6-acpi-dock-oops.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 25 22:45:23 UTC 2007
Author: cebbert
Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv19379
Modified Files:
kernel-2.6.spec linux-2.6-acpi-dock-oops.patch
Added Files:
linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
Log Message:
* Wed Jul 25 2007 Chuck Ebbert <cebbert at redhat.com>
- kernel requires newer version of cpuspeed
- pata_hpt37x: Fix 2.6.22 clock PLL regression (#249254)
- atl1: possibly fix DMA bugs (#249511)
linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch:
pata_hpt37x.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch ---
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=64a8170975947978ea4094dd6c4b1f41119d6ae6
Commit: 64a8170975947978ea4094dd6c4b1f41119d6ae6
Parent: 5c8d52015c09b42632a73896f8a80cff64c5c1d1
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
AuthorDate: Tue Jul 24 15:17:48 2007 +0100
Committer: Jeff Garzik <jeff at garzik.org>
CommitDate: Tue Jul 24 16:55:02 2007 -0400
pata_hpt37x: Fix 2.6.22 clock PLL regression
Just one version of Linux ago
The PLL code broke - oh no!
But set the right mode
And fix up the code
Makes the PLL timing sync go
[whatever happened to the sailor from Nantucket, hero of many limericks? -jg]
Closes-bug: #8791
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
drivers/ata/pata_hpt37x.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index b0af65a..84d9c55 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -26,7 +26,7 @@
#include <linux/libata.h>
#define DRV_NAME "pata_hpt37x"
-#define DRV_VERSION "0.6.6"
+#define DRV_VERSION "0.6.7"
struct hpt_clock {
u8 xfer_speed;
@@ -1103,17 +1103,17 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
/* Select the DPLL clock. */
pci_write_config_byte(dev, 0x5b, 0x21);
- pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low);
+ pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low | 0x100);
for(adjust = 0; adjust < 8; adjust++) {
if (hpt37x_calibrate_dpll(dev))
break;
/* See if it'll settle at a fractionally different clock */
- if ((adjust & 3) == 3) {
- f_low --;
- f_high ++;
- }
- pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low);
+ if (adjust & 1)
+ f_low -= adjust >> 1;
+ else
+ f_high += adjust >> 1;
+ pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low | 0x100);
}
if (adjust == 8) {
printk(KERN_WARNING "hpt37x: DPLL did not stabilize.\n");
linux-2.6-net-atl1-fix-typo-in-dma-setup.patch:
atl1_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE linux-2.6-net-atl1-fix-typo-in-dma-setup.patch ---
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3f516c00d416bd39aab6cfb348b68919e295fe23
Commit: 3f516c00d416bd39aab6cfb348b68919e295fe23
Parent: e6a7ff4a617ad3f6a59e2576d430b9292299d067
Author: Jay Cliburn <jacliburn at bellsouth.net>
AuthorDate: Thu Jul 19 18:45:11 2007 -0500
Committer: Jeff Garzik <jeff at garzik.org>
CommitDate: Tue Jul 24 16:28:40 2007 -0400
atl1: fix typo in DMA engine setup
The DMA engine setup contains a typo that can result in an incorrect
dmaw_block setting.
Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
[cebbert at redhat.com: whitespace fixup for 2.6.22]
---
drivers/net/atl1/atl1_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-2.6.22.noarch.orig/drivers/net/atl1/atl1_main.c
+++ linux-2.6.22.noarch/drivers/net/atl1/atl1_main.c
@@ -1159,8 +1159,8 @@ static u32 atl1_configure(struct atl1_ad
/* config DMA Engine */
value = ((((u32) hw->dmar_block) & DMA_CTRL_DMAR_BURST_LEN_MASK)
<< DMA_CTRL_DMAR_BURST_LEN_SHIFT) |
- ((((u32) hw->dmaw_block) & DMA_CTRL_DMAR_BURST_LEN_MASK)
- << DMA_CTRL_DMAR_BURST_LEN_SHIFT) |
+ ((((u32) hw->dmaw_block) & DMA_CTRL_DMAW_BURST_LEN_MASK)
+ << DMA_CTRL_DMAW_BURST_LEN_SHIFT) |
DMA_CTRL_DMAR_EN | DMA_CTRL_DMAW_EN;
value |= (u32) hw->dma_ord;
if (atl1_rcb_128 == hw->rcb_value)
linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch:
atl1_hw.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch ---
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ef76e3e2505db01f7d4b537854f4a177220c26c8
Commit: ef76e3e2505db01f7d4b537854f4a177220c26c8
Parent: 91a500ac5654766e4d9a6502dfcceb7e0a235f98
Author: Jay Cliburn <jacliburn at bellsouth.net>
AuthorDate: Thu Jul 19 18:45:13 2007 -0500
Committer: Jeff Garzik <jeff at garzik.org>
CommitDate: Tue Jul 24 16:28:41 2007 -0400
atl1: fix typo in dma_req_block
s/dam/dma
Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
Signed-off-by: Jeff Garzik <jeff at garzik.org>
---
drivers/net/atl1/atl1_hw.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/atl1/atl1_hw.h b/drivers/net/atl1/atl1_hw.h
index 100c09c..f0d7e82 100644
--- a/drivers/net/atl1/atl1_hw.h
+++ b/drivers/net/atl1/atl1_hw.h
@@ -929,8 +929,8 @@ enum atl1_dma_req_block {
atl1_dma_req_128 = 0,
atl1_dma_req_256 = 1,
atl1_dma_req_512 = 2,
- atl1_dam_req_1024 = 3,
- atl1_dam_req_2048 = 4,
+ atl1_dma_req_1024 = 3,
+ atl1_dma_req_2048 = 4,
atl1_dma_req_4096 = 5
};
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2997
retrieving revision 1.2998
diff -u -r1.2997 -r1.2998
--- kernel-2.6.spec 23 Jul 2007 19:34:43 -0000 1.2997
+++ kernel-2.6.spec 25 Jul 2007 22:45:20 -0000 1.2998
@@ -376,7 +376,7 @@
# problems with the newer kernel or lack certain things that make
# integration in the distro harder than needed.
#
-%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, selinux-policy-targeted < 1.25.3-14
+%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, selinux-policy-targeted < 1.25.3-14, cpuspeed < 1.2.1-1.48
#
# The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
@@ -588,10 +588,13 @@
Patch667: linux-2.6-libata-ata_piix_fix_pio-mwdma-programming.patch
Patch668: linux-2.6-libata_pata_atiixp_add_ati_sb700.patch
Patch669: linux-2.6-libata-restore-combined-mode.patch
+Patch670: linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
Patch680: git-wireless-dev.patch
Patch690: linux-2.6-e1000-ich9.patch
Patch710: linux-2.6-bcm43xx-pci-neuter.patch
-Patch711: linux-2.6-sky2-restore-workarounds.patch
+Patch712: linux-2.6-sky2-restore-workarounds.patch
+Patch713: linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
+Patch714: linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
Patch740: linux-2.6-sdhci-ene-controller-quirk.patch
Patch741: linux-2.6-sdhci-fix-interrupt-mask.patch
Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
@@ -1253,6 +1256,8 @@
ApplyPatch linux-2.6-libata_pata_atiixp_add_ati_sb700.patch
# restore the ugly libata COMBINED_MODE hacks
ApplyPatch linux-2.6-libata-restore-combined-mode.patch
+# fix hpt37x PLL regression
+ApplyPatch linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
# Add the new wireless stack and drivers from wireless-dev
ApplyPatch git-wireless-dev.patch
@@ -1263,6 +1268,9 @@
# sky2: restore lost interrupt workarounds
# maintainer wanted this in 2.6.22
ApplyPatch linux-2.6-sky2-restore-workarounds.patch
+# atl1 DMA bugs
+ApplyPatch linux-2.6-net-atl1-fix-typo-in-dma-setup.patch
+ApplyPatch linux-2.6-net-atl1-fix-typo-in-dma_req_block.patch
# sdhci
#
@@ -2226,6 +2234,11 @@
%endif
%changelog
+* Wed Jul 25 2007 Chuck Ebbert <cebbert at redhat.com>
+- kernel requires newer version of cpuspeed
+- pata_hpt37x: Fix 2.6.22 clock PLL regression (#249254)
+- atl1: possibly fix DMA bugs (#249511)
+
* Mon Jul 23 2007 Chuck Ebbert <cebbert at redhat.com>
- set CONFIG_DEBUG_SHIRQ only in -debug kernels
linux-2.6-acpi-dock-oops.patch:
dock.c | 7 +++++++
1 files changed, 7 insertions(+)
Index: linux-2.6-acpi-dock-oops.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-acpi-dock-oops.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-acpi-dock-oops.patch 10 Jul 2007 01:23:51 -0000 1.1
+++ linux-2.6-acpi-dock-oops.patch 25 Jul 2007 22:45:21 -0000 1.2
@@ -1,10 +1,31 @@
+Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=22fe4c2114e29477ca6738729c074ee8f60d3b73
+Commit: 22fe4c2114e29477ca6738729c074ee8f60d3b73
+Parent: 38ff4ffc039ba5a5878f2dcbb03d87c3a1f02f1b
+Author: Chuck Ebbert <cebbert at redhat.com>
+AuthorDate: Wed May 9 15:05:48 2007 -0700
+Committer: Len Brown <len.brown at intel.com>
+CommitDate: Thu May 10 03:30:41 2007 -0400
+
+ ACPI: dock: fix opps after dock driver fails to initialize
+
+ The driver tests the dock_station pointer for nonnull
+ to check whether it has initialized properly. But in
+ some cases dock_station will be non-null after being
+ freed when driver init fails. Fix by zeroing the
+ pointer after freeing.
+
+ Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
+ Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
+ Signed-off-by: Len Brown <len.brown at intel.com>
---
- drivers/acpi/dock.c | 6 ++++++
- 1 file changed, 6 insertions(+)
+ drivers/acpi/dock.c | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
---- 2.6.21-d390.orig/drivers/acpi/dock.c
-+++ 2.6.21-d390/drivers/acpi/dock.c
-@@ -698,6 +698,7 @@ static int dock_add(acpi_handle handle)
+diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
+index 9ddc3f1..f66f4f7 100644
+--- a/drivers/acpi/dock.c
++++ b/drivers/acpi/dock.c
+@@ -715,6 +715,7 @@ static int dock_add(acpi_handle handle)
if (ret) {
printk(KERN_ERR PREFIX "Error %d registering dock device\n", ret);
kfree(dock_station);
@@ -12,7 +33,7 @@
return ret;
}
ret = device_create_file(&dock_device.dev, &dev_attr_docked);
-@@ -705,6 +706,7 @@ static int dock_add(acpi_handle handle)
+@@ -722,6 +723,7 @@ static int dock_add(acpi_handle handle)
printk("Error %d adding sysfs file\n", ret);
platform_device_unregister(&dock_device);
kfree(dock_station);
@@ -20,15 +41,23 @@
return ret;
}
ret = device_create_file(&dock_device.dev, &dev_attr_undock);
-@@ -713,6 +715,7 @@ static int dock_add(acpi_handle handle)
+@@ -730,6 +732,7 @@ static int dock_add(acpi_handle handle)
device_remove_file(&dock_device.dev, &dev_attr_docked);
platform_device_unregister(&dock_device);
kfree(dock_station);
+ dock_station = NULL;
return ret;
}
+ ret = device_create_file(&dock_device.dev, &dev_attr_uid);
+@@ -739,6 +742,7 @@ static int dock_add(acpi_handle handle)
+ device_remove_file(&dock_device.dev, &dev_attr_undock);
+ platform_device_unregister(&dock_device);
+ kfree(dock_station);
++ dock_station = NULL;
+ return ret;
+ }
-@@ -725,6 +728,7 @@ static int dock_add(acpi_handle handle)
+@@ -751,6 +755,7 @@ static int dock_add(acpi_handle handle)
dd = alloc_dock_dependent_device(handle);
if (!dd) {
kfree(dock_station);
@@ -36,15 +65,15 @@
ret = -ENOMEM;
goto dock_add_err_unregister;
}
-@@ -752,6 +756,7 @@ dock_add_err_unregister:
- device_remove_file(&dock_device.dev, &dev_attr_undock);
+@@ -779,6 +784,7 @@ dock_add_err_unregister:
+ device_remove_file(&dock_device.dev, &dev_attr_uid);
platform_device_unregister(&dock_device);
kfree(dock_station);
+ dock_station = NULL;
return ret;
}
-@@ -785,6 +790,7 @@ static int dock_remove(void)
+@@ -813,6 +819,7 @@ static int dock_remove(void)
/* free dock station memory */
kfree(dock_station);
More information about the fedora-cvs-commits
mailing list