Date: Mon, 21 Feb 2011 14:21:03 +0300 From: Sergey Kandaurov <pluknet@freebsd.org> To: Andrew Turner <andrew@fubar.geek.nz> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Olivier Houchard <cognet@freebsd.org> Subject: Re: svn commit: r218666 - in head/sys/arm: at91 econa sa11x0 xscale/i80321 xscale/ixp425 Message-ID: <AANLkTi=UU6jfos0jWfbdc9V6b8HHHd3EzpWLDqFwwn=k@mail.gmail.com> In-Reply-To: <20110221232357.2ae44d4b@fubar.geek.nz> References: <201102132002.p1DK2kRg051314@svn.freebsd.org> <20110221232357.2ae44d4b@fubar.geek.nz>
next in thread | previous in thread | raw e-mail | index | archive | help
--0015175cb4442f5a2d049cc90f1e
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
On 21 February 2011 13:23, Andrew Turner <andrew@fubar.geek.nz> wrote:
> On Sun, 13 Feb 2011 20:02:46 +0000 (UTC)
> Olivier Houchard <cognet@FreeBSD.org> wrote:
>> Modified: head/sys/arm/at91/at91_machdep.c
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
>> --- head/sys/arm/at91/at91_machdep.c =A0Sun Feb 13 19:46:55
>> 2011 =A0(r218665) +++ head/sys/arm/at91/at91_machdep.c =A0Sun
>> Feb 13 20:02:46 2011 =A0(r218666) @@ -234,7 +234,7 @@
>> at91_ramsize(void) bw =3D (cr & AT91SAM9G20_SDRAMC_CR_DBW_16) ? 1 : 2;
>> =A0 =A0 =A0 }
>>
>> - =A0 =A0 return (1 << (cols + rows + banks + bw));
>> + =A0 =A0 return ((1 << (cols + rows + banks + bw));
>> =A0}
>>
>> =A0void *
>> @@ -302,6 +302,8 @@ initarm(void *arg, void *arg2)
>> =A0 =A0 =A0 valloc_pages(kernelstack, KSTACK_PAGES);
>> =A0 =A0 =A0 valloc_pages(msgbufpv, round_page(msgbufsize) / PAGE_SIZE);
>>
>> + =A0 =A0 /* Do basic tuning, hz etc */
>> + =A0 =A0 init_param1();
> This appears to be wrong. As msgbufsize is set in init_param1 it is
> used before being set in the at91 initarm function.
>
> Andrew
>
Oh,
this should work (see also in attach).
init_param1() moved under PCPU_SET(curthread, &thread0).
Index: sys/arm/xscale/i8134x/crb_machdep.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/arm/xscale/i8134x/crb_machdep.c (revision 218911)
+++ sys/arm/xscale/i8134x/crb_machdep.c (working copy)
@@ -196,6 +196,9 @@
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
+ /* Do basic tuning, hz etc */
+ init_param1();
+
freemempos =3D 0x00200000;
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
@@ -389,8 +392,6 @@
phys_avail[i++] =3D 0;
phys_avail[i] =3D 0;
- /* Do basic tuning, hz etc */
- init_param1();
init_param2(physmem);
kdb_init();
return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP -
Index: sys/arm/xscale/pxa/pxa_machdep.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/arm/xscale/pxa/pxa_machdep.c (revision 218911)
+++ sys/arm/xscale/pxa/pxa_machdep.c (working copy)
@@ -182,6 +182,9 @@
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
+ /* Do basic tuning, hz etc */
+ init_param1();
+
freemempos =3D 0xa0200000;
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
@@ -424,8 +427,6 @@
phys_avail[0] =3D round_page(virtual_avail - KERNBASE + phys_avail[=
0]);
#endif
- /* Do basic tuning, hz etc */
- init_param1();
init_param2(physmem);
kdb_init();
return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP -
Index: sys/arm/s3c2xx0/s3c24x0_machdep.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/arm/s3c2xx0/s3c24x0_machdep.c (revision 218911)
+++ sys/arm/s3c2xx0/s3c24x0_machdep.c (working copy)
@@ -257,6 +257,9 @@
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
+ /* Do basic tuning, hz etc */
+ init_param1();
+
#define KERNEL_TEXT_BASE (KERNBASE)
freemempos =3D (lastaddr + PAGE_MASK) & ~PAGE_MASK;
/* Define a macro to simplify memory allocation */
@@ -438,8 +441,6 @@
phys_avail[2] =3D 0;
phys_avail[3] =3D 0;
- /* Do basic tuning, hz etc */
- init_param1();
init_param2(physmem);
kdb_init();
Index: sys/arm/at91/at91_machdep.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sys/arm/at91/at91_machdep.c (revision 218911)
+++ sys/arm/at91/at91_machdep.c (working copy)
@@ -256,6 +256,9 @@
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
+ /* Do basic tuning, hz etc */
+ init_param1();
+
freemempos =3D (lastaddr + PAGE_MASK) & ~PAGE_MASK;
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
@@ -302,8 +305,6 @@
valloc_pages(kernelstack, KSTACK_PAGES);
valloc_pages(msgbufpv, round_page(msgbufsize) / PAGE_SIZE);
- /* Do basic tuning, hz etc */
- init_param1();
/*
* Now we start construction of the L1 page table
* We start by mapping the L2 page tables into the L1.
--=20
wbr,
pluknet
--0015175cb4442f5a2d049cc90f1e
Content-Type: application/octet-stream; name="arm_msgbufsize_cleanup.diff"
Content-Disposition: attachment; filename="arm_msgbufsize_cleanup.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gkfamtux0
SW5kZXg6IHN5cy9hcm0veHNjYWxlL2k4MTM0eC9jcmJfbWFjaGRlcC5jCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IHN5cy9hcm0veHNjYWxlL2k4MTM0eC9jcmJfbWFjaGRlcC5jCShyZXZpc2lvbiAyMTg5MTEpCisr
KyBzeXMvYXJtL3hzY2FsZS9pODEzNHgvY3JiX21hY2hkZXAuYwkod29ya2luZyBjb3B5KQpAQCAt
MTk2LDYgKzE5Niw5IEBACiAJcGNwdV9pbml0KHBjcHVwLCAwLCBzaXplb2Yoc3RydWN0IHBjcHUp
KTsKIAlQQ1BVX1NFVChjdXJ0aHJlYWQsICZ0aHJlYWQwKTsKIAorCS8qIERvIGJhc2ljIHR1bmlu
ZywgaHogZXRjICovCisJaW5pdF9wYXJhbTEoKTsKKwogCWZyZWVtZW1wb3MgPSAweDAwMjAwMDAw
OwogCS8qIERlZmluZSBhIG1hY3JvIHRvIHNpbXBsaWZ5IG1lbW9yeSBhbGxvY2F0aW9uICovCiAj
ZGVmaW5lCXZhbGxvY19wYWdlcyh2YXIsIG5wKQkJCVwKQEAgLTM4OSw4ICszOTIsNiBAQAogCXBo
eXNfYXZhaWxbaSsrXSA9IDA7CiAJcGh5c19hdmFpbFtpXSA9IDA7CiAJCi0JLyogRG8gYmFzaWMg
dHVuaW5nLCBoeiBldGMgKi8KLQlpbml0X3BhcmFtMSgpOwogCWluaXRfcGFyYW0yKHBoeXNtZW0p
OwogCWtkYl9pbml0KCk7CiAJcmV0dXJuICgodm9pZCAqKShrZXJuZWxzdGFjay5wdl92YSArIFVT
UEFDRV9TVkNfU1RBQ0tfVE9QIC0KSW5kZXg6IHN5cy9hcm0veHNjYWxlL3B4YS9weGFfbWFjaGRl
cC5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIHN5cy9hcm0veHNjYWxlL3B4YS9weGFfbWFjaGRlcC5jCShyZXZp
c2lvbiAyMTg5MTEpCisrKyBzeXMvYXJtL3hzY2FsZS9weGEvcHhhX21hY2hkZXAuYwkod29ya2lu
ZyBjb3B5KQpAQCAtMTgyLDYgKzE4Miw5IEBACiAJcGNwdV9pbml0KHBjcHVwLCAwLCBzaXplb2Yo
c3RydWN0IHBjcHUpKTsKIAlQQ1BVX1NFVChjdXJ0aHJlYWQsICZ0aHJlYWQwKTsKIAorCS8qIERv
IGJhc2ljIHR1bmluZywgaHogZXRjICovCisJaW5pdF9wYXJhbTEoKTsKKwogCWZyZWVtZW1wb3Mg
PSAweGEwMjAwMDAwOwogCS8qIERlZmluZSBhIG1hY3JvIHRvIHNpbXBsaWZ5IG1lbW9yeSBhbGxv
Y2F0aW9uICovCiAjZGVmaW5lCXZhbGxvY19wYWdlcyh2YXIsIG5wKQkJCVwKQEAgLTQyNCw4ICs0
MjcsNiBAQAogCXBoeXNfYXZhaWxbMF0gPSByb3VuZF9wYWdlKHZpcnR1YWxfYXZhaWwgLSBLRVJO
QkFTRSArIHBoeXNfYXZhaWxbMF0pOwogI2VuZGlmCiAKLQkvKiBEbyBiYXNpYyB0dW5pbmcsIGh6
IGV0YyAqLwotCWluaXRfcGFyYW0xKCk7CiAJaW5pdF9wYXJhbTIocGh5c21lbSk7CiAJa2RiX2lu
aXQoKTsKIAlyZXR1cm4gKCh2b2lkICopKGtlcm5lbHN0YWNrLnB2X3ZhICsgVVNQQUNFX1NWQ19T
VEFDS19UT1AgLQpJbmRleDogc3lzL2FybS9zM2MyeHgwL3MzYzI0eDBfbWFjaGRlcC5jCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIHN5cy9hcm0vczNjMnh4MC9zM2MyNHgwX21hY2hkZXAuYwkocmV2aXNpb24gMjE4
OTExKQorKysgc3lzL2FybS9zM2MyeHgwL3MzYzI0eDBfbWFjaGRlcC5jCSh3b3JraW5nIGNvcHkp
CkBAIC0yNTcsNiArMjU3LDkgQEAKIAlwY3B1X2luaXQocGNwdXAsIDAsIHNpemVvZihzdHJ1Y3Qg
cGNwdSkpOwogCVBDUFVfU0VUKGN1cnRocmVhZCwgJnRocmVhZDApOwogCisJLyogRG8gYmFzaWMg
dHVuaW5nLCBoeiBldGMgKi8KKwlpbml0X3BhcmFtMSgpOworCiAjZGVmaW5lIEtFUk5FTF9URVhU
X0JBU0UgKEtFUk5CQVNFKQogCWZyZWVtZW1wb3MgPSAobGFzdGFkZHIgKyBQQUdFX01BU0spICYg
flBBR0VfTUFTSzsKIAkvKiBEZWZpbmUgYSBtYWNybyB0byBzaW1wbGlmeSBtZW1vcnkgYWxsb2Nh
dGlvbiAqLwpAQCAtNDM4LDggKzQ0MSw2IEBACiAJcGh5c19hdmFpbFsyXSA9IDA7CiAJcGh5c19h
dmFpbFszXSA9IDA7CiAKLQkvKiBEbyBiYXNpYyB0dW5pbmcsIGh6IGV0YyAqLwotCWluaXRfcGFy
YW0xKCk7CiAJaW5pdF9wYXJhbTIocGh5c21lbSk7CiAJa2RiX2luaXQoKTsKIApJbmRleDogc3lz
L2FybS9hdDkxL2F0OTFfbWFjaGRlcC5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN5cy9hcm0vYXQ5MS9hdDkx
X21hY2hkZXAuYwkocmV2aXNpb24gMjE4OTExKQorKysgc3lzL2FybS9hdDkxL2F0OTFfbWFjaGRl
cC5jCSh3b3JraW5nIGNvcHkpCkBAIC0yNTYsNiArMjU2LDkgQEAKIAlwY3B1X2luaXQocGNwdXAs
IDAsIHNpemVvZihzdHJ1Y3QgcGNwdSkpOwogCVBDUFVfU0VUKGN1cnRocmVhZCwgJnRocmVhZDAp
OwogCisJLyogRG8gYmFzaWMgdHVuaW5nLCBoeiBldGMgKi8KKwlpbml0X3BhcmFtMSgpOworCiAJ
ZnJlZW1lbXBvcyA9IChsYXN0YWRkciArIFBBR0VfTUFTSykgJiB+UEFHRV9NQVNLOwogCS8qIERl
ZmluZSBhIG1hY3JvIHRvIHNpbXBsaWZ5IG1lbW9yeSBhbGxvY2F0aW9uICovCiAjZGVmaW5lIHZh
bGxvY19wYWdlcyh2YXIsIG5wKSAgICAgICAgICAgICAgICAgICBcCkBAIC0zMDIsOCArMzA1LDYg
QEAKIAl2YWxsb2NfcGFnZXMoa2VybmVsc3RhY2ssIEtTVEFDS19QQUdFUyk7CiAJdmFsbG9jX3Bh
Z2VzKG1zZ2J1ZnB2LCByb3VuZF9wYWdlKG1zZ2J1ZnNpemUpIC8gUEFHRV9TSVpFKTsKIAotCS8q
IERvIGJhc2ljIHR1bmluZywgaHogZXRjICovCi0JaW5pdF9wYXJhbTEoKTsKIAkvKgogCSAqIE5v
dyB3ZSBzdGFydCBjb25zdHJ1Y3Rpb24gb2YgdGhlIEwxIHBhZ2UgdGFibGUKIAkgKiBXZSBzdGFy
dCBieSBtYXBwaW5nIHRoZSBMMiBwYWdlIHRhYmxlcyBpbnRvIHRoZSBMMS4K
--0015175cb4442f5a2d049cc90f1e--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTi=UU6jfos0jWfbdc9V6b8HHHd3EzpWLDqFwwn=k>