Linux 2.4.21-rc5

PATCH New Marcelo Tosatti 6 participants 7 messages May 27, 2003 – May 28, 2003

lore

Share & tools

lore

Marcelo Tosatti

author

2003-05-27 19:31 UTC #0 lore raw

Hi,

Mainly due to a IDE DMA problem which would happen on boxes with lots of RAM, here is -rc5.

As I always ask, please test.

Summary of changes from v2.4.21-rc4 to v2.4.21-rc5
============================================

Alan Cox <[email protected]>:
o 1: (trivial) Fix the formatting of your ide hack
o 2: =scsi option fails in some cases
o 3: IDE DMA
o add the via ide ident
o fix the siimage mmio stuff

Andi Kleen <[email protected]>:
o Fix 32bit ioctl holes
o Fix context switch bug on x86-64
o Prefetch workaround for csum-copy

Benjamin Herrenschmidt <[email protected]>:
o PPC Documentation/Configure.help fix

Marcelo Tosatti <[email protected]>:
o Changed EXTRAVERSION to -rc5

Alex Romosan

2003-05-27 20:42 UTC #1 lore raw

Quoted 4 lines · Marcelo Tosatti

Mainly due to a IDE DMA problem which would happen on boxes with lots of RAM, here is -rc5.
As I always ask, please test.

i get the following error:

