rpms/kernel/devel linux-2.6-x86-debug-edd.patch, NONE, 1.1 linux-2.6-x86-edd-maxdrive.patch, NONE, 1.1 kernel.spec, 1.164, 1.165 linux-2.6-libata-pata-dma-disable-option.patch, 1.1, 1.2
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Fri Sep 14 16:24:20 UTC 2007
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6246
Modified Files:
kernel.spec linux-2.6-libata-pata-dma-disable-option.patch
Added Files:
linux-2.6-x86-debug-edd.patch linux-2.6-x86-edd-maxdrive.patch
Log Message:
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- x86 setup: limit number of EDD devices scanned
- x86 setup: print number of EDD device during scan
- libata: change boot option name to "libata.dma"
(still only affects PATA drives)
linux-2.6-x86-debug-edd.patch:
--- NEW FILE linux-2.6-x86-debug-edd.patch ---
---
arch/i386/boot/edd.c | 1 +
1 file changed, 1 insertion(+)
--- linux-2.6.22.noarch.orig/arch/i386/boot/edd.c
+++ linux-2.6.22.noarch/arch/i386/boot/edd.c
@@ -151,6 +151,7 @@ void query_edd(void)
* Scan the BIOS-supported hard disks and query EDD
* information...
*/
+ putchar('0' + (devno - 0x80) % 10);
get_edd_info(devno, &ei);
if (boot_params.eddbuf_entries < EDDMAXNR) {
linux-2.6-x86-edd-maxdrive.patch:
--- NEW FILE linux-2.6-x86-edd-maxdrive.patch ---
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c
index bd138e4..fad5f6b 100644
--- a/arch/i386/boot/edd.c
+++ b/arch/i386/boot/edd.c
@@ -129,7 +129,7 @@ void query_edd(void)
char eddarg[8];
int do_mbr = 1;
int do_edd = 1;
- int devno;
+ int devno, maxdrive;
struct edd_info ei, *edp;
u32 *mbrptr;
@@ -145,8 +145,22 @@ void query_edd(void)
if (!do_edd)
return;
-
- for (devno = 0x80; devno < 0x80+EDD_MBR_SIG_MAX; devno++) {
+
+ /* Query the number of drives. This prevents the probe
+ from wandering into CD-ROMs and nonexistent devices;
+ some machines have been known to hang if nonexistent
+ devices are probed.
+
+ Ralf Brown (inter61) seems to imply that BIOS location
+ 40:75 is more reliable than the return value from INT 13h,
+ AH=08h, so go with that. */
+
+ set_fs(0);
+ maxdrive = rdfs8(0x475)|0x80;
+ if (maxdrive > 0x80+EDD_MBR_SIG_MAX)
+ maxdrive = 0x80+EDD_MBR_SIG_MAX;
+
+ for (devno = 0x80; devno < maxdrive; devno++) {
/*
* Scan the BIOS-supported hard disks and query EDD
* information...
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kernel.spec 13 Sep 2007 20:59:51 -0000 1.164
+++ kernel.spec 14 Sep 2007 16:23:47 -0000 1.165
@@ -580,6 +580,7 @@
Patch42: linux-2.6-x86-tune-generic.patch
Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
Patch75: linux-2.6-x86-debug-boot.patch
+Patch76: linux-2.6-x86-debug-edd.patch
Patch100: linux-2.6-g5-therm-shutdown.patch
Patch120: linux-2.6-ppc32-ucmpdi2.patch
Patch130: linux-2.6-ibmvscsi-schizo.patch
@@ -671,6 +672,8 @@
Patch1508: linux-2.6-firewire-multi-lun.patch
Patch1515: linux-2.6-lirc.patch
+Patch1600: linux-2.6-x86-edd-maxdrive.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1004,6 +1007,7 @@
#ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
# debug early boot
ApplyPatch linux-2.6-x86-debug-boot.patch
+ApplyPatch linux-2.6-x86-debug-edd.patch
#
# PowerPC
@@ -1204,6 +1208,9 @@
# ---------- below all scheduled for 2.6.23 -----------------
+# EDD fix
+ApplyPatch linux-2.6-x86-edd-maxdrive.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -1796,6 +1803,12 @@
%changelog
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
+- x86 setup: limit number of EDD devices scanned
+- x86 setup: print number of EDD device during scan
+- libata: change boot option name to "libata.dma"
+ (still only affects PATA drives)
+
+* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.23-rc6-git4
* Thu Sep 13 2007 Chuck Ebbert <cebbert at redhat.com>
linux-2.6-libata-pata-dma-disable-option.patch:
Index: linux-2.6-libata-pata-dma-disable-option.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-libata-pata-dma-disable-option.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-libata-pata-dma-disable-option.patch 11 Sep 2007 21:25:51 -0000 1.1
+++ linux-2.6-libata-pata-dma-disable-option.patch 14 Sep 2007 16:23:47 -0000 1.2
@@ -44,8 +44,8 @@
MODULE_PARM_DESC(ignore_hpa, "Ignore HPA limit (0=keep BIOS limits, 1=ignore limits, using full disk)");
+static int ata_pata_dma = ATA_DMA_MASK_ATA|ATA_DMA_MASK_ATAPI|ATA_DMA_MASK_CFA;
-+module_param_named(pata_dma, ata_pata_dma, int, 0644);
-+MODULE_PARM_DESC(pata_dma, "Use DMA on PATA devices");
++module_param_named(dma, ata_pata_dma, int, 0644);
++MODULE_PARM_DESC(dma, "Use DMA on PATA devices");
+
static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ;
module_param(ata_probe_timeout, int, 0444);
More information about the fedora-extras-commits
mailing list