Re: [PATCH] typo introduced in libssl/src/crypto/ec/ecp_nistp521.c
> Hi, > > I notice a typo since revision 1.3 by miod@, correction below:: Oops. Fixed. Thanks! Miod
[PATCH] typo introduced in libssl/src/crypto/ec/ecp_nistp521.c
Hi, I notice a typo since revision 1.3 by miod@, correction below:: --- src/lib/libssl/src/crypto/ec/ecp_nistp521.c 8 May 2014 12:59:17 - 1.5 +++ src/lib/libssl/src/crypto/ec/ecp_nistp521.c 9 May 2014 22:11:32 - @@ -1611,7 +1611,7 @@ .points_make_affine = ec_GFp_simple_points_make_affine, .mul = ec_GFp_nistp521_points_mul, .precompute_mult = ec_GFp_nistp521_precompute_mult, - .have_precompulte_mult = ec_GFp_nistp521_have_precompute_mult, + .have_precompute_mult = ec_GFp_nistp521_have_precompute_mult, .field_mul = ec_GFp_nist_field_mul, .field_sqr = ec_GFp_nist_field_sqr }; But otherwise, thanks for the good work! Regards, -- Steven Chamberlain ste...@pyro.eu.org
Re: [PATCH] comparison between signed and unsigned in rcs
On Fri, May 09, 2014 at 18:50, Fritjof Bornebusch wrote: > But if you like OpenRCS as it is and don't want to get any diffs unless > security fixes, then just say it. > Or if you work on other stuff and you don't have time for that, then just > say it. Personally, I don't much like to see diffs "fixing" signed comparison warnings, because I think most such warnings are harmless and the diffs to silence the warning have at least 50/50 chance of introducing a real bug. The benefit, compared to the time spent reviewing, is very low.
Re: openbsd-current: cannot suspend -return from zzz-
On Fri, May 9, 2014 at 3:12 PM, Abel Abraham Camarillo Ojeda wrote: > On Fri, May 9, 2014 at 8:47 AM, Martin Pieuchot > wrote: >> On 09/05/14(Fri) 08:36, Abel Abraham Camarillo Ojeda wrote: >>> On Fri, May 9, 2014 at 4:37 AM, Abel Abraham Camarillo Ojeda >>> wrote: >>> >>> This commit breaks resume for my machine: >> >> Could you find which device and/or controller breaks it? Since you have >> only one mouse attached to your machine, can you resume if the mouse is >> unplugged? > > USB mouse presence/not-presence shows no changes. > >> If not, can you resume with ohci(4) disable (you won't be >> able to use your USB mouse)? > > disabling ohci enables resume again. > >> If not can you resume with ehci(4) >> disable or do you need to disable both controller drivers? > > disabling ehci shows no changes. > > Thanks. > > diff between dmesg{raw,ohcidisabled}: > > --- test/current/dmesg Fri May 9 08:09:50 2014 > +++ test/disableohci.dmesg Fri May 9 15:05:25 2014 > @@ -2,6 +2,12 @@ > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP > real mem = 17124114432 (16330MB) > avail mem = 16659517440 (15887MB) > +User Kernel Config > +UKC> disable ohci* > +134 ohci* disabled > +135 ohci* disabled > +UKC> quit > +Continuing... > mpath0 at root > scsibus0 at mpath0: 256 targets > mainbus0 at root > @@ -15,7 +21,7 @@ > acpitimer0 at acpi0: 3579545 Hz, 32 bits > acpimadt0 at acpi0 addr 0xfee0: PC-AT compat > cpu0 at mainbus0: apid 0 (boot processor) > -cpu0: AMD Phenom(tm) II X4 955 Processor, 3211.11 MHz > +cpu0: AMD Phenom(tm) II X4 955 Processor, 3211.07 MHz > cpu0: > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC > cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache > cpu0: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative > @@ -26,7 +32,7 @@ > cpu0: apic clock running at 200MHz > cpu0: mwait min=64, max=64, C-substates=0.0.0.0.0, IBE > cpu1 at mainbus0: apid 1 (application processor) > -cpu1: AMD Phenom(tm) II X4 955 Processor, 3210.75 MHz > +cpu1: AMD Phenom(tm) II X4 955 Processor, 3210.72 MHz > cpu1: > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC > cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache > cpu1: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative > @@ -34,7 +40,7 @@ > cpu1: AMD erratum 721 detected and fixed > cpu1: smt 0, core 1, package 0 > cpu2 at mainbus0: apid 2 (application processor) > -cpu2: AMD Phenom(tm) II X4 955 Processor, 3210.75 MHz > +cpu2: AMD Phenom(tm) II X4 955 Processor, 3210.72 MHz > cpu2: > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC > cpu2: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache > cpu2: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative > @@ -42,7 +48,7 @@ > cpu2: AMD erratum 721 detected and fixed > cpu2: smt 0, core 2, package 0 > cpu3 at mainbus0: apid 3 (application processor) > -cpu3: AMD Phenom(tm) II X4 955 Processor, 3210.75 MHz > +cpu3: AMD Phenom(tm) II X4 955 Processor, 3210.72 MHz > cpu3: > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC > cpu3: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache > cpu3: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative > @@ -101,17 +107,17 @@ > sd1: 476940MB, 512 bytes/sector, 976773168 sectors > sd2 at scsibus1 targ 5 lun 0: SCSI3 0/direct > fixed naa.5000c500355a1b53 > sd2: 476940MB, 512 bytes/sector, 976773168 sectors > -ohci0 at pci0 dev 18 function 0 "ATI SB700 USB" rev 0x00: apic 5 int > 18, version 1.0, legacy support > +"ATI SB700 USB" rev 0x00 at pci0 dev 18 function 0 not configured > ehci0 at pci0 dev 18 function 2 "ATI SB700 USB2" rev 0x00: apic 5 int 17 > usb0 at ehci0: USB revision 2.0 > uhub0 at usb0 "ATI EHCI root hub" rev 2.00/1.00 addr 1 > -ohci1 at pci0 dev 19 function 0 "ATI SB700 USB" rev 0x00: apic 5 int > 20, version 1.0, legacy support > +"ATI SB700 USB" rev 0x00 at pci0 dev 19 function 0 not configured > eh
Re: openbsd-current: cannot suspend -return from zzz-
On Fri, May 9, 2014 at 8:47 AM, Martin Pieuchot wrote: > On 09/05/14(Fri) 08:36, Abel Abraham Camarillo Ojeda wrote: >> On Fri, May 9, 2014 at 4:37 AM, Abel Abraham Camarillo Ojeda >> wrote: >> >> This commit breaks resume for my machine: > > Could you find which device and/or controller breaks it? Since you have > only one mouse attached to your machine, can you resume if the mouse is > unplugged? USB mouse presence/not-presence shows no changes. > If not, can you resume with ohci(4) disable (you won't be > able to use your USB mouse)? disabling ohci enables resume again. > If not can you resume with ehci(4) > disable or do you need to disable both controller drivers? disabling ehci shows no changes. Thanks. diff between dmesg{raw,ohcidisabled}: --- test/current/dmesg Fri May 9 08:09:50 2014 +++ test/disableohci.dmesg Fri May 9 15:05:25 2014 @@ -2,6 +2,12 @@ dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP real mem = 17124114432 (16330MB) avail mem = 16659517440 (15887MB) +User Kernel Config +UKC> disable ohci* +134 ohci* disabled +135 ohci* disabled +UKC> quit +Continuing... mpath0 at root scsibus0 at mpath0: 256 targets mainbus0 at root @@ -15,7 +21,7 @@ acpitimer0 at acpi0: 3579545 Hz, 32 bits acpimadt0 at acpi0 addr 0xfee0: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) -cpu0: AMD Phenom(tm) II X4 955 Processor, 3211.11 MHz +cpu0: AMD Phenom(tm) II X4 955 Processor, 3211.07 MHz cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache cpu0: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative @@ -26,7 +32,7 @@ cpu0: apic clock running at 200MHz cpu0: mwait min=64, max=64, C-substates=0.0.0.0.0, IBE cpu1 at mainbus0: apid 1 (application processor) -cpu1: AMD Phenom(tm) II X4 955 Processor, 3210.75 MHz +cpu1: AMD Phenom(tm) II X4 955 Processor, 3210.72 MHz cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache cpu1: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative @@ -34,7 +40,7 @@ cpu1: AMD erratum 721 detected and fixed cpu1: smt 0, core 1, package 0 cpu2 at mainbus0: apid 2 (application processor) -cpu2: AMD Phenom(tm) II X4 955 Processor, 3210.75 MHz +cpu2: AMD Phenom(tm) II X4 955 Processor, 3210.72 MHz cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC cpu2: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache cpu2: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative @@ -42,7 +48,7 @@ cpu2: AMD erratum 721 detected and fixed cpu2: smt 0, core 2, package 0 cpu3 at mainbus0: apid 3 (application processor) -cpu3: AMD Phenom(tm) II X4 955 Processor, 3210.75 MHz +cpu3: AMD Phenom(tm) II X4 955 Processor, 3210.72 MHz cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC cpu3: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache cpu3: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative @@ -101,17 +107,17 @@ sd1: 476940MB, 512 bytes/sector, 976773168 sectors sd2 at scsibus1 targ 5 lun 0: SCSI3 0/direct fixed naa.5000c500355a1b53 sd2: 476940MB, 512 bytes/sector, 976773168 sectors -ohci0 at pci0 dev 18 function 0 "ATI SB700 USB" rev 0x00: apic 5 int 18, version 1.0, legacy support +"ATI SB700 USB" rev 0x00 at pci0 dev 18 function 0 not configured ehci0 at pci0 dev 18 function 2 "ATI SB700 USB2" rev 0x00: apic 5 int 17 usb0 at ehci0: USB revision 2.0 uhub0 at usb0 "ATI EHCI root hub" rev 2.00/1.00 addr 1 -ohci1 at pci0 dev 19 function 0 "ATI SB700 USB" rev 0x00: apic 5 int 20, version 1.0, legacy support +"ATI SB700 USB" rev 0x00 at pci0 dev 19 function 0 not configured ehci1 at pci0 dev 19 function 2 "ATI SB700 USB2" rev 0x00: apic 5 int 21 usb1 at ehci1: USB revision 2.0 uhub1 at usb1 "ATI EHCI root hub" rev 2.00/1.00 addr 1 piixpm0 at pci0 dev 20 function 0 "ATI SBx00 SMBus" rev 0x42: polling iic0 at piixpm0 -iic0
Re: amd64 support for AR9485
> > > No guarantees as to whether this is sufficient, or if further > > work is needed, but it will at least get the device picked up by > > the athn driver. > > Further work is needed. > > I have diffs which do much more but don't yet work either. > I've given up on trying to get this to work for now, and will > share my diffs with anyone who wants to take over. If you're > an aspiring wifi hacker, then this is for you. If not, just > buy a supported card. > Thanks for you reply, I'm not ready for this yet, but I keep it in mind and maybe in a few months. I can easly get a compatible wifi dongle for now.
Re: [PATCH] comparison between signed and unsigned in rcs
On Fri, May 09, 2014 at 06:01:52PM +0200, J??r??mie Courr??ges-Anglas wrote: > Fritjof Bornebusch writes: > > > Hi tech, > > Hi, > > > if I compile rcs, gcc prints a few warnings like this: > > - comparison between signed and unsigned > > - signed and unsigned type in conditional expression > > > > I'm not quite sure if the typecasts are at the correct place, but these > > diffs removes the warnings. > > > > fritjof > > > > > > Index: buf.c > > === > > RCS file: /cvs/src/usr.bin/rcs/buf.c,v > > retrieving revision 1.22 > > diff -u -p -r1.22 buf.c > > --- buf.c 6 Jul 2011 15:36:52 - 1.22 > > +++ buf.c 6 May 2014 20:56:55 - > > @@ -98,7 +98,7 @@ buf_load(const char *path) > > if (fstat(fd, &st) == -1) > > goto out; > > > > - if (st.st_size > SIZE_MAX) { > > + if (st.st_size > (off_t)SIZE_MAX) { > > errno = EFBIG; > > goto out; > > } > > This would break on 64 bits archs: there, SIZE_MAX casted to an off_t > is -1 (implementation-defined behavior iirc). > > Also it breaks platforms with 32 bits off_t (this does not affect > OpenBSD). > > I think the code is perfectly fine as is, but a possible clarification > that does not do assumptions about the site of off_t and size_t could > be: > > if ((uintmax_t)st.st_size > (uintmax_t)SIZE_MAX) > ... > > > Index: diff.c > > === > > RCS file: /cvs/src/usr.bin/rcs/diff.c,v > > retrieving revision 1.34 > > diff -u -p -r1.34 diff.c > > --- diff.c 16 May 2013 12:44:48 - 1.34 > > +++ diff.c 6 May 2014 20:57:07 - > > @@ -432,13 +432,13 @@ prepare(int i, FILE *fd, off_t filesize, > > > > rewind(fd); > > > > - sz = (filesize <= SIZE_MAX ? filesize : SIZE_MAX) / 25; > > + sz = (filesize <= (off_t)SIZE_MAX ? filesize : (off_t)SIZE_MAX) / > > 25; > > if (sz < 100) > > sz = 100; > > Same problem here. > > > p = xcalloc(sz + 3, sizeof(*p)); > > for (j = 0; (h = readhash(fd, flags));) { > > - if (j == sz) { > > + if ((size_t)j == sz) { > > sz = sz * 3 / 2; > > p = xrealloc(p, sz + 3, sizeof(*p)); > > } > > Declaring j as a size_t would save a cast. > > > Index: diff3.c > > === > > RCS file: /cvs/src/usr.bin/rcs/diff3.c,v > > retrieving revision 1.33 > > diff -u -p -r1.33 diff3.c > > --- diff3.c 4 Mar 2012 04:05:15 - 1.33 > > +++ diff3.c 6 May 2014 20:57:18 - > > @@ -908,7 +908,7 @@ edscript(int n) > > (void)fseek(fp[2], (long)de[n].new.from, SEEK_SET); > > for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) { > > j = k > BUFSIZ ? BUFSIZ : k; > > - if (fread(block, 1, j, fp[2]) != j) > > + if ((int)fread(block, 1, j, fp[2]) != j) > > return (-1); > > block[j] = '\0'; > > diff_output("%s", block); > > Same here. > > > Index: buf.c > > === > > RCS file: /cvs/src/usr.bin/rcs/buf.c,v > > retrieving revision 1.22 > > diff -u -p -r1.22 buf.c > > --- buf.c 6 Jul 2011 15:36:52 - 1.22 > > +++ buf.c 6 May 2014 20:57:30 - > > @@ -98,7 +98,7 @@ buf_load(const char *path) > > if (fstat(fd, &st) == -1) > > goto out; > > > > - if (st.st_size > SIZE_MAX) { > > + if (st.st_size > (off_t)SIZE_MAX) { > > errno = EFBIG; > > goto out; > > } > > > > Duplicated hunk? > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE Hi, thank you for your feedback. I'll add it. fritjof
Re: [PATCH] comparison between signed and unsigned in rcs
On Fri, May 09, 2014 at 12:35:11PM -0400, Kenneth Westerback wrote: > On 9 May 2014 11:47, Kenneth Westerback wrote: > > On 9 May 2014 11:41, Fritjof Bornebusch wrote: > >> On Wed, May 07, 2014 at 08:59:03PM +0200, Fritjof Bornebusch wrote: > >>> On Wed, May 07, 2014 at 08:05:35PM +0200, J??r??mie Courr??ges-Anglas > >>> wrote: > >>> > Fritjof Bornebusch writes: > >>> > > >>> > [...] > >>> > > >>> > > Does no one want to check the diff and give me some feedback? > >>> > > >>> > Regardless of the content of your diff, the date of your mail was: > >>> > > >>> > Date: Tue, 6 May 2014 22:57:57 +0200 > >>> > > >>> > I doubt there are developers that are paid full-time to improve rcs, > >>> > please be more patient. > >>> > > >>> > -- > >>> > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 > >>> > E7EE > >>> > >>> Sorry, you are right. > >>> Next time I'll be more patient. > >>> > >>> fritjof > >>> > >> Come on, nobody? > >> If my diffs point to the wrong direction, then please tell me! > >> > >> fritjof > >> > > > > No one has the time or interest apparently. Whining about it every > > couple of days does not help motivate people to drop their current > > work to look at your stylistic tweaks. > > > > Ken > > I apologize for the unintentionally harsh tone. We are always > interested in getting diffs. > > Ken No problem. But if you like OpenRCS as it is and don't want to get any diffs unless security fixes, then just say it. Or if you work on other stuff and you don't have time for that, then just say it. fritjof
Re: [PATCH] comparison between signed and unsigned in rcs
Fritjof Bornebusch writes: > Hi tech, Hi, > if I compile rcs, gcc prints a few warnings like this: > - comparison between signed and unsigned > - signed and unsigned type in conditional expression > > I'm not quite sure if the typecasts are at the correct place, but these diffs > removes the warnings. > > fritjof > > > Index: buf.c > === > RCS file: /cvs/src/usr.bin/rcs/buf.c,v > retrieving revision 1.22 > diff -u -p -r1.22 buf.c > --- buf.c 6 Jul 2011 15:36:52 - 1.22 > +++ buf.c 6 May 2014 20:56:55 - > @@ -98,7 +98,7 @@ buf_load(const char *path) > if (fstat(fd, &st) == -1) > goto out; > > - if (st.st_size > SIZE_MAX) { > + if (st.st_size > (off_t)SIZE_MAX) { > errno = EFBIG; > goto out; > } This would break on 64 bits archs: there, SIZE_MAX casted to an off_t is -1 (implementation-defined behavior iirc). Also it breaks platforms with 32 bits off_t (this does not affect OpenBSD). I think the code is perfectly fine as is, but a possible clarification that does not do assumptions about the site of off_t and size_t could be: if ((uintmax_t)st.st_size > (uintmax_t)SIZE_MAX) ... > Index: diff.c > === > RCS file: /cvs/src/usr.bin/rcs/diff.c,v > retrieving revision 1.34 > diff -u -p -r1.34 diff.c > --- diff.c 16 May 2013 12:44:48 - 1.34 > +++ diff.c 6 May 2014 20:57:07 - > @@ -432,13 +432,13 @@ prepare(int i, FILE *fd, off_t filesize, > > rewind(fd); > > - sz = (filesize <= SIZE_MAX ? filesize : SIZE_MAX) / 25; > + sz = (filesize <= (off_t)SIZE_MAX ? filesize : (off_t)SIZE_MAX) / 25; > if (sz < 100) > sz = 100; Same problem here. > p = xcalloc(sz + 3, sizeof(*p)); > for (j = 0; (h = readhash(fd, flags));) { > - if (j == sz) { > + if ((size_t)j == sz) { > sz = sz * 3 / 2; > p = xrealloc(p, sz + 3, sizeof(*p)); > } Declaring j as a size_t would save a cast. > Index: diff3.c > === > RCS file: /cvs/src/usr.bin/rcs/diff3.c,v > retrieving revision 1.33 > diff -u -p -r1.33 diff3.c > --- diff3.c 4 Mar 2012 04:05:15 - 1.33 > +++ diff3.c 6 May 2014 20:57:18 - > @@ -908,7 +908,7 @@ edscript(int n) > (void)fseek(fp[2], (long)de[n].new.from, SEEK_SET); > for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) { > j = k > BUFSIZ ? BUFSIZ : k; > - if (fread(block, 1, j, fp[2]) != j) > + if ((int)fread(block, 1, j, fp[2]) != j) > return (-1); > block[j] = '\0'; > diff_output("%s", block); Same here. > Index: buf.c > === > RCS file: /cvs/src/usr.bin/rcs/buf.c,v > retrieving revision 1.22 > diff -u -p -r1.22 buf.c > --- buf.c 6 Jul 2011 15:36:52 - 1.22 > +++ buf.c 6 May 2014 20:57:30 - > @@ -98,7 +98,7 @@ buf_load(const char *path) > if (fstat(fd, &st) == -1) > goto out; > > - if (st.st_size > SIZE_MAX) { > + if (st.st_size > (off_t)SIZE_MAX) { > errno = EFBIG; > goto out; > } > Duplicated hunk? -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [PATCH] comparison between signed and unsigned in rcs
On 9 May 2014 11:47, Kenneth Westerback wrote: > On 9 May 2014 11:41, Fritjof Bornebusch wrote: >> On Wed, May 07, 2014 at 08:59:03PM +0200, Fritjof Bornebusch wrote: >>> On Wed, May 07, 2014 at 08:05:35PM +0200, J??r??mie Courr??ges-Anglas wrote: >>> > Fritjof Bornebusch writes: >>> > >>> > [...] >>> > >>> > > Does no one want to check the diff and give me some feedback? >>> > >>> > Regardless of the content of your diff, the date of your mail was: >>> > >>> > Date: Tue, 6 May 2014 22:57:57 +0200 >>> > >>> > I doubt there are developers that are paid full-time to improve rcs, >>> > please be more patient. >>> > >>> > -- >>> > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 >>> > E7EE >>> >>> Sorry, you are right. >>> Next time I'll be more patient. >>> >>> fritjof >>> >> Come on, nobody? >> If my diffs point to the wrong direction, then please tell me! >> >> fritjof >> > > No one has the time or interest apparently. Whining about it every > couple of days does not help motivate people to drop their current > work to look at your stylistic tweaks. > > Ken I apologize for the unintentionally harsh tone. We are always interested in getting diffs. Ken
Re: [PATCH] comparison between signed and unsigned in rcs
On 9 May 2014 11:41, Fritjof Bornebusch wrote: > On Wed, May 07, 2014 at 08:59:03PM +0200, Fritjof Bornebusch wrote: >> On Wed, May 07, 2014 at 08:05:35PM +0200, J??r??mie Courr??ges-Anglas wrote: >> > Fritjof Bornebusch writes: >> > >> > [...] >> > >> > > Does no one want to check the diff and give me some feedback? >> > >> > Regardless of the content of your diff, the date of your mail was: >> > >> > Date: Tue, 6 May 2014 22:57:57 +0200 >> > >> > I doubt there are developers that are paid full-time to improve rcs, >> > please be more patient. >> > >> > -- >> > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE >> >> Sorry, you are right. >> Next time I'll be more patient. >> >> fritjof >> > Come on, nobody? > If my diffs point to the wrong direction, then please tell me! > > fritjof > No one has the time or interest apparently. Whining about it every couple of days does not help motivate people to drop their current work to look at your stylistic tweaks. Ken
Re: [PATCH] comparison between signed and unsigned in rcs
On Wed, May 07, 2014 at 08:59:03PM +0200, Fritjof Bornebusch wrote: > On Wed, May 07, 2014 at 08:05:35PM +0200, J??r??mie Courr??ges-Anglas wrote: > > Fritjof Bornebusch writes: > > > > [...] > > > > > Does no one want to check the diff and give me some feedback? > > > > Regardless of the content of your diff, the date of your mail was: > > > > Date: Tue, 6 May 2014 22:57:57 +0200 > > > > I doubt there are developers that are paid full-time to improve rcs, > > please be more patient. > > > > -- > > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE > > Sorry, you are right. > Next time I'll be more patient. > > fritjof > Come on, nobody? If my diffs point to the wrong direction, then please tell me! fritjof
pcidevs nvidia 650GTX
Hello, Here is a small diff for pcidevs to add the NVIDIA GTX 650, including its HDMI audio part. Regards --- sys/dev/pci/pcidevs.old Fri May 9 14:39:50 2014 +++ sys/dev/pci/pcidevs Fri May 9 14:39:26 2014 @@ -5507,6 +5507,8 @@ product NVIDIA MCP89_OHCI 0x0d9c MCP89 USB product NVIDIA MCP89_EHCI 0x0d9d MCP89 USB product NVIDIA GEFORCE_425M 0x0df0 GeForce 425M +product NVIDIA GK107HDMI 0x0e1b GK107 HDMI Audio +product NVIDIA GEFORCEGTX650 0x0fc6 GeForce GTX 650 product NVIDIA GEFORCEGTX550TI 0x1244 GeForce GTX 550 Ti product NVIDIA GEFORCEGTS450_1 0x1245 GeForce GTS 450 product NVIDIA GEFORCEGT550M 0x1246 GeForce GT 550M smime.p7s Description: S/MIME Cryptographic Signature
Re: openbsd-current: cannot suspend -return from zzz-
On 09/05/14(Fri) 08:36, Abel Abraham Camarillo Ojeda wrote: > On Fri, May 9, 2014 at 4:37 AM, Abel Abraham Camarillo Ojeda > wrote: > > > > On Thu, Apr 17, 2014 at 4:46 AM, Abel Abraham Camarillo Ojeda > > wrote: > >> > >> >>> > On Tue, Apr 8, 2014 at 5:46 PM, Mike Larkin > >> >>> > wrote: > >> >>> >> On Tue, Apr 08, 2014 at 05:30:59PM -0500, Abel Abraham Camarillo > >> >>> >> Ojeda wrote: > >> >>> >>> I was trying to build some kernels between 5.3 and 5.4 to see when > >> >>> >>> this machine breaks, > >> >>> >>> had no time to do it though... > >> >>> >>> > >> > >> first of all: sorry for some noise. > >> > >> I cannot reproduce this with 5.4/amd64, but can reproduce the fail -no > >> resume- in > >> -current/amd64, I will stop trying to get more info into this until > >> 5.5 is released > >> so I can see if it breaks between 5.4-> 5.5 or 5.5 -> -current; I > >> think it will be > >> pretty difficult to build an OPENBSD_5_5_BASE system starting from my > >> 5.4/amd64 system > >> -because the time_t changes-. > > > > > > > > Suspend works in 5.5/amd64 but no in current/amd64 as may-8 - > > post resume screen is only blank, will try disabling radeondrm0 and > > attaching serial, again. > > > > This commit breaks resume for my machine: Could you find which device and/or controller breaks it? Since you have only one mouse attached to your machine, can you resume if the mouse is unplugged? If not, can you resume with ohci(4) disable (you won't be able to use your USB mouse)? If not can you resume with ehci(4) disable or do you need to disable both controller drivers?
Re: openbsd-current: cannot suspend -return from zzz-
On Fri, May 9, 2014 at 4:37 AM, Abel Abraham Camarillo Ojeda wrote: > > On Thu, Apr 17, 2014 at 4:46 AM, Abel Abraham Camarillo Ojeda > wrote: >> >> >>> > On Tue, Apr 8, 2014 at 5:46 PM, Mike Larkin >> >>> > wrote: >> >>> >> On Tue, Apr 08, 2014 at 05:30:59PM -0500, Abel Abraham Camarillo >> >>> >> Ojeda wrote: >> >>> >>> I was trying to build some kernels between 5.3 and 5.4 to see when >> >>> >>> this machine breaks, >> >>> >>> had no time to do it though... >> >>> >>> >> >> first of all: sorry for some noise. >> >> I cannot reproduce this with 5.4/amd64, but can reproduce the fail -no >> resume- in >> -current/amd64, I will stop trying to get more info into this until >> 5.5 is released >> so I can see if it breaks between 5.4-> 5.5 or 5.5 -> -current; I >> think it will be >> pretty difficult to build an OPENBSD_5_5_BASE system starting from my >> 5.4/amd64 system >> -because the time_t changes-. > > > > Suspend works in 5.5/amd64 but no in current/amd64 as may-8 - > post resume screen is only blank, will try disabling radeondrm0 and > attaching serial, again. > This commit breaks resume for my machine: on sys/dev/usb/usb.c: revision 1.95 date: 2014/03/31 16:18:06; author: mpi; state: Exp; lines: +61 -40; Force the detach of all USB devices by disconnecting the root hubs before suspending the machine. Prior to this commit, devices were logically disconnected after resuming the machine leading to funny races since the controller was reset in between. ok deraadt@ the following patch (inlined and attached) reverts it - so fix resume for me, I have applied it on -current. note: I have no working usb input devices after resume with or without this - not even plugging devices again, so I use ps2 keyboard/mouse, this worked in some older release but I'm not sure if it's important enough to do the check... comments? Thanks Index: usb.c === RCS file: /cvs/src/sys/dev/usb/usb.c,v retrieving revision 1.95 diff -u -p -r1.95 usb.c --- usb.c 31 Mar 2014 16:18:06 - 1.95 +++ usb.c 9 May 2014 13:10:39 - @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.95 2014/03/31 16:18:06 mpi Exp $ */ +/* $OpenBSD: usb.c,v 1.94 2014/03/08 11:49:19 mpi Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -92,7 +92,6 @@ struct usb_softc { struct device sc_dev; /* base device */ struct usbd_bus *sc_bus; /* USB controller */ struct usbd_port sc_port; /* dummy port for root hub */ - int sc_speed; struct usb_task sc_explore_task; @@ -126,9 +125,6 @@ void usb_attach(struct device *, struc int usb_detach(struct device *, int); int usb_activate(struct device *, int); -int usb_attach_roothub(struct usb_softc *); -void usb_detach_roothub(struct usb_softc *); - struct cfdriver usb_cd = { NULL, "usb", DV_DULL }; @@ -151,7 +147,10 @@ void usb_attach(struct device *parent, struct device *self, void *aux) { struct usb_softc *sc = (struct usb_softc *)self; + struct usbd_device *dev; + usbd_status err; int usbrev; + int speed; if (usb_nbuses == 0) { rw_init(&usbpalock, "usbpalock"); @@ -172,13 +171,13 @@ usb_attach(struct device *parent, struct switch (usbrev) { case USBREV_1_0: case USBREV_1_1: - sc->sc_speed = USB_SPEED_FULL; + speed = USB_SPEED_FULL; break; case USBREV_2_0: - sc->sc_speed = USB_SPEED_HIGH; + speed = USB_SPEED_HIGH; break; case USBREV_3_0: - sc->sc_speed = USB_SPEED_SUPER; + speed = USB_SPEED_SUPER; break; default: printf(", not supported\n"); @@ -207,10 +206,17 @@ usb_attach(struct device *parent, struct return; } - - - if (!usb_attach_roothub(sc)) { - struct usbd_device *dev = sc->sc_bus->root_hub; + err = usbd_new_device(&sc->sc_dev, sc->sc_bus, 0, speed, 0, + &sc->sc_port); + if (!err) { + dev = sc->sc_port.device; + if (dev->hub == NULL) { + sc->sc_bus->dying = 1; + printf("%s: root device is not a hub\n", + sc->sc_dev.dv_xname); + return; + } + sc->sc_bus->root_hub = dev; #if 1 /* * Turning this code off will delay attachment of USB devices @@ -220,8 +226,11 @@ usb_attach(struct device *parent, struct if (cold && (sc->sc_dev.dv_cfdata->cf_flags & 1)) dev->hub->explore(sc->sc_bus->root_hub); #endif + } else { + printf("%s: root hub problem, error=%d\n", + sc->sc_dev.dv_xname, err); + sc->sc_bus->dying = 1; } - if (cold) sc->sc_bus->use_polling--; @@ -234,41 +243,6 @@ usb_attach(struct device *parent, struct } } -int -usb_attach_roothub(struct usb_softc *sc) -{ - struct usbd_device *dev; - - if (usbd_new_device(&sc->sc_dev, sc->sc_bus, 0, sc->sc_speed, 0, -&sc->sc_port)) { - printf("%s: root hub problem\n", sc->sc_dev.dv_xname); - sc->sc_bus->dying = 1; - return (1); - } - - dev = sc->sc_port.device; - if (dev->hub == NULL) { - printf("%s: root device is not a hub\n", sc->sc_dev.dv_xname); - sc->sc_bus->dying = 1; - return (1); - } - sc->sc_bus->root_hub = dev; - - return (0
Re: amd64 support for AR9485
On Fri, May 09, 2014 at 12:08:21AM +0100, Stuart Henderson wrote: > You could try adding the ID to the athn driver to get it to match: > > Index: if_athn_pci.c > === > RCS file: /cvs/src/sys/dev/pci/if_athn_pci.c,v > retrieving revision 1.14 > diff -u -p -r1.14 if_athn_pci.c > --- if_athn_pci.c 6 Dec 2013 21:03:03 - 1.14 > +++ if_athn_pci.c 8 May 2014 23:07:17 - > @@ -98,7 +98,8 @@ static const struct pci_matchid athn_pci > { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR2427 }, > { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9227 }, > { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9287 }, > - { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9300 } > + { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9300 }, > + { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9485 } > }; > > int > > No guarantees as to whether this is sufficient, or if further > work is needed, but it will at least get the device picked up by > the athn driver. Further work is needed. I have diffs which do much more but don't yet work either. I've given up on trying to get this to work for now, and will share my diffs with anyone who wants to take over. If you're an aspiring wifi hacker, then this is for you. If not, just buy a supported card.
Re: openbsd-current: cannot suspend -return from zzz-
On Thu, Apr 17, 2014 at 4:46 AM, Abel Abraham Camarillo Ojeda < acam...@verlet.org> wrote: > >>> > On Tue, Apr 8, 2014 at 5:46 PM, Mike Larkin > wrote: > >>> >> On Tue, Apr 08, 2014 at 05:30:59PM -0500, Abel Abraham Camarillo > Ojeda wrote: > >>> >>> I was trying to build some kernels between 5.3 and 5.4 to see when > >>> >>> this machine breaks, > >>> >>> had no time to do it though... > >>> >>> > > first of all: sorry for some noise. > > I cannot reproduce this with 5.4/amd64, but can reproduce the fail -no > resume- in > -current/amd64, I will stop trying to get more info into this until > 5.5 is released > so I can see if it breaks between 5.4-> 5.5 or 5.5 -> -current; I > think it will be > pretty difficult to build an OPENBSD_5_5_BASE system starting from my > 5.4/amd64 system > -because the time_t changes-. > Suspend works in 5.5/amd64 but no in current/amd64 as may-8 - post resume screen is only blank, will try disabling radeondrm0 and attaching serial, again. dmesg from 5.5 (with some my notes marked as ###) and current inlined OpenBSD 5.5 (GENERIC.MP) #315: Wed Mar 5 09:37:46 MST 2014 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP real mem = 17124114432 (16330MB) avail mem = 16659664896 (15887MB) mainbus0 at root bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xeed90 (55 entries) bios0: vendor American Megatrends Inc. version "1605" date 10/25/2012 bios0: ASUSTeK COMPUTER INC. M5A97 acpi0 at bios0: rev 2 acpi0: sleep states S0 S1 S3 S4 S5 acpi0: tables DSDT FACP APIC MCFG HPET SSDT IVRS acpi0: wakeup devices SBAZ(S4) PS2K(S3) PS2M(S3) UAR1(S4) P0PC(S4) UHC1(S4) UHC2(S4) USB3(S4) UHC4(S4) USB5(S4) UHC6(S4) UHC7(S4) PE20(S4) PE21(S4) PE22(S4) PE23(S4) [...] acpitimer0 at acpi0: 3579545 Hz, 32 bits acpimadt0 at acpi0 addr 0xfee0: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) cpu0: AMD Phenom(tm) II X4 955 Processor, 3211.07 MHz cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache cpu0: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative cpu0: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative cpu0: AMD erratum 721 detected and fixed cpu0: smt 0, core 0, package 0 mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges cpu0: apic clock running at 200MHz cpu0: mwait min=64, max=64, C-substates=0.0.0.0.0, IBE cpu1 at mainbus0: apid 1 (application processor) cpu1: AMD Phenom(tm) II X4 955 Processor, 3210.72 MHz cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache cpu1: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative cpu1: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative cpu1: AMD erratum 721 detected and fixed cpu1: smt 0, core 1, package 0 cpu2 at mainbus0: apid 2 (application processor) cpu2: AMD Phenom(tm) II X4 955 Processor, 3210.72 MHz cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC cpu2: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache cpu2: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative cpu2: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative cpu2: AMD erratum 721 detected and fixed cpu2: smt 0, core 2, package 0 cpu3 at mainbus0: apid 3 (application processor) cpu3: AMD Phenom(tm) II X4 955 Processor, 3210.72 MHz cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DNOW,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,NODEID,ITSC cpu3: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB 64b/line 16-way L2 cache, 6MB 64b/line 48-way L3 cache cpu3: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative cpu3: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative cpu3: AMD erratum 721 detected and fixed cpu3: smt 0, core 3, package 0 ioapic0 at mainbus0: apid 5 pa 0xfec0, version 21, 24 pins ioapic1 at mainbus0: apid 6 pa 0xfec2, version 21, 32 pins acpimcfg0 at acpi0 addr 0xe000, bus 0-255 acpihpet0 at acpi0: 14318180 Hz acpiprt0 at acpi0: bus 0 (PCI0) acpiprt1 a