mp_machdep.c (was Re: [Fwd: Re: Bug reports requested - acpi])

John Baldwin jhb at FreeBSD.org
Tue Sep 21 12:05:26 PDT 2004


On Tuesday 21 September 2004 12:27 pm, Roman Kurakin wrote:
> My solution works for current so I am going to commit it and MFC after
> a while. To be sure that I am not on the wrong way I need some
> reviewed/approved signs ;-) I also hope to get one (or more) tested signs.
>
> Patch I plan to commit following patch:
>
> Index: mp_machdep.c
> ===================================================================
> RCS file: /home/ncvs/src/sys/i386/i386/mp_machdep.c,v
> retrieving revision 1.238
> diff -u -r1.238 mp_machdep.c
> --- mp_machdep.c        1 Sep 2004 06:42:01 -0000       1.238
> +++ mp_machdep.c        21 Sep 2004 15:54:41 -0000
> @@ -743,10 +743,11 @@
>         u_int8_t *dst8;
>         u_int16_t *dst16;
>         u_int32_t *dst32;
> +       vm_offset_t va = (vm_offset_t) dst;
>
>         POSTCODE(INSTALL_AP_TRAMP_POST);
>
> -       pmap_kenter(boot_address + KERNBASE, boot_address);
> +       pmap_map(&va, boot_address, boot_address + size, 0);
>         for (x = 0; x < size; ++x)
>                 *dst++ = *src++;
>
> Any signs for(or against)?
>
> Thanks!
>
> PS. John: I am against of pmap_kenter/pmap_invalidate_XXX since we could
> get
> the same problem if we would use atomic functions instead of composite
> functions,
> which, I hope, will track all changes in the future.
>
> rik

Actually, another alternative might be this:

--- mp_machdep.c        1 Sep 2004 06:42:01 -0000       1.238
+++ mp_machdep.c        21 Sep 2004 19:05:12 -0000
@@ -738,7 +738,7 @@
        int     x;
        int     size = *(int *) ((u_long) & bootMP_size);
        u_char *src = (u_char *) ((u_long) bootMP);
-       u_char *dst = (u_char *) boot_address + KERNBASE;
+       u_char *dst;
        u_int   boot_base = (u_int) bootMP;
        u_int8_t *dst8;
        u_int16_t *dst16;
@@ -746,7 +746,7 @@

        POSTCODE(INSTALL_AP_TRAMP_POST);

-       pmap_kenter(boot_address + KERNBASE, boot_address);
+       dst = pmap_mapdev(boot_address, size);
        for (x = 0; x < size; ++x)
                *dst++ = *src++;

Though it's not really a device. :-P

-- 
John Baldwin <jhb at FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve"  =  http://www.FreeBSD.org


More information about the freebsd-current mailing list