2000-11-28 03:16:24

by Linus Torvalds

[permalink] [raw]
Subject: test12-pre2


Oh, well. Some people saw the (unannounced, and not for public
consumption) pre1, so here's pre2. pre1 was just meant to be an interim
patch to sync up with the ISDN patches.

Due to the birth of my third daughter last week (yes, I got /.'ed), if you
sent me patches that aren't in pre2, you can pretty much consider them
lost.

Linus

---

- pre2:
- Peter Anvin: more P4 configuration parsing
- Stephen Tweedie: O_SYNC patches. Make O_SYNC/fsync/fdatasync
do the right thing.
- Keith Owens: make mdule loading use the right struct module size
- Boszormenyi Zoltan: get MTRR's right for the >32-bit case
- Alan Cox: various random documentation etc
- Dario Ballabio: EATA and u14-34f update
- Ivan Kokshaysky: unbreak alpha ruffian
- Richard Henderson: PCI bridge initialization on alpha
- Zach Brown: correct locking in Maestro driver
- Geert Uytterhoeven: more m68k updates
- Andrey Savochkin: eepro100 update
- Dag Brattli: irda update
- Johannes Erdfelt: USB update

- pre1: (for ISDN synchronization _ONLY_! Not complete!)
- Byron Stanoszek: correct decimal precision for CPU MHz in
/proc/cpuinfo
- Ollie Lho: SiS pirq routing.
- Andries Brouwer: isofs cleanups
- Matt Kraai: /proc read() on directories should return EISDIR, not EINVAL
- me: be stricter about what we accept as a PCI bridge setup.
- me: always set PCI interrupts to be level-triggered when we enable them.
- me: updated PageDirty and swap cache handling
- Peter Anvin: update A20 code to work without keyboard controller
- Kai Germaschewski: ISDN updates
- Russell King: ARM updates
- Geert Uytterhoeven: m68k updates


2000-11-28 04:17:22

by NeilBrown

[permalink] [raw]
Subject: Re: test12-pre2

On Monday November 27, [email protected] wrote:
>
> Oh, well. Some people saw the (unannounced, and not for public
> consumption) pre1, so here's pre2. pre1 was just meant to be an interim
> patch to sync up with the ISDN patches.
>
> Due to the birth of my third daughter last week (yes, I got /.'ed), if you
> sent me patches that aren't in pre2, you can pretty much consider them
> lost.
>
> Linus
>

What happens about the stuff that went in to 2.4.0test11-ac{1,2,3,4}?
Are you going to "sync-up" with Alan, or should we send bits directly
to you?

NeilBrown

2000-11-28 04:19:33

by John B. Jacobsen

[permalink] [raw]
Subject: Linus daughter

>
> Oh, well. Some people saw the (unannounced, and not for public
> consumption) pre1, so here's pre2. pre1 was just meant to be an interim
> patch to sync up with the ISDN patches.
>
> Due to the birth of my third daughter last week (yes, I got /.'ed), if you
> sent me patches that aren't in pre2, you can pretty much consider them
> lost.

Congratulations with your new child !!

Regards

John


>
> Linus
>
> ---
>
> - pre2:
> - Peter Anvin: more P4 configuration parsing
> - Stephen Tweedie: O_SYNC patches. Make O_SYNC/fsync/fdatasync
> do the right thing.
> - Keith Owens: make mdule loading use the right struct module size
> - Boszormenyi Zoltan: get MTRR's right for the >32-bit case
> - Alan Cox: various random documentation etc
> - Dario Ballabio: EATA and u14-34f update
> - Ivan Kokshaysky: unbreak alpha ruffian
> - Richard Henderson: PCI bridge initialization on alpha
> - Zach Brown: correct locking in Maestro driver
> - Geert Uytterhoeven: more m68k updates
> - Andrey Savochkin: eepro100 update
> - Dag Brattli: irda update
> - Johannes Erdfelt: USB update
>
> - pre1: (for ISDN synchronization _ONLY_! Not complete!)
> - Byron Stanoszek: correct decimal precision for CPU MHz in
> /proc/cpuinfo
> - Ollie Lho: SiS pirq routing.
> - Andries Brouwer: isofs cleanups
> - Matt Kraai: /proc read() on directories should return EISDIR, not EINVAL
> - me: be stricter about what we accept as a PCI bridge setup.
> - me: always set PCI interrupts to be level-triggered when we enable them.
> - me: updated PageDirty and swap cache handling
> - Peter Anvin: update A20 code to work without keyboard controller
> - Kai Germaschewski: ISDN updates
> - Russell King: ARM updates
> - Geert Uytterhoeven: m68k updates
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> Please read the FAQ at http://www.tux.org/lkml/
>

2000-11-28 04:24:24

by Alan

[permalink] [raw]
Subject: Re: test12-pre2

> > Due to the birth of my third daughter last week (yes, I got /.'ed), if you
> > sent me patches that aren't in pre2, you can pretty much consider them
> > lost.
> >
> > Linus
> >
>
> What happens about the stuff that went in to 2.4.0test11-ac{1,2,3,4}?
> Are you going to "sync-up" with Alan, or should we send bits directly
> to you?

When Linus puts out pre3 I will start sending him stuff from my tree which
proves workable. Stuff that seems suspect and needs more work I'll keep in
the -ac tree and continue to release it against current Linus code.

It doesnt cause me any problem if you send Linus a copy, I'll just drop it
from my patches as it appears in his tree.

Alan

2000-11-28 04:47:39

by Mohammad A. Haque

[permalink] [raw]
Subject: Re: test12-pre2

Congrats Linus!

Which part of the kernel is dedicated to Celeste? =P

Linus Torvalds wrote:
>
> Due to the birth of my third daughter last week (yes, I got /.'ed), if you
> sent me patches that aren't in pre2, you can pretty much consider them
> lost.

--

=====================================================================
Mohammad A. Haque http://www.haque.net/
[email protected]

"Alcohol and calculus don't mix. Project Lead
Don't drink and derive." --Unknown http://wm.themes.org/
[email protected]
=====================================================================

2000-11-28 05:09:37

by Linus Torvalds

[permalink] [raw]
Subject: Re: test12-pre2



On Tue, 28 Nov 2000, Neil Brown wrote:
>
> What happens about the stuff that went in to 2.4.0test11-ac{1,2,3,4}?
> Are you going to "sync-up" with Alan, or should we send bits directly
> to you?

Either, or both.

Alan feeds me his patches in small chunks anyway, and does a good job of
keeping stuff separate. Re-sending directly to me means that Alan would
just drop that part of the patch - or that I'd get the patch twice. Both
of which work ok, as long as it's the _same_ patch.

If you've made modifications since sending the stuff to Alan, you should
synchronize with Alan too - just to make sure that I don't en dup applying
the old stuff through Alan.

Linus

2000-11-28 12:43:37

by George R. Kasica

[permalink] [raw]
Subject: Re: Linus daughter

On Tue, 28 Nov 2000 03:55:29 +0100 (CET), you wrote:

>>
>> Oh, well. Some people saw the (unannounced, and not for public
>> consumption) pre1, so here's pre2. pre1 was just meant to be an interim
>> patch to sync up with the ISDN patches.
>>
>> Due to the birth of my third daughter last week (yes, I got /.'ed), if you
>> sent me patches that aren't in pre2, you can pretty much consider them
>> lost.
Congratulations from across the pond in Milwaukee WI!

Hope all is well.

George

===[George R. Kasica]=== +1 262 513 8503
President +1 206 374 6482 FAX
Netwrx Consulting Inc. Waukesha, WI USA
http://www.netwrx1.com
[email protected]
ICQ #12862186

2000-11-29 02:49:23

by Wakko Warner

[permalink] [raw]
Subject: Re: test12-pre2

> - pre2:
> - Richard Henderson: PCI bridge initialization on alpha

Doesn't boot on noritake alpha.

It gets to POSIX conformance testing by UNIFIX
and hard locks. the halt switch doesn't even work.


--
Lab tests show that use of micro$oft causes cancer in lab animals

2000-11-29 14:06:29

by Ingo Oeser

[permalink] [raw]
Subject: Re: test12-pre2

On Mon, Nov 27, 2000 at 06:45:31PM -0800, Linus Torvalds wrote:
> Due to the birth of my third daughter last week (yes, I got /.'ed), if you
> sent me patches that aren't in pre2, you can pretty much consider them
> lost.

Congrats ;-)

> - Kai Germaschewski: ISDN updates

There seem to be a questionable part of it (didn't see this part
on linux-kernel, why?).

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/isdn/hisax/bkm_a8.c linux/drivers/isdn/hisax/bkm_a8.c
--- v2.4.0-test11/linux/drivers/isdn/hisax/bkm_a8.c Mon Aug 21 07:49:02 2000
+++ linux/drivers/isdn/hisax/bkm_a8.c Mon Nov 27 16:53:43 2000
@@ -282,17 +283,17 @@
return(0);
}

-static struct pci_dev *dev_a8 __initdata = NULL;
-static u16 sub_vendor_id __initdata = 0;
-static u16 sub_sys_id __initdata = 0;
-static u_char pci_bus __initdata = 0;
-static u_char pci_device_fn __initdata = 0;
-static u_char pci_irq __initdata = 0;
+static struct pci_dev *dev_a8 __initdata;
+static u16 sub_vendor_id __initdata;
+static u16 sub_sys_id __initdata;
+static u_char pci_bus __initdata;
+static u_char pci_device_fn __initdata;
+static u_char pci_irq __initdata;

#endif /* CONFIG_PCI */

-__initfunc(int
-setup_sct_quadro(struct IsdnCard *card))
+int __init
+setup_sct_quadro(struct IsdnCard *card)
{
#if CONFIG_PCI
struct IsdnCardState *cs = card->cs;

IIRC variables marked as "__initdata" need to be explicitly set
even to zero, because gcc won't put them into the right section
otherwise. One of Tigran's patches has been reverted because of
this.

So please reconsider this chunk and prove me wrong if I'm ;-)

PS: Same goes for several other chunks in the submitted
ISDN-Patch.

PPS: No, this is not fixed in pre3.

Regards

Ingo Oeser
--
To the systems programmer, users and applications
serve only to provide a test load.
<esc>:x

2000-11-29 16:46:59

by Kai Germaschewski

[permalink] [raw]
Subject: Re: test12-pre2


On Wed, 29 Nov 2000, Ingo Oeser wrote:

> IIRC variables marked as "__initdata" need to be explicitly set
> even to zero, because gcc won't put them into the right section
> otherwise. One of Tigran's patches has been reverted because of
> this.

I checked the archives, you're right, of course.

Fix is appended, Linus please apply.

--Kai

diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/avm_pci.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/avm_pci.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/avm_pci.c Wed Nov 29 11:38:12 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/avm_pci.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-/* $Id: avm_pci.c,v 1.22.6.1 2000/11/28 12:02:46 kai Exp $
+/* $Id: avm_pci.c,v 1.22.6.2 2000/11/29 16:00:14 kai Exp $
*
* avm_pci.c low level stuff for AVM Fritz!PCI and ISA PnP isdn cards
* Thanks to AVM, Berlin for informations
@@ -18,7 +18,7 @@
#include <linux/interrupt.h>

extern const char *CardType[];
-static const char *avm_pci_rev = "$Revision: 1.22.6.1 $";
+static const char *avm_pci_rev = "$Revision: 1.22.6.2 $";

#define AVM_FRITZ_PCI 1
#define AVM_FRITZ_PNP 2
@@ -758,7 +758,7 @@
return(0);
}

-static struct pci_dev *dev_avm __initdata;
+static struct pci_dev *dev_avm __initdata = NULL;

int __init
setup_avm_pcipnp(struct IsdnCard *card)
diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/bkm_a4t.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/bkm_a4t.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/bkm_a4t.c Wed Nov 29 11:38:13 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/bkm_a4t.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-/* $Id: bkm_a4t.c,v 1.13.6.1 2000/11/28 12:02:46 kai Exp $
+/* $Id: bkm_a4t.c,v 1.13.6.2 2000/11/29 16:00:14 kai Exp $
* bkm_a4t.c low level stuff for T-Berkom A4T
* derived from the original file sedlbauer.c
* derived from the original file niccy.c
@@ -24,7 +24,7 @@

extern const char *CardType[];

-const char *bkm_a4t_revision = "$Revision: 1.13.6.1 $";
+const char *bkm_a4t_revision = "$Revision: 1.13.6.2 $";


static inline u_char
@@ -264,7 +264,7 @@
return (0);
}

-static struct pci_dev *dev_a4t __initdata;
+static struct pci_dev *dev_a4t __initdata = NULL;

int __init
setup_bkm_a4t(struct IsdnCard *card)
diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/bkm_a8.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/bkm_a8.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/bkm_a8.c Wed Nov 29 11:38:13 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/bkm_a8.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-/* $Id: bkm_a8.c,v 1.14.6.1 2000/11/28 12:02:46 kai Exp $
+/* $Id: bkm_a8.c,v 1.14.6.2 2000/11/29 16:00:14 kai Exp $
* bkm_a8.c low level stuff for Scitel Quadro (4*S0, passive)
* derived from the original file sedlbauer.c
* derived from the original file niccy.c
@@ -27,7 +27,7 @@

extern const char *CardType[];

-const char sct_quadro_revision[] = "$Revision: 1.14.6.1 $";
+const char sct_quadro_revision[] = "$Revision: 1.14.6.2 $";

static const char *sct_quadro_subtypes[] =
{
@@ -283,12 +283,12 @@
return(0);
}

-static struct pci_dev *dev_a8 __initdata;
-static u16 sub_vendor_id __initdata;
-static u16 sub_sys_id __initdata;
-static u_char pci_bus __initdata;
-static u_char pci_device_fn __initdata;
-static u_char pci_irq __initdata;
+static struct pci_dev *dev_a8 __initdata = NULL;
+static u16 sub_vendor_id __initdata = 0;
+static u16 sub_sys_id __initdata = 0;
+static u_char pci_bus __initdata = 0;
+static u_char pci_device_fn __initdata = 0;
+static u_char pci_irq __initdata = 0;

#endif /* CONFIG_PCI */

diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/diva.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/diva.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/diva.c Wed Nov 29 11:38:13 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/diva.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-/* $Id: diva.c,v 1.25.6.1 2000/11/28 12:02:46 kai Exp $
+/* $Id: diva.c,v 1.25.6.2 2000/11/29 16:00:14 kai Exp $
*
* diva.c low level stuff for Eicon.Diehl Diva Family ISDN cards
*
@@ -24,7 +24,7 @@

extern const char *CardType[];

-const char *Diva_revision = "$Revision: 1.25.6.1 $";
+const char *Diva_revision = "$Revision: 1.25.6.2 $";

#define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr)
@@ -820,9 +820,9 @@
return(0);
}

-static struct pci_dev *dev_diva __initdata;
-static struct pci_dev *dev_diva_u __initdata;
-static struct pci_dev *dev_diva201 __initdata;
+static struct pci_dev *dev_diva __initdata = NULL;
+static struct pci_dev *dev_diva_u __initdata = NULL;
+static struct pci_dev *dev_diva201 __initdata = NULL;

int __init
setup_diva(struct IsdnCard *card)
diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/gazel.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/gazel.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/gazel.c Wed Nov 29 11:38:13 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/gazel.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-/* $Id: gazel.c,v 2.11.6.1 2000/11/28 12:02:46 kai Exp $
+/* $Id: gazel.c,v 2.11.6.2 2000/11/29 16:00:14 kai Exp $
*
* gazel.c low level stuff for Gazel isdn cards
*
@@ -19,7 +19,7 @@
#include <linux/pci.h>

extern const char *CardType[];
-const char *gazel_revision = "$Revision: 2.11.6.1 $";
+const char *gazel_revision = "$Revision: 2.11.6.2 $";

#define R647 1
#define R685 2
@@ -544,7 +544,7 @@
return (0);
}

-static struct pci_dev *dev_tel __initdata;
+static struct pci_dev *dev_tel __initdata = NULL;

static int
setup_gazelpci(struct IsdnCardState *cs)
diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/niccy.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/niccy.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/niccy.c Wed Nov 29 11:38:14 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/niccy.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-/* $Id: niccy.c,v 1.15.6.1 2000/11/28 12:02:46 kai Exp $
+/* $Id: niccy.c,v 1.15.6.2 2000/11/29 16:00:14 kai Exp $
*
* niccy.c low level stuff for Dr. Neuhaus NICCY PnP and NICCY PCI and
* compatible (SAGEM cybermodem)
@@ -22,7 +22,7 @@
#include <linux/pci.h>

extern const char *CardType[];
-const char *niccy_revision = "$Revision: 1.15.6.1 $";
+const char *niccy_revision = "$Revision: 1.15.6.2 $";

#define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr)
@@ -235,7 +235,7 @@
return(0);
}

-static struct pci_dev *niccy_dev __initdata;
+static struct pci_dev *niccy_dev __initdata = NULL;

int __init
setup_niccy(struct IsdnCard *card)
diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/nj_s.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/nj_s.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/nj_s.c Wed Nov 29 11:38:14 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/nj_s.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-// $Id: nj_s.c,v 2.7 2000/11/24 17:05:38 kai Exp $
+// $Id: nj_s.c,v 2.7.6.1 2000/11/29 16:00:14 kai Exp $
//
// This file is (c) under GNU PUBLIC LICENSE
//
@@ -14,7 +14,7 @@
#include <linux/ppp_defs.h>
#include "netjet.h"

-const char *NETjet_S_revision = "$Revision: 2.7 $";
+const char *NETjet_S_revision = "$Revision: 2.7.6.1 $";

static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off)
{
@@ -140,7 +140,7 @@
return(0);
}

-static struct pci_dev *dev_netjet __initdata;
+static struct pci_dev *dev_netjet __initdata = NULL;

int __init
setup_netjet_s(struct IsdnCard *card)
diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/nj_u.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/nj_u.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/nj_u.c Wed Nov 29 11:38:14 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/nj_u.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-/* $Id: nj_u.c,v 2.8 2000/11/24 17:05:38 kai Exp $
+/* $Id: nj_u.c,v 2.8.6.1 2000/11/29 16:00:14 kai Exp $
*
* This file is (c) under GNU PUBLIC LICENSE
*
@@ -15,7 +15,7 @@
#include <linux/ppp_defs.h>
#include "netjet.h"

-const char *NETjet_U_revision = "$Revision: 2.8 $";
+const char *NETjet_U_revision = "$Revision: 2.8.6.1 $";

static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off)
{
@@ -142,7 +142,7 @@
return(0);
}

-static struct pci_dev *dev_netjet __initdata;
+static struct pci_dev *dev_netjet __initdata = NULL;

int __init
setup_netjet_u(struct IsdnCard *card)
diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/telespci.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/telespci.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/telespci.c Wed Nov 29 11:38:14 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/telespci.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-/* $Id: telespci.c,v 2.16.6.1 2000/11/28 12:02:46 kai Exp $
+/* $Id: telespci.c,v 2.16.6.2 2000/11/29 16:00:14 kai Exp $
*
* telespci.c low level stuff for Teles PCI isdn cards
*
@@ -18,7 +18,7 @@
#include <linux/pci.h>

extern const char *CardType[];
-const char *telespci_revision = "$Revision: 2.16.6.1 $";
+const char *telespci_revision = "$Revision: 2.16.6.2 $";

#define ZORAN_PO_RQ_PEN 0x02000000
#define ZORAN_PO_WR 0x00800000
@@ -275,7 +275,7 @@
return(0);
}

-static struct pci_dev *dev_tel __initdata;
+static struct pci_dev *dev_tel __initdata = NULL;

int __init
setup_telespci(struct IsdnCard *card)
diff -ur linux-2.4.0-test12-pre3/drivers/isdn/hisax/w6692.c linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/w6692.c
--- linux-2.4.0-test12-pre3/drivers/isdn/hisax/w6692.c Wed Nov 29 11:38:15 2000
+++ linux-2.4.0-test12-pre3.w/drivers/isdn/hisax/w6692.c Wed Nov 29 17:04:19 2000
@@ -1,4 +1,4 @@
-/* $Id: w6692.c,v 1.12.6.1 2000/11/28 12:02:46 kai Exp $
+/* $Id: w6692.c,v 1.12.6.2 2000/11/29 16:00:14 kai Exp $
*
* w6692.c Winbond W6692 specific routines
*
@@ -35,7 +35,7 @@

extern const char *CardType[];

-const char *w6692_revision = "$Revision: 1.12.6.1 $";
+const char *w6692_revision = "$Revision: 1.12.6.2 $";

#define DBUSY_TIMER_VALUE 80

@@ -957,7 +957,7 @@

static int id_idx ;

-static struct pci_dev *dev_w6692 __initdata;
+static struct pci_dev *dev_w6692 __initdata = NULL;

int __init
setup_w6692(struct IsdnCard *card)

2000-11-29 17:35:55

by Wakko Warner

[permalink] [raw]
Subject: Re: test12-pre2

> > Ok, I won't have time this morning to try it, but I'll try it when I get off
> > work
>
> Ok. If that patch won't help, here is another one - setting
> cacheline/latency also might cause a trouble.

the patch helped, but it ooped after finding the last scsi drive (the
cdrom). I'll try removing the cdrom from the system as I've had problems
with it in the past. (might want to post your prior patch to the list)

> > I have no idea what 00:07.0 is.
>
> PCI to ISA bridge.

It does have 2 eisa slots.

> --- linux/drivers/pci/setup-res.c.orig Tue Nov 28 14:27:54 2000
> +++ linux/drivers/pci/setup-res.c Wed Nov 29 16:01:13 2000
> @@ -208,11 +208,11 @@ pdev_enable_device(struct pci_dev *dev)
> /* ??? Always turn on bus mastering. If the device doesn't support
> it, the bit will go into the bucket. */
> cmd |= PCI_COMMAND_MASTER;
> -
> +#if 0
> /* Set the cache line and default latency (32). */
> pci_write_config_word(dev, PCI_CACHE_LINE_SIZE,
> (32 << 8) | (L1_CACHE_BYTES / sizeof(u32)));
> -
> +#endif
> /* Enable the appropriate bits in the PCI command register. */
> pci_write_config_word(dev, PCI_COMMAND, cmd);

I'll try this once I get back on the system.

--
Lab tests show that use of micro$oft causes cancer in lab animals

2000-11-30 17:56:44

by Ivan Kokshaysky

[permalink] [raw]
Subject: [patch] Re: test12-pre2

On Tue, Nov 28, 2000 at 09:30:03PM -0500, Wakko Warner wrote:
> Doesn't boot on noritake alpha.
>
> It gets to POSIX conformance testing by UNIFIX
> and hard locks. the halt switch doesn't even work.

The video card on that system turned out to have pci class
PCI_CLASS_NOT_DEFINED_VGA instead of PCI_CLASS_DISPLAY_VGA.
So it was disabled, and I guess that any access to it (printk())
caused machine checks without anything displayed on the screen.

A tad more care in disabling devices should fix that.

Ivan.

--- 2.4.0t12p3/drivers/pci/setup-bus.c Thu Nov 30 12:14:31 2000
+++ linux/drivers/pci/setup-bus.c Thu Nov 30 12:31:35 2000
@@ -45,24 +45,28 @@ pbus_assign_resources_sorted(struct pci_
head_io.next = head_mem.next = NULL;
for (ln=bus->devices.next; ln != &bus->devices; ln=ln->next) {
struct pci_dev *dev = pci_dev_b(ln);
+ u16 class = dev->class >> 8;
u16 cmd;

/* First, disable the device to avoid side
effects of possibly overlapping I/O and
memory ranges.
- Except the VGA - for obvious reason. :-) */
- if (dev->class >> 8 == PCI_CLASS_DISPLAY_VGA)
+ Leave VGA enabled - for obvious reason. :-)
+ Same with all sorts of bridges - they may
+ have VGA behind them. */
+ if (class == PCI_CLASS_DISPLAY_VGA
+ || class == PCI_CLASS_NOT_DEFINED_VGA)
found_vga = 1;
- else {
+ else if (class >> 8 != PCI_BASE_CLASS_BRIDGE) {
pci_read_config_word(dev, PCI_COMMAND, &cmd);
cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY
| PCI_COMMAND_MASTER);
pci_write_config_word(dev, PCI_COMMAND, cmd);
}
-
+
/* Reserve some resources for CardBus.
Are these values reasonable? */
- if (dev->class >> 8 == PCI_CLASS_BRIDGE_CARDBUS) {
+ if (class == PCI_CLASS_BRIDGE_CARDBUS) {
io_reserved += 8*1024;
mem_reserved += 32*1024*1024;
continue;
--- 2.4.0t12p3/arch/alpha/kernel/pci.c Thu Nov 30 12:17:36 2000
+++ linux/arch/alpha/kernel/pci.c Thu Nov 30 12:15:58 2000
@@ -56,13 +56,13 @@ struct pci_controler *pci_isa_hose;
static void __init
quirk_eisa_bridge(struct pci_dev *dev)
{
- dev->class = PCI_CLASS_BRIDGE_EISA;
+ dev->class = PCI_CLASS_BRIDGE_EISA << 8;
}

static void __init
quirk_isa_bridge(struct pci_dev *dev)
{
- dev->class = PCI_CLASS_BRIDGE_ISA;
+ dev->class = PCI_CLASS_BRIDGE_ISA << 8;
}

static void __init

2000-12-03 20:17:48

by Wakko Warner

[permalink] [raw]
Subject: Re: [patch] Re: test12-pre2

> > It just oops continuously. It finds the scsi drives and says it's enabling
> > a few pci devices but it scrolls too fast to see what it really does
>
> If it finds scsi drives, PCI setup is probably ok. There could be
> a lot of other problems - too much changes since 2.2.
>
> Capturing kernel messages via serial port would be helpful,
> but I understand that it is not always possible. :-(

I have the capture. It actually mounts / and attempts to free unused memory
and then it continuously oops's in swapper. (See attached)

For the people on the list, I have also included the patch that allows me to
boot my machine.

--
Lab tests show that use of micro$oft causes cancer in lab animals


Attachments:
2.4.0-test12pre3-bootlog (13.78 kB)
240t12p3-pci-patch (1.94 kB)
Download all attachments