amd k1x patch, silly mistake.
The initial msr read is pointless now, quit passing it around. I don't use the
value in k1x_acpi_states().
My bad. But I guess it could be left in as an early detection of a newer CPU
that doesn't support K10 style msr's (..vs as soon as someone fiddles
with a sysctl or enables apmd).
-Bryan.
Index: amd64/amd64/k1x-pstate.c
===
RCS file: /cvs/src/sys/arch/amd64/amd64/k1x-pstate.c,v
retrieving revision 1.3
diff -u -p -u -r1.3 k1x-pstate.c
--- arch/amd64/amd64/k1x-pstate.c 7 Jan 2012 05:55:08 - 1.3
+++ arch/amd64/amd64/k1x-pstate.c 28 Jan 2012 02:58:15 -
@@ -76,8 +76,7 @@ void k1x_transition(struct k1x_cpu_state
#if NACPICPU > 0
void k1x_acpi_init(struct k1x_cpu_state *);
-void k1x_acpi_states(struct k1x_cpu_state *, struct acpicpu_pss *, int,
-u_int64_t);
+void k1x_acpi_states(struct k1x_cpu_state *, struct acpicpu_pss *, int);
#endif
void
@@ -131,7 +130,7 @@ k1x_transition(struct k1x_cpu_state *cst
void
k1x_acpi_states(struct k1x_cpu_state *cstate, struct acpicpu_pss *pss,
-int nstates, u_int64_t msr)
+int nstates)
{
struct k1x_state state;
int j, n;
@@ -157,15 +156,12 @@ void
k1x_acpi_init(struct k1x_cpu_state *cstate)
{
struct acpicpu_pss *pss;
- u_int64_t msr;
cstate->n_states = acpicpu_fetch_pss(&pss);
if (cstate->n_states == 0)
return;
- msr = rdmsr(MSR_K1X_STATUS);
-
- k1x_acpi_states(cstate, pss, cstate->n_states, msr);
+ k1x_acpi_states(cstate, pss, cstate->n_states);
return;
}
Index: i386/i386/k1x-pstate.c
===
RCS file: /cvs/src/sys/arch/i386/i386/k1x-pstate.c,v
retrieving revision 1.3
diff -u -p -u -r1.3 k1x-pstate.c
--- arch/i386/i386/k1x-pstate.c 7 Jan 2012 05:55:08 - 1.3
+++ arch/i386/i386/k1x-pstate.c 28 Jan 2012 02:58:16 -
@@ -76,8 +76,7 @@ void k1x_transition(struct k1x_cpu_state
#if NACPICPU > 0
void k1x_acpi_init(struct k1x_cpu_state *);
-void k1x_acpi_states(struct k1x_cpu_state *, struct acpicpu_pss *, int,
-u_int64_t);
+void k1x_acpi_states(struct k1x_cpu_state *, struct acpicpu_pss *, int);
#endif
void
@@ -131,7 +130,7 @@ k1x_transition(struct k1x_cpu_state *cst
void
k1x_acpi_states(struct k1x_cpu_state *cstate, struct acpicpu_pss *pss,
-int nstates, u_int64_t msr)
+int nstates)
{
struct k1x_state state;
int j, n;
@@ -157,15 +156,12 @@ void
k1x_acpi_init(struct k1x_cpu_state *cstate)
{
struct acpicpu_pss *pss;
- u_int64_t msr;
cstate->n_states = acpicpu_fetch_pss(&pss);
if (cstate->n_states == 0)
return;
- msr = rdmsr(MSR_K1X_STATUS);
-
- k1x_acpi_states(cstate, pss, cstate->n_states, msr);
+ k1x_acpi_states(cstate, pss, cstate->n_states);
return;
}
small vr(4) patch.
Remove redundant call to vr_reset, it gets called in vr_init.
-Bryan.
Index: if_vr.c
===
RCS file: /cvs/src/sys/dev/pci/if_vr.c,v
retrieving revision 1.113
diff -u -p -u -r1.113 if_vr.c
--- dev/pci/if_vr.c 5 Jan 2012 19:08:25 - 1.113
+++ dev/pci/if_vr.c 28 Jan 2012 02:41:20 -
@@ -1124,7 +1124,6 @@ vr_intr(void *arg)
if (status & VR_ISR_TX_UNDERRUN)
printf("%s: transmit underrun\n",
sc->sc_dev.dv_xname);
- vr_reset(sc);
vr_init(sc);
status = 0;
}
b3
qwgxzhgd 2012-1-28 [demime 1.01d removed an attachment of type image/jpeg which had a name of tqnjkuw.jpg]
add pcidev id for ATI Radeon 6320
I just bought a new laptop and the graphics is not fully supported.
Accordin to the X.org driver, all Evergreen chipsets are the same as
R7xx, so act as RV770.
OK?
Index: dev/pci/pcidevs
===
RCS file: /cvs/openbsd/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1633
diff -u -p -r1.1633 pcidevs
--- dev/pci/pcidevs 12 Jan 2012 05:06:00 - 1.1633
+++ dev/pci/pcidevs 27 Jan 2012 17:35:15 -
@@ -1412,6 +1412,7 @@ product ATI RADEON_HD6310_1 0x9802 Radeo
product ATI RADEON_HD6310_20x9803 Radeon HD 6310
product ATI RADEON_HD6250_10x9804 Radeon HD 6250
product ATI RADEON_HD6250_20x9805 Radeon HD 6250
+product ATI RADEON_HD6320 0x9806 Radeon HD 6320
product ATI RADEON_HD2600_HDA 0xaa08 Radeon HD 2600 HD Audio
product ATI RS690M_HDA 0xaa10 RS690M HD Audio
product ATI RADEON_HD3870_HDA 0xaa18 Radeon HD 3870 HD Audio
Index: dev/pci/drm/radeon_drv.c
===
RCS file: /cvs/openbsd/src/sys/dev/pci/drm/radeon_drv.c,v
retrieving revision 1.56
diff -u -p -r1.56 radeon_drv.c
--- dev/pci/drm/radeon_drv.c22 Aug 2011 23:12:09 - 1.56
+++ dev/pci/drm/radeon_drv.c27 Jan 2012 21:53:19 -
@@ -525,6 +525,8 @@ const static struct drm_pcidev radeondrm
CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4890,
CHIP_RV770|RADEON_NEW_MEMMAP},
+ {PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD6320,
+ CHIP_RV770|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4200,
CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD4250,
dmesg:
OpenBSD 5.1-beta (GENERIC.MP) #7: Fri Jan 27 20:49:22 CET 2012
phess...@poro.theapt.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
RTC BIOS diagnostic error 80
real mem = 3867213824 (3688MB)
avail mem = 3750109184 (3576MB)
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.6 @ 0xea830 (47 entries)
bios0: vendor LENOVO version "4BCN24WW" date 08/10/2011
bios0: LENOVO 10383EG
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP HPET APIC MCFG SLIC UEFI UEFI SSDT SSDT UEFI
acpi0: wakeup devices PB4_(S4) PB5_(S4) PB6_(S4) PB7_(S4) OHC1(S3) EHC1(S3)
OHC2(S3) EHC2(S3) OHC3(S3) EHC3(S3) OHC4(S3) SBAZ(S3) GEC_(S4) P2P_(S5)
SPB0(S4) SPB1(S4) SPB2(S4) SPB3(S4) LID0(S3) SLPB(S3)
acpitimer0 at acpi0: 3579545 Hz, 32 bits
acpihpet0 at acpi0: 14318180 Hz
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: AMD E-450 APU with Radeon(tm) HD Graphics, 1647.86 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,SSSE3,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,IBS,SKINIT
cpu0: 32KB 64b/line 2-way I-cache, 32KB 64b/line 8-way D-cache, 512KB 64b/line
16-way L2 cache
cpu0: DTLB 40 4KB entries fully associative, 8 4MB entries fully associative
cpu0: apic clock running at 199MHz
cpu1 at mainbus0: apid 1 (application processor)
cpu1: AMD E-450 APU with Radeon(tm) HD Graphics, 1646.50 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,SSSE3,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,IBS,SKINIT
cpu1: 32KB 64b/line 2-way I-cache, 32KB 64b/line 8-way D-cache, 512KB 64b/line
16-way L2 cache
cpu1: DTLB 40 4KB entries fully associative, 8 4MB entries fully associative
ioapic0 at mainbus0: apid 2 pa 0xfec0, version 21, 24 pins
ioapic0: misconfigured as apic 0, remapped to apid 2
acpimcfg0 at acpi0 addr 0xf800, bus 0-31
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (PB4_)
acpiprt2 at acpi0: bus -1 (PB5_)
acpiprt3 at acpi0: bus -1 (PB6_)
acpiprt4 at acpi0: bus -1 (PB7_)
acpiprt5 at acpi0: bus 1 (P2P_)
acpiprt6 at acpi0: bus 2 (SPB0)
acpiprt7 at acpi0: bus -1 (SPB1)
acpiprt8 at acpi0: bus 3 (SPB2)
acpiprt9 at acpi0: bus -1 (SPB3)
acpiec0 at acpi0
acpicpu0 at acpi0: C2, PSS
acpicpu1 at acpi0: C2, PSS
acpitz0 at acpi0: critical temperature is 97 degC
acpitz1 at acpi0: critical temperature is 126 degC
acpibtn0 at acpi0: PWRB
acpiac0 at acpi0: AC unit online
acpibat0 at acpi0: BAT0 model "L09S6Y14" serial 144 type LION oem
"3131004f594e4153"
acpibtn1 at acpi0: LID0
acpibtn2 at acpi0: SLPB
acpivideo0 at acpi0: VGA_
acpivideo1 at acpi0: VGA_
acpivout0 at acpivideo1: LCD_
cpu0: 1646 MHz: speeds: 1650 1320 825 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "AMD AMD64 14h Host" rev 0x00
vga1 at pci0 dev 1 function 0 "ATI Radeon HD 6320" rev 0x00
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
radeondrm0 at vga1: apic 2 int 18
drm0 at radeondrm0
azalia0 at pci0 dev 1 fu
Re: Apache's FAQ.html
On Fri, Jan 27, 2012 at 08:42:08AM +, Jason McIntyre wrote: > hmm. there are more problems than this: > > - some of the pages in htdocs refer to a FAQ page at > http://httpd.apache.org/docs/misc/FAQ.html. the link doesn;t work > though. > > - misc/index.html refers to FAQ.html, the file you propose to remove. > > your intention seems correct though (i agree misc/FAQ.html looks > broken). > > the reference in misc/index.html can be trivially fixed. i've no idea > about the apache link though. > > jmc I would also change link in ssl faq too: Index: mod/mod_ssl/ssl_faq.html === RCS file: /cvs/src/usr.sbin/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html,v retrieving revision 1.12 diff -u -r1.12 ssl_faq.html --- mod/mod_ssl/ssl_faq.html18 Jun 2008 05:42:29 - 1.12 +++ mod/mod_ssl/ssl_faq.html27 Jan 2012 18:34:58 - @@ -500,7 +500,7 @@ are done with full year value instead of abbreviating to two digits. Additionally according to a http://www.apache.org/docs/misc/FAQ.html#year2000";>Year 2000 +href="../../misc/FAQ.html#year2000">Year 2000 statement from the Apache Group, the Apache webserver is Year 2000 compliant, too. But whether OpenSSL or the underlaying Operating System (either a Unix or Win32 platform) is Year 2000 compliant is a different Looking at latest online FAQ for Apache 1.3 it looks even worse than in-tree manual/FAQ.html http://httpd.apache.org/docs/1.3/misc/FAQ.html so I'm also not sure what's the option here. -- best regards q#
rtadvd(8) patch 2/2 : finalize server-side RFC 6106 support
Hello again tech@,
Here's also the updated version of a patch I wrote approx. one year ago
to support RFC 6106 in rtadvd(8). J.R. Oldroyd told me there was a bug
in the generation of the DNS search list and that the format of the
packets generated was not valid.
I fixed that, so here is the patch.
Regards,
--
Stephane A. Sezer
Index: sys/netinet/icmp6.h
===
RCS file: /cvs/src/sys/netinet/icmp6.h,v
retrieving revision 1.33
diff -u -r1.33 icmp6.h
--- sys/netinet/icmp6.h 22 Mar 2010 12:23:32 - 1.33
+++ sys/netinet/icmp6.h 26 Jan 2012 17:11:40 -
@@ -282,6 +282,8 @@
#define ND_OPT_PREFIX_INFORMATION 3
#define ND_OPT_REDIRECTED_HEADER 4
#define ND_OPT_MTU 5
+#define ND_OPT_RDNSS 25
+#define ND_OPT_DNSSL 31
struct nd_opt_prefix_info {/* prefix information */
u_int8_tnd_opt_pi_type;
@@ -310,6 +312,22 @@
u_int8_tnd_opt_mtu_len;
u_int16_t nd_opt_mtu_reserved;
u_int32_t nd_opt_mtu_mtu;
+} __packed;
+
+struct nd_opt_rdnss { /* RDNSS option */
+ u_int8_tnd_opt_rdnss_type;
+ u_int8_tnd_opt_rdnss_len;
+ u_int16_t nd_opt_rdnss_reserved;
+ u_int32_t nd_opt_rdnss_lifetime;
+ /* followed by list of recursive DNS servers */
+} __packed;
+
+struct nd_opt_dnssl { /* DNSSL option */
+ u_int8_tnd_opt_dnssl_type;
+ u_int8_tnd_opt_dnssl_len;
+ u_int16_t nd_opt_dnssl_reserved;
+ u_int32_t nd_opt_dnssl_lifetime;
+ /* followed by list of DNS search domains */
} __packed;
/*
Index: usr.sbin/rtadvd/config.c
===
RCS file: /cvs/src/usr.sbin/rtadvd/config.c,v
retrieving revision 1.26
diff -u -r1.26 config.c
--- usr.sbin/rtadvd/config.c23 Apr 2008 10:17:50 - 1.26
+++ usr.sbin/rtadvd/config.c26 Jan 2012 17:11:42 -
@@ -109,6 +109,8 @@
fatal("malloc");
TAILQ_INIT(&tmp->prefixes);
+ TAILQ_INIT(&tmp->rdnsss);
+ TAILQ_INIT(&tmp->dnssls);
SLIST_INIT(&tmp->soliciters);
/* check if we are allowed to forward packets (if not determined) */
@@ -323,6 +325,106 @@
if (tmp->pfxs == 0)
get_prefix(tmp);
+ tmp->rdnsscnt = 0;
+ for (i = -1; i < MAXRDNSS; ++i) {
+ struct rdnss *rds;
+ char entbuf[256];
+ char *tmpaddr;
+
+ makeentry(entbuf, sizeof(entbuf), i, "rdnss");
+ addr = agetstr(entbuf, &bp);
+ if (addr == NULL)
+ continue;
+
+ /* servers are separated by commas in the config file */
+ val = 1;
+ tmpaddr = addr;
+ while (*tmpaddr++)
+ if (*tmpaddr == ',')
+ ++val;
+
+ rds = malloc(sizeof(struct rdnss) + val * sizeof(struct
in6_addr));
+ if (rds == NULL)
+ fatal("malloc");
+
+ TAILQ_INSERT_TAIL(&tmp->rdnsss, rds, entry);
+ tmp->rdnsscnt++;
+
+ rds->servercnt = val;
+
+ makeentry(entbuf, sizeof(entbuf), i, "rdnssltime");
+ MAYHAVE(val, entbuf, (tmp->maxinterval * 3) / 2);
+ if (val < tmp->maxinterval || val > tmp->maxinterval * 2) {
+ log_warnx("%s (%ld) on %s is invalid "
+ "(should be between %d and %d)",
+ entbuf, val, intface, tmp->maxinterval,
+ tmp->maxinterval * 2);
+ }
+ rds->lifetime = val;
+
+ val = 0;
+ while ((tmpaddr = strsep(&addr, ","))) {
+ if (inet_pton(AF_INET6, tmpaddr, &rds->servers[val]) !=
1) {
+ log_warn("inet_pton failed for %s", tmpaddr);
+ exit(1);
+ }
+ val++;
+ }
+ }
+
+ tmp->dnsslcnt = 0;
+ for (i = -1; i < MAXDNSSL; ++i) {
+ struct dnssl *dsl;
+ char entbuf[256];
+ char *tmpsl;
+
+ makeentry(entbuf, sizeof(entbuf), i, "dnssl");
+ addr = agetstr(entbuf, &bp);
+ if (addr == NULL)
+ continue;
+
+ dsl = malloc(sizeof(struct dnssl));
+ if (dsl == NULL)
+ fatal("malloc");
+
+ TAILQ_INIT(&dsl->dnssldoms);
+
+ while ((tmpsl = strsep(&addr, ","))) {
+ struct dnssldom *dnsd;
+ ssize_t len;
+
+ len = strlen(tmpsl);
+
+ /* if the domain is not "dot-terminated", add it */
+
rtadvd(8) patch 1/2 : `noifprefix` support
Hello tech@,
I discussed a little with brad@ of some features of the rtadvd(8)
daemon in OpenBSD and of the state of the support for some IPv6
features and he asked me if it was possible to add a `noifprefix`
option to the deamon, to disable automatic prefix information querying
on the interface in case no `addr` option is present in the config file.
Here is the (very simple) patch for this.
Regards,
--
Stephane A. Sezer
Index: usr.sbin/rtadvd/config.c
===
RCS file: /cvs/src/usr.sbin/rtadvd/config.c,v
retrieving revision 1.26
diff -u -r1.26 config.c
--- usr.sbin/rtadvd/config.c23 Apr 2008 10:17:50 - 1.26
+++ usr.sbin/rtadvd/config.c25 Jan 2012 03:30:54 -
@@ -320,7 +320,7 @@
now.tv_sec + pfx->preflifetime;
}
}
- if (tmp->pfxs == 0)
+ if (tmp->pfxs == 0 && !agetflag("noifprefix"))
get_prefix(tmp);
MAYHAVE(val, "mtu", 0);
Index: usr.sbin/rtadvd/rtadvd.conf.5
===
RCS file: /cvs/src/usr.sbin/rtadvd/rtadvd.conf.5,v
retrieving revision 1.25
diff -u -r1.25 rtadvd.conf.5
--- usr.sbin/rtadvd/rtadvd.conf.5 19 Sep 2010 21:59:23 - 1.25
+++ usr.sbin/rtadvd/rtadvd.conf.5 25 Jan 2012 03:30:54 -
@@ -142,7 +142,9 @@
These items can be omitted, then
.Nm rtadvd
will automatically get appropriate prefixes from the kernel's routing table,
-and advertise the prefixes with the default parameters.
+and advertise the prefixes with the default parameters, unless the
+.Cm noifprefix
+flag is specified.
Keywords other than
.Cm clockskew
can be augmented with a number, like
@@ -184,6 +186,18 @@
.Xr termcap 5
file format as well as IPv6 numeric addresses, the field MUST be quoted
using double quotes.
+.It Cm \&noifprefix
+(bool) Specifies whether
+.Nm rtadvd
+should gather prefix information from the interface if no
+.Cm addr
+is specified. If no
+.Cm addr
+is given, and
+.Cm noifprefix
+is set,
+.Nm rtadvd
+will send RA packets with no prefix information.
.It Cm \&vltime
(num) Valid lifetime field
.Pq unit: seconds .
Re: Apache's FAQ.html
On Thu, Jan 26, 2012 at 10:02:59PM +, Mikolaj Kucharski wrote: > On Thu, Sep 15, 2011 at 11:51:00PM +0100, Mikolaj Kucharski wrote: > > Hi, > > > > Looking at the /usr/src/usr.sbin/httpd/htdocs/manual files I think file > > misc/FAQ.html should be overwritten by FAQ.html and then FAQ.html can be > > removed as nothing reference to that location. All links point to > > misc/FAQ.html. > > In other words, this is what I mean: > > > $ cd /usr/src/usr.sbin/httpd/htdocs/manual > $ ls -l FAQ.html misc/FAQ.html > -rw-r--r-- 1 build build 153831 Jun 21 2009 FAQ.html > -rw-r--r-- 1 build build5463 Jun 21 2009 misc/FAQ.html > $ cat FAQ.html > misc/FAQ.html > $ rm -f FAQ.html > $ cvs rm FAQ.html > > > I didn't run make release with above, so not sure are there any > additional changes needed, by looking at the source of html files only > misc/FAQ.html file is used, other one isn't. However as you can see > above from the sizes, content of misc/FAQ.html is much smaller and if > you open that file in the browser, file looks broken. > > > PS. Please CC me in any replies. > > -- > best regards > q# > hmm. there are more problems than this: - some of the pages in htdocs refer to a FAQ page at http://httpd.apache.org/docs/misc/FAQ.html. the link doesn;t work though. - misc/index.html refers to FAQ.html, the file you propose to remove. your intention seems correct though (i agree misc/FAQ.html looks broken). the reference in misc/index.html can be trivially fixed. i've no idea about the apache link though. jmc
