lkml.org 
[lkml]   [1997]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Linux 2.0.31-pre2 + Buffer /Swap patch Jul21

Please try these patches against setup.c and setup.S and let me know
if they solve your problem. Are you using loadlin to boot? Also,
send me the memory detection boot message so I can see what BIOS
calls are being reported.

Thanks,

Larry

--- /user/kernel/linux2.0.30-gcc2.7.2-5/linux-2.0.30/arch/i386/kernel/setup.c Wed Jun 4 08:12:59 1997
+++ arch/i386/kernel/setup.c Wed Jul 16 15:35:17 1997
@@ -87,6 +87,12 @@
#endif
#define DRIVE_INFO (*(struct drive_info_struct *) (PARAM+0x80))
#define SCREEN_INFO (*(struct screen_info *) (PARAM+0))
+/* Total memory in 1K blocks */
+#define MEM_K (*(unsigned int *) (PARAM+0x1E0))
+/* Amounted of memory cached in 1K blocks */
+#define MEM_K_CACHED (*(unsigned int *) (PARAM+0x1E4))
+/* Return code from BIOS memory detection routines in setup.S */
+#define MEM_BIOS_RESULTS (*(unsigned char *) (PARAM+0x1E8))
#define MOUNT_ROOT_RDONLY (*(unsigned short *) (PARAM+0x1F2))
#define RAMDISK_FLAGS (*(unsigned short *) (PARAM+0x1F8))
#define ORIG_ROOT_DEV (*(unsigned short *) (PARAM+0x1FC))
@@ -95,12 +101,6 @@
#define KERNEL_START (*(unsigned long *) (PARAM+0x214))
#define INITRD_START (*(unsigned long *) (PARAM+0x218))
#define INITRD_SIZE (*(unsigned long *) (PARAM+0x21c))
-/* Total memory in 1K blocks */
-#define MEM_K (*(unsigned int *) (PARAM+0x220))
-/* Amounted of memory cached in 1K blocks */
-#define MEM_K_CACHED (*(unsigned int *) (PARAM+0x224))
-/* Return code from BIOS memory detection routines in setup.S */
-#define MEM_BIOS_RESULTS (*(unsigned char *) (PARAM+0x228))
#define COMMAND_LINE ((char *) (PARAM+2048))
#define COMMAND_LINE_SIZE 256

