2008-06-08 19:06:17

by Adrian Bunk

[permalink] [raw]
Subject: m68k: could the Apollo support possibly work?

Nothing seems to set apollo_model (apollo_parse_bootinfo() has no caller).

Therefore trying to boot an Apollo machine seems to do:
arch/m68k/kernel/setup.c:setup_arch()
arch/m68k/apollo/config.c:config_apollo()
arch/m68k/apollo/config.c:dn_setup_model()
panic()

Do I miss anything?

Does anyone still have this hardware and tried booting it in recent years?

This problem already exists in kernel 2.4.0, and my gut feeling is
it's quite dead code I could remove.

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


2008-06-09 06:44:46

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: m68k: could the Apollo support possibly work?

On Sun, 8 Jun 2008, Adrian Bunk wrote:
> Nothing seems to set apollo_model (apollo_parse_bootinfo() has no caller).
>
> Therefore trying to boot an Apollo machine seems to do:
> arch/m68k/kernel/setup.c:setup_arch()
> arch/m68k/apollo/config.c:config_apollo()
> arch/m68k/apollo/config.c:dn_setup_model()
> panic()
>
> Do I miss anything?

Obviously it should be called from m68k_parse_bootinfo(), but there's no
MACH_IS_APOLLO case there. Strange...

> Does anyone still have this hardware and tried booting it in recent years?
>
> This problem already exists in kernel 2.4.0, and my gut feeling is
> it's quite dead code I could remove.

P2?

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

2008-06-10 17:23:19

by Kolbjørn Barmen

[permalink] [raw]
Subject: Re: m68k: could the Apollo support possibly work?

On Sun, 8 Jun 2008, Adrian Bunk wrote:

> Does anyone still have this hardware and tried booting it in recent years?

I think I might borrow one from some NetBSD people, if I ask really really
nicely :)

-- kolla

2008-06-10 17:46:45

by Adrian Bunk

[permalink] [raw]
Subject: Re: m68k: could the Apollo support possibly work?

On Tue, Jun 10, 2008 at 06:48:34PM +0200, Kolbjørn Barmen wrote:
> On Sun, 8 Jun 2008, Adrian Bunk wrote:
>
> > Does anyone still have this hardware and tried booting it in recent years?
>
> I think I might borrow one from some NetBSD people, if I ask really really
> nicely :)

AFAIR NetBSD doesn't support the Apollos.

Do you plan to work on getting the Linux support back into shape?

> -- kolla

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

2008-06-11 18:19:37

by Kolbjørn Barmen

[permalink] [raw]
Subject: Re: m68k: could the Apollo support possibly work?

On Tue, 10 Jun 2008, Adrian Bunk wrote:

> On Tue, Jun 10, 2008 at 06:48:34PM +0200, Kolbjørn Barmen wrote:
> > On Sun, 8 Jun 2008, Adrian Bunk wrote:
> >
> > > Does anyone still have this hardware and tried booting it in recent years?
> >
> > I think I might borrow one from some NetBSD people, if I ask really really
> > nicely :)
>
> AFAIR NetBSD doesn't support the Apollos.

OK, I was (and still is) somewhat confused about the defintion of "apollo" :)

What NetBSD does support is the so called hp300, the Apollo DNXXXXX is not
supported, allthough there appearantly a guy "working" on it every now and
then. http://netbsd.pair.com/Ports/hp300/

What definition of Apollo are we talking about in Linux/m68k context?
I thought it was http://www.tazenda.demon.co.uk/phil/linux-hp/ which
actuall is hp300, from what I can tell.

> Do you plan to work on getting the Linux support back into shape?

Heh, no, I was just saying that I might try to boot one :)


-- kolla

2008-06-11 18:35:47

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: m68k: could the Apollo support possibly work?

On Wed, 11 Jun 2008, Kolbjørn Barmen wrote:
> On Tue, 10 Jun 2008, Adrian Bunk wrote:
> > On Tue, Jun 10, 2008 at 06:48:34PM +0200, Kolbjørn Barmen wrote:
> > > On Sun, 8 Jun 2008, Adrian Bunk wrote:
> > >
> > > > Does anyone still have this hardware and tried booting it in recent years?
> > >
> > > I think I might borrow one from some NetBSD people, if I ask really really
> > > nicely :)
> >
> > AFAIR NetBSD doesn't support the Apollos.
>
> OK, I was (and still is) somewhat confused about the defintion of "apollo" :)
>
> What NetBSD does support is the so called hp300, the Apollo DNXXXXX is not
> supported, allthough there appearantly a guy "working" on it every now and
> then. http://netbsd.pair.com/Ports/hp300/
>
> What definition of Apollo are we talking about in Linux/m68k context?
> I thought it was http://www.tazenda.demon.co.uk/phil/linux-hp/ which
> actuall is hp300, from what I can tell.

