[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Athlon patch. (Was:Re: Driver used by Xorg)
From: |
Jose Luis Alarcon Sanchez |
Subject: |
Re: Athlon patch. (Was:Re: Driver used by Xorg) |
Date: |
Wed, 4 Jul 2007 01:43:54 +0200 |
User-agent: |
Mutt/1.5.16 (2007-06-11) |
On Tue, Jul 03, 2007 at 11:17:30PM +0200, Samuel Thibault wrote:
> Hi,
>
> Jose Luis Alarcon Sanchez, le Tue 03 Jul 2007 13:18:37 +0200, a ?crit :
> > Without CR0_NW the XWindow boots too, with nv driver and DDC enabled.
>
> Could you try with the attached patch instead of my previous patch?
>
> Note: this patch is what Linux always does.
>
> Samuel
> Index: i386/intel/pmap.c
> ===================================================================
> RCS file: /cvsroot/hurd/gnumach/i386/intel/pmap.c,v
> retrieving revision 1.4.2.17
> diff -u -p -r1.4.2.17 pmap.c
> --- i386/intel/pmap.c 30 Apr 2007 20:30:11 -0000 1.4.2.17
> +++ i386/intel/pmap.c 3 Jul 2007 21:15:36 -0000
> @@ -1506,6 +1506,9 @@ Retry:
> template |= INTEL_PTE_USER;
> if (prot & VM_PROT_WRITE)
> template |= INTEL_PTE_WRITE;
> + if (machine_slot[cpu_number()].cpu_type >= CPU_TYPE_I486
> + && pa >= phys_last_addr)
> + template |= INTEL_PTE_NCACHE|INTEL_PTE_WTHRU;
> if (wired)
> template |= INTEL_PTE_WIRED;
> PMAP_UPDATE_TLBS(pmap, v, v + PAGE_SIZE);
> @@ -1615,6 +1618,9 @@ Retry:
> template |= INTEL_PTE_USER;
> if (prot & VM_PROT_WRITE)
> template |= INTEL_PTE_WRITE;
> + if (machine_slot[cpu_number()].cpu_type >= CPU_TYPE_I486
> + && pa >= phys_last_addr)
> + template |= INTEL_PTE_NCACHE|INTEL_PTE_WTHRU;
> if (wired)
> template |= INTEL_PTE_WIRED;
> i = ptes_per_vm_page;
>
Can't understand why:
/usr/src/gnumach# patch -p0 < patch_04.patch
patching file i386/intel/pmap.c
Hunk #1 FAILED at 1506.
Hunk #2 FAILED at 1618.
2 out of 2 hunks FAILED -- saving rejects to file i386/intel/pmap.c.rej
/usr/src/gnumach#
/usr/src/gnumach# cat i386/intel/pmap.c.rej
*************** Retry:
*** 1506,1511 ****
template |= INTEL_PTE_USER;
if (prot & VM_PROT_WRITE)
template |= INTEL_PTE_WRITE;
if (wired)
template |= INTEL_PTE_WIRED;
PMAP_UPDATE_TLBS(pmap, v, v + PAGE_SIZE);
--- 1506,1514 ----
template |= INTEL_PTE_USER;
if (prot & VM_PROT_WRITE)
template |= INTEL_PTE_WRITE;
+ if (machine_slot[cpu_number()].cpu_type >= CPU_TYPE_I486
+ && pa >= phys_last_addr)
+ template |= INTEL_PTE_NCACHE|INTEL_PTE_WTHRU;
if (wired)
template |= INTEL_PTE_WIRED;
PMAP_UPDATE_TLBS(pmap, v, v + PAGE_SIZE);
*************** Retry:
*** 1615,1620 ****
template |= INTEL_PTE_USER;
if (prot & VM_PROT_WRITE)
template |= INTEL_PTE_WRITE;
if (wired)
template |= INTEL_PTE_WIRED;
i = ptes_per_vm_page;
--- 1618,1626 ----
template |= INTEL_PTE_USER;
if (prot & VM_PROT_WRITE)
template |= INTEL_PTE_WRITE;
+ if (machine_slot[cpu_number()].cpu_type >= CPU_TYPE_I486
+ && pa >= phys_last_addr)
+ template |= INTEL_PTE_NCACHE|INTEL_PTE_WTHRU;
if (wired)
template |= INTEL_PTE_WIRED;
i = ptes_per_vm_page;
/usr/src/gnumach#
Can you see the "problem"?.
Regards.
Jose.
--
http://www.lordofunix.org/
Not Registered GNU/Hurd User.
Registered BSD User 51101.
Registered Linux User #213309.
Memories..... You are talking about memories.
Rick Deckard. Blade Runner.
signature.asc
Description: Digital signature
- Re: Driver used by Xorg, Jose Luis Alarcon Sanchez, 2007/07/01
- Re: Driver used by Xorg, Samuel Thibault, 2007/07/01
- Athlon patch. (Was:Re: Driver used by Xorg), Jose Luis Alarcon Sanchez, 2007/07/02
- Re: Athlon patch. (Was:Re: Driver used by Xorg), Samuel Thibault, 2007/07/02
- Re: Athlon patch. (Was:Re: Driver used by Xorg), Jose Luis Alarcon Sanchez, 2007/07/02
- Re: Athlon patch. (Was:Re: Driver used by Xorg), Samuel Thibault, 2007/07/02
- Re: Athlon patch. (Was:Re: Driver used by Xorg), Jose Luis Alarcon Sanchez, 2007/07/03
- Re: Athlon patch. (Was:Re: Driver used by Xorg), Jose Luis Alarcon Sanchez, 2007/07/03
- Re: Athlon patch. (Was:Re: Driver used by Xorg), Samuel Thibault, 2007/07/03
- Re: Athlon patch. (Was:Re: Driver used by Xorg),
Jose Luis Alarcon Sanchez <=
- Re: Athlon patch. (Was:Re: Driver used by Xorg), Ivan Shmakov, 2007/07/03
- Re: Athlon patch. (Was:Re: Driver used by Xorg), Jose Luis Alarcon Sanchez, 2007/07/06