Date: Thu, 13 Feb 2020 09:22:26 -0600 From: Kyle Evans <kevans@freebsd.org> To: Ralf Wenk <iz-rpi03@hs-karlsruhe.de> Cc: Andrew Turner <andrew@freebsd.org>, Oleksandr Tymoshenko <gonzo@freebsd.org>, freebsd-arm <freebsd-arm@freebsd.org>, Emmanuel Vadot <manu@freebsd.org> Subject: Re: A investigative hack that makes (for example) head -r356529 boot and operate normally an RPi4B (finally!): protect all armstub8-gic.bin's loaded content from replacement by the kernel Message-ID: <CACNAnaHUwu0GmqW9QZRhS2sMK0HpsjdYRz3YouL5FMBdWBCW-Q@mail.gmail.com> In-Reply-To: <E1j2G3j-000Mzo-Dw@iz-wera-new.HS-Karlsruhe.DE> References: <7E7605DC-021D-448A-8459-8EC26BA9836D.ref@yahoo.com> <7E7605DC-021D-448A-8459-8EC26BA9836D@yahoo.com> <E1j2EmR-000Mwm-ID@iz-wera-new.HS-Karlsruhe.DE> <CACNAnaHVYeuoK=4f7XzokpAVjcqd6ovD58-0LdP_vPGjiXQgdw@mail.gmail.com> <E1j2FRX-000MyR-1O@iz-wera-new.HS-Karlsruhe.DE> <E1j2G3j-000Mzo-Dw@iz-wera-new.HS-Karlsruhe.DE>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Feb 13, 2020 at 9:05 AM Ralf Wenk <iz-rpi03@hs-karlsruhe.de> wrote:
>
> On 2020-02-13 at 15:26 +0100 Ralf Wenk wrote:
> > On 2020-02-13 at 7:49 -0600 Kyle Evans wrote:
> > > On Thu, Feb 13, 2020 at 7:43 AM Ralf Wenk <iz-rpi03@hs-karlsruhe.de> wrote:
> > > >
> > > > On 2020-02-12 at 18:00 -0800 Mark Millard wrote via freebsd-arm:
> > > > > [...]
> > > > >
> > > > > # svnlite diff /usr/src/sys/dev/fdt/fdt_common.c
> > > > > Index: /usr/src/sys/dev/fdt/fdt_common.c
> > > > > ===================================================================
> > > > > --- /usr/src/sys/dev/fdt/fdt_common.c (revision 357529)
> > > > > +++ /usr/src/sys/dev/fdt/fdt_common.c (working copy)
> > > > > @@ -485,7 +485,18 @@
> > > > >
> > > > > tuples = res_len / tuple_size;
> > > > > reservep = (pcell_t *)&reserve;
> > > > > +#ifdef __aarch64__
> > > > > + //HACK!!!
> > > > > + // Reserve the first few pages, for example to
> > > > > + // preserve armstub8-gic.bin or armstub.bin
> > > > > + // content.
> > > > > + mr[0].mr_start= 0;
> > > > > + mr[0].mr_size= 2*4096;
> > > > > + tuples++;
> > > > > + for (i = 1; i < tuples; i++) {
> > > > > +#else
> > > > > for (i = 0; i < tuples; i++) {
> > > > > +#endif
> > > > >
> > > > > rv = fdt_data_to_res(reservep, addr_cells, size_cells,
> > > > > (u_long *)&mr[i].mr_start, (u_long *)&mr[i].mr_size);
> > > > > @@ -512,6 +523,11 @@
> > > > >
> > > > > root = OF_finddevice("/reserved-memory");
> > > > > if (root == -1) {
> > > > > + // Fail over to checking for and handling memreserve,
> > > > > + // such as for a RPi4B.
> > > > > + if (0 == fdt_get_reserved_regions(reserved,mreserved))
> > > > > + return (0);
> > > > > +
> > > > > return (ENXIO);
> > > > > }
> > > > >
> > > >
> > > > I can confirm that with your patch(es) my RPi3 does not freeze any more
> > > > when loading mac_ntpd.ko. The patches are applied against r357853M.
>
> An reboot is working again too.
>
> > > Have you tested the RPi3 with just this second hunk of patch to
> > > fallover to memreserve, or is the first hunk definitely required as
> > > well?
> >
> > Good question. I tested both hunks together.
> > Will try what happens when just applying the second and report back.
>
> Here it is:
> Without the first hunk the system freezes again when loading mac_ntpd.ko.
> Also the CPU information during boot for CPUs 1 to 3 looks strange again.
>
Yeah- I see it now; both armstubs are about 5k. I've raised an
issue[0] with upstream for armstub/rpi bits to work out the proper
solution, because I don't necessarily want to commit the workaround.
I'll throw up the second hunk on phabricator for review by #arm/#arm64
folks, because that seems to me the proper fallback.
I also discovered some issues when trying to read /memreserve/ with
our dtc and filed a PR[1] to fix those.
Thanks,
Kyle Evans
[0] https://github.com/raspberrypi/tools/issues/107
[1] https://github.com/davidchisnall/dtc/pull/59
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaHUwu0GmqW9QZRhS2sMK0HpsjdYRz3YouL5FMBdWBCW-Q>