make[5]: Entering directory `/usr/src/linux/drivers/ide/pci'
gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=athlon -I../ -nostdinc -iwithprefix include -DKBUILD_BASENAME=via82cxxx -c -o via82cxxx.o via82cxxx.c via82cxxx.c:77: error: `PCI_DEVICE_ID_VIA_8237' undeclared here (not in a function)
via82cxxx.c:77: error: initializer element is not constant
via82cxxx.c:77: error: (near initialization for `via_isa_bridges[0].id')
via82cxxx.c:77: error: initializer element is not constant
via82cxxx.c:77: error: (near initialization for `via_isa_bridges[0]')
via82cxxx.c:78: error: initializer element is not constant
via82cxxx.c:78: error: (near initialization for `via_isa_bridges[1]')
via82cxxx.c:79: error: initializer element is not constant
via82cxxx.c:79: error: (near initialization for `via_isa_bridges[2]')
via82cxxx.c:80: error: initializer element is not constant
via82cxxx.c:80: error: (near initialization for `via_isa_bridges[3]')
via82cxxx.c:81: error: initializer element is not constant
via82cxxx.c:81: error: (near initialization for `via_isa_bridges[4]')
via82cxxx.c:82: error: initializer element is not constant
via82cxxx.c:82: error: (near initialization for `via_isa_bridges[5]')
via82cxxx.c:83: error: initializer element is not constant
via82cxxx.c:83: error: (near initialization for `via_isa_bridges[6]')
via82cxxx.c:84: error: initializer element is not constant
via82cxxx.c:84: error: (near initialization for `via_isa_bridges[7]')
via82cxxx.c:85: error: initializer element is not constant
via82cxxx.c:85: error: (near initialization for `via_isa_bridges[8]')
via82cxxx.c:86: error: initializer element is not constant
via82cxxx.c:86: error: (near initialization for `via_isa_bridges[9]')
via82cxxx.c:87: error: initializer element is not constant
via82cxxx.c:87: error: (near initialization for `via_isa_bridges[10]')
via82cxxx.c:88: error: initializer element is not constant
via82cxxx.c:88: error: (near initialization for `via_isa_bridges[11]')
via82cxxx.c:89: error: initializer element is not constant
via82cxxx.c:89: error: (near initialization for `via_isa_bridges[12]')
via82cxxx.c:90: error: initializer element is not constant
via82cxxx.c:90: error: (near initialization for `via_isa_bridges[13]')
via82cxxx.c:91: error: initializer element is not constant
via82cxxx.c:91: error: (near initialization for `via_isa_bridges[14]')
via82cxxx.c:92: error: initializer element is not constant
via82cxxx.c:92: error: (near initialization for `via_isa_bridges[15]')
via82cxxx.c:93: error: initializer element is not constant
via82cxxx.c:93: error: (near initialization for `via_isa_bridges[16]')
via82cxxx.c:94: error: initializer element is not constant
via82cxxx.c:94: error: (near initialization for `via_isa_bridges[17]')
via82cxxx.c:95: error: initializer element is not constant
via82cxxx.c:95: error: (near initialization for `via_isa_bridges[18]')
make[5]: *** [via82cxxx.o] Error 1
make[5]: Leaving directory `/usr/src/linux/drivers/ide/pci'
make[4]: *** [first_rule] Error 2
make[4]: Leaving directory `/usr/src/linux/drivers/ide/pci'
make[3]: *** [_subdir_pci] Error 2
make[3]: Leaving directory `/usr/src/linux/drivers/ide'
make[2]: *** [_subdir_ide] Error 2
make[2]: Leaving directory `/usr/src/linux/drivers'
make[1]: *** [_dir_drivers] Error 2
make[1]: Leaving directory `/usr/src/linux'
make: *** [stamp-build] Error 2

this compiled in -rc4.

--alex--

Signature · 4 lines

| I believe the moment is at hand when, by a paranoiac and active |
|  advance of the mind, it will be possible (simultaneously with  |
|  automatism and other passive states) to systematize confusion  |
|  and thus to help to discredit completely the world of reality. |

Alan Cox

2003-05-27 21:22 UTC #2 lore raw

Quoted 6 lines · Alex Romosan

i get the following error:
make[5]: Entering directory `/usr/src/linux/drivers/ide/pci'
gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=athlon -I../ -nostdinc -iwithprefix include -DKBUILD_BASENAME=via82cxxx -c -o via82cxxx.o via82cxxx.c via82cxxx.c:77: error: `PCI_DEVICE_ID_VIA_8237' undeclared here (not in a function)
via82cxxx.c:77: error: initializer element is not constant

Doh .. my fault

include/linux/pci_ids.h +6 -3

diff -u --exclude-from /usr/src/exclude --new-file --recursive linux.21rc4/include/linux/pci_ids.h linux.21rc4-ac1/include/linux/pci_ids.h
@@ -501,6 +501,7 @@
 #define PCI_DEVICE_ID_SI_650		0x0650
 #define PCI_DEVICE_ID_SI_651		0x0651
 #define PCI_DEVICE_ID_SI_652		0x0652
+#define PCI_DEVICE_ID_SI_655		0x0655
 #define PCI_DEVICE_ID_SI_730		0x0730
 #define PCI_DEVICE_ID_SI_630_VGA	0x6300
 #define PCI_DEVICE_ID_SI_730_VGA	0x7300

@@ -1025,11 +1026,13 @@
 #define PCI_DEVICE_ID_VIA_8622		0x3102
 #define PCI_DEVICE_ID_VIA_8233C_0	0x3109
 #define PCI_DEVICE_ID_VIA_8361		0x3112
+#define PCI_DEVICE_ID_VIA_8375		0x3116
 #define PCI_DEVICE_ID_VIA_8233A		0x3147
-#define PCI_DEVICE_ID_VIA_P4X333   0x3168
-#define PCI_DEVICE_ID_VIA_8235        0x3177
-#define PCI_DEVICE_ID_VIA_8377_0  0x3189
+#define PCI_DEVICE_ID_VIA_8237_SATA	0x3149
+#define PCI_DEVICE_ID_VIA_P4X333	0x3168
+#define PCI_DEVICE_ID_VIA_8235		0x3177
 #define PCI_DEVICE_ID_VIA_8377_0	0x3189
+#define PCI_DEVICE_ID_VIA_8237		0x3227
 #define PCI_DEVICE_ID_VIA_86C100A	0x6100
 #define PCI_DEVICE_ID_VIA_8231		0x8231
 #define PCI_DEVICE_ID_VIA_8231_4	0x8235

Marcelo Tosatti

author

2003-05-27 21:42 UTC #3 lore raw

In reply to Alex Romosan

Quoted 5 lines · Alex Romosan

Quoted 3 lines · Marcelo Tosatti
Mainly due to a IDE DMA problem which would happen on boxes with lots of RAM, here is -rc5.

Quoted 7 lines

Quoted 1 line
As I always ask, please test.
i get the following error:
make[5]: Entering directory `/usr/src/linux/drivers/ide/pci'
gcc -D__KERNEL__ -I/usr/src/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=athlon -I../ -nostdinc -iwithprefix include -DKBUILD_BASENAME=via82cxxx -c -o via82cxxx.o via82cxxx.c via82cxxx.c:77: error: `PCI_DEVICE_ID_VIA_8237' undeclared here (not in a function)

Get the latest BK tree.

I will have to release -rc6 (will probably do later tonight, maybe something else shows up).

Carl-Daniel Hailfinger

2003-05-27 22:22 UTC #4 lore raw

PATCH 1/1 IDE config correctness (was: Linux 2.4.21-rc5)

In reply to Marcelo Tosatti

Quoted 5 lines · Marcelo Tosatti

Summary of changes from v2.4.21-rc4 to v2.4.21-rc5
============================================
Alan Cox <[email protected]>:
o 1: (trivial) Fix the formatting of your ide hack

Darn. Everytime I send a patch for drivers/ide/Config.in, someone beats me to it and my patch causes a conflict. This time with one more bugfix for the same line.

Fixes:
CONFIG_PDC202XX_BURST was not selectable if CONFIG_BLK_DEV_PDC202XX_OLD=m

CONFIG_PDC202XX_BURST depended on CONFI_BLK_DEV_IDEDMA_PCI, which is a typo.

Please apply,

Carl-Daniel

===== drivers/ide/Config.in 1.32 vs edited =====

drivers/ide/Config.in +1 -1

@@ -63,7 +63,7 @@
 	    dep_tristate '    NS87415 chipset support' CONFIG_BLK_DEV_NS87415 $CONFIG_BLK_DEV_IDEDMA_PCI
 	    dep_tristate '    OPTi 82C621 chipset enhanced support (EXPERIMENTAL)' CONFIG_BLK_DEV_OPTI621 $CONFIG_EXPERIMENTAL
 	    dep_tristate '    PROMISE PDC202{46|62|65|67} support' CONFIG_BLK_DEV_PDC202XX_OLD $CONFIG_BLK_DEV_IDEDMA_PCI
-	    dep_bool     '      Special UDMA Feature' CONFIG_PDC202XX_BURST $CONFIG_BLK_DEV_PDC202XX_OLD $CONFI_BLK_DEV_IDEDMA_PCI
+	    dep_mbool    '      Special UDMA Feature' CONFIG_PDC202XX_BURST $CONFIG_BLK_DEV_PDC202XX_OLD $CONFIG_BLK_DEV_IDEDMA_PCI
 	    dep_tristate '    PROMISE PDC202{68|69|70|71|75|76|77} support' CONFIG_BLK_DEV_PDC202XX_NEW $CONFIG_BLK_DEV_IDEDMA_PCI
 	    if [ "$CONFIG_BLK_DEV_PDC202XX_OLD" = "y" -o "$CONFIG_BLK_DEV_PDC202XX_OLD" = "m" -o "$CONFIG_BLK_DEV_PDC202XX_NEW" = "y" -o "$CONFIG_BLK_DEV_PDC202XX_NEW" = "m" ]; then
 	        bool     '    Special FastTrak Feature' CONFIG_PDC202XX_FORCE

Jerome Chantelauze

2003-05-28 05:30 UTC #5 lore raw

Re: Linux 2.4.21-rc5: [RESENT PATCH] kernel with Old ide hard disk only support doesn't build.

In reply to Marcelo Tosatti

Quoted 7 lines · Marcelo Tosatti

Hi,
Mainly due to a IDE DMA problem which would happen on boxes with lots of RAM, here is -rc5.
As I always ask, please test.

Hi,

Kernel 2.4.21-rc5 with CONFIG_BLK_DEV_HD_ONLY=y still doen't build (it doesn't build since 2.4.21-rc3).

I resend this patch which shoud fix the problem.

*** drivers/ide/Makefile.orig Wed May 28 07:33:33 2003
--- drivers/ide/Makefile Wed May 28 07:34:03 2003
***************
*** 19,24 ****
--- 19,26 ----
obj-m :=
ide-obj-y :=

+ subdir-$(CONFIG_BLK_DEV_HD_ONLY) += legacy
+
subdir-$(CONFIG_BLK_DEV_IDE) += legacy ppc arm raid pci

# First come modules that register themselves with the core

FYI, here is the error message:

make -C ide
make[2]: Entering directory `/usr/src/linux-2.4.21-rc5/drivers/ide' make all_targets
make[3]: Entering directory `/usr/src/linux-2.4.21-rc5/drivers/ide' rm -f idedriver.o
ld -m elf_i386 -r -o idedriver.o legacy/idedriver-legacy.o
ld: cannot open legacy/idedriver-legacy.o: No such file or directory make[3]: *** [idedriver.o] Error 1
make[3]: Leaving directory `/usr/src/linux-2.4.21-rc5/drivers/ide' make[2]: *** [first_rule] Error 2
make[2]: Leaving directory `/usr/src/linux-2.4.21-rc5/drivers/ide' make[1]: *** [_subdir_ide] Error 2
make[1]: Leaving directory `/usr/src/linux-2.4.21-rc5/drivers'
make: *** [_dir_drivers] Error 2

Best regards.
--
Jerome Chantelauze

Olaf Dietrich

2003-05-28 07:57 UTC #6 lore raw

In reply to Marcelo Tosatti

Attached are two tiny type-related fixes for
2.4.21-rc5 to avoid compiler warnings.

Olaf

drivers/char/agp/agpgart_be.c +1 -1

diff -Nur linux-2.4.21-rc5/drivers/char/agp/agpgart_be.c linux-2.4.21-rc5.n/drivers/char/agp/agpgart_be.c
@@ -577,7 +577,7 @@
 	for (page = virt_to_page(table); page <= virt_to_page(table_end); page++)
 		SetPageReserved(page);
 
-	agp_bridge.gatt_table_real = (unsigned long *) table;
+	agp_bridge.gatt_table_real = (u32 *) table;
 	agp_gatt_table = (void *)table;
 #ifdef CONFIG_X86
 	err = change_page_attr(virt_to_page(table), 1<<page_order, PAGE_KERNEL_NOCACHE);

fs/ext2/balloc.c +1 -1

diff -Nur linux-2.4.21-rc5/fs/ext2/balloc.c linux-2.4.21-rc5.n/fs/ext2/balloc.c
@@ -520,7 +520,7 @@
 	    in_range (tmp, le32_to_cpu(gdp->bg_inode_table),
 		      EXT2_SB(sb)->s_itb_per_group)) {
 		ext2_error (sb, "ext2_new_block",
-			    "Allocating block in system zone - block = %lu",
+			    "Allocating block in system zone - block = %u",
 			    tmp);
 		ext2_set_bit(j, bh->b_data);
 		DQUOT_FREE_BLOCK(inode, 1);