This has more IDE and PCI toys. Handle with care. This brings most of the
quirk handling from 2.4 into 2.5. The ALi Magick one requires the video4linux
stuff is fixed in 2.5 as well. I've not yet merged the 450NX patch to mtrr
(450NX mtrr write combining has errata)
Linux 2.5.62-ac1
Merge Linus 2.5.62
o UNEXPECTED_IO_APIC can be static (Pavel Machek)
o Update IPMI driver to version 18 (Corey Minyard)
o Tons of spelling fixes (Steven Cole)
o FBdev updates (James Simmons)
o PC-9800 update (Osamu Tomita)
o Remove dead scripts (Brian Gerst)
o v850 updates (Miles Bader)
o Update 3c523 to new MCA api (untested) (James Bottomley)
o Toshiba keyboard workaround (Pavel Machek)
o Fix mremap file name in comments (Paul Larson)
o Firestream typo fixes (Maciej Soltysiak)
o Backport trident reset fix from 2.4 (Muli Ben-Yehuda)
o Morse code panics are back! (Tomas Szepe)
o Fix aicasm build (Bob Tracy)
o Fixes for 700/710 drivers (Rolf Eike Beer)
o Spelling fixes (Rolf Eike Beer)
o Optimise CRC32 (Joakim Tjernlund)
o Next batch of v850 updates (Miles Bader)
o Takayoshi Kochi has moved email (Takayoshi Kochi)
o SunRPC race fix (Trond Myklebust)
o Refix addr/port naming confusion in IDE iops (me)
o Forward port VIA APIC handling quirks (me)
o Forward port ALi magick quirk flag handler (me)
| Needs bt848 etc to acquire the fix too
o Forward port IDE bases fix (me)
o Forward port pci irq search for legacy IDE (me)
Linux 2.5.61-ac1
Merge Linus 2.5.61
o Fix aic7xxx makefile (Sam Ravnborg)
o Fix ieee1394 build on Alpha (Ben Collins)
o Fix isdn_net build with X.25 (Adriank Bunk)
o Typo fix (Steven Bosscher)
o A pile of other typo fixes (Steven Cole)
o C99 initializers (Art Haas)
o dasd typo fix (Maciej Soltysiak)
o Remove an unused variable in sunrpc (Robert Love)
o Remove duplicate different BSD partition names (Andries Brouwer)
o PPC plural fix (Steven Cole)
o EISA driver class patches (Marc Zyngier)
o VIA Rhine updates (Roger Luethi)
o Further ppa scsi fix (John Kim)
o Kill unused __beep (Hugh Dickins)
o Merge visws support (Andrey Panin)
| Some collisions with pc9800 but should be ok
o Limits for upward growing stacks (Matthew Wilcox)
o ucLinux updates (Greg Ungerer)
o 68328 frame buffer updates (Greg Ungerer)
o Merge ucLinux H8300 support (Yoshinori Sato)
o Fix aironet compile (Ookhoi)
o Fix DMA mask on OSS trident driver (Ivan Kokshaysky)
o Kill some old 2.4 glue code in DRM (John Kim)
o Fix compile of old "hd.c" driver (Paul Gortmaker)
o Add experimental BOCHS virtualisation (Kevin Lawton)
o Clean up intermezzo driver (Adrian Bunk)
o Clean up rio use of compatmac (Adrian Bunk)
o Remove 2.0 ifdefs from ipchains code (Adrian Bunk)
o Remove old junk from efs (Adrian Bunk)
o Remove old 2.0/2.2 junk from media/video (Adrian Bunk)
o Remove unused variable in ali-ircc (Adrian Bunk)
o Remove 2.0 ifdefs from network drivers (Adrian Bunk)
o Clean up uglies in inia100 (Adrian Bunk)
o Clean up uglies in i91u scsi (Adrian Bunk)
o Clean up wan drivers 2.0/2.2 code (Adrian Bunk)
o Restore ontrack remap support (Jim Houston)
| I'd really like to see this get turned into device mapper..
o Forward port emu10k1 driver to 2.5 (Rui Souza)
o Fix boot on EPOX 4BEA-R and friends (Alexandar Achenbach)
o Switch alpha cia code to static inline (Matt Reppert)
o Fix pcmcia scsi compile breakages (Mike Anderson)
o EHCI workarounds (David Brownell)
Linux 2.5.60-ac1 (not published)
Includes Linus BK snapshot
Merge relevant pieces from old -ac (me)
| Dropped visws and stuff thats been redone
| also dropped out IRQ stacks (port is tricky!)
o Fix build of cciss driver (me)
o Fix build of 3036 tv tuner (me)
o Remove i2o_lan (me)
o Fix i2o_scsi (Randy Dunlap)
o Fix iph5526 scsi changes (not fixed DMA) (me)
o Make starfire compile (me)
o Make mca-legacy warn if used (me)
o Make sim710 build with EISA (me)
o Make ultrastor compile (me)
o Make aha152x/aha154x build (Randy Dunlap)
o Fix aha154x/mca bits (me)
o Fix fd_mcs build (me)
o Fix NCR53c406a.c (me)
o Fix sym53c416.c (me)
o Fix ibmmca compile (me)
o Fix ppa compile (me)
o Fix NCR539x compile (John Kim)
o Fix mca_53c9x compile (me)
> Alan, this doesn't boot in my vmware setup while 2.5.62 vanilla does
> (same config where applicable). Never gets to do anything after
> 'Uncompressing Linux... Ok, booting the kernel.' Any off-hand suspects?
Curious. And its definitely not turned console support back off in the
make config ?
Do you have pretty flashing keyboard lights ?
> [[email protected]]
>
> Linux 2.5.62-ac1
>
> This has more IDE and PCI toys. Handle with care. This brings most of the
> quirk handling from 2.4 into 2.5. The ALi Magick one requires the video4linux
> stuff is fixed in 2.5 as well. I've not yet merged the 450NX patch to mtrr
> (450NX mtrr write combining has errata)
Alan, this doesn't boot in my vmware setup while 2.5.62 vanilla does
(same config where applicable). Never gets to do anything after
'Uncompressing Linux... Ok, booting the kernel.' Any off-hand suspects?
--
Tomas Szepe <[email protected]>
> [[email protected]]
>
> > Alan, this doesn't boot in my vmware setup while 2.5.62 vanilla does
> > (same config where applicable). Never gets to do anything after
> > 'Uncompressing Linux... Ok, booting the kernel.' Any off-hand suspects?
>
> Curious. And its definitely not turned console support back off in the
> make config ?
$ diff -u 2.5.62/.config 2.5.62-ac1/.config
--- 2.5.62/.config 2003-02-18 09:35:12.000000000 +0100
+++ 2.5.62-ac1/.config 2003-02-20 23:55:10.000000000 +0100
@@ -19,6 +19,8 @@
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_SYSCTL=y
CONFIG_LOG_BUF_SHIFT=14
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
CONFIG_MORSE_PANICS=y
#
@@ -39,6 +41,7 @@
# CONFIG_X86_NUMAQ is not set
# CONFIG_X86_SUMMIT is not set
# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
@@ -850,6 +853,10 @@
CONFIG_DUMMY_CONSOLE=y
#
+# Logo configuration
+#
+
+#
# Sound
#
# CONFIG_SOUND is not set
@@ -902,3 +909,7 @@
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m
CONFIG_X86_BIOS_REBOOT=y
+
+#
+# Hardware Abstraction Layer
+#
> Do you have pretty flashing keyboard lights ?
Nothing I'm afraid.
--
Tomas Szepe <[email protected]>
On Thu, 2003-02-20 at 15:33, Alan Cox wrote:
> This has more IDE and PCI toys. Handle with care. This brings most of the
> quirk handling from 2.4 into 2.5. The ALi Magick one requires the video4linux
> stuff is fixed in 2.5 as well. I've not yet merged the 450NX patch to mtrr
> (450NX mtrr write combining has errata)
>
> Linux 2.5.62-ac1
Didn't boot. I copied this trace by hand.
The box is dual PIII, SCSI disks, aic7xxx.
Results of grep ^CONFIG .config attached as myconfig.
Steven
Call Trace:
ide_xlate_1024+0xf5
read_dev_sector+0x69
handle_ide_mess+0x179
msdos_partition+0x3c
call_console_drivers+0xeb
printk+0x17d
check_partition+0xac
register_disk+0xd0
blk_register_region+0x24
add_disk+0x35
exact_match+0x0
exact_lock+0x0
sd_attach+0x291
scsi_register_device+0x94
init+0x62
init+0x0
kernel_thread_helper+0x5
> ide_xlate_1024+0xf5
> read_dev_sector+0x69
> handle_ide_mess+0x179
Ok I broke it with the change to the partiton stuff I put back. If you drop
that partition tweak out it ought to boot.
On Thu, 2003-02-20 at 16:57, Alan Cox wrote:
> > ide_xlate_1024+0xf5
> > read_dev_sector+0x69
> > handle_ide_mess+0x179
>
> Ok I broke it with the change to the partiton stuff I put back. If you drop
> that partition tweak out it ought to boot.
>
I'll try that tomorrow morning (12 hours from now) when I have access to that machine.
Thanks,
Steven
> Linux 2.5.62-ac1
> o PC-9800 update (Osamu Tomita)
Thanks!
> o Toshiba keyboard workaround (Pavel Machek)
This change conflict with PC98 keyboard. Always shows message
'Keyboard glitch detected, ignoring keypress' every keypress.
Other machine has no problem?
Regards,
Osamu Tomita
> > Linux 2.5.62-ac1
> > o PC-9800 update (Osamu Tomita)
> Thanks!
>
> > o Toshiba keyboard workaround (Pavel Machek)
> This change conflict with PC98 keyboard. Always shows message
> 'Keyboard glitch detected, ignoring keypress' every keypress.
> Other machine has no problem?
I've had no other reports of it triggering wrongly. Thats easy to
deal with. Pavel can you send me the dmidecode data for the afflicted
laptop ?
On Thu, Feb 20, 2003 at 05:33:08PM -0500, Alan Cox wrote:
>...
> Linux 2.5.62-ac1
>...
> o FBdev updates (James Simmons)
>...
FYI:
This causes the followig compile error (more error messages in this file
skipped):
<-- snip -->
...
gcc -Wp,-MD,drivers/video/aty/.mach64_ct.o.d -D__KERNEL__ -Iinclude
-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing
-fno-common -pipe -mpreferred-stack-boundary=2 -march=k6
-Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include
-DKBUILD_BASENAME=mach64_ct -DKBUILD_MODNAME=atyfb -c -o
drivers/video/aty/mach64_ct.o drivers/video/aty/mach64_ct.c
drivers/video/aty/mach64_ct.c: In function `aty_dsp_gt':
drivers/video/aty/mach64_ct.c:51: structure has no member named
`xclk_post_div_real'
drivers/video/aty/mach64_ct.c:60: structure has no member named
`fifo_size'
drivers/video/aty/mach64_ct.c:67: structure has no member named
`fifo_size'
drivers/video/aty/mach64_ct.c:69: structure has no member named
`page_size'
drivers/video/aty/mach64_ct.c:86: structure has no member named
`dsp_loop_latency'
...
make[3]: *** [drivers/video/aty/mach64_ct.o] Error 1
<-- snip -->
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
On Thu, Feb 20, 2003 at 05:33:08PM -0500, Alan Cox wrote:
>...
> Linux 2.5.62-ac1
>...
> o FBdev updates (James Simmons)
>...
FYI:
The Logo changes seem to be incomplete, at least pnmtologo is missing:
<-- snip -->
...
./scripts/pnmtologo -t mono -n logo_linux_mono -o drivers/video/logo/logo_linux_mono.c drivers/video/logo/logo_linux_mono.pbm
make[3]: ./scripts/pnmtologo: Command not found
make[3]: *** [drivers/video/logo/logo_linux_mono.c] Error 127
<-- snip -->
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
On Thu, Feb 20, 2003 at 05:33:08PM -0500, Alan Cox wrote:
>...
> Linux 2.5.62-ac1
>...
> o FBdev updates (James Simmons)
>...
gcc 2.95 doesn't like variable declarations in the middle of a function:
<-- snip -->
...
gcc -Wp,-MD,drivers/video/.aty128fb.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe
-mpreferred-stack-boundary=2 -march=k6 -Iinclude/asm-i386/mach-default -nostdinc
-iwithprefix include -DKBUILD_BASENAME=aty128fb -DKBUILD_MODNAME=aty128fb -c -o drivers
/video/aty128fb.o drivers/video/aty128fb.c
drivers/video/aty128fb.c: In function `aty128_map_ROM':
drivers/video/aty128fb.c:1811: parse error before `unsigned'
drivers/video/aty128fb.c:1814: `addr' undeclared (first use in this function)
drivers/video/aty128fb.c:1814: (Each undeclared identifier is reported only once
drivers/video/aty128fb.c:1814: for each function it appears in.)
drivers/video/aty128fb.c: In function `aty128_unmap_ROM':
drivers/video/aty128fb.c:1827: parse error before `struct'
drivers/video/aty128fb.c:1828: `r' undeclared (first use in this function)
make[2]: *** [drivers/video/aty128fb.o] Error 1
<-- snip -->
The following patch fixes the compilation:
--- linux-2.5.62-ac/drivers/video/aty128fb.c.old 2003-02-21 16:14:58.000000000 +0100
+++ linux-2.5.62-ac/drivers/video/aty128fb.c 2003-02-21 16:21:02.000000000 +0100
@@ -1793,6 +1793,8 @@
#if !defined(CONFIG_PPC) && !defined(__sparc__)
static void * __init aty128_map_ROM(struct pci_dev *dev)
{
+ unsigned char *addr;
+
// If this is a primary card, there is a shadow copy of the
// ROM somewhere in the first meg. We will just ignore the copy
// and use the ROM directly.
@@ -1808,7 +1810,7 @@
if (!(r->flags & PCI_ROM_ADDRESS_ENABLE))
pci_write_config_dword(dev, dev->rom_base_reg, r->start | PCI_ROM_ADDRESS_ENABLE);
- unsigned char *addr = ioremap(r->start, r->end - r->start + 1);
+ addr = ioremap(r->start, r->end - r->start + 1);
// Very simple test to make sure it appeared
if (addr && (*addr != 0x55)) {
@@ -1821,10 +1823,12 @@
static void __init aty128_unmap_ROM(struct pci_dev *dev, void * rom)
{
+ struct resource *r;
+
iounmap(rom);
// leave it disabled and unassigned
- struct resource *r = &dev->resource[PCI_ROM_RESOURCE];
+ r = &dev->resource[PCI_ROM_RESOURCE];
r->flags &= !PCI_ROM_ADDRESS_ENABLE;
r->end -= r->start;
r->start = 0;
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
> > Linux 2.5.62-ac1
> >...
> > o FBdev updates (James Simmons)
> >...
>
> FYI:
>
> The Logo changes seem to be incomplete, at least pnmtologo is missing:
>
> <-- snip -->
>
> ...
> ./scripts/pnmtologo -t mono -n logo_linux_mono -o drivers/video/logo/logo_linux_mono.c drivers/video/logo/logo_linux_mono.pbm
> make[3]: ./scripts/pnmtologo: Command not found
> make[3]: *** [drivers/video/logo/logo_linux_mono.c] Error 127
>
Hm. Looks like pnmtologo didn't get compiled. In scripts/Makefile add
pnmtologo to host-progs :=
That shoudl fix the problem.
Hi!
> > > Linux 2.5.62-ac1
> > > o PC-9800 update (Osamu Tomita)
> > Thanks!
> >
> > > o Toshiba keyboard workaround (Pavel Machek)
> > This change conflict with PC98 keyboard. Always shows message
> > 'Keyboard glitch detected, ignoring keypress' every keypress.
> > Other machine has no problem?
>
> I've had no other reports of it triggering wrongly. Thats easy to
> deal with. Pavel can you send me the dmidecode data for the afflicted
> laptop ?
arch/i386/kernel/dmi_scan.c, broken_toshiba_keyboard() is the right
place. DMI data are:
{ broken_toshiba_keyboard, "Toshiba Satellite 4030cdt", { /* Keyboard generates spurious repeats */
MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
NO_MATCH, NO_MATCH, NO_MATCH
} },
Pavel
--
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]
On Fri, 21 Feb 2003, James Simmons wrote:
> > > Linux 2.5.62-ac1
> > >...
> > > o FBdev updates (James Simmons)
> > >...
> >
> > FYI:
> >
> > The Logo changes seem to be incomplete, at least pnmtologo is missing:
> >
> > <-- snip -->
> >
> > ...
> > ./scripts/pnmtologo -t mono -n logo_linux_mono -o drivers/video/logo/logo_linux_mono.c drivers/video/logo/logo_linux_mono.pbm
> > make[3]: ./scripts/pnmtologo: Command not found
> > make[3]: *** [drivers/video/logo/logo_linux_mono.c] Error 127
> >
>
> Hm. Looks like pnmtologo didn't get compiled. In scripts/Makefile add
> pnmtologo to host-progs :=
>
> That shoudl fix the problem.
No, you forgot to include scripts/pnmtologo in your latest fbdev.diff.gz.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
> > Hm. Looks like pnmtologo didn't get compiled. In scripts/Makefile add
> > pnmtologo to host-progs :=
> >
> > That shoudl fix the problem.
>
> No, you forgot to include scripts/pnmtologo in your latest fbdev.diff.gz.
I thought pnmtologo was a generated binary.
On Tue, 25 Feb 2003, James Simmons wrote:
> > > Hm. Looks like pnmtologo didn't get compiled. In scripts/Makefile add
> > > pnmtologo to host-progs :=
> > >
> > > That shoudl fix the problem.
> >
> > No, you forgot to include scripts/pnmtologo in your latest fbdev.diff.gz.
>
> I thought pnmtologo was a generated binary.
Sorry, I meant scripts/pnmtologo.c.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds