svn commit: r237118 - head/sys/arm/arm
Author: imp
Date: Fri Jun 15 07:26:39 2012
New Revision: 237118
URL: http://svn.freebsd.org/changeset/base/237118
Log:
Fix a global shadowing problem when LINUX_BOOT_ABI was defined.
Modified:
head/sys/arm/arm/machdep.c
Modified: head/sys/arm/arm/machdep.c
==
--- head/sys/arm/arm/machdep.c Fri Jun 15 07:14:43 2012(r237117)
+++ head/sys/arm/arm/machdep.c Fri Jun 15 07:26:39 2012(r237118)
@@ -686,7 +686,7 @@ makectx(struct trapframe *tf, struct pcb
* calling pmap_bootstrap.
*/
void
-arm_dump_avail_init(vm_offset_t memsize, size_t max)
+arm_dump_avail_init(vm_offset_t ramsize, size_t max)
{
#ifdef LINUX_BOOT_ABI
/*
@@ -713,7 +713,7 @@ arm_dump_avail_init(vm_offset_t memsize,
panic("dump_avail too small\n");
dump_avail[0] = round_page(PHYSADDR);
- dump_avail[1] = trunc_page(PHYSADDR + memsize);
+ dump_avail[1] = trunc_page(PHYSADDR + ramsize);
dump_avail[2] = 0;
dump_avail[3] = 0;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237119 - head/cddl/contrib/opensolaris/lib/libzfs/common
Author: mm Date: Fri Jun 15 07:38:21 2012 New Revision: 237119 URL: http://svn.freebsd.org/changeset/base/237119 Log: Do not remount ZFS dataset if changing canmount property to "on" and dataset is already mounted. PR: 167905 Submitted by: Bryan Drewery MFC after:1 week Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c == --- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.cFri Jun 15 07:26:39 2012(r237118) +++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.cFri Jun 15 07:38:21 2012(r237119) @@ -1485,11 +1485,13 @@ zfs_prop_set(zfs_handle_t *zhp, const ch /* * If the dataset's canmount property is being set to noauto, +* or being set to on and the dataset is already mounted, * then we want to prevent unmounting & remounting it. */ do_prefix = !((prop == ZFS_PROP_CANMOUNT) && (zprop_string_to_index(prop, propval, &idx, - ZFS_TYPE_DATASET) == 0) && (idx == ZFS_CANMOUNT_NOAUTO)); + ZFS_TYPE_DATASET) == 0) && (idx == ZFS_CANMOUNT_NOAUTO || + (idx == ZFS_CANMOUNT_ON && zfs_is_mounted(zhp, NULL; if (do_prefix && (ret = changelist_prefix(cl)) != 0) goto error; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237122 - head/sys/arm/at91
Author: imp Date: Fri Jun 15 07:50:26 2012 New Revision: 237122 URL: http://svn.freebsd.org/changeset/base/237122 Log: Collapse the files.at91 and files.at91sam9 back into files.at91. Create a new option for at91rm9200 support. Set this option in std.at91. Create a new option for the at91sam9 standard devices. Set this option in std.at91sam9. Retire files.at91sam9. Add options for at91sam9x25 SoC and SAM9X25EK board, but don't connect it just yet as the supporting files aren't quite ready. Note: device at91rm9200 and device at91sam9 are presently mutually exclusive. Deleted: head/sys/arm/at91/files.at91sam9 Modified: head/sys/arm/at91/files.at91 head/sys/arm/at91/std.at91 head/sys/arm/at91/std.at91sam9 Modified: head/sys/arm/at91/files.at91 == --- head/sys/arm/at91/files.at91Fri Jun 15 07:42:44 2012 (r237121) +++ head/sys/arm/at91/files.at91Fri Jun 15 07:50:26 2012 (r237122) @@ -8,25 +8,38 @@ arm/at91/at91_mci.c optionalat91_mci arm/at91/at91_nand.c optionalnand arm/at91/at91_pio.cstandard arm/at91/at91_pmc.cstandard +arm/at91/at91_pit.coptionalat91sam9 +arm/at91/at91_reset.S optionalat91sam9 +arm/at91/at91_rst.coptionalat91sam9 arm/at91/at91_rtc.coptionalat91_rtc arm/at91/at91_spi.coptionalat91_spi\ dependency "spibus_if.h" arm/at91/at91_ssc.coptionalat91_ssc -arm/at91/at91_st.c standard +arm/at91/at91_st.c optionalat91rm9200 arm/at91/at91_tc.c optionalat91_tc arm/at91/at91_twi.coptionalat91_twi +arm/at91/at91_wdt.coptionalat91_wdt arm/at91/if_ate.c optionalate +arm/at91/if_macb.c optionalmacb arm/at91/uart_bus_at91usart.c optionaluart arm/at91/uart_cpu_at91rm9200usart.coptionaluart arm/at91/uart_dev_at91usart.c optionaluart # # All the "systems on a chip" we support # -arm/at91/at91rm9200.c standard +arm/at91/at91rm9200.c optionalat91rm9200 +arm/at91/at91sam9260.c optionalat91sam9260 +arm/at91/at91sam9g20.c optionalat91sam9g20 +arm/at91/at91sam9x25.c optionalat91sam9x25 # # All the boards we support # arm/at91/board_bwct.c optionalat91_board_bwct +arm/at91/board_ethernut5.c optionalat91_board_ethernut5 arm/at91/board_hl200.c optionalat91_board_hl200 +arm/at91/board_hl201.c optionalat91_board_hl201 arm/at91/board_kb920x.coptionalat91_board_kb920x +arm/at91/board_qila9g20.c optionalat91_board_qila9g20 +arm/at91/board_sam9g20ek.c optionalat91_board_sam9g20ek +arm/at91/board_sam9x25ek.c optionalat91_board_sam9x25ek arm/at91/board_tsc4370.c optionalat91_board_tsc4370 Modified: head/sys/arm/at91/std.at91 == --- head/sys/arm/at91/std.at91 Fri Jun 15 07:42:44 2012(r237121) +++ head/sys/arm/at91/std.at91 Fri Jun 15 07:50:26 2012(r237122) @@ -4,3 +4,6 @@ files "../at91/files.at91" cpuCPU_ARM9 makeoptionsCONF_CFLAGS=-mcpu=arm9 optionsPHYSADDR=0x2000 + +# For now, just do the AT91RM9200 +device at91rm9200 Modified: head/sys/arm/at91/std.at91sam9 == --- head/sys/arm/at91/std.at91sam9 Fri Jun 15 07:42:44 2012 (r237121) +++ head/sys/arm/at91/std.at91sam9 Fri Jun 15 07:50:26 2012 (r237122) @@ -1,9 +1,12 @@ # $FreeBSD$ -files "../at91/files.at91sam9" +files "../at91/files.at91" cpuCPU_ARM9 -makeoptionsCONF_CFLAGS="-mcpu=arm9" +makeoptionsCONF_CFLAGS=-mcpu=arm9 optionsPHYSADDR=0x2000 -device at91sam9g20 +# bring in the sam specific timers and such +device at91sam9 + device at91sam9260 +device at91sam9g20 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237124 - head/sys/arm/conf
Author: imp Date: Fri Jun 15 07:56:53 2012 New Revision: 237124 URL: http://svn.freebsd.org/changeset/base/237124 Log: This hints file doesn't actually do anything, and besides it is commented out here. Remove it. Modified: head/sys/arm/conf/BWCT Modified: head/sys/arm/conf/BWCT == --- head/sys/arm/conf/BWCT Fri Jun 15 07:52:20 2012(r237123) +++ head/sys/arm/conf/BWCT Fri Jun 15 07:56:53 2012(r237124) @@ -25,7 +25,6 @@ options AT91_BWCT include"../at91/std.bwct" #To statically compile in device wiring instead of /boot/device.hints -#hints "hints.at91rm9200" hints "BWCT.hints" makeoptionsMODULES_OVERRIDE="" ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237125 - in head/sys: arm/conf conf
Author: imp Date: Fri Jun 15 08:01:16 2012 New Revision: 237125 URL: http://svn.freebsd.org/changeset/base/237125 Log: These options are unused, and can safely be retired. Modified: head/sys/arm/conf/BWCT head/sys/conf/options.arm Modified: head/sys/arm/conf/BWCT == --- head/sys/arm/conf/BWCT Fri Jun 15 07:56:53 2012(r237124) +++ head/sys/arm/conf/BWCT Fri Jun 15 08:01:16 2012(r237125) @@ -21,7 +21,6 @@ ident BWCT optionsVERBOSE_INIT_ARM -optionsAT91_BWCT include"../at91/std.bwct" #To statically compile in device wiring instead of /boot/device.hints Modified: head/sys/conf/options.arm == --- head/sys/conf/options.arm Fri Jun 15 07:56:53 2012(r237124) +++ head/sys/conf/options.arm Fri Jun 15 08:01:16 2012(r237125) @@ -24,7 +24,6 @@ LINUX_BOOT_ABIopt_global.h LOADERRAMADDR opt_global.h PHYSADDR opt_global.h QEMU_WORKAROUNDS opt_global.h -SKYEYE_WORKAROUNDS opt_global.h SOC_MV_DISCOVERY opt_global.h SOC_MV_KIRKWOODopt_global.h SOC_MV_ORION opt_global.h @@ -33,9 +32,6 @@ XSCALE_CACHE_READ_WRITE_ALLOCATE opt_glo XSACLE_DISABLE_CCNTopt_timer.h VERBOSE_INIT_ARM opt_global.h AT91_ATE_USE_RMII opt_at91.h -AT91_BWCT opt_at91.h -AT91_TSC opt_at91.h -AT91_KWIKBYTE opt_at91.h AT91_MCI_HAS_4WIRE opt_at91.h AT91_MCI_SLOT_Bopt_at91.h AT91C_MAIN_CLOCK opt_at91.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237129 - head/tools/tools/net80211/wlanstats
Author: adrian
Date: Fri Jun 15 08:37:46 2012
New Revision: 237129
URL: http://svn.freebsd.org/changeset/base/237129
Log:
Add the AMPDU BAR TX statistics to the "ampdu" tag.
Modified:
head/tools/tools/net80211/wlanstats/main.c
Modified: head/tools/tools/net80211/wlanstats/main.c
==
--- head/tools/tools/net80211/wlanstats/main.c Fri Jun 15 08:10:14 2012
(r237128)
+++ head/tools/tools/net80211/wlanstats/main.c Fri Jun 15 08:37:46 2012
(r237129)
@@ -57,7 +57,8 @@ static struct {
},
{ "ampdu",
"input,output,ampdu_reorder,ampdu_oor,rx_dup,ampdu_flush,ampdu_move,"
-"ampdu_drop,ampdu_bar,ampdu_baroow,ampdu_barmove,rssi,rate"
+"ampdu_drop,ampdu_bar,ampdu_baroow,ampdu_barmove,ampdu_bartx,"
+"ampdu_bartxfail,ampdu_bartxretry,rssi,rate"
},
};
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237130 - head/sys/arm/at91
Author: imp
Date: Fri Jun 15 08:37:50 2012
New Revision: 237130
URL: http://svn.freebsd.org/changeset/base/237130
Log:
Make it possible to link together a sam and an rm kernel. The results
aren't very pretty yet, but this takes DELAY and cpu_reset and makes
them pointers.
# I worry that these are set too late in the boot, especially cpu_reset.
Modified:
head/sys/arm/at91/at91_machdep.c
head/sys/arm/at91/at91_pit.c
head/sys/arm/at91/at91_rst.c
head/sys/arm/at91/at91_st.c
head/sys/arm/at91/at91var.h
Modified: head/sys/arm/at91/at91_machdep.c
==
--- head/sys/arm/at91/at91_machdep.cFri Jun 15 08:37:46 2012
(r237129)
+++ head/sys/arm/at91/at91_machdep.cFri Jun 15 08:37:50 2012
(r237130)
@@ -201,11 +201,22 @@ const struct pmap_devmap at91_devmap[] =
{ 0, 0, 0, 0, 0, }
};
+#ifdef LINUX_BOOT_ABI
+extern int membanks;
+extern int memstart[];
+extern int memsize[];
+#endif
+
long
at91_ramsize(void)
{
uint32_t cr, mr;
int banks, rows, cols, bw;
+#ifdef LINUX_BOOT_ABI
+ // If we found any ATAGs that were for memory, return the first bank.
+ if (membanks > 0)
+ return memsize[0];
+#endif
if (at91_is_rm92()) {
uint32_t *SDRAMC = (uint32_t *)(AT91_BASE +
AT91RM92_SDRAMC_BASE);
@@ -593,3 +604,19 @@ cpu_initclocks(void)
{
}
+
+void
+DELAY(int n)
+{
+ if (soc_data.delay)
+ soc_data.delay(n);
+}
+
+void
+cpu_reset(void)
+{
+ if (soc_data.reset)
+ soc_data.reset();
+ while (1)
+ continue;
+}
Modified: head/sys/arm/at91/at91_pit.c
==
--- head/sys/arm/at91/at91_pit.cFri Jun 15 08:37:46 2012
(r237129)
+++ head/sys/arm/at91/at91_pit.cFri Jun 15 08:37:50 2012
(r237130)
@@ -48,6 +48,10 @@ __FBSDID("$FreeBSD$");
#include
#include
+#ifndef PIT_PRESCALE
+#define PIT_PRESCALE (16)
+#endif
+
static struct pit_softc {
struct resource *mem_res; /* Memory resource */
void*intrhand; /* Interrupt handle */
@@ -55,6 +59,8 @@ static struct pit_softc {
} *sc;
static uint32_t timecount = 0;
+static unsigned at91pit_get_timecount(struct timecounter *tc);
+static int pit_intr(void *arg);
static inline uint32_t
RD4(struct pit_softc *sc, bus_size_t off)
@@ -70,12 +76,28 @@ WR4(struct pit_softc *sc, bus_size_t off
bus_write_4(sc->mem_res, off, val);
}
-static unsigned at91pit_get_timecount(struct timecounter *tc);
-static int pit_intr(void *arg);
+static void
+at91pit_delay(int us)
+{
+ int32_t cnt, last, piv;
+ uint64_t pit_freq;
+ const uint64_t mhz = 1E6;
-#ifndef PIT_PRESCALE
-#define PIT_PRESCALE (16)
-#endif
+ last = PIT_PIV(RD4(sc, PIT_PIIR));
+
+ /* Max delay ~= 260s. @ 133Mhz */
+ pit_freq = at91_master_clock / PIT_PRESCALE;
+ cnt = ((pit_freq * us) + (mhz -1)) / mhz;
+ cnt = (cnt <= 0) ? 1 : cnt;
+
+ while (cnt > 0) {
+ piv = PIT_PIV(RD4(sc, PIT_PIIR));
+ cnt -= piv - last ;
+ if (piv < last)
+ cnt -= PIT_PIV(~0u) - last;
+ last = piv;
+ }
+}
static struct timecounter at91pit_timecounter = {
at91pit_get_timecount, /* get_timecount */
@@ -90,11 +112,8 @@ static int
at91pit_probe(device_t dev)
{
- if (at91_is_sam9() || at91_is_sam9xe()) {
- device_set_desc(dev, "AT91SAM9 PIT");
- return (0);
- }
- return (ENXIO);
+ device_set_desc(dev, "AT91SAM9 PIT");
+return (0);
}
static int
@@ -135,6 +154,7 @@ at91pit_attach(device_t dev)
/* Enable the PIT here. */
WR4(sc, PIT_MR, PIT_PIV(at91_master_clock / PIT_PRESCALE / hz) |
PIT_EN | PIT_IEN);
+soc_data.delay = at91pit_delay;
out:
return (err);
}
@@ -183,26 +203,3 @@ at91pit_get_timecount(struct timecounter
icnt = piir >> 20; /* Overflows */
return (timecount + PIT_PIV(piir) + PIT_PIV(RD4(sc, PIT_MR)) * icnt);
}
-
-void
-DELAY(int us)
-{
- int32_t cnt, last, piv;
- uint64_t pit_freq;
- const uint64_t mhz = 1E6;
-
- last = PIT_PIV(RD4(sc, PIT_PIIR));
-
- /* Max delay ~= 260s. @ 133Mhz */
- pit_freq = at91_master_clock / PIT_PRESCALE;
- cnt = ((pit_freq * us) + (mhz -1)) / mhz;
- cnt = (cnt <= 0) ? 1 : cnt;
-
- while (cnt > 0) {
- piv = PIT_PIV(RD4(sc, PIT_PIIR));
- cnt -= piv - last ;
- if (piv < last)
- cnt -= PIT_PIV(~0u) - last;
- last = piv;
- }
-}
Modified: head/sys/arm/at91/at91_rst.c
==
--- head/sys/arm/at91/at91_rst.cFri Jun 15 08:37
svn commit: r237131 - head/sys/dev/drm2/i915
Author: kib Date: Fri Jun 15 08:50:44 2012 New Revision: 237131 URL: http://svn.freebsd.org/changeset/base/237131 Log: Use right size when freeing unneeded GTT mapping. MFC after:3 days Modified: head/sys/dev/drm2/i915/i915_gem.c Modified: head/sys/dev/drm2/i915/i915_gem.c == --- head/sys/dev/drm2/i915/i915_gem.c Fri Jun 15 08:37:50 2012 (r237130) +++ head/sys/dev/drm2/i915/i915_gem.c Fri Jun 15 08:50:44 2012 (r237131) @@ -1064,7 +1064,7 @@ i915_gem_gtt_write(struct drm_device *de IDX_TO_OFF(obj_pi), size, PAT_WRITE_COMBINING); ret = -copyin_nofault((void *)(uintptr_t)data_ptr, (char *)mkva + obj_po, size); - pmap_unmapdev(mkva, PAGE_SIZE); + pmap_unmapdev(mkva, size); return (ret); } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237132 - head/share/man/man4
Author: ru
Date: Fri Jun 15 09:12:47 2012
New Revision: 237132
URL: http://svn.freebsd.org/changeset/base/237132
Log:
Fixed an example that set IP_ONESBCAST socket option to actually work,
and not return EINVAL.
Modified:
head/share/man/man4/ip.4
Modified: head/share/man/man4/ip.4
==
--- head/share/man/man4/ip.4Fri Jun 15 08:50:44 2012(r237131)
+++ head/share/man/man4/ip.4Fri Jun 15 09:12:47 2012(r237132)
@@ -32,7 +32,7 @@
.\" @(#)ip.4 8.2 (Berkeley) 11/30/93
.\" $FreeBSD$
.\"
-.Dd June 12, 2012
+.Dd June 15, 2012
.Dt IP 4
.Os
.Sh NAME
@@ -227,7 +227,7 @@ configured with the broadcast address 19
.Bd -literal
char msg[512];
struct sockaddr_in sin;
-u_char onesbcast = 1; /* 0 = disable (default), 1 = enable */
+int onesbcast = 1; /* 0 = disable (default), 1 = enable */
setsockopt(s, IPPROTO_IP, IP_ONESBCAST, &onesbcast, sizeof(onesbcast));
sin.sin_addr.s_addr = inet_addr("192.168.2.255");
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237133 - head/sys/kern
Author: pjd Date: Fri Jun 15 10:00:29 2012 New Revision: 237133 URL: http://svn.freebsd.org/changeset/base/237133 Log: One more attempt to make prototypes formated according to style(9), which holefully recovers from the "worse than useless" state. Reported by: bde MFC after:1 month Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c == --- head/sys/kern/kern_descrip.cFri Jun 15 09:12:47 2012 (r237132) +++ head/sys/kern/kern_descrip.cFri Jun 15 10:00:29 2012 (r237133) @@ -114,21 +114,22 @@ static uma_zone_t file_zone; #define DUP_FIXED 0x1 /* Force fixed allocation */ #define DUP_FCNTL 0x2 /* fcntl()-style errors */ -static int closefp(struct filedesc *fdp, int fd, struct file *fp, -struct thread *td, int holdleaders); -static int do_dup(struct thread *td, int flags, int old, int new, -register_t *retval); -static int fd_first_free(struct filedesc *fdp, int low, int size); -static int fd_last_used(struct filedesc *fdp, int size); -static void fdgrowtable(struct filedesc *fdp, int nfd); -static void fdunused(struct filedesc *fdp, int fd); -static void fdused(struct filedesc *fdp, int fd); -static int fill_pipe_info(struct pipe *pi, struct kinfo_file *kif); -static int fill_procdesc_info(struct procdesc *pdp, struct kinfo_file *kif); -static int fill_pts_info(struct tty *tp, struct kinfo_file *kif); -static int fill_shm_info(struct file *fp, struct kinfo_file *kif); -static int fill_socket_info(struct socket *so, struct kinfo_file *kif); -static int fill_vnode_info(struct vnode *vp, struct kinfo_file *kif); +static int closefp(struct filedesc *fdp, int fd, struct file *fp, + struct thread *td, int holdleaders); +static int do_dup(struct thread *td, int flags, int old, int new, + register_t *retval); +static int fd_first_free(struct filedesc *fdp, int low, int size); +static int fd_last_used(struct filedesc *fdp, int size); +static voidfdgrowtable(struct filedesc *fdp, int nfd); +static voidfdunused(struct filedesc *fdp, int fd); +static voidfdused(struct filedesc *fdp, int fd); +static int fill_pipe_info(struct pipe *pi, struct kinfo_file *kif); +static int fill_procdesc_info(struct procdesc *pdp, + struct kinfo_file *kif); +static int fill_pts_info(struct tty *tp, struct kinfo_file *kif); +static int fill_shm_info(struct file *fp, struct kinfo_file *kif); +static int fill_socket_info(struct socket *so, struct kinfo_file *kif); +static int fill_vnode_info(struct vnode *vp, struct kinfo_file *kif); /* * A process is initially started out with NDFILE descriptors stored within ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r237133 - head/sys/kern
On Fri, 15 Jun 2012, Pawel Jakub Dawidek wrote:
Log:
One more attempt to make prototypes formated according to style(9),
Thanks. The prototypes look OK now.
which
holefully recovers from the "worse than useless" state.
Er, my "worse than useless" description wasn't about prototypes. It
was about putting a tab in the middle of type a declaration. The tab
lines up some identifier, but this is worse than useless since it
makes things look like they are lined up, but when you look closer
you see that the wrong things are lined up. Example:
struct fstat_args {
int fd;
struct stat *sb;
};
Bruce
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237135 - head/sys/dev/isp
Author: mjacob
Date: Fri Jun 15 15:28:15 2012
New Revision: 237135
URL: http://svn.freebsd.org/changeset/base/237135
Log:
If debug values were set, the default from tval floated
down and triggered an attempt to set multiple virtual
ports whether you wanted them or not.
MFC after:3 days
Modified:
head/sys/dev/isp/isp_pci.c
Modified: head/sys/dev/isp/isp_pci.c
==
--- head/sys/dev/isp/isp_pci.c Fri Jun 15 10:38:14 2012(r237134)
+++ head/sys/dev/isp/isp_pci.c Fri Jun 15 15:28:15 2012(r237135)
@@ -483,6 +483,7 @@ isp_get_generic_options(device_t dev, is
if (bootverbose) {
isp->isp_dblev |= ISP_LOGCONFIG|ISP_LOGINFO;
}
+ tval = 0;
(void) resource_int_value(device_get_name(dev), device_get_unit(dev),
"vports", &tval);
if (tval > 0 && tval < 127) {
*nvp = tval;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237136 - in head/sys: amd64/conf i386/conf
Author: adrian Date: Fri Jun 15 15:32:16 2012 New Revision: 237136 URL: http://svn.freebsd.org/changeset/base/237136 Log: Oops - use the actual 11n enable option. Modified: head/sys/amd64/conf/GENERIC head/sys/i386/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Fri Jun 15 15:28:15 2012(r237135) +++ head/sys/amd64/conf/GENERIC Fri Jun 15 15:32:16 2012(r237136) @@ -274,7 +274,7 @@ device ath_pci # Atheros pci/cardbus g device ath_hal # pci/cardbus chip support optionsAH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors optionsAH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -optionsATH_SUPPORT_11N # Enable 802.11n support for AR5416 and later +optionsATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #devicebwi # Broadcom BCM430x/BCM431x wireless NICs. #devicebwn # Broadcom BCM43xx wireless NICs. Modified: head/sys/i386/conf/GENERIC == --- head/sys/i386/conf/GENERIC Fri Jun 15 15:28:15 2012(r237135) +++ head/sys/i386/conf/GENERIC Fri Jun 15 15:32:16 2012(r237136) @@ -286,7 +286,7 @@ device ath_pci # Atheros pci/cardbus g device ath_hal # pci/cardbus chip support optionsAH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors optionsAH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -optionsATH_SUPPORT_11N # Enable 802.11n support for AR5416 and later +optionsATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #devicebwi # Broadcom BCM430x/BCM431x wireless NICs. #devicebwn # Broadcom BCM43xx wireless NICs. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r232249 - head
On Tue, 2012-02-28 at 11:06:52 +, Sergey Kandaurov wrote:
> Author: pluknet
> Date: Tue Feb 28 11:06:52 2012
> New Revision: 232249
> URL: http://svn.freebsd.org/changeset/base/232249
>
> Log:
> Add lib32 part after libarchive 3.0.3 update.
>
> Modified:
> head/ObsoleteFiles.inc
>
> Modified: head/ObsoleteFiles.inc
> ==
> --- head/ObsoleteFiles.incTue Feb 28 08:36:38 2012(r232248)
> +++ head/ObsoleteFiles.incTue Feb 28 11:06:52 2012(r232249)
> @@ -56,6 +56,9 @@ OLD_FILES+=man/man3/archive_read_data_in
> man/man3/archive_write_set_compression_none.3.gz \
> man/man3/archive_write_set_compression_program.3.gz
> OLD_LIBS+=usr/lib/libarchive.so.5
> +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
> +OLD_LIBS+=usr/lib32/libarchive.so.5
> +.endif
> # 20120113: removal of wtmpcvt(1)
> OLD_FILES+=usr/bin/wtmpcvt
> OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
Please don't add TARGET_ARCH checks unless they are really necessary.
Here they aren't, they very rarely are.
Thanks
Uli
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237137 - head/sys/arm/s3c2xx0
Author: imp Date: Fri Jun 15 16:50:32 2012 New Revision: 237137 URL: http://svn.freebsd.org/changeset/base/237137 Log: Remove stray line from merge. Modified: head/sys/arm/s3c2xx0/s3c24x0_machdep.c Modified: head/sys/arm/s3c2xx0/s3c24x0_machdep.c == --- head/sys/arm/s3c2xx0/s3c24x0_machdep.c Fri Jun 15 15:32:16 2012 (r237136) +++ head/sys/arm/s3c2xx0/s3c24x0_machdep.c Fri Jun 15 16:50:32 2012 (r237137) @@ -249,7 +249,6 @@ initarm(struct arm_boot_params *abp) i = 0; set_cpufuncs(); cpufuncs.cf_sleep = s3c24x0_sleep; - lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237141 - head
Author: brooks
Date: Fri Jun 15 19:40:59 2012
New Revision: 237141
URL: http://svn.freebsd.org/changeset/base/237141
Log:
MFP4: 212854, 212854
Add a LOCAL_LIB_DIRS variable to complement the existing LOCAL_DIRS
and LOCAL_TOOL_DIRS variables. Directories in LOCAL_LIB_DIRS are
built at the end of the _generic_libs target.
Reviewed by: imp (212854)
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Jun 15 17:31:15 2012(r237140)
+++ head/Makefile.inc1 Fri Jun 15 19:40:59 2012(r237141)
@@ -15,6 +15,7 @@
# -DNO_WWWUPDATE do not update www in ${MAKE} update
# -DNO_CTF do not run the DTrace CTF conversion tools on built objects
# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries
# LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
# list
# TARGET="machine" to crossbuild world for a different machine type
@@ -88,7 +89,7 @@ SUBDIR+=etc
# These are last, since it is nice to at least get the base system
# rebuilt before you do them.
-.for _DIR in ${LOCAL_DIRS}
+.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS}
.if exists(${.CURDIR}/${_DIR}/Makefile)
SUBDIR+= ${_DIR}
.endif
@@ -1273,6 +1274,11 @@ _ofed_lib= contrib/ofed/usr.lib/
.endif
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib}
usr.bin/lex/lib ${_ofed_lib}
+.for _DIR in ${LOCAL_LIB_DIRS}
+.if exists(${.CURDIR}/${_DIR}/Makefile)
+_generic_libs+= ${_DIR}
+.endif
+.endfor
lib/libopie__L lib/libtacplus__L: lib/libmd__L
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237142 - head
Author: brooks
Date: Fri Jun 15 19:42:49 2012
New Revision: 237142
URL: http://svn.freebsd.org/changeset/base/237142
Log:
Minor wording change. The previous commit message should have included:
Sponsored by: DARPA, AFRL
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Jun 15 19:40:59 2012(r237141)
+++ head/Makefile.inc1 Fri Jun 15 19:42:49 2012(r237142)
@@ -15,7 +15,7 @@
# -DNO_WWWUPDATE do not update www in ${MAKE} update
# -DNO_CTF do not run the DTrace CTF conversion tools on built objects
# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
-# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries
+# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
# LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
# list
# TARGET="machine" to crossbuild world for a different machine type
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237143 - head/tools/tools/ath/athdebug
Author: adrian
Date: Fri Jun 15 20:08:13 2012
New Revision: 237143
URL: http://svn.freebsd.org/changeset/base/237143
Log:
Convert athdebug to use the 64 bit dev.ath.X.debug sysctl.
Modified:
head/tools/tools/ath/athdebug/athdebug.c
Modified: head/tools/tools/ath/athdebug/athdebug.c
==
--- head/tools/tools/ath/athdebug/athdebug.cFri Jun 15 19:42:49 2012
(r237142)
+++ head/tools/tools/ath/athdebug/athdebug.cFri Jun 15 20:08:13 2012
(r237143)
@@ -51,6 +51,7 @@
const char *progname;
+/* XXX TODO: include if_ath_debug.h */
enum {
ATH_DEBUG_XMIT = 0x0001, /* basic xmit operation */
ATH_DEBUG_XMIT_DESC = 0x0002, /* xmit descriptors */
@@ -81,7 +82,7 @@ enum {
static struct {
const char *name;
- u_int bit;
+ uint64_tbit;
} flags[] = {
{ "xmit", ATH_DEBUG_XMIT },
{ "xmit_desc", ATH_DEBUG_XMIT_DESC },
@@ -109,7 +110,7 @@ static struct {
{ "fatal", ATH_DEBUG_FATAL },
};
-static u_int
+static uint64_t
getflag(const char *name, int len)
{
int i;
@@ -150,7 +151,7 @@ main(int argc, char *argv[])
const char *cp, *tp;
const char *sep;
int c, op, i;
- u_int32_t debug, ndebug;
+ uint64_t debug, ndebug;
size_t debuglen;
char oid[256];
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r232249 - head
On 15 June 2012 20:34, Ulrich Spörlein wrote:
> On Tue, 2012-02-28 at 11:06:52 +, Sergey Kandaurov wrote:
>> Author: pluknet
>> Date: Tue Feb 28 11:06:52 2012
>> New Revision: 232249
>> URL: http://svn.freebsd.org/changeset/base/232249
>>
>> Log:
>> Add lib32 part after libarchive 3.0.3 update.
>>
>> Modified:
>> head/ObsoleteFiles.inc
>>
>> Modified: head/ObsoleteFiles.inc
>> ==
>> --- head/ObsoleteFiles.inc Tue Feb 28 08:36:38 2012 (r232248)
>> +++ head/ObsoleteFiles.inc Tue Feb 28 11:06:52 2012 (r232249)
>> @@ -56,6 +56,9 @@ OLD_FILES+=man/man3/archive_read_data_in
>> man/man3/archive_write_set_compression_none.3.gz \
>> man/man3/archive_write_set_compression_program.3.gz
>> OLD_LIBS+=usr/lib/libarchive.so.5
>> +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
>> +OLD_LIBS+=usr/lib32/libarchive.so.5
>> +.endif
>> # 20120113: removal of wtmpcvt(1)
>> OLD_FILES+=usr/bin/wtmpcvt
>> OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
>
> Please don't add TARGET_ARCH checks unless they are really necessary.
> Here they aren't, they very rarely are.
This is a quite old change.
Please see http://svn.freebsd.org/changeset/base/233010
--
wbr,
pluknet
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237151 - head/sys/arm/at91
Author: imp Date: Sat Jun 16 04:34:46 2012 New Revision: 237151 URL: http://svn.freebsd.org/changeset/base/237151 Log: Throw this debug behind bootverbose. The information isn't all that exciting once the initial board bring up is over. Modified: head/sys/arm/at91/at91_pio.c Modified: head/sys/arm/at91/at91_pio.c == --- head/sys/arm/at91/at91_pio.cFri Jun 15 23:07:51 2012 (r237150) +++ head/sys/arm/at91/at91_pio.cSat Jun 16 04:34:46 2012 (r237151) @@ -143,9 +143,10 @@ at91_pio_attach(device_t dev) if (err) goto out; - device_printf(dev, "ABSR: %#x OSR: %#x PSR:%#x ODSR: %#x\n", - RD4(sc, PIO_ABSR), RD4(sc, PIO_OSR), RD4(sc, PIO_PSR), - RD4(sc, PIO_ODSR)); +if (bootverbose) + device_printf(dev, "ABSR: %#x OSR: %#x PSR:%#x ODSR: %#x\n", + RD4(sc, PIO_ABSR), RD4(sc, PIO_OSR), RD4(sc, PIO_PSR), + RD4(sc, PIO_ODSR)); AT91_PIO_LOCK_INIT(sc); /* ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237152 - head/sys/dev/ath
Author: adrian
Date: Sat Jun 16 04:36:08 2012
New Revision: 237152
URL: http://svn.freebsd.org/changeset/base/237152
Log:
Shave four (or eight) bytes off of ath_buf - this field isn't used.
Modified:
head/sys/dev/ath/if_athvar.h
Modified: head/sys/dev/ath/if_athvar.h
==
--- head/sys/dev/ath/if_athvar.hSat Jun 16 04:34:46 2012
(r237151)
+++ head/sys/dev/ath/if_athvar.hSat Jun 16 04:36:08 2012
(r237152)
@@ -232,8 +232,6 @@ struct ath_buf {
bfs_doprot:1, /* do RTS/CTS based protection */
bfs_doratelookup:1; /* do rate lookup before each TX */
- int bfs_nfl;/* next fragment length */
-
/*
* These fields are passed into the
* descriptor setup functions.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237153 - in head/sys/dev/ath: . ath_hal
Author: adrian
Date: Sat Jun 16 04:41:35 2012
New Revision: 237153
URL: http://svn.freebsd.org/changeset/base/237153
Log:
Shuffle some more fields in ath_buf so it's not too big.
This shaves off 20 bytes - from 288 bytes to 268 bytes.
However, it's still too big.
Modified:
head/sys/dev/ath/ath_hal/ah_desc.h
head/sys/dev/ath/if_ath.c
head/sys/dev/ath/if_athvar.h
Modified: head/sys/dev/ath/ath_hal/ah_desc.h
==
--- head/sys/dev/ath/ath_hal/ah_desc.h Sat Jun 16 04:36:08 2012
(r237152)
+++ head/sys/dev/ath/ath_hal/ah_desc.h Sat Jun 16 04:41:35 2012
(r237153)
@@ -225,6 +225,7 @@ struct ath_desc_status {
#defineds_rxstat ds_us.rx
/* flags passed to tx descriptor setup methods */
+/* This is a uint16_t field in ath_buf, just be warned! */
#defineHAL_TXDESC_CLRDMASK 0x0001 /* clear destination filter
mask */
#defineHAL_TXDESC_NOACK0x0002 /* don't wait for ACK */
#defineHAL_TXDESC_RTSENA 0x0004 /* enable RTS */
Modified: head/sys/dev/ath/if_ath.c
==
--- head/sys/dev/ath/if_ath.c Sat Jun 16 04:36:08 2012(r237152)
+++ head/sys/dev/ath/if_ath.c Sat Jun 16 04:41:35 2012(r237153)
@@ -662,6 +662,9 @@ ath_attach(u_int16_t devid, struct ath_s
(void) ath_hal_settxchainmask(sc->sc_ah, tx_chainmask);
}
+ device_printf(sc->sc_dev, "%s: sizeof(ath_buf) = %d bytes\n",
+ __func__, sizeof(struct ath_buf));
+
#ifdef ATH_ENABLE_11N
/*
* Query HT capabilities
Modified: head/sys/dev/ath/if_athvar.h
==
--- head/sys/dev/ath/if_athvar.hSat Jun 16 04:36:08 2012
(r237152)
+++ head/sys/dev/ath/if_athvar.hSat Jun 16 04:41:35 2012
(r237153)
@@ -236,20 +236,32 @@ struct ath_buf {
* These fields are passed into the
* descriptor setup functions.
*/
+
+ /* Make this an 8 bit value? */
HAL_PKT_TYPE bfs_atype; /* packet type */
- int bfs_pktlen; /* length of this packet */
- int bfs_hdrlen; /* length of this packet header */
+
+ uint32_t bfs_pktlen;/* length of this packet */
+
+ uint16_t bfs_hdrlen;/* length of this packet header */
uint16_t bfs_al;/* length of aggregate */
- int bfs_txflags;/* HAL (tx) descriptor flags */
- int bfs_txrate0;/* first TX rate */
- int bfs_try0; /* first try count */
+
+ uint16_t bfs_txflags; /* HAL (tx) descriptor flags */
+ uint8_t bfs_txrate0;/* first TX rate */
+ uint8_t bfs_try0; /* first try count */
+
+ uint16_t bfs_txpower; /* tx power */
uint8_t bfs_ctsrate0; /* Non-zero - use this as ctsrate */
- int bfs_keyix; /* crypto key index */
- int bfs_txpower;/* tx power */
- int bfs_txantenna; /* TX antenna config */
+ uint8_t bfs_ctsrate;/* CTS rate */
+
+ /* 16 bit? */
+ int32_t bfs_keyix; /* crypto key index */
+ int32_t bfs_txantenna; /* TX antenna config */
+
+ /* Make this an 8 bit value? */
enum ieee80211_protmode bfs_protmode;
- int bfs_ctsrate;/* CTS rate */
- int bfs_ctsduration;/* CTS duration (pre-11n NICs) */
+
+ /* 16 bit? */
+ uint32_t bfs_ctsduration; /* CTS duration (pre-11n NICs)
*/
struct ath_rc_series bfs_rc[ATH_RC_NUM];/* non-11n TX
series */
} bf_state;
};
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r237156 - head/lib/libc/gen
Author: joel (doc committer) Date: Sat Jun 16 06:38:11 2012 New Revision: 237156 URL: http://svn.freebsd.org/changeset/base/237156 Log: mandoc fixes. Obtained from:OpenBSD Modified: head/lib/libc/gen/signal.3 Modified: head/lib/libc/gen/signal.3 == --- head/lib/libc/gen/signal.3 Sat Jun 16 06:24:05 2012(r237155) +++ head/lib/libc/gen/signal.3 Sat Jun 16 06:38:11 2012(r237156) @@ -38,20 +38,11 @@ .Lb libc .Sh SYNOPSIS .In signal.h -.\" XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX -.\" The prototype for signal(3) cannot be cleanly marked up in -mdoc -.\" without the following lower-level tweak. -.nr in-synopsis-section 0 -.Pp -.Ft "void \*(lp*" Ns -.Fo signal -.Fa "int sig" -.Fa "void \*(lp*func\*(rp\*(lpint\*(rp" -.Fc Ns -.Ft "\*(rp\*(lpint\*(rp" ; +.\" The following is Quite Ugly, but syntactically correct. +.\" Don't try to fix it. +.Ft void +.Fn \*(lp*signal "int sig" "void \*(lp*func\*(rp\*(lpint\*(rp\*(rp\*(rp\*(lpint" .Pp -.nr in-synopsis-section 1 -.\" XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX or in .Fx Ap s equivalent but easier to read typedef'd version: @@ -98,7 +89,7 @@ an interrupt. These signals are defined in the file .In signal.h : .Bl -column No ".Dv SIGVTALRM" "create core image" -.It Sy "No NameDefault Action Description" +.It Sy "Num" Ta Sy "Name" Ta Sy "Default Action" Ta Sy "Description" .It 1 Ta Dv SIGHUP Ta "terminate process" Ta "terminal line hangup" .It 2 Ta Dv SIGINT Ta "terminate process" Ta "interrupt program" .It 3 Ta Dv SIGQUIT Ta "create core image" Ta "quit program" ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