We're talking about the real Apollos (DNxxxx): the machines that used to run
DomainOS, and felt very sad when they couldn't find their friends on the
(token ring) network ;-)

`hp300' means HP/Apollo 9000 machines, more specifically the 300 and 400
series.

Later HP/Apollo 9000 machines (e.g. the 700 series) used PA-RISC, not
m68k.

> > Do you plan to work on getting the Linux support back into shape?
>
> Heh, no, I was just saying that I might try to boot one :)

"If it compiles, it is good, if it boots up it is perfect."
-- Linus Torvalds.

(for the Apollo, I can only keep it `good' ;-)

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

2008-06-15 12:26:16

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: m68k: could the Apollo support possibly work?

On Mon, 9 Jun 2008, Geert Uytterhoeven wrote:
> On Sun, 8 Jun 2008, Adrian Bunk wrote:
> > Nothing seems to set apollo_model (apollo_parse_bootinfo() has no caller).
> >
> > Therefore trying to boot an Apollo machine seems to do:
> > arch/m68k/kernel/setup.c:setup_arch()
> > arch/m68k/apollo/config.c:config_apollo()
> > arch/m68k/apollo/config.c:dn_setup_model()
> > panic()
> >
> > Do I miss anything?
>
> Obviously it should be called from m68k_parse_bootinfo(), but there's no
> MACH_IS_APOLLO case there. Strange...

Subject: [PATCH] m68k/apollo: Add missing call to apollo_parse_bootinfo()

Add the missing call to apollo_parse_bootinfo(), which had been lost from a
big Apollo support patch by Peter De Schrijver in 1999.

Thanks to Adrian Bunk for noticing!

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/kernel/setup.c | 2 ++
1 file changed, 2 insertions(+)

--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -190,6 +190,8 @@ static void __init m68k_parse_bootinfo(c
unknown = mvme147_parse_bootinfo(record);
else if (MACH_IS_HP300)
unknown = hp300_parse_bootinfo(record);
+ else if (MACH_IS_APOLLO)
+ unknown = apollo_parse_bootinfo(record);
else
unknown = 1;
}

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

2008-06-15 18:43:19

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: m68k: could the Apollo support possibly work?

On Sun, 15 Jun 2008, Geert Uytterhoeven wrote:
> On Mon, 9 Jun 2008, Geert Uytterhoeven wrote:
> > On Sun, 8 Jun 2008, Adrian Bunk wrote:
> > > Nothing seems to set apollo_model (apollo_parse_bootinfo() has no caller).
> > >
> > > Therefore trying to boot an Apollo machine seems to do:
> > > arch/m68k/kernel/setup.c:setup_arch()
> > > arch/m68k/apollo/config.c:config_apollo()
> > > arch/m68k/apollo/config.c:dn_setup_model()
> > > panic()
> > >
> > > Do I miss anything?
> >
> > Obviously it should be called from m68k_parse_bootinfo(), but there's no
> > MACH_IS_APOLLO case there. Strange...

[second try, missed the prototype]

Subject: [PATCH] m68k/apollo: Add missing call to apollo_parse_bootinfo()

Add the missing call to apollo_parse_bootinfo(), which had been lost from a
big Apollo support patch by Peter De Schrijver in 1999.

Thanks to Adrian Bunk for noticing!

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/kernel/setup.c | 3 +++
1 file changed, 3 insertions(+)

--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -123,6 +123,7 @@ extern int bvme6000_parse_bootinfo(const
extern int mvme16x_parse_bootinfo(const struct bi_record *);
extern int mvme147_parse_bootinfo(const struct bi_record *);
extern int hp300_parse_bootinfo(const struct bi_record *);
+extern int apollo_parse_bootinfo(const struct bi_record *);

extern void config_amiga(void);
extern void config_atari(void);
@@ -190,6 +191,8 @@ static void __init m68k_parse_bootinfo(c
unknown = mvme147_parse_bootinfo(record);
else if (MACH_IS_HP300)
unknown = hp300_parse_bootinfo(record);
+ else if (MACH_IS_APOLLO)
+ unknown = apollo_parse_bootinfo(record);
else
unknown = 1;
}

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