@@ -114,7 +114,7 @@
void setup_arch(char **cmdline_p,
unsigned long * memory_start_p, unsigned long * memory_end_p)
{
- unsigned long memory_start, memory_end;
+ unsigned long memory_start, memory_end, old_style_memory_end;
char c = ' ', *to = command_line, *from = COMMAND_LINE;
int len = 0;
static unsigned char smptrap=0;
@@ -134,23 +134,31 @@
aux_device_present = AUX_DEVICE_INFO;

/* Memory detection code added by lma@varesearch.com 4/16/97 */
+ old_style_memory_end = (1<<20) + (EXT_MEM_K << 10);
memory_end = MEM_K << 10;
+ if (old_style_memory_end > memory_end) {
+ printk("Old 16-bit EXT_MEM_K parameter shows more memory than new 32-bit\n memory detection code. Please report this to lma@varesearch.com.\n Reverting to old 16-bit memory parameter.\n");
+ memory_end = old_style_memory_end;
+ }
printk("BIOS query detected %dKB RAM. Report errors to lma@varesearch.com\n", MEM_K);
switch(MEM_BIOS_RESULTS) {
case 0x01:
printk("Warning: BIOS function int 15h ah=88h used to determine RAM size returned an error code\n indicating failure. The amount of detected RAM may be incorrect.\n");
break;
case 0x02:
- printk("Warning: BIOS function int 15h ah=88h indicated at least 64M system RAM\n and all BIOS calls capable of detecting more than 64M RAM failed.\n");
+ printk("Total RAM size was detected using int 15h, ah=88h.\n Your system BIOS does not support detecting more than 64M of RAM.\n");
break;
case 0x03:
printk("Total RAM size was detected using BIOS function int 15h, ax=e801h.\n");
break;
case 0x04:
- printk("BIOS int 15h, ah=c7h reports %dKB of %dKB RAM is cached.\n", MEM_K, MEM_K_CACHED);
+ printk("Total RAM size was detected using BIOS function int 15h, ax=e801h.\n Your BIOS does not support the ah=c0h feature code test.\n");
break;
case 0x05:
- printk("Total RAM size was detected using BIOS function int 15h, ah=88h.\n");
+ printk("BIOS int 15h, ah=c7h reports %dKB of %dKB RAM is cached.\n", MEM_K, MEM_K_CACHED);
+ break;
+ case 0x06:
+ printk("Total RAM size was detected using BIOS function int 15h, ax=e801h.\n A call to ah=c7h did not succeed.\n");
break;
default:
printk("Warning: BIOS based memory detection routine returned unknown result code %x.\n", MEM_BIOS_RESULTS);
--- /user/kernel/linux2.0.30-gcc2.7.2-5/linux-2.0.30/arch/i386/boot/setup.S Wed Jun 4 08:12:59 1997
+++ arch/i386/boot/setup.S Wed Jul 16 15:38:10 1997
@@ -245,38 +245,22 @@
mov ah,#0x88
int 0x15
pushf ! Save CF error flag
+ mov [0x2], ax ! save result at PARAM+2 offset in kernel parameter page
and eax, #0x0000ffff ! Clear upper 16 bits
add eax, #0x0400 ! Add 1MB
- mov [0x220], eax ! Save 32-bit result in case we need to return it
+ mov [0x1E0], eax ! Save 32-bit result at PARAM+0x220 offset
popf ! Restore CF error flag
jnc int15_88_good ! CF = 1 indicates error
- movb [0x228], #0x01 ! Return the result code
+ movb [0x1E8], #0x01 ! Return the result code
lea cx, end_memdetect ! gas can't do 16-bit offset jumps. very annoying.
jmp cx
int15_88_good:
- cmp eax, #0x00010000 ! check AX for memory >= 64M
- jge testfor_int15_c7 ! if >= 64M, check for more advanced BIOS calls
- movb [0x228], #0x05 ! else return the result code
- jmp end_memdetect ! and we're done
-testfor_int15_c7:
-! 64M or more
-! Test if int 15h ah=c7h is supported using int 15h, ah=c0
- push es
- mov ah, #0xc0
- int 0x15 ! ES:BX points to a configuration table
- seg es
- movb al, 6(bx) ! Save byte at ES:BX + 6 for testing
- pop es
- or ah,ah ! check return code
- jnz try_int15_e801 ! BIOS call failed, try int 15h, ax=e801
-int15_c0_good: ! int 15, c0 call succeeded
- and al,#0x10 ! Test bit 4 of byte at ES:BX + 6
- jnz try_int15_c7 ! int 15h, ah=c7h is supported. call it.
-try_int15_e801: ! else try int 15h, ax=e801
+ ! int 15h succeeded, but now we should check for more advanced BIOS calls
+try_int15_e801: ! try int 15h, ax=e801
mov ax,#0xe801
int 0x15
jnc int15_e801_good ! CF = 1 indicates error
- movb [0x228], #0x02 ! Only int 15h, ah=88h succeeded. Return the result code.
+ movb [0x1E8], #0x02 ! Only int 15h, ah=88h succeeded. Return the result code.
jmp end_memdetect ! Return int 15h, ah=88h result.
int15_e801_good:
and eax, #0x0000ffff ! Clear upper 16 bits
@@ -284,8 +268,23 @@
shl ebx, 6 ! Multiply EBX by 64 so we have memory in 1K blocks
add eax, ebx
add eax, #0x0400 ! Add 1MB
- mov [0x220], eax ! Return 32-bit result
- movb [0x228], #0x03 ! int 15h,ax=e801h succeeded. Return the result code.
+ mov [0x1E0], eax ! Return 32-bit result
+testfor_int15_c7: ! Test if int 15h ah=c7h is supported using int 15h, ah=c0
+ push es
+ mov ah, #0xc0
+ int 0x15 ! ES:BX points to a configuration table
+ seg es
+ movb al, 6(bx) ! Save byte at ES:BX + 6 for testing
+ pop es
+ or ah,ah ! check return code
+ jnz int15_c7_test_failed ! BIOS call failed, try int 15h, ax=e801
+int15_c0_good: ! int 15, c0 call succeeded
+ and al,#0x10 ! Test bit 4 of byte at ES:BX + 6
+ jnz try_int15_c7 ! int 15h, ah=c7h is supported. call it.
+ movb [0x1E8], #0x03 ! int 15h,ax=e801h succeeded. ah=c7h not supported. Return result.
+ jmp end_memdetect
+int15_c7_test_failed:
+ movb [0x1E8], #0x04 ! int 15h,ax=e801h succeeded. ah=c0h BIOS feature test failed.
jmp end_memdetect
try_int15_c7: ! Try calling int 15 ah=c7
push ds
@@ -295,21 +294,24 @@
mov ah,#0xc7 !
int 0x15 !
pop ds
- jc try_int15_e801 ! CF = 1 indicates an error, fall back to int 15h ax=e801
+ jc int15_c7_fail ! CF = 1 indicates an error, fall back to int 15h ax=e801
int15_c7_good:
mov eax, lmlo ! Memory between 1M and 16M in 1K blocks
add eax, lmhi ! Memory above 16M in 1K blocks
add eax, #0x0400 ! Add 1MB
- mov [0x220], eax ! Return 32-bit result
+ mov [0x1E0], eax ! Return 32-bit result
mov eax, cmlo ! Cacheable memory between 1M and 16M in 1K blocks
add eax, cmhi ! Cacheable memory above 16M in 1K blocks
add eax, #0x0400 ! Add 1MB
- mov [0x224], eax ! Return 32-bit result
- movb [0x228], #0x04 ! Return the result code
+ mov [0x1E4], eax ! Return 32-bit result
+ movb [0x1E8], #0x05 ! Return the result code
+int15_c7_fail:
+ movb [0x1E8], #0x06 ! int 15h,ax=e801h succeeded. ah=c7h call failed.
end_memdetect:

! LMA 4/15/97 removed setting of keyboard repeat rate. Causes some systems
-! to hang at boot.
+! to hang at boot. No need for this in ther kernel anyway. It is probably better done
+! with the kbdrate command.
! Set the keyboard repeat rate to the max

! mov ax,#0x0305
\
 
 \ /
  Last update: 2005-03-22 13:39    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site