svn commit: r278238 - in head/sys: conf kern
Author: jmg
Date: Thu Feb 5 07:51:38 2015
New Revision: 278238
URL: https://svnweb.freebsd.org/changeset/base/278238
Log:
turn GEOM_UNCOMPRESS_DEBUG into a proper option so it can be specified
in kernel config files..
put VERBOSE_SYSINIT in it's own option header so the one file,
init_main.c, can use it instead of requiring an entire kernel recompile
to change one file..
Modified:
head/sys/conf/options
head/sys/kern/init_main.c
Modified: head/sys/conf/options
==
--- head/sys/conf/options Thu Feb 5 07:46:34 2015(r278237)
+++ head/sys/conf/options Thu Feb 5 07:51:38 2015(r278238)
@@ -129,6 +129,7 @@ GEOM_SHSEC opt_geom.h
GEOM_STRIPEopt_geom.h
GEOM_SUNLABEL opt_geom.h
GEOM_UNCOMPRESSopt_geom.h
+GEOM_UNCOMPRESS_DEBUG opt_geom.h
GEOM_UZIP opt_geom.h
GEOM_VINUM opt_geom.h
GEOM_VIRSTOR opt_geom.h
@@ -209,7 +210,7 @@ SW_WATCHDOG opt_watchdog.h
TURNSTILE_PROFILING
UMTX_PROFILING
VFS_AIO
-VERBOSE_SYSINITopt_global.h
+VERBOSE_SYSINIT
WLCACHEopt_wavelan.h
WLDEBUGopt_wavelan.h
Modified: head/sys/kern/init_main.c
==
--- head/sys/kern/init_main.c Thu Feb 5 07:46:34 2015(r278237)
+++ head/sys/kern/init_main.c Thu Feb 5 07:51:38 2015(r278238)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include "opt_ddb.h"
#include "opt_init_path.h"
+#include "opt_verbose_sysinit.h"
#include
#include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278237 - head/sys/dev/iscsi
Author: trasz
Date: Thu Feb 5 07:46:34 2015
New Revision: 278237
URL: https://svnweb.freebsd.org/changeset/base/278237
Log:
Don't call callout_drain() with iscsi mutex held; this fixes a warning
that was introduced recently. While here, don't try to access is_terminating
without lock.
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/iscsi/iscsi.c
Modified: head/sys/dev/iscsi/iscsi.c
==
--- head/sys/dev/iscsi/iscsi.c Thu Feb 5 07:32:24 2015(r278236)
+++ head/sys/dev/iscsi/iscsi.c Thu Feb 5 07:46:34 2015(r278237)
@@ -421,6 +421,7 @@ iscsi_maintenance_thread_terminate(struc
sx_xunlock(&sc->sc_lock);
icl_conn_close(is->is_conn);
+ callout_drain(&is->is_callout);
ISCSI_SESSION_LOCK(is);
@@ -434,8 +435,6 @@ iscsi_maintenance_thread_terminate(struc
cv_signal(&is->is_login_cv);
#endif
- callout_drain(&is->is_callout);
-
iscsi_session_cleanup(is, true);
KASSERT(TAILQ_EMPTY(&is->is_outstanding),
@@ -511,6 +510,7 @@ iscsi_session_reconnect(struct iscsi_ses
static void
iscsi_session_terminate(struct iscsi_session *is)
{
+
if (is->is_terminating)
return;
@@ -532,12 +532,14 @@ iscsi_callout(void *context)
is = context;
- if (is->is_terminating)
+ ISCSI_SESSION_LOCK(is);
+ if (is->is_terminating) {
+ ISCSI_SESSION_UNLOCK(is);
return;
+ }
callout_schedule(&is->is_callout, 1 * hz);
- ISCSI_SESSION_LOCK(is);
is->is_timeout++;
if (is->is_waiting_for_iscsid) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278236 - head/usr.sbin/iscsid
Author: trasz
Date: Thu Feb 5 07:32:24 2015
New Revision: 278236
URL: https://svnweb.freebsd.org/changeset/base/278236
Log:
The connection_new() routine was taking an absurd number of parameters; fix
it.
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/usr.sbin/iscsid/iscsid.c
Modified: head/usr.sbin/iscsid/iscsid.c
==
--- head/usr.sbin/iscsid/iscsid.c Thu Feb 5 07:24:17 2015
(r278235)
+++ head/usr.sbin/iscsid/iscsid.c Thu Feb 5 07:32:24 2015
(r278236)
@@ -151,9 +151,7 @@ resolve_addr(const struct connection *co
}
static struct connection *
-connection_new(unsigned int session_id, const uint8_t isid[8], uint16_t tsih,
-const struct iscsi_session_conf *conf, const struct iscsi_session_limits
-*limits, int iscsi_fd)
+connection_new(int iscsi_fd, const struct iscsi_daemon_request *request)
{
struct connection *conn;
struct addrinfo *from_ai, *to_ai;
@@ -177,17 +175,13 @@ connection_new(unsigned int session_id,
conn->conn_max_data_segment_length = 8192;
conn->conn_max_burst_length = 262144;
conn->conn_first_burst_length = 65536;
-
- conn->conn_session_id = session_id;
- memcpy(&conn->conn_isid, isid, sizeof(conn->conn_isid));
- conn->conn_tsih = tsih;
conn->conn_iscsi_fd = iscsi_fd;
- /*
-* XXX: Should we sanitize this somehow?
-*/
- memcpy(&conn->conn_conf, conf, sizeof(conn->conn_conf));
- memcpy(&conn->conn_limits, limits, sizeof(conn->conn_limits));
+ conn->conn_session_id = request->idr_session_id;
+ memcpy(&conn->conn_conf, &request->idr_conf, sizeof(conn->conn_conf));
+ memcpy(&conn->conn_isid, &request->idr_isid, sizeof(conn->conn_isid));
+ conn->conn_tsih = request->idr_tsih;
+ memcpy(&conn->conn_limits, &request->idr_limits,
sizeof(conn->conn_limits));
from_addr = conn->conn_conf.isc_initiator_addr;
to_addr = conn->conn_conf.isc_target_addr;
@@ -444,9 +438,7 @@ handle_request(int iscsi_fd, const struc
setproctitle("%s", request->idr_conf.isc_target_addr);
}
- conn = connection_new(request->idr_session_id, request->idr_isid,
- request->idr_tsih, &request->idr_conf, &request->idr_limits,
- iscsi_fd);
+ conn = connection_new(iscsi_fd, request);
set_timeout(timeout);
capsicate(conn);
login(conn);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278234 - in head/sys/boot: amd64/efi efi/include
Author: rpaulo
Date: Thu Feb 5 07:19:30 2015
New Revision: 278234
URL: https://svnweb.freebsd.org/changeset/base/278234
Log:
EFI: print more information about EFI Tables.
This adds the GUIDs for DXE, HOB, Memory Type Information and Debug
Image Info.
Modified:
head/sys/boot/amd64/efi/main.c
head/sys/boot/efi/include/efiapi.h
Modified: head/sys/boot/amd64/efi/main.c
==
--- head/sys/boot/amd64/efi/main.c Thu Feb 5 07:16:45 2015
(r278233)
+++ head/sys/boot/amd64/efi/main.c Thu Feb 5 07:19:30 2015
(r278234)
@@ -53,6 +53,10 @@ EFI_GUID imgid = LOADED_IMAGE_PROTOCOL;
EFI_GUID mps = MPS_TABLE_GUID;
EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL;
EFI_GUID smbios = SMBIOS_TABLE_GUID;
+EFI_GUID dxe = DXE_SERVICES_TABLE_GUID;
+EFI_GUID hoblist = HOB_LIST_TABLE_GUID;
+EFI_GUID memtype = MEMORY_TYPE_INFORMATION_TABLE_GUID;
+EFI_GUID debugimg = DEBUG_IMAGE_INFO_TABLE_GUID;
EFI_STATUS
main(int argc, CHAR16 *argv[])
@@ -264,6 +268,14 @@ command_configuration(int argc, char *ar
printf("ACPI 2.0 Table");
else if (!memcmp(guid, &smbios, sizeof(EFI_GUID)))
printf("SMBIOS Table");
+ else if (!memcmp(guid, &dxe, sizeof(EFI_GUID)))
+ printf("DXE Table");
+ else if (!memcmp(guid, &hoblist, sizeof(EFI_GUID)))
+ printf("HOB List Table");
+ else if (!memcmp(guid, &memtype, sizeof(EFI_GUID)))
+ printf("Memory Type Information Table");
+ else if (!memcmp(guid, &debugimg, sizeof(EFI_GUID)))
+ printf("Debug Image Info Table");
else
printf("Unknown Table (%s)", guid_to_string(guid));
printf(" at %p\n", ST->ConfigurationTable[i].VendorTable);
@@ -319,7 +331,7 @@ command_mode(int argc, char *argv[])
}
if (i != 0)
- printf("Choose the mode with \"col \"\n");
+ printf("Choose the mode with \"col \"\n");
return (CMD_OK);
}
Modified: head/sys/boot/efi/include/efiapi.h
==
--- head/sys/boot/efi/include/efiapi.h Thu Feb 5 07:16:45 2015
(r278233)
+++ head/sys/boot/efi/include/efiapi.h Thu Feb 5 07:19:30 2015
(r278234)
@@ -88,7 +88,7 @@ EFI_STATUS
IN VOID *Buffer
);
-typedef
+typedef
EFI_STATUS
(EFIAPI *EFI_SET_VIRTUAL_ADDRESS_MAP) (
IN UINTNMemoryMapSize,
@@ -103,7 +103,7 @@ EFI_STATUS
#define EFI_INTERNAL_PTR0x0004 // Pointer to internal
runtime data
-typedef
+typedef
EFI_STATUS
(EFIAPI *EFI_CONVERT_POINTER) (
IN UINTNDebugDisposition,
@@ -168,7 +168,7 @@ EFI_STATUS
IN EFI_EVENTEvent
);
-typedef
+typedef
EFI_STATUS
(EFIAPI *EFI_WAIT_FOR_EVENT) (
IN UINTNNumberOfEvents,
@@ -194,8 +194,8 @@ EFI_STATUS
#define TPL_APPLICATION4
#define TPL_CALLBACK 8
-#define TPL_NOTIFY16
-#define TPL_HIGH_LEVEL31
+#define TPL_NOTIFY16
+#define TPL_HIGH_LEVEL31
typedef
EFI_TPL
@@ -320,14 +320,14 @@ EFI_STATUS
// Image Entry prototype
-typedef
+typedef
EFI_STATUS
(EFIAPI *EFI_IMAGE_ENTRY_POINT) (
IN EFI_HANDLE ImageHandle,
IN struct _EFI_SYSTEM_TABLE *SystemTable
);
-typedef
+typedef
EFI_STATUS
(EFIAPI *EFI_IMAGE_LOAD) (
IN BOOLEAN BootPolicy,
@@ -338,7 +338,7 @@ EFI_STATUS
OUT EFI_HANDLE *ImageHandle
);
-typedef
+typedef
EFI_STATUS
(EFIAPI *EFI_IMAGE_START) (
IN EFI_HANDLE ImageHandle,
@@ -355,7 +355,7 @@ EFI_STATUS
IN CHAR16 *ExitData OPTIONAL
);
-typedef
+typedef
EFI_STATUS
(EFIAPI *EFI_IMAGE_UNLOAD) (
IN EFI_HANDLE ImageHandle
@@ -491,7 +491,7 @@ EFI_STATUS
);
typedef
-EFI_STATUS
+EFI_STATUS
(EFIAPI *EFI_REGISTER_PROTOCOL_NOTIFY) (
IN EFI_GUID *Protocol,
IN EFI_EVENTEvent,
@@ -535,7 +535,7 @@ EFI_STATUS
);
typedef
-EFI_STATUS
+EFI_STATUS
(EFIAPI *EFI_CONNECT_CONTROLLER) (
IN EFI_HANDLEControllerHandle,
IN EFI_HANDLE*DriverImageHandleOPTIONAL,
@@ -544,19 +544,19 @@ EFI_STATUS
);
typedef
-EFI_STATUS
+EFI_STATUS
(EFIAPI *EFI_DISCONNECT_CONTROLLER)(
IN EFI_HANDLE ControllerHandle,
IN EFI_HANDLE DriverImageHandle, OPTIONAL
IN EFI_HANDLE ChildHandleOPTIONAL
- );
+ );
-#define EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL0x0001
-#define EFI_OPEN_PROTOCOL_GET_PROTOCOL0x0002
-#define EFI_OPEN_PROTOCOL_TEST_PROTOCOL0x0004
-#de
svn commit: r278233 - head/sys/dev/iscsi
Author: trasz
Date: Thu Feb 5 07:16:45 2015
New Revision: 278233
URL: https://svnweb.freebsd.org/changeset/base/278233
Log:
Fix error handling.
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/iscsi/iscsi.c
Modified: head/sys/dev/iscsi/iscsi.c
==
--- head/sys/dev/iscsi/iscsi.c Thu Feb 5 06:37:59 2015(r278232)
+++ head/sys/dev/iscsi/iscsi.c Thu Feb 5 07:16:45 2015(r278233)
@@ -1766,15 +1766,17 @@ iscsi_ioctl_session_add(struct iscsi_sof
arc4rand(&is->is_isid[1], 5, 0);
is->is_tsih = 0;
callout_init(&is->is_callout, 1);
- callout_reset(&is->is_callout, 1 * hz, iscsi_callout, is);
- TAILQ_INSERT_TAIL(&sc->sc_sessions, is, is_next);
error = kthread_add(iscsi_maintenance_thread, is, NULL, NULL, 0, 0,
"iscsimt");
if (error != 0) {
ISCSI_SESSION_WARN(is, "kthread_add(9) failed with error %d",
error);
+ sx_xunlock(&sc->sc_lock);
return (error);
}
+ callout_reset(&is->is_callout, 1 * hz, iscsi_callout, is);
+ TAILQ_INSERT_TAIL(&sc->sc_sessions, is, is_next);
+
/*
* Trigger immediate reconnection.
*/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278232 - in head: sys/dev/iscsi usr.bin/iscsictl usr.sbin/iscsid
Author: trasz
Date: Thu Feb 5 06:37:59 2015
New Revision: 278232
URL: https://svnweb.freebsd.org/changeset/base/278232
Log:
Make it possible to set (via iscsi.conf(5)) and query (via iscsictl -v)
initiator iSCSI offload. Pass maximum data segment size supported by
chosen offload module to iscsid(8), and make iscsid(8) not try to negotiate
anything larger than that.
MFC after:1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/iscsi/icl.h
head/sys/dev/iscsi/icl_soft.c
head/sys/dev/iscsi/iscsi.c
head/sys/dev/iscsi/iscsi_ioctl.h
head/usr.bin/iscsictl/iscsi.conf.5
head/usr.bin/iscsictl/iscsictl.c
head/usr.bin/iscsictl/iscsictl.h
head/usr.bin/iscsictl/parse.y
head/usr.bin/iscsictl/token.l
head/usr.sbin/iscsid/iscsid.c
head/usr.sbin/iscsid/iscsid.h
head/usr.sbin/iscsid/login.c
Modified: head/sys/dev/iscsi/icl.h
==
--- head/sys/dev/iscsi/icl.hThu Feb 5 03:56:49 2015(r278231)
+++ head/sys/dev/iscsi/icl.hThu Feb 5 06:37:59 2015(r278232)
@@ -113,6 +113,7 @@ struct icl_conn {
boolic_disconnecting;
boolic_iser;
const char *ic_name;
+ const char *ic_offload;
void(*ic_receive)(struct icl_pdu *);
void(*ic_error)(struct icl_conn *);
Modified: head/sys/dev/iscsi/icl_soft.c
==
--- head/sys/dev/iscsi/icl_soft.c Thu Feb 5 03:56:49 2015
(r278231)
+++ head/sys/dev/iscsi/icl_soft.c Thu Feb 5 06:37:59 2015
(r278232)
@@ -1185,6 +1185,7 @@ icl_soft_new_conn(const char *name, stru
#endif
ic->ic_max_data_segment_length = ICL_MAX_DATA_SEGMENT_LENGTH;
ic->ic_name = name;
+ ic->ic_offload = "none";
return (ic);
}
Modified: head/sys/dev/iscsi/iscsi.c
==
--- head/sys/dev/iscsi/iscsi.c Thu Feb 5 03:56:49 2015(r278231)
+++ head/sys/dev/iscsi/iscsi.c Thu Feb 5 06:37:59 2015(r278232)
@@ -1306,6 +1306,16 @@ iscsi_ioctl_daemon_wait(struct iscsi_sof
request->idr_tsih = 0; /* New or reinstated session. */
memcpy(&request->idr_conf, &is->is_conf,
sizeof(request->idr_conf));
+
+ error = icl_limits(is->is_conf.isc_offload,
+ &request->idr_limits.isl_max_data_segment_length);
+ if (error != 0) {
+ ISCSI_SESSION_WARN(is, "icl_limits for offload \"%s\" "
+ "failed with error %d", is->is_conf.isc_offload,
+ error);
+ sx_sunlock(&sc->sc_lock);
+ return (error);
+ }
sx_sunlock(&sc->sc_lock);
return (0);
@@ -1731,7 +1741,13 @@ iscsi_ioctl_session_add(struct iscsi_sof
return (EBUSY);
}
- is->is_conn = icl_new_conn(NULL, "iscsi", &is->is_lock);
+ is->is_conn = icl_new_conn(is->is_conf.isc_offload,
+ "iscsi", &is->is_lock);
+ if (is->is_conn == NULL) {
+ sx_xunlock(&sc->sc_lock);
+ free(is, M_ISCSI);
+ return (EINVAL);
+ }
is->is_conn->ic_receive = iscsi_receive_callback;
is->is_conn->ic_error = iscsi_error_callback;
is->is_conn->ic_prv0 = is;
@@ -1836,6 +1852,7 @@ iscsi_ioctl_session_list(struct iscsi_so
iss.iss_id = is->is_id;
strlcpy(iss.iss_target_alias, is->is_target_alias,
sizeof(iss.iss_target_alias));
strlcpy(iss.iss_reason, is->is_reason, sizeof(iss.iss_reason));
+ strlcpy(iss.iss_offload, is->is_conn->ic_offload,
sizeof(iss.iss_offload));
if (is->is_conn->ic_header_crc32c)
iss.iss_header_digest = ISCSI_DIGEST_CRC32C;
Modified: head/sys/dev/iscsi/iscsi_ioctl.h
==
--- head/sys/dev/iscsi/iscsi_ioctl.hThu Feb 5 03:56:49 2015
(r278231)
+++ head/sys/dev/iscsi/iscsi_ioctl.hThu Feb 5 06:37:59 2015
(r278232)
@@ -43,6 +43,7 @@
#defineISCSI_ADDR_LEN 47 /* INET6_ADDRSTRLEN + '\0' */
#defineISCSI_ALIAS_LEN 256 /* XXX: Where did it come from?
*/
#defineISCSI_SECRET_LEN17 /* 16 + '\0' */
+#defineISCSI_OFFLOAD_LEN 8
#defineISCSI_REASON_LEN64
#defineISCSI_DIGEST_NONE 0
@@ -65,7 +66,16 @@ struct iscsi_session_conf {
int isc_header_digest;
int isc_data_digest;
int isc_iser;
- int isc_spare[4];
+ charisc_offload
Re: svn commit: r278154 - head/lib/msun/src
On Tue, 3 Feb 2015, Steve Kargl wrote:
On Wed, Feb 04, 2015 at 04:37:14AM +1100, Bruce Evans wrote:
On Tue, 3 Feb 2015, Steve Kargl wrote:
-#include
+#include
#include
+#defineFLT_LARGE FLT_MAX_EXP - FLT_MIN_EXP + FLT_MANT_DIG
+...
This is a lot of code and bugs (missing parentheses) for negative gain.
My crystal ball isn't function too well lately.
I thought I mentioned this in my first reply. (I didn't write lines
like the above because they are too verbose, and I didn't write down
hard limits because I didn't have time to choose them carefully.)
Given that the widest field width in IEEE754-2008 for
binary128 is 15, which gives a maximum unbiased exponent
of 2**15, then using +-65536 should cover our needs. The
functions scalbn[fl] can then deal with values of n
that may result in exponents that are too small or too
large. Untested diff below.
Doesn't IEEE allow extensions? More than 15 is just not currently
needed, and also not likely to be common soon.
I agree that it is enough. Elwhere, we have many checks like
LDBL_MAX_EXP == 0x4000 since we only support long doubles if they are
either mere doubles or have a 15-exponent with the usual encoding.
So anyone enlarging the exponent long doubles would have a lot of
work to do and shouldn't need to be reminded to do it here too.
Index: s_scalbln.c
===
--- s_scalbln.c (revision 278165)
+++ s_scalbln.c (working copy)
@@ -27,17 +27,17 @@
#include
__FBSDID("$FreeBSD$");
-#include
#include
+#defineLARGE 65536
+#defineSMALL -65536
+
double
scalbln (double x, long n)
{
int in;
- in = (int)n;
- if (in != n)
- in = (n > 0) ? INT_MAX: INT_MIN;
+ in = n > LARGE ? LARGE : n < SMALL ? SMALL : n;
return (scalbn(x, in));
}
You also removed extra parentheses around the comparison operator. I put
them in since I'm trying to sell conditional operators but some people
find conditional operators more confusing without extra parentheses.
The extra parentheses around the inner comparisons are possibly the
ones least needed for technical reasons, but seem to improve readability.
After shortening it with shorter limit variable names and no extra
parentheses, it fits in 1 line:
double
scalbln (double x, long n)
{
return (scalbn(x, n > LARGE ? LARGE : n < SMALL ? SMALL : n);
}
Not using the temporary variable makes it more readable IMO.
I would also drop the strict KNF of having an empty line after the
null local declarations, and restore the cast on the final n. In
previous versions, there was an explicit conversion of the expression's
value from long to int by assignment to 'in'. Now there is only an
implicit conversion by the prototype. Casting the final n would make
the expression have type int.
Also fix the gnu-style parentheses in 'scalbln ('. This bug apparently
came from fdlibm for scalbn(). It has been cloned to several other
scal*'s but isn't in all, even for fdlibm.
Bruce
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278231 - head/lib/csu/powerpc64
Author: jhibbits
Date: Thu Feb 5 03:56:49 2015
New Revision: 278231
URL: https://svnweb.freebsd.org/changeset/base/278231
Log:
powerpc64 csu needs to be built by gcc, so enforce that.
With this change, world is one step closer to being clang-able.
MFC after:2 weeks
Modified:
head/lib/csu/powerpc64/Makefile
Modified: head/lib/csu/powerpc64/Makefile
==
--- head/lib/csu/powerpc64/Makefile Thu Feb 5 01:43:21 2015
(r278230)
+++ head/lib/csu/powerpc64/Makefile Thu Feb 5 03:56:49 2015
(r278231)
@@ -9,6 +9,9 @@ CFLAGS+=-I${.CURDIR}/../common \
-I${.CURDIR}/../../libc/include \
-mlongcall
+CC:= gcc
+COMPILER_TYPE:=gcc
+
all: ${OBJS}
CLEANFILES=${OBJS}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278230 - head/sys/kern
Author: peter Date: Thu Feb 5 01:43:21 2015 New Revision: 278230 URL: https://svnweb.freebsd.org/changeset/base/278230 Log: Initialize ticks so that it wraps 10 minutes after boot to increase the chances of finding problems related to wraparound sooner. This comes from P4 change 167856 on 2009/08/26 around when we had problems with the TCP stack with ticks after 24 days of uptime. Modified: head/sys/kern/kern_clock.c Modified: head/sys/kern/kern_clock.c == --- head/sys/kern/kern_clock.c Thu Feb 5 01:36:53 2015(r278229) +++ head/sys/kern/kern_clock.c Thu Feb 5 01:43:21 2015(r278230) @@ -410,6 +410,11 @@ initclocks(dummy) #ifdef SW_WATCHDOG EVENTHANDLER_REGISTER(watchdog_list, watchdog_config, NULL, 0); #endif + /* +* Arrange for ticks to wrap 10 minutes after boot to help catch +* sign problems sooner. +*/ + ticks = INT_MAX - (hz * 10 * 60); } /* ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278229 - head/sys/conf
Author: peter
Date: Thu Feb 5 01:36:53 2015
New Revision: 278229
URL: https://svnweb.freebsd.org/changeset/base/278229
Log:
Add -fwrapv to CFLAGS for the kernel. This essentially un-reverts r259045.
The C standard undefines behavior when signed integers overflow. The
compiler toolchain has become more adept at detecting this and taking
advantage of faster undefined behavior. At the current time this has the
unfortunate effect of the clock stopping after 24 days of uptime.
clang makes no distinction between -fwrapv and -fno-strict-overflow. gcc
does treat them differently but -fwrapv is mature in gcc and is the
behavior are actually expecting.
Obtained from:kib
Modified:
head/sys/conf/kern.mk
Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk Thu Feb 5 00:12:21 2015(r278228)
+++ head/sys/conf/kern.mk Thu Feb 5 01:36:53 2015(r278229)
@@ -158,6 +158,14 @@ INLINE_LIMIT?= 8000
CFLAGS+= -ffreestanding
#
+# The C standard leaves signed integer overflow behavior undefined.
+# gcc and clang opimizers take advantage of this. The kernel makes
+# use of signed integer wraparound mechanics so we need the compiler
+# to treat it as a wraparound and not take shortcuts.
+#
+CFLAGS+= -fwrapv
+
+#
# GCC SSP support
#
.if ${MK_SSP} != "no" && \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278228 - in head/sys: cam cam/scsi sys
Author: ken
Date: Thu Feb 5 00:12:21 2015
New Revision: 278228
URL: https://svnweb.freebsd.org/changeset/base/278228
Log:
Add support for probing the SCSI VPD Extended Inquiry page (0x86).
This VPD page is effectively an extension of the standard Inquiry
data page, and includes lots of additional bits.
This commit includes support for probing the page in the SCSI probe code,
and an additional request type for the XPT_DEV_ADVINFO CCB. CTL already
supports the Extended Inquiry page.
Support for querying this page in the sa(4) driver will come later.
sys/cam/scsi/scsi_xpt.c:
Probe the Extended Inquiry page, if the device supports it, and
return it in response to a XPT_DEV_ADVINFO CCB if it is requested.
sys/cam/scsi/cam_ccb.h:
Define a new advanced information CCB data type, CDAI_TYPE_EXT_INQ.
sys/cam/cam_xpt.c:
Free the extended inquiry data in a device when the device goes
away.
sys/cam/cam_xpt_internal.h:
Add an extended inquiry data pointer and length to struct cam_ed.
sys/sys/param.h
Bump __FreeBSD_version for the addition of the new
CDAI_TYPE_EXT_INQ advanced information type.
Sponsored by: Spectra Logic
MFC after:1 week
Modified:
head/sys/cam/cam_ccb.h
head/sys/cam/cam_xpt.c
head/sys/cam/cam_xpt_internal.h
head/sys/cam/scsi/scsi_xpt.c
head/sys/sys/param.h
Modified: head/sys/cam/cam_ccb.h
==
--- head/sys/cam/cam_ccb.h Thu Feb 5 00:11:05 2015(r278227)
+++ head/sys/cam/cam_ccb.h Thu Feb 5 00:12:21 2015(r278228)
@@ -1147,6 +1147,7 @@ struct ccb_dev_advinfo {
#defineCDAI_TYPE_SERIAL_NUM2
#defineCDAI_TYPE_PHYS_PATH 3
#defineCDAI_TYPE_RCAPLONG 4
+#defineCDAI_TYPE_EXT_INQ 5
off_t bufsiz; /* IN: Size of external buffer */
#defineCAM_SCSI_DEVID_MAXLEN 65536 /* length in buffer is an
uint16_t */
off_t provsiz; /* OUT: Size required/used */
Modified: head/sys/cam/cam_xpt.c
==
--- head/sys/cam/cam_xpt.c Thu Feb 5 00:11:05 2015(r278227)
+++ head/sys/cam/cam_xpt.c Thu Feb 5 00:12:21 2015(r278228)
@@ -4795,6 +4795,7 @@ xpt_release_device(struct cam_ed *device
*/
free(device->supported_vpds, M_CAMXPT);
free(device->device_id, M_CAMXPT);
+ free(device->ext_inq, M_CAMXPT);
free(device->physpath, M_CAMXPT);
free(device->rcap_buf, M_CAMXPT);
free(device->serial_num, M_CAMXPT);
Modified: head/sys/cam/cam_xpt_internal.h
==
--- head/sys/cam/cam_xpt_internal.h Thu Feb 5 00:11:05 2015
(r278227)
+++ head/sys/cam/cam_xpt_internal.h Thu Feb 5 00:12:21 2015
(r278228)
@@ -83,6 +83,8 @@ struct cam_ed {
uint8_t supported_vpds_len;
uint32_t device_id_len;
uint8_t *device_id;
+ uint32_t ext_inq_len;
+ uint8_t *ext_inq;
uint8_t physpath_len;
uint8_t *physpath; /* physical path string form */
uint32_t rcap_len;
Modified: head/sys/cam/scsi/scsi_xpt.c
==
--- head/sys/cam/scsi/scsi_xpt.cThu Feb 5 00:11:05 2015
(r278227)
+++ head/sys/cam/scsi/scsi_xpt.cThu Feb 5 00:12:21 2015
(r278228)
@@ -139,6 +139,7 @@ typedef enum {
PROBE_MODE_SENSE,
PROBE_SUPPORTED_VPD_LIST,
PROBE_DEVICE_ID,
+ PROBE_EXTENDED_INQUIRY,
PROBE_SERIAL_NUM,
PROBE_TUR_FOR_NEGOTIATION,
PROBE_INQUIRY_BASIC_DV1,
@@ -156,6 +157,7 @@ static char *probe_action_text[] = {
"PROBE_MODE_SENSE",
"PROBE_SUPPORTED_VPD_LIST",
"PROBE_DEVICE_ID",
+ "PROBE_EXTENDED_INQUIRY",
"PROBE_SERIAL_NUM",
"PROBE_TUR_FOR_NEGOTIATION",
"PROBE_INQUIRY_BASIC_DV1",
@@ -923,6 +925,34 @@ done:
}
goto done;
}
+ case PROBE_EXTENDED_INQUIRY:
+ {
+ struct scsi_vpd_extended_inquiry_data *ext_inq;
+
+ ext_inq = NULL;
+ if (scsi_vpd_supported_page(periph, SVPD_EXTENDED_INQUIRY_DATA))
+ ext_inq = malloc(sizeof(*ext_inq), M_CAMXPT,
+ M_NOWAIT | M_ZERO);
+
+ if (ext_inq != NULL) {
+ scsi_inquiry(csio,
+/*retries*/4,
+probedone,
+MSG_SIMPLE_Q_TAG,
+(uint8_t *)ext_inq,
+sizeof(*ext_inq),
+
svn commit: r278227 - vendor-sys/acpica/20150204
Author: jkim Date: Thu Feb 5 00:11:05 2015 New Revision: 278227 URL: https://svnweb.freebsd.org/changeset/base/278227 Log: Tag ACPICA 20150204. Added: vendor-sys/acpica/20150204/ - copied from r278226, vendor-sys/acpica/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278226 - in vendor-sys/acpica/dist: . generate/unix source/common source/compiler source/components/debugger source/components/disassembler source/components/dispatcher source/componen...
Author: jkim Date: Thu Feb 5 00:09:52 2015 New Revision: 278226 URL: https://svnweb.freebsd.org/changeset/base/278226 Log: Import ACPICA 20150204. Modified: vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/generate/unix/Makefile.config vendor-sys/acpica/dist/source/common/acgetline.c vendor-sys/acpica/dist/source/common/adfile.c vendor-sys/acpica/dist/source/common/adisasm.c vendor-sys/acpica/dist/source/common/adwalk.c vendor-sys/acpica/dist/source/common/ahids.c vendor-sys/acpica/dist/source/common/ahpredef.c vendor-sys/acpica/dist/source/common/ahuuids.c vendor-sys/acpica/dist/source/common/cmfsize.c vendor-sys/acpica/dist/source/common/dmextern.c vendor-sys/acpica/dist/source/common/dmrestag.c vendor-sys/acpica/dist/source/common/dmtable.c vendor-sys/acpica/dist/source/common/dmtbdump.c vendor-sys/acpica/dist/source/common/dmtbinfo.c vendor-sys/acpica/dist/source/common/getopt.c vendor-sys/acpica/dist/source/compiler/aslanalyze.c vendor-sys/acpica/dist/source/compiler/aslascii.c vendor-sys/acpica/dist/source/compiler/aslbtypes.c vendor-sys/acpica/dist/source/compiler/aslcodegen.c vendor-sys/acpica/dist/source/compiler/aslcompile.c vendor-sys/acpica/dist/source/compiler/aslcompiler.h vendor-sys/acpica/dist/source/compiler/aslcompiler.l vendor-sys/acpica/dist/source/compiler/asldefine.h vendor-sys/acpica/dist/source/compiler/aslerror.c vendor-sys/acpica/dist/source/compiler/aslfileio.c vendor-sys/acpica/dist/source/compiler/aslfiles.c vendor-sys/acpica/dist/source/compiler/aslfold.c vendor-sys/acpica/dist/source/compiler/aslglobal.h vendor-sys/acpica/dist/source/compiler/aslhex.c vendor-sys/acpica/dist/source/compiler/asllength.c vendor-sys/acpica/dist/source/compiler/asllisting.c vendor-sys/acpica/dist/source/compiler/asllistsup.c vendor-sys/acpica/dist/source/compiler/aslload.c vendor-sys/acpica/dist/source/compiler/asllookup.c vendor-sys/acpica/dist/source/compiler/aslmain.c vendor-sys/acpica/dist/source/compiler/aslmap.c vendor-sys/acpica/dist/source/compiler/aslmapenter.c vendor-sys/acpica/dist/source/compiler/aslmapoutput.c vendor-sys/acpica/dist/source/compiler/aslmaputils.c vendor-sys/acpica/dist/source/compiler/aslmessages.c vendor-sys/acpica/dist/source/compiler/aslmessages.h vendor-sys/acpica/dist/source/compiler/aslmethod.c vendor-sys/acpica/dist/source/compiler/aslnamesp.c vendor-sys/acpica/dist/source/compiler/asloffset.c vendor-sys/acpica/dist/source/compiler/aslopcodes.c vendor-sys/acpica/dist/source/compiler/asloperands.c vendor-sys/acpica/dist/source/compiler/aslopt.c vendor-sys/acpica/dist/source/compiler/asloptions.c vendor-sys/acpica/dist/source/compiler/aslparser.y vendor-sys/acpica/dist/source/compiler/aslpredef.c vendor-sys/acpica/dist/source/compiler/aslprepkg.c vendor-sys/acpica/dist/source/compiler/aslprintf.c vendor-sys/acpica/dist/source/compiler/aslprune.c vendor-sys/acpica/dist/source/compiler/aslresource.c vendor-sys/acpica/dist/source/compiler/aslrestype1.c vendor-sys/acpica/dist/source/compiler/aslrestype1i.c vendor-sys/acpica/dist/source/compiler/aslrestype2.c vendor-sys/acpica/dist/source/compiler/aslrestype2d.c vendor-sys/acpica/dist/source/compiler/aslrestype2e.c vendor-sys/acpica/dist/source/compiler/aslrestype2q.c vendor-sys/acpica/dist/source/compiler/aslrestype2s.c vendor-sys/acpica/dist/source/compiler/aslrestype2w.c vendor-sys/acpica/dist/source/compiler/aslrules.y vendor-sys/acpica/dist/source/compiler/aslstartup.c vendor-sys/acpica/dist/source/compiler/aslstubs.c vendor-sys/acpica/dist/source/compiler/aslsupport.l vendor-sys/acpica/dist/source/compiler/aslsupport.y vendor-sys/acpica/dist/source/compiler/asltokens.y vendor-sys/acpica/dist/source/compiler/asltransform.c vendor-sys/acpica/dist/source/compiler/asltree.c vendor-sys/acpica/dist/source/compiler/asltypes.h vendor-sys/acpica/dist/source/compiler/asltypes.y vendor-sys/acpica/dist/source/compiler/aslutils.c vendor-sys/acpica/dist/source/compiler/asluuid.c vendor-sys/acpica/dist/source/compiler/aslwalks.c vendor-sys/acpica/dist/source/compiler/aslxref.c vendor-sys/acpica/dist/source/compiler/dtcompile.c vendor-sys/acpica/dist/source/compiler/dtcompiler.h vendor-sys/acpica/dist/source/compiler/dtexpress.c vendor-sys/acpica/dist/source/compiler/dtfield.c vendor-sys/acpica/dist/source/compiler/dtio.c vendor-sys/acpica/dist/source/compiler/dtparser.l vendor-sys/acpica/dist/source/compiler/dtparser.y vendor-sys/acpica/dist/source/compiler/dtsubtable.c vendor-sys/acpica/dist/source/compiler/dttable.c vendor-sys/acpica/dist/source/compiler/dttemplate.c vendor-sys/acpica/dist/source/compiler/dttemplate.h vendor-sys/acpica/dist/source/compiler/dtutils.c vendor-sys/acpica/dist/source/compiler/preprocess.h vendor-sys/acpica/dist/source/compiler/prexpress.c vendor-sys/acpica/dist/source/compiler/prmacros.c vendor-sys
Re: svn commit: r278223 - head/lib/clang
On Wed, Feb 4, 2015 at 1:44 PM, Dimitry Andric wrote: ... > This flag is only relevant when you are 1) using clang to compile, and > 2) on freebsd 9.x. You cannot compile clang in head with base gcc > anyway. Good point. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278225 - head/lib/clang
Author: dim
Date: Wed Feb 4 21:48:50 2015
New Revision: 278225
URL: https://svnweb.freebsd.org/changeset/base/278225
Log:
Followup to r278223, by only using -stdlib=libc++ when the compiler is
clang; not even recent versions of gcc support the -stdlib flag.
Noticed by: ngie
Modified:
head/lib/clang/clang.build.mk
Modified: head/lib/clang/clang.build.mk
==
--- head/lib/clang/clang.build.mk Wed Feb 4 21:08:28 2015
(r278224)
+++ head/lib/clang/clang.build.mk Wed Feb 4 21:48:50 2015
(r278225)
@@ -34,7 +34,8 @@ BUILD_TRIPLE?=${BUILD_ARCH:C/amd64/x86_
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
-CXXFLAGS+= -std=c++11 -stdlib=libc++ -fno-exceptions -fno-rtti
+CXXFLAGS+= -std=c++11 -fno-exceptions -fno-rtti
+CXXFLAGS.clang+= -stdlib=libc++
.PATH: ${LLVM_SRCS}/${SRCDIR}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r278223 - head/lib/clang
On 04 Feb 2015, at 22:23, NGie Cooper wrote: > > On Wed, Feb 4, 2015 at 1:16 PM, Dimitry Andric wrote: >> On 04 Feb 2015, at 22:09, NGie Cooper wrote: >>> >>> On Wed, Feb 4, 2015 at 1:00 PM, Dimitry Andric wrote: Author: dim Date: Wed Feb 4 21:00:29 2015 New Revision: 278223 URL: https://svnweb.freebsd.org/changeset/base/278223 Log: For now, add -stdlib=libc++ to the flags for building clang, since that makes it easier to build head on stable/9, where libstdc++ is still the default. We can revisit this when somebody will try to build base with gcc 4.8.1 or higher, and its included libstdc++. >>> >>> Maybe this should be conditionalized on COMPILER_TYPE? >> >> COMPILER_TYPE doesn't say anything about the C++ library used. Maybe we >> need a CXX_LIBRARY_TYPE setting for it? >> >> That said, you may be right that it should be conditionalized on the >> compiler type anyway, since gcc does not support the -stdlib= option. > >Yeah... true. >My original point was coming more from a perspective that this was > being done strictly for the GNU toolchain, so conditionalizing the > CFLAGS on the compiler being used seemed reasonable. This flag is only relevant when you are 1) using clang to compile, and 2) on freebsd 9.x. You cannot compile clang in head with base gcc anyway. -Dimitry signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r278223 - head/lib/clang
On Wed, Feb 4, 2015 at 1:16 PM, Dimitry Andric wrote: > On 04 Feb 2015, at 22:09, NGie Cooper wrote: >> >> On Wed, Feb 4, 2015 at 1:00 PM, Dimitry Andric wrote: >>> Author: dim >>> Date: Wed Feb 4 21:00:29 2015 >>> New Revision: 278223 >>> URL: https://svnweb.freebsd.org/changeset/base/278223 >>> >>> Log: >>> For now, add -stdlib=libc++ to the flags for building clang, since that >>> makes it easier to build head on stable/9, where libstdc++ is still the >>> default. We can revisit this when somebody will try to build base with >>> gcc 4.8.1 or higher, and its included libstdc++. >> >> Maybe this should be conditionalized on COMPILER_TYPE? > > COMPILER_TYPE doesn't say anything about the C++ library used. Maybe we > need a CXX_LIBRARY_TYPE setting for it? > > That said, you may be right that it should be conditionalized on the > compiler type anyway, since gcc does not support the -stdlib= option. Yeah... true. My original point was coming more from a perspective that this was being done strictly for the GNU toolchain, so conditionalizing the CFLAGS on the compiler being used seemed reasonable. Thanks! ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r278223 - head/lib/clang
On 04 Feb 2015, at 22:09, NGie Cooper wrote: > > On Wed, Feb 4, 2015 at 1:00 PM, Dimitry Andric wrote: >> Author: dim >> Date: Wed Feb 4 21:00:29 2015 >> New Revision: 278223 >> URL: https://svnweb.freebsd.org/changeset/base/278223 >> >> Log: >> For now, add -stdlib=libc++ to the flags for building clang, since that >> makes it easier to build head on stable/9, where libstdc++ is still the >> default. We can revisit this when somebody will try to build base with >> gcc 4.8.1 or higher, and its included libstdc++. > > Maybe this should be conditionalized on COMPILER_TYPE? COMPILER_TYPE doesn't say anything about the C++ library used. Maybe we need a CXX_LIBRARY_TYPE setting for it? That said, you may be right that it should be conditionalized on the compiler type anyway, since gcc does not support the -stdlib= option. -Dimitry signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r278223 - head/lib/clang
On Wed, Feb 4, 2015 at 1:00 PM, Dimitry Andric wrote: > Author: dim > Date: Wed Feb 4 21:00:29 2015 > New Revision: 278223 > URL: https://svnweb.freebsd.org/changeset/base/278223 > > Log: > For now, add -stdlib=libc++ to the flags for building clang, since that > makes it easier to build head on stable/9, where libstdc++ is still the > default. We can revisit this when somebody will try to build base with > gcc 4.8.1 or higher, and its included libstdc++. Maybe this should be conditionalized on COMPILER_TYPE? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278223 - head/lib/clang
Author: dim
Date: Wed Feb 4 21:00:29 2015
New Revision: 278223
URL: https://svnweb.freebsd.org/changeset/base/278223
Log:
For now, add -stdlib=libc++ to the flags for building clang, since that
makes it easier to build head on stable/9, where libstdc++ is still the
default. We can revisit this when somebody will try to build base with
gcc 4.8.1 or higher, and its included libstdc++.
Reported by: rpaulo
Modified:
head/lib/clang/clang.build.mk
Modified: head/lib/clang/clang.build.mk
==
--- head/lib/clang/clang.build.mk Wed Feb 4 20:55:21 2015
(r278222)
+++ head/lib/clang/clang.build.mk Wed Feb 4 21:00:29 2015
(r278223)
@@ -34,7 +34,7 @@ BUILD_TRIPLE?=${BUILD_ARCH:C/amd64/x86_
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
-CXXFLAGS+= -std=c++11 -fno-exceptions -fno-rtti
+CXXFLAGS+= -std=c++11 -stdlib=libc++ -fno-exceptions -fno-rtti
.PATH: ${LLVM_SRCS}/${SRCDIR}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278222 - head/sys/sys
Author: dim Date: Wed Feb 4 20:55:21 2015 New Revision: 278222 URL: https://svnweb.freebsd.org/changeset/base/278222 Log: Mark typedefs for manually implementing _Static_assert() as unused, so they won't show up unecessarily for -Wunused-local-typedefs. MFC after:3 days Modified: head/sys/sys/cdefs.h Modified: head/sys/sys/cdefs.h == --- head/sys/sys/cdefs.hWed Feb 4 20:03:57 2015(r278221) +++ head/sys/sys/cdefs.hWed Feb 4 20:55:21 2015(r278222) @@ -293,7 +293,8 @@ #elif defined(__COUNTER__) #define_Static_assert(x, y)__Static_assert(x, __COUNTER__) #define__Static_assert(x, y) ___Static_assert(x, y) -#define___Static_assert(x, y) typedef char __assert_ ## y[(x) ? 1 : -1] +#define___Static_assert(x, y) typedef char __assert_ ## y[(x) ? 1 : -1] \ + __unused #else #define_Static_assert(x, y)struct __hack #endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278221 - in head/sys/dev/sfxge: . common
Author: arybchik
Date: Wed Feb 4 20:03:57 2015
New Revision: 278221
URL: https://svnweb.freebsd.org/changeset/base/278221
Log:
sfxge: Add macros to init, destroy, acquire, release and assert locks
Sponsored by: Solarflare Communications, Inc.
Approved by:gnn (mentor)
Modified:
head/sys/dev/sfxge/common/efsys.h
head/sys/dev/sfxge/sfxge.c
head/sys/dev/sfxge/sfxge.h
head/sys/dev/sfxge/sfxge_ev.c
head/sys/dev/sfxge/sfxge_mcdi.c
head/sys/dev/sfxge/sfxge_port.c
head/sys/dev/sfxge/sfxge_rx.c
head/sys/dev/sfxge/sfxge_tx.c
head/sys/dev/sfxge/sfxge_tx.h
Modified: head/sys/dev/sfxge/common/efsys.h
==
--- head/sys/dev/sfxge/common/efsys.h Wed Feb 4 19:58:54 2015
(r278220)
+++ head/sys/dev/sfxge/common/efsys.h Wed Feb 4 20:03:57 2015
(r278221)
@@ -517,6 +517,15 @@ typedef struct efsys_bar_s {
struct resource *esb_res;
} efsys_bar_t;
+#defineSFXGE_BAR_LOCK_INIT(_esbp, _name)
\
+ mtx_init(&(_esbp)->esb_lock, (_name), NULL, MTX_DEF)
+#defineSFXGE_BAR_LOCK_DESTROY(_esbp)
\
+ mtx_destroy(&(_esbp)->esb_lock)
+#defineSFXGE_BAR_LOCK(_esbp)
\
+ mtx_lock(&(_esbp)->esb_lock)
+#defineSFXGE_BAR_UNLOCK(_esbp)
\
+ mtx_unlock(&(_esbp)->esb_lock)
+
#defineEFSYS_BAR_READD(_esbp, _offset, _edp, _lock)
\
do {\
_NOTE(CONSTANTCONDITION)\
@@ -525,7 +534,7 @@ typedef struct efsys_bar_s {
\
_NOTE(CONSTANTCONDITION)\
if (_lock) \
- mtx_lock(&((_esbp)->esb_lock)); \
+ SFXGE_BAR_LOCK(_esbp); \
\
(_edp)->ed_u32[0] = bus_space_read_4((_esbp)->esb_tag, \
(_esbp)->esb_handle, (_offset));\
@@ -535,7 +544,7 @@ typedef struct efsys_bar_s {
\
_NOTE(CONSTANTCONDITION)\
if (_lock) \
- mtx_unlock(&((_esbp)->esb_lock)); \
+ SFXGE_BAR_UNLOCK(_esbp);\
_NOTE(CONSTANTCONDITION)\
} while (B_FALSE)
@@ -545,7 +554,7 @@ typedef struct efsys_bar_s {
KASSERT(IS_P2ALIGNED(_offset, sizeof (efx_qword_t)),\
("not power of 2 aligned"));\
\
- mtx_lock(&((_esbp)->esb_lock)); \
+ SFXGE_BAR_LOCK(_esbp); \
\
(_eqp)->eq_u32[0] = bus_space_read_4((_esbp)->esb_tag, \
(_esbp)->esb_handle, (_offset));\
@@ -556,7 +565,7 @@ typedef struct efsys_bar_s {
uint32_t, (_eqp)->eq_u32[1],\
uint32_t, (_eqp)->eq_u32[0]); \
\
- mtx_unlock(&((_esbp)->esb_lock)); \
+ SFXGE_BAR_UNLOCK(_esbp);\
_NOTE(CONSTANTCONDITION)\
} while (B_FALSE)
@@ -568,7 +577,7 @@ typedef struct efsys_bar_s {
\
_NOTE(CONSTANTCONDITION)\
if (_lock) \
- mtx_lock(&((_esbp)->esb_lock)); \
+ SFXGE_BAR_LOCK(_esbp); \
\
(_eop)->eo_u32[0] = bus_space_read_4((_esbp)->esb_tag, \
(_esbp)->esb_handle, (_offset));\
@@ -587,7 +596,7 @@ typedef struct efsys_bar_s {
\
_NOTE(CONSTANTCONDITION)\
if (_lock) \
- mtx_unlock(
svn commit: r278220 - head/sys/dev/sfxge/common
Author: arybchik
Date: Wed Feb 4 19:58:54 2015
New Revision: 278220
URL: https://svnweb.freebsd.org/changeset/base/278220
Log:
sfxge: Implement EFSYS_MEM_READ_BARRIER()
Sponsored by: Solarflare Communications, Inc.
Approved by:gnn (mentor)
Modified:
head/sys/dev/sfxge/common/efsys.h
Modified: head/sys/dev/sfxge/common/efsys.h
==
--- head/sys/dev/sfxge/common/efsys.h Wed Feb 4 19:40:30 2015
(r278219)
+++ head/sys/dev/sfxge/common/efsys.h Wed Feb 4 19:58:54 2015
(r278220)
@@ -677,8 +677,7 @@ typedef struct efsys_bar_s {
/* BARRIERS */
-/* Strict ordering guaranteed by devacc.devacc_attr_dataorder */
-#defineEFSYS_MEM_READ_BARRIER()
+#defineEFSYS_MEM_READ_BARRIER()rmb()
#defineEFSYS_PIO_WRITE_BARRIER()
/* TIMESTAMP */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278219 - in stable/9: etc/rc.d tools/build/mk
Author: ngie
Date: Wed Feb 4 19:40:30 2015
New Revision: 278219
URL: https://svnweb.freebsd.org/changeset/base/278219
Log:
MFC r277732,r277733:
r277732:
Honor MK_API in etc/rc.d
Sponsored by: EMC / Isilon Storage Division
r277733:
Honor MK_AMD with etc/rc.d/amd
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/etc/rc.d/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/etc/rc.d/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/rc.d/Makefile
==
--- stable/9/etc/rc.d/Makefile Wed Feb 4 18:58:09 2015(r278218)
+++ stable/9/etc/rc.d/Makefile Wed Feb 4 19:40:30 2015(r278219)
@@ -11,9 +11,6 @@ FILES=DAEMON \
accounting \
addswap \
adjkerntz \
- amd \
- apm \
- apmd \
archdep \
atm1 \
atm2 \
@@ -155,6 +152,15 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_AMD} != "no"
+FILES+=amd
+.endif
+
+.if ${MK_APM} != "no"
+FILES+=apm
+FILES+=apmd
+.endif
+
.if ${MK_BSNMP} != "no"
FILES+=bsnmpd
.endif
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 18:58:09
2015(r278218)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 19:40:30
2015(r278219)
@@ -26,6 +26,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz
.if ${MK_AMD} == no
OLD_FILES+=etc/amd.map
+OLD_FILES+=etc/rc.d/amd
OLD_FILES+=usr/bin/pawd
OLD_FILES+=usr/sbin/amd
OLD_FILES+=usr/sbin/amq
@@ -48,6 +49,8 @@ OLD_FILES+=usr/share/man/man8/wire-test.
.endif
.if ${MK_APM} == no
+OLD_FILES+=etc/rc.d/apm
+OLD_FILES+=etc/rc.d/apmd
OLD_FILES+=etc/apmd.conf
OLD_FILES+=usr/sbin/apm
OLD_FILES+=usr/share/examples/etc/apmd.conf
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278216 - head/sys/arm/ti
Author: loos
Date: Wed Feb 4 18:35:49 2015
New Revision: 278216
URL: https://svnweb.freebsd.org/changeset/base/278216
Log:
Fix a bug where an interrupt could be masked unintentionally when
bus_config_intr() is called with the same interrupt type and polarity that
is already set.
Pointy hat: loos
Modified:
head/sys/arm/ti/ti_gpio.c
Modified: head/sys/arm/ti/ti_gpio.c
==
--- head/sys/arm/ti/ti_gpio.c Wed Feb 4 18:15:28 2015(r278215)
+++ head/sys/arm/ti/ti_gpio.c Wed Feb 4 18:35:49 2015(r278216)
@@ -1004,7 +1004,7 @@ ti_gpio_config_intr(device_t dev, int ir
val |= TI_GPIO_MASK(irq);
ti_gpio_write_4(sc, TI_GPIO_BANK(irq), reg, val);
}
- if (oldreg != 0) {
+ if (reg != oldreg && oldreg != 0) {
/* Remove the old settings. */
val = ti_gpio_read_4(sc, TI_GPIO_BANK(irq), oldreg);
val &= ~TI_GPIO_MASK(irq);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278215 - head/sys/arm/broadcom/bcm2835
Author: loos
Date: Wed Feb 4 18:15:28 2015
New Revision: 278215
URL: https://svnweb.freebsd.org/changeset/base/278215
Log:
Add GPIO interrupt support for BCM2835 (Raspberry pi).
With this commit any of the GPIO pins can now be programmed to act as an
interrupt source for GPIO devices (i.e. limited to devices directly
attached to gpiobus - at least for now).
Differential Revision:https://reviews.freebsd.org/D1000
Modified:
head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
==
--- head/sys/arm/broadcom/bcm2835/bcm2835_gpio.cWed Feb 4 17:23:02
2015(r278214)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_gpio.cWed Feb 4 18:15:28
2015(r278215)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -57,6 +58,7 @@ __FBSDID("$FreeBSD$");
#defineBCM_GPIO_IRQS 4
#defineBCM_GPIO_PINS 54
+#defineBCM_GPIO_PINS_PER_BANK 32
#defineBCM_GPIO_DEFAULT_CAPS (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT |
\
GPIO_PIN_PULLUP | GPIO_PIN_PULLDOWN)
@@ -81,12 +83,15 @@ struct bcm_gpio_softc {
struct resource * sc_res[BCM_GPIO_IRQS + 1];
bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh;
- void * sc_intrhand;
+ void * sc_intrhand[BCM_GPIO_IRQS];
int sc_gpio_npins;
int sc_ro_npins;
int sc_ro_pins[BCM_GPIO_PINS];
struct gpio_pin sc_gpio_pins[BCM_GPIO_PINS];
+ struct intr_event * sc_events[BCM_GPIO_PINS];
struct bcm_gpio_sysctl sc_sysctl[BCM_GPIO_PINS];
+ enum intr_trigger sc_irq_trigger[BCM_GPIO_PINS];
+ enum intr_polarity sc_irq_polarity[BCM_GPIO_PINS];
};
enum bcm_gpio_pud {
@@ -95,21 +100,35 @@ enum bcm_gpio_pud {
BCM_GPIO_PULLUP,
};
-#defineBCM_GPIO_LOCK(_sc) mtx_lock(&_sc->sc_mtx)
-#defineBCM_GPIO_UNLOCK(_sc)mtx_unlock(&_sc->sc_mtx)
-#defineBCM_GPIO_LOCK_ASSERT(_sc) mtx_assert(&_sc->sc_mtx,
MA_OWNED)
-
-#defineBCM_GPIO_GPFSEL(_bank) 0x00 + _bank * 4
-#defineBCM_GPIO_GPSET(_bank) 0x1c + _bank * 4
-#defineBCM_GPIO_GPCLR(_bank) 0x28 + _bank * 4
-#defineBCM_GPIO_GPLEV(_bank) 0x34 + _bank * 4
-#defineBCM_GPIO_GPPUD(_bank) 0x94
-#defineBCM_GPIO_GPPUDCLK(_bank)0x98 + _bank * 4
-
+#defineBCM_GPIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx)
+#defineBCM_GPIO_UNLOCK(_sc)mtx_unlock_spin(&(_sc)->sc_mtx)
+#defineBCM_GPIO_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->sc_mtx,
MA_OWNED)
#defineBCM_GPIO_WRITE(_sc, _off, _val) \
-bus_space_write_4(_sc->sc_bst, _sc->sc_bsh, _off, _val)
+bus_space_write_4((_sc)->sc_bst, (_sc)->sc_bsh, _off, _val)
#defineBCM_GPIO_READ(_sc, _off)\
-bus_space_read_4(_sc->sc_bst, _sc->sc_bsh, _off)
+bus_space_read_4((_sc)->sc_bst, (_sc)->sc_bsh, _off)
+#defineBCM_GPIO_CLEAR_BITS(_sc, _off, _bits) \
+BCM_GPIO_WRITE(_sc, _off, BCM_GPIO_READ(_sc, _off) & ~(_bits))
+#defineBCM_GPIO_SET_BITS(_sc, _off, _bits) \
+BCM_GPIO_WRITE(_sc, _off, BCM_GPIO_READ(_sc, _off) | _bits)
+#defineBCM_GPIO_BANK(a)(a / BCM_GPIO_PINS_PER_BANK)
+#defineBCM_GPIO_MASK(a)(1U << (a % BCM_GPIO_PINS_PER_BANK))
+
+#defineBCM_GPIO_GPFSEL(_bank) (0x00 + _bank * 4) /* Function
Select */
+#defineBCM_GPIO_GPSET(_bank) (0x1c + _bank * 4) /* Pin Out Set
*/
+#defineBCM_GPIO_GPCLR(_bank) (0x28 + _bank * 4) /* Pin Out
Clear */
+#defineBCM_GPIO_GPLEV(_bank) (0x34 + _bank * 4) /* Pin Level */
+#defineBCM_GPIO_GPEDS(_bank) (0x40 + _bank * 4) /* Event Status
*/
+#defineBCM_GPIO_GPREN(_bank) (0x4c + _bank * 4) /* Rising Edge
irq */
+#defineBCM_GPIO_GPFEN(_bank) (0x58 + _bank * 4) /* Falling Edge
irq */
+#defineBCM_GPIO_GPHEN(_bank) (0x64 + _bank * 4) /* High Level
irq */
+#defineBCM_GPIO_GPLEN(_bank) (0x70 + _bank * 4) /* Low Level
irq */
+#defineBCM_GPIO_GPAREN(_bank) (0x7c + _bank * 4) /* Async Rising
Edge */
+#defineBCM_GPIO_GPAFEN(_bank) (0x88 + _bank * 4) /* Async
Falling Egde */
+#defineBCM_GPIO_GPPUD(_bank) (0x94) /* Pin Pull
up/down */
+#defineBCM_GPIO_GPPUDCLK(_bank) (0x98 + _bank * 4) /* Pin Pull up
clock */
+
+static struct bcm_gpio_softc *bcm_gpio_sc = NULL;
static int
bcm_gpio_pin_is_ro(struct bcm_gpio_softc *sc, int pin)
@@ -657,6 +676,40 @@ bcm_gpio_get_reserved_pins(struct bcm_gp
}
static int
+bcm_gpio_intr(void *arg)
+{
+ int bank_last,
svn commit: r278214 - head/sys/arm/broadcom/bcm2835
Author: loos
Date: Wed Feb 4 17:23:02 2015
New Revision: 278214
URL: https://svnweb.freebsd.org/changeset/base/278214
Log:
Sort and remove unnecessary includes.
Modified:
head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
==
--- head/sys/arm/broadcom/bcm2835/bcm2835_gpio.cWed Feb 4 16:36:51
2015(r278213)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_gpio.cWed Feb 4 17:23:02
2015(r278214)
@@ -31,26 +31,18 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-
+#include
#include
-#include
-#include
#include
+#include
#include
-#include
+#include
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
#include
#include
-#include
#include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278213 - head/sys/arm/broadcom/bcm2835
Author: loos
Date: Wed Feb 4 16:36:51 2015
New Revision: 278213
URL: https://svnweb.freebsd.org/changeset/base/278213
Log:
Remove stale comments about the issues with HS mode.
Remove a previous workaround to limit the minimum sdhci frequency that
isn't needed anymore.
Modified:
head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
==
--- head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Wed Feb 4 16:21:45
2015(r278212)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Wed Feb 4 16:36:51
2015(r278213)
@@ -67,19 +67,9 @@ __FBSDID("$FreeBSD$");
#define dprintf(fmt, args...)
#endif
-/*
- * Arasan HC seems to have problem with Data CRC on lower frequencies.
- * Use this tunable to cap initialization sequence frequency at higher
- * value. Default is standard 400kHz.
- * HS mode brings too many problems for most of cards, so disable HS mode
- * until a better fix comes up.
- * HS mode still can be enabled with the tunable.
- */
-static int bcm2835_sdhci_min_freq = 40;
static int bcm2835_sdhci_hs = 1;
static int bcm2835_sdhci_pio_mode = 0;
-TUNABLE_INT("hw.bcm2835.sdhci.min_freq", &bcm2835_sdhci_min_freq);
TUNABLE_INT("hw.bcm2835.sdhci.hs", &bcm2835_sdhci_hs);
TUNABLE_INT("hw.bcm2835.sdhci.pio_mode", &bcm2835_sdhci_pio_mode);
@@ -404,13 +394,6 @@ bcm_sdhci_write_multi_4(device_t dev, st
bus_space_write_multi_4(sc->sc_bst, sc->sc_bsh, off, data, count);
}
-static uint32_t
-bcm_sdhci_min_freq(device_t dev, struct sdhci_slot *slot)
-{
-
- return bcm2835_sdhci_min_freq;
-}
-
static void
bcm_sdhci_start_dma_seg(struct bcm_sdhci_softc *sc)
{
@@ -663,7 +646,6 @@ static device_method_t bcm_sdhci_methods
DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host),
DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host),
- DEVMETHOD(sdhci_min_freq, bcm_sdhci_min_freq),
/* Platform transfer methods */
DEVMETHOD(sdhci_platform_will_handle,
bcm_sdhci_will_handle_transfer),
DEVMETHOD(sdhci_platform_start_transfer,
bcm_sdhci_start_transfer),
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278212 - head/sys/arm/broadcom/bcm2835
Author: loos
Date: Wed Feb 4 16:21:45 2015
New Revision: 278212
URL: https://svnweb.freebsd.org/changeset/base/278212
Log:
Remove some duplicate calls to bus_release_resource() and destroy the mutex
on error cases.
While here remove unnecessary includes.
Modified:
head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
==
--- head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Wed Feb 4 16:19:31
2015(r278211)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Wed Feb 4 16:21:45
2015(r278212)
@@ -29,32 +29,17 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
-#include
-#include
#include
-#include
#include
#include
#include
#include
-#include
-#include
#include
#include
#include
-#include
-#include
-#include
-
-#include
#include
-#include
-#include
-#include
-#include
#include
#include
@@ -211,16 +196,12 @@ bcm_sdhci_attach(device_t dev)
RF_ACTIVE);
if (!sc->sc_irq_res) {
device_printf(dev, "cannot allocate interrupt\n");
- bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
err = ENXIO;
goto fail;
}
if (bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
- NULL, bcm_sdhci_intr, sc, &sc->sc_intrhand))
- {
- bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
- bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res);
+ NULL, bcm_sdhci_intr, sc, &sc->sc_intrhand)) {
device_printf(dev, "cannot setup interrupt handler\n");
err = ENXIO;
goto fail;
@@ -286,6 +267,7 @@ fail:
bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res);
if (sc->sc_mem_res)
bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+ mtx_destroy(&sc->sc_mtx);
return (err);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278211 - head/sys/dev/ed
Author: imp Date: Wed Feb 4 16:19:31 2015 New Revision: 278211 URL: https://svnweb.freebsd.org/changeset/base/278211 Log: Fix typo Submitted by: matteo@ Modified: head/sys/dev/ed/if_ed.c Modified: head/sys/dev/ed/if_ed.c == --- head/sys/dev/ed/if_ed.c Wed Feb 4 15:59:51 2015(r278210) +++ head/sys/dev/ed/if_ed.c Wed Feb 4 16:19:31 2015(r278211) @@ -976,7 +976,7 @@ edintr(void *arg) /* * loop until there are no more new interrupts. When the card goes * away, the hardware will read back 0xff. Looking at the interrupts, -* it would appear that 0xff is impossible as ED_ISR_RST is noramlly +* it would appear that 0xff is impossible as ED_ISR_RST is normally * clear. ED_ISR_RDC is also normally clear and only set while * we're transferring memory to the card and we're holding the * ED_LOCK (so we can't get into here). ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278210 - head/sys/dev/ed
Author: imp
Date: Wed Feb 4 15:59:51 2015
New Revision: 278210
URL: https://svnweb.freebsd.org/changeset/base/278210
Log:
Add comment about why checking for 0xff is OK. There's two bits in the
ISR that are normally clear. RST is one, though in some overflow cases
it can be set. RDC is only set when a remote DMA is finished from the
memory mapped memory to the transmit rings, which we poll fore in the
code with ED_LOCK around the operation that would set it.
Modified:
head/sys/dev/ed/if_ed.c
Modified: head/sys/dev/ed/if_ed.c
==
--- head/sys/dev/ed/if_ed.c Wed Feb 4 14:49:47 2015(r278209)
+++ head/sys/dev/ed/if_ed.c Wed Feb 4 15:59:51 2015(r278210)
@@ -976,8 +976,10 @@ edintr(void *arg)
/*
* loop until there are no more new interrupts. When the card goes
* away, the hardware will read back 0xff. Looking at the interrupts,
-* it would appear that 0xff is impossible, or at least extremely
-* unlikely.
+* it would appear that 0xff is impossible as ED_ISR_RST is noramlly
+* clear. ED_ISR_RDC is also normally clear and only set while
+* we're transferring memory to the card and we're holding the
+* ED_LOCK (so we can't get into here).
*/
while ((isr = ed_nic_inb(sc, ED_P0_ISR)) != 0 && isr != 0xff) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278209 - head/sys/kern
Author: kib
Date: Wed Feb 4 14:49:47 2015
New Revision: 278209
URL: https://svnweb.freebsd.org/changeset/base/278209
Log:
Add ddb command 'show clocksource' to display state of the per-cpu
clock events.
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/kern/kern_clocksource.c
Modified: head/sys/kern/kern_clocksource.c
==
--- head/sys/kern/kern_clocksource.cWed Feb 4 13:56:38 2015
(r278208)
+++ head/sys/kern/kern_clocksource.cWed Feb 4 14:49:47 2015
(r278209)
@@ -908,3 +908,42 @@ sysctl_kern_eventtimer_periodic(SYSCTL_H
SYSCTL_PROC(_kern_eventtimer, OID_AUTO, periodic,
CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
0, 0, sysctl_kern_eventtimer_periodic, "I", "Enable event timer periodic
mode");
+
+#include "opt_ddb.h"
+
+#ifdef DDB
+#include
+
+DB_SHOW_COMMAND(clocksource, db_show_clocksource)
+{
+ struct pcpu_state *st;
+ int c;
+
+ CPU_FOREACH(c) {
+ st = DPCPU_ID_PTR(c, timerstate);
+ db_printf(
+ "CPU %2d: action %d handle %d ipi %d idle %d\n"
+ "now %#jx nevent %#jx (%jd)\n"
+ "ntick %#jx (%jd) nhard %#jx (%jd)\n"
+ "nstat %#jx (%jd) nprof %#jx (%jd)\n"
+ "ncall %#jx (%jd) ncallopt %#jx (%jd)\n",
+ c, st->action, st->handle, st->ipi, st->idle,
+ (uintmax_t)st->now,
+ (uintmax_t)st->nextevent,
+ (uintmax_t)(st->nextevent - st->now) / tick_sbt,
+ (uintmax_t)st->nexttick,
+ (uintmax_t)(st->nexttick - st->now) / tick_sbt,
+ (uintmax_t)st->nexthard,
+ (uintmax_t)(st->nexthard - st->now) / tick_sbt,
+ (uintmax_t)st->nextstat,
+ (uintmax_t)(st->nextstat - st->now) / tick_sbt,
+ (uintmax_t)st->nextprof,
+ (uintmax_t)(st->nextprof - st->now) / tick_sbt,
+ (uintmax_t)st->nextcall,
+ (uintmax_t)(st->nextcall - st->now) / tick_sbt,
+ (uintmax_t)st->nextcallopt,
+ (uintmax_t)(st->nextcallopt - st->now) / tick_sbt);
+ }
+}
+
+#endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278206 - head/release
Author: gjb Date: Wed Feb 4 11:55:32 2015 New Revision: 278206 URL: https://svnweb.freebsd.org/changeset/base/278206 Log: Bump copyright after r277458. MFC after:2 weeks X-MFC-with: r277458, r277536, r277606, r277609, r277836, r278118, r278119 Sponsored by: The FreeBSD Foundation Modified: head/release/release.sh Modified: head/release/release.sh == --- head/release/release.sh Wed Feb 4 11:51:46 2015(r278205) +++ head/release/release.sh Wed Feb 4 11:55:32 2015(r278206) @@ -1,6 +1,6 @@ #!/bin/sh #- -# Copyright (c) 2013, 2014 The FreeBSD Foundation +# Copyright (c) 2013-2015 The FreeBSD Foundation # Copyright (c) 2013 Glen Barber # Copyright (c) 2011 Nathan Whitehorn # All rights reserved. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278205 - in stable/9: etc/rc.d tools/build/mk
Author: ngie
Date: Wed Feb 4 11:51:46 2015
New Revision: 278205
URL: https://svnweb.freebsd.org/changeset/base/278205
Log:
MFC r277731,r277734:
r277731:
Honor MK_LPR with etc/rc.d/lpd
Sponsored by: EMC / Isilon Storage Division
r277734:
Remove explicit inclusion of lpd from FILES
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/etc/rc.d/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/etc/rc.d/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/rc.d/Makefile
==
--- stable/9/etc/rc.d/Makefile Wed Feb 4 11:48:33 2015(r278204)
+++ stable/9/etc/rc.d/Makefile Wed Feb 4 11:51:46 2015(r278205)
@@ -72,7 +72,6 @@ FILES=DAEMON \
local \
localpkg \
lockd \
- lpd \
mixer \
motd \
mountcritlocal \
@@ -168,6 +167,10 @@ _ipxrouted=ipxrouted
FILES+=jail
.endif
+.if ${MK_LPR} != "no"
+FILES+=lpd
+.endif
+
.if ${MK_OFED} != "no"
_opensm= opensm
.endif
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 11:48:33
2015(r278204)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 11:51:46
2015(r278205)
@@ -2931,6 +2931,7 @@ OLD_FILES+=usr/share/man/man8/updatedb.8
.if ${MK_LPR} == no
OLD_FILES+=etc/hosts.lpd
OLD_FILES+=etc/printcap
+OLD_FILES+=etc/rc.d/lpd
OLD_FILES+=usr/bin/lp
OLD_FILES+=usr/bin/lpq
OLD_FILES+=usr/bin/lpr
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278204 - head/include
Author: ngie
Date: Wed Feb 4 11:48:33 2015
New Revision: 278204
URL: https://svnweb.freebsd.org/changeset/base/278204
Log:
Sort the entries by build knob, then MACHINE_ARCH like other areas of the tree
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/include/Makefile
Modified: head/include/Makefile
==
--- head/include/Makefile Wed Feb 4 11:45:15 2015(r278203)
+++ head/include/Makefile Wed Feb 4 11:48:33 2015(r278204)
@@ -56,18 +56,14 @@ LSUBDIRS= cam/ata cam/scsi \
security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
-.if ${MK_USB} != "no"
-LSUBDIRS+= dev/usb
-.endif
-
LSUBSUBDIRS= dev/mpt/mpilib
-.if ${MK_CUSE} != "no"
-LSUBDIRS+= fs/cuse
+.if ${MK_BLUETOOTH} != "no"
+LSUBSUBDIRS+= netgraph/bluetooth/include
.endif
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
-_dev_powermac_nvram= dev/powermac_nvram
+.if ${MK_CUSE} != "no"
+LSUBDIRS+= fs/cuse
.endif
.if ${MK_GSSAPI} != "no"
@@ -79,15 +75,18 @@ INCS+= gssapi.h
INCS+= hesiod.h
.endif
-.if ${MK_BLUETOOTH} != "no"
-LSUBSUBDIRS+= netgraph/bluetooth/include
-.endif
-
# Handle the #define aliases for libiconv
.if ${MK_ICONV} == "yes"
INCS+= iconv.h
.endif
-
+
+.if ${MK_USB} != "no"
+LSUBDIRS+= dev/usb
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+_dev_powermac_nvram= dev/powermac_nvram
+.endif
# Define SHARED to indicate whether you want symbolic links to the system
# source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278202 - in head: include share/examples share/man/man4 share/man/man9 share/misc tools/build/mk
Author: ngie
Date: Wed Feb 4 11:43:19 2015
New Revision: 278202
URL: https://svnweb.freebsd.org/changeset/base/278202
Log:
Clean up more usb related files when MK_USB == no when dealing with
manpages, libraries, and binaries
MFC after: 1 week
X-MFC with: r278135
Sponsored by: EMC / Isilon Storage Division
Modified:
head/include/Makefile
head/share/examples/Makefile
head/share/man/man4/Makefile
head/share/man/man9/Makefile
head/share/misc/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
head/ (props changed)
head/include/ (props changed)
head/share/ (props changed)
head/share/man/man4/ (props changed)
Modified: head/include/Makefile
==
--- head/include/Makefile Wed Feb 4 11:25:34 2015(r278201)
+++ head/include/Makefile Wed Feb 4 11:43:19 2015(r278202)
@@ -44,7 +44,7 @@ LSUBDIRS= cam/ata cam/scsi \
dev/hwpmc \
dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/nvme \
dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \
- dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
+ dev/speaker dev/utopia dev/vkbd dev/wi \
fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \
fs/procfs fs/smbfs fs/udf fs/unionfs \
geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
@@ -56,6 +56,10 @@ LSUBDIRS=cam/ata cam/scsi \
security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
+.if ${MK_USB} != "no"
+LSUBDIRS+= dev/usb
+.endif
+
LSUBSUBDIRS= dev/mpt/mpilib
.if ${MK_CUSE} != "no"
Modified: head/share/examples/Makefile
==
--- head/share/examples/MakefileWed Feb 4 11:25:34 2015
(r278201)
+++ head/share/examples/MakefileWed Feb 4 11:43:19 2015
(r278202)
@@ -18,7 +18,6 @@ LDIRS=BSD_daemon \
ipfw \
jails \
kld \
- libusb20 \
libvgl \
mdoc \
netgraph \
@@ -92,12 +91,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \
kld/syscall/module/syscall.c \
kld/syscall/test/Makefile \
kld/syscall/test/call.c \
- libusb20/Makefile \
- libusb20/README \
- libusb20/util.c \
- libusb20/util.h \
- libusb20/bulk.c \
- libusb20/control.c \
libvgl/Makefile \
libvgl/demo.c \
mdoc/POSIX-copyright \
@@ -203,6 +196,16 @@ XFILES+= hast/ucarp.sh \
hast/vip-up.sh
.endif
+.if ${MK_USB} != "no"
+LDIRS+=libusb20
+XFILES+= libusb20/Makefile \
+ libusb20/README \
+ libusb20/util.c \
+ libusb20/util.h \
+ libusb20/bulk.c \
+ libusb20/control.c
+.endif
+
.if ${MACHINE_CPUARCH} == "amd64"
.if ${MK_BHYVE} != "no"
LDIRS+=bhyve
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileWed Feb 4 11:25:34 2015
(r278201)
+++ head/share/man/man4/MakefileWed Feb 4 11:43:19 2015
(r278202)
@@ -503,56 +503,6 @@ MAN= aac.4 \
tws.4 \
tx.4 \
txp.4 \
- u3g.4 \
- uark.4 \
- uart.4 \
- uath.4 \
- ubsa.4 \
- ubsec.4 \
- ubser.4 \
- ubtbcmfw.4 \
- uchcom.4 \
- ucom.4 \
- ucycom.4 \
- udav.4 \
- udbp.4 \
- udp.4 \
- udplite.4 \
- uep.4 \
- ufm.4 \
- ufoma.4 \
- uftdi.4 \
- ugen.4 \
- uhci.4 \
- uhid.4 \
- uhso.4 \
- uipaq.4 \
- ukbd.4 \
- uled.4 \
- ulpt.4 \
- umass.4 \
- umcs.4 \
- umct.4 \
- umodem.4 \
- umoscom.4 \
- ums.4 \
- unix.4 \
- upgt.4 \
- uplcom.4 \
- ural.4 \
- urio.4 \
- urndis.4 \
- ${_urtw.4} \
- urtwn.4 \
- urtwnfw.4 \
- usb.4 \
- usb_template.4 \
- usb_quirk.4 \
- uslcom.4 \
- usfs.4 \
- utopia.4 \
- uvisor.4 \
- uvscom.4 \
vale.4 \
vga.4 \
vge.4 \
@@ -735,13 +685,6 @@ MLINKS+=tl.4 if_tl.4
MLINKS+=tun.4 if_tun.4
MLINKS+=tx.4 if_tx.4
MLINKS+=txp.4 if_txp.4
-MLINKS+=u3g.4 u3gstub.4
-MLINKS+=uath.4 if_uath.4
-MLINKS+=udav.4 if_udav.4
-MLINKS+=upgt.4 if_upgt.4
-MLINKS+=ural.4 if_ural.4
-MLINKS+=urndis.4 if_urndis.4
-MLINKS+=${_urtw.4} ${_if_urtw.4}
MLINKS+=vge.4 if_vge.4
MLINKS+=vlan.4 if_vlan.4
MLINKS+=vxlan.4 if_vxlan.4
@@ -883,4 +826,66 @@ _pflog.4= pflog.4
_pfsync.4= pfsync.4
.endif
+.if ${MK_USB} != "no"
+MAN+= \
+ u3g.4 \
+ uark.4 \
+ uart.4 \
+ uath.4 \
+ ubsa.4 \
+ ubsec.4 \
+ ubser.4 \
+ ubtbcmfw.4 \
+ uchcom.4 \
+ ucom.4 \
+ ucycom.4 \
svn commit: r278195 - in stable/9: etc/rc.d tools/build/mk
Author: ngie
Date: Wed Feb 4 10:36:10 2015
New Revision: 278195
URL: https://svnweb.freebsd.org/changeset/base/278195
Log:
MFC r277686,r277687:
r277686:
Install bsnmp rc.d script if MK_BSNMP != no
Sponsored by: EMC / Isilon Storage Division
r277687:
Fill in entries for MK_BSNMP == no
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/etc/rc.d/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/etc/rc.d/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/rc.d/Makefile
==
--- stable/9/etc/rc.d/Makefile Wed Feb 4 10:29:53 2015(r278194)
+++ stable/9/etc/rc.d/Makefile Wed Feb 4 10:36:10 2015(r278195)
@@ -24,7 +24,6 @@ FILES=DAEMON \
${_bluetooth} \
bootparams \
bridge \
- bsnmpd \
${_bthidd} \
ccd \
cleanvar \
@@ -157,6 +156,10 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_BSNMP} != "no"
+FILES+=bsnmpd
+.endif
+
.if ${MK_IPX} != "no"
_ipxrouted=ipxrouted
.endif
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 10:29:53
2015(r278194)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 10:36:10
2015(r278195)
@@ -466,6 +466,99 @@ OLD_FILES+=usr/share/man/man8/sdpd.8.gz
# to be filled in
#.endif
+.if ${MK_BSNMP} == no
+OLD_FILES+=etc/snmpd.config
+OLD_FILES+=etc/rc.d/bsnmpd
+OLD_FILES+=usr/bin/bsnmpget
+OLD_FILES+=usr/bin/bsnmpset
+OLD_FILES+=usr/bin/bsnmpwalk
+OLD_FILES+=usr/include/bsnmp/asn1.h
+OLD_FILES+=usr/include/bsnmp/bridge_snmp.h
+OLD_FILES+=usr/include/bsnmp/snmp.h
+OLD_FILES+=usr/include/bsnmp/snmp_atm.h
+OLD_FILES+=usr/include/bsnmp/snmp_mibII.h
+OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h
+OLD_FILES+=usr/include/bsnmp/snmpagent.h
+OLD_FILES+=usr/include/bsnmp/snmpclient.h
+OLD_FILES+=usr/include/bsnmp/snmpmod.h
+OLD_FILES+=usr/lib/libbsnmp.a
+OLD_LIBS+=usr/lib/libbsnmp.so.6
+OLD_FILES+=usr/lib/libbsnmp_p.a
+OLD_FILES+=usr/lib/libbsnmptools.a
+OLD_LIBS+=usr/lib/libbsnmptools.so.0
+OLD_FILES+=usr/lib/libbsnmptools_p.a
+OLD_LIBS+=usr/lib/snmp_atm.so.6
+OLD_LIBS+=usr/lib/snmp_bridge.so.6
+OLD_LIBS+=usr/lib/snmp_hast.so.6
+OLD_LIBS+=usr/lib/snmp_hostres.so.6
+OLD_LIBS+=usr/lib/snmp_lm75.so.6
+OLD_LIBS+=usr/lib/snmp_mibII.so.6
+OLD_LIBS+=usr/lib/snmp_netgraph.so.6
+OLD_LIBS+=usr/lib/snmp_pf.so.6
+OLD_LIBS+=usr/lib/snmp_target.so.6
+OLD_LIBS+=usr/lib/snmp_usm.so.6
+OLD_LIBS+=usr/lib/snmp_vacm.so.6
+OLD_LIBS+=usr/lib/snmp_wlan.so.6
+OLD_FILES+=usr/sbin/bsnmpd
+OLD_FILES+=usr/sbin/gensnmptree
+OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz
+OLD_FILES+=usr/share/man/man1/bsnmpget.1.gz
+OLD_FILES+=usr/share/man/man1/bsnmpset.1.gz
+OLD_FILES+=usr/share/man/man1/bsnmpwalk.1.gz
+OLD_FILES+=usr/share/man/man1/gensnmptree.1.gz
+OLD_FILES+=usr/share/man/man3/asn1.3.gz
+OLD_FILES+=usr/share/man/man3/bsnmpagent.3.gz
+OLD_FILES+=usr/share/man/man3/bsnmpclient.3.gz
+OLD_FILES+=usr/share/man/man3/bsnmplib.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_lm75.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_mibII.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_target.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_usm.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_vacm.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
+OLD_FILES+=usr/share/man/man3/snmpmod.3.gz
+OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
+OLD_FILES+=usr/share/snmp/defs/atm_tree.def
+OLD_FILES+=usr/share/snmp/defs/bridge_tree.def
+OLD_FILES+=usr/share/snmp/defs/hast_tree.def
+OLD_FILES+=usr/share/snmp/defs/hostres_tree.def
+OLD_FILES+=usr/share/snmp/defs/lm75_tree.def
+OLD_FILES+=usr/share/snmp/defs/mibII_tree.def
+OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def
+OLD_FILES+=usr/share/snmp/defs/pf_tree.def
+OLD_FILES+=usr/share/snmp/defs/target_tree.def
+OLD_FILES+=usr/share/snmp/defs/tree.def
+OLD_FILES+=usr/share/snmp/defs/usm_tree.def
+OLD_FILES+=usr/share/snmp/defs/vacm_tree.def
+OLD_FILES+=usr/share/snmp/defs/wlan_tree.def
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-BRIDGE-MIB.txt
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HOSTRES-MIB.txt
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-IP-MIB.txt
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-LM75-MIB.txt
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB.txt
+OLD
svn commit: r278194 - head/share/man/man5
Author: ngie Date: Wed Feb 4 10:29:53 2015 New Revision: 278194 URL: https://svnweb.freebsd.org/changeset/base/278194 Log: Regen src.conf(5) Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Wed Feb 4 10:24:40 2015 (r278193) +++ head/share/man/man5/src.conf.5 Wed Feb 4 10:29:53 2015 (r278194) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd January 25, 2015 +.Dd February 4, 2015 .Dt SRC.CONF 5 .Os .Sh NAME @@ -154,6 +154,14 @@ Set to not build Bluetooth related kerne .It Va WITHOUT_BOOT .\" from FreeBSD: head/tools/build/options/WITHOUT_BOOT 156932 2006-03-21 07:50:50Z ru Set to not build the boot blocks and loader. +.It Va WITHOUT_BOOTPARAMD +.\" from FreeBSD: head/tools/build/options/WITHOUT_BOOTPARAMD 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr bootparamd 8 . +.It Va WITHOUT_BOOTPD +.\" from FreeBSD: head/tools/build/options/WITHOUT_BOOTPD 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr bootpd 8 . .It Va WITHOUT_BSDINSTALL .\" from FreeBSD: head/tools/build/options/WITHOUT_BSDINSTALL 277677 2015-01-25 04:43:13Z ngie Set to not build @@ -430,6 +438,17 @@ Set to avoid installing examples to .\" from FreeBSD: head/tools/build/options/WITHOUT_FDT 221539 2011-05-06 19:10:27Z ru Set to not build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. +.It Va WITHOUT_FILE +.\" from FreeBSD: head/tools/build/options/WITHOUT_FILE 278193 2015-02-04 10:24:40Z ngie +Set to not build +.Xr file 1 +and related programs. +.It Va WITHOUT_FINGER +.\" from FreeBSD: head/tools/build/options/WITHOUT_FINGER 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr finger 1 +and +.Xr fingerd 8 . .It Va WITHOUT_FLOPPY .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru Set to not build or install programs @@ -461,6 +480,12 @@ without floating-point support. .\" from FreeBSD: head/tools/build/options/WITHOUT_FREEBSD_UPDATE 183242 2008-09-21 22:02:26Z sam Set to not build .Xr freebsd-update 8 . +.It Va WITHOUT_FTP +.\" from FreeBSD: head/tools/build/options/WITHOUT_FTP 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr ftp 1 +and +.Xr ftpd 8 . .It Va WITHOUT_GAMES .\" from FreeBSD: head/tools/build/options/WITHOUT_GAMES 156932 2006-03-21 07:50:50Z ru Set to not build games. @@ -602,6 +627,10 @@ When set, it also enforces the following .It Va WITHOUT_INET6_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_INET6_SUPPORT 156932 2006-03-21 07:50:50Z ru Set to build libraries, programs, and kernel modules without IPv6 support. +.It Va WITHOUT_INETD +.\" from FreeBSD: head/tools/build/options/WITHOUT_INETD 278192 2015-02-04 10:19:32Z ngie +Set to not build +.Xr inetd 8 . .It Va WITHOUT_INET_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_INET_SUPPORT 221266 2011-04-30 17:58:28Z bz Set to build libraries, programs, and kernel modules without IPv4 support. @@ -977,6 +1006,16 @@ Set to avoid compiling profiled librarie Set to not build .Xr quota 8 and related programs. +.It Va WITHOUT_RADIUS_SUPPORT +.\" from FreeBSD: head/tools/build/options/WITHOUT_RADIUS_SUPPORT 278182 2015-02-04 06:53:45Z ngie +Set to not build radius support into various applications, like +.Xr pam_radius 8 +and +.Xr ppp 8 . +.It Va WITHOUT_RBOOTD +.\" from FreeBSD: head/tools/build/options/WITHOUT_RBOOTD 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr rbootd 8 . .It Va WITHOUT_RCMDS .\" from FreeBSD: head/tools/build/options/WITHOUT_RCMDS 156932 2006-03-21 07:50:50Z ru Disable building of the @@ -1080,6 +1119,11 @@ Set to not build or install .Xr talk 1 and .Xr talkd 8 . +.It Va WITHOUT_TCP_WRAPPERS +.\" from FreeBSD: head/tools/build/options/WITHOUT_TCP_WRAPPERS 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr tcpd 8 , +and related utilities. .It Va WITHOUT_TCSH .\" from FreeBSD: head/tools/build/options/WITHOUT_TCSH 156932 2006-03-21 07:50:50Z ru Set to not build and install @@ -1120,6 +1164,16 @@ When set, it also enforces the following .It .Va WITHOUT_GROFF .El +.It Va WITHOUT_TFTP +.\" from FreeBSD: head/tools/build/options/WITHOUT_TFTP 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr tftp 1 +and +.Xr tftpd 8 . +.It Va WITHOUT_TIMED +.\" from FreeBSD: head/tools/build/options/WITHOUT_TIMED 278192 2015-02-04 10:19:32Z ngie +Set to not build or install +.Xr timed 8 . .It Va WITHOUT_TOOLCHAIN .\" from FreeBSD: head/tools/build/options/WITHOUT_TOOLCHAIN 273172 2014-10-16 15:55:13Z brooks Set to not install header or
svn commit: r278193 - in head: lib share/mk tools/build/options usr.bin
Author: ngie
Date: Wed Feb 4 10:24:40 2015
New Revision: 278193
URL: https://svnweb.freebsd.org/changeset/base/278193
Log:
Add MK_FILE to control whether or not to build file(1), libmagic(3), etc
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Added:
head/tools/build/options/WITHOUT_FILE (contents, props changed)
Modified:
head/lib/Makefile
head/share/mk/src.opts.mk
head/usr.bin/Makefile
Modified: head/lib/Makefile
==
--- head/lib/Makefile Wed Feb 4 10:19:32 2015(r278192)
+++ head/lib/Makefile Wed Feb 4 10:24:40 2015(r278193)
@@ -63,7 +63,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
libkvm \
${_libldns} \
liblzma \
- libmagic \
+ ${_libmagic} \
libmandoc \
libmemstat \
libmd \
@@ -195,6 +195,10 @@ _cuse= libcuse
_libelftc= libelftc
.endif
+.if ${MK_FILE} != "no"
+_libmagic= libmagic
+.endif
+
.if ${MK_GPIO} != "no"
_libgpio= libgpio
.endif
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Wed Feb 4 10:19:32 2015(r278192)
+++ head/share/mk/src.opts.mk Wed Feb 4 10:24:40 2015(r278193)
@@ -83,6 +83,7 @@ __DEFAULT_YES_OPTIONS = \
ELFTOOLCHAIN_TOOLS \
EXAMPLES \
FDT \
+FILE \
FINGER \
FLOPPY \
FMTREE \
Added: head/tools/build/options/WITHOUT_FILE
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_FILE Wed Feb 4 10:24:40 2015
(r278193)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr file 1
+and related programs.
Modified: head/usr.bin/Makefile
==
--- head/usr.bin/Makefile Wed Feb 4 10:19:32 2015(r278192)
+++ head/usr.bin/Makefile Wed Feb 4 10:24:40 2015(r278193)
@@ -48,7 +48,6 @@ SUBDIR= ${_addr2line} \
expand \
false \
fetch \
- file \
find \
fmt \
fold \
@@ -246,6 +245,10 @@ _size= size
_strings= strings
.endif
+.if ${MK_FILE} != "no"
+SUBDIR+= file
+.endif
+
.if ${MK_FINGER} != "no"
SUBDIR+= finger
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278192 - in head: etc libexec share/mk tools/build/options usr.bin usr.sbin
Author: ngie
Date: Wed Feb 4 10:19:32 2015
New Revision: 278192
URL: https://svnweb.freebsd.org/changeset/base/278192
Log:
Add the following options to enable/disable several features in the base
system
WITHOUT_BOOTPARAMD - bootparamd
WITHOUT_BOOTPD - bootpd
WITHOUT_FINGER - finger, fingerd
WITHOUT_FTP - ftp, ftpd
WITHOUT_INETD - inetd
WITHOUT_RBOOTD - rbootd
WITHOUT_TCP_WRAPPERS - tcpd, et al
WITHOUT_TFTP - tftp, tftp-server
WITHOUT_TIMED - timed
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Added:
head/tools/build/options/WITHOUT_BOOTPARAMD (contents, props changed)
head/tools/build/options/WITHOUT_BOOTPD (contents, props changed)
head/tools/build/options/WITHOUT_FINGER (contents, props changed)
head/tools/build/options/WITHOUT_FTP (contents, props changed)
head/tools/build/options/WITHOUT_INETD (contents, props changed)
head/tools/build/options/WITHOUT_RBOOTD (contents, props changed)
head/tools/build/options/WITHOUT_TCP_WRAPPERS (contents, props changed)
head/tools/build/options/WITHOUT_TFTP (contents, props changed)
head/tools/build/options/WITHOUT_TIMED (contents, props changed)
Modified:
head/etc/Makefile
head/libexec/Makefile
head/share/mk/src.opts.mk
head/usr.bin/Makefile
head/usr.sbin/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Wed Feb 4 09:33:42 2015(r278191)
+++ head/etc/Makefile Wed Feb 4 10:19:32 2015(r278192)
@@ -21,13 +21,11 @@ BIN1= crontab \
dhclient.conf \
disktab \
fbtab \
- ftpusers \
gettytab \
group \
hosts \
hosts.allow \
hosts.equiv \
- inetd.conf \
libalias.conf \
libmap.conf \
login.access \
@@ -101,6 +99,14 @@ BIN1+= snmpd.config
BIN1+= freebsd-update.conf
.endif
+.if ${MK_FTP} != "no"
+BIN1+= ftpusers
+.endif
+
+.if ${MK_INETD} != "no"
+BIN1+= inetd.conf
+.endif
+
.if ${MK_LOCATE} != "no"
BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc
.endif
Modified: head/libexec/Makefile
==
--- head/libexec/Makefile Wed Feb 4 09:33:42 2015(r278191)
+++ head/libexec/Makefile Wed Feb 4 10:19:32 2015(r278192)
@@ -5,18 +5,14 @@
SUBDIR=${_atf} \
${_atrun} \
- bootpd \
${_casper} \
${_comsat} \
${_dma} \
${_dma-mbox-create} \
- fingerd \
- ftpd \
getty \
${_mail.local} \
${_mknetid} \
${_pppoed} \
- rbootd \
revnetgroup \
${_rlogind} \
rpc.rquotad \
@@ -28,10 +24,8 @@ SUBDIR= ${_atf} \
${_rtld-elf} \
save-entropy \
${_smrsh} \
- tcpd \
${_telnetd} \
${_tests} \
- tftpd \
${_tftp-proxy} \
ulog-helper \
${_ypxfr}
@@ -40,10 +34,22 @@ SUBDIR= ${_atf} \
_atrun=atrun
.endif
+.if ${MK_BOOTPD} != "no"
+SUBDIR+= bootpd
+.endif
+
.if ${MK_CASPER} != "no"
_casper= casper
.endif
+.if ${MK_FINGER} != "no"
+SUBDIR+= fingerd
+.endif
+
+.if ${MK_FTP} != "no"
+SUBDIR+= ftpd
+.endif
+
.if ${MK_MAIL} != "no"
_comsat= comsat
.endif
@@ -70,6 +76,10 @@ _tftp-proxy= tftp-proxy
_rtld-elf= rtld-elf
.endif
+.if ${MK_RBOOTD} != "no"
+SUBDIR+= rbootd
+.endif
+
.if ${MK_RCMDS} != "no"
_rlogind= rlogind
_rshd= rshd
@@ -84,10 +94,18 @@ _smrsh= smrsh
SUBDIR+= talkd
.endif
+.if ${MK_TCP_WRAPPERS} != "no"
+SUBDIR+= tcpd
+.endif
+
.if ${MK_TELNET} != "no"
_telnetd= telnetd
.endif
+.if ${MK_TFTP} != "no"
+SUBDIR+= tftpd
+.endif
+
.if ${MK_TESTS} != "no"
_atf= atf
_tests=tests
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Wed Feb 4 09:33:42 2015(r278191)
+++ head/share/mk/src.opts.mk Wed Feb 4 10:19:32 2015(r278192)
@@ -58,6 +58,8 @@ __DEFAULT_YES_OPTIONS = \
BINUTILS_BOOTSTRAP \
BLUETOOTH \
BOOT \
+BOOTPARAMD \
+BOOTPD \
BSD_CPIO \
BSDINSTALL \
BSNMP \
@@ -81,11 +83,13 @@ __DEFAULT_YES_OPTIONS = \
ELFTOOLCHAIN_TOOLS \
EXAMPLES \
FDT \
+FINGER \
FLOPPY \
FMTREE \
FORTH \
FP_LIBC \
FREEBSD_UPDATE \
+FTP \
GAMES \
GCOV \
GDB \
@@ -100,6 +104,7 @@ __DEFAULT_YES_OPTIONS = \
ICONV \
INET \
INET6 \
+INETD \
IPFILTER \
IPFW \
ISCSI \
@@ -137,6 +142,7 @@ __DEFAULT_YES_OPTIONS = \
QUOTAS \
RADIUS_SUPPORT \
RCMDS \
+RBOOTD \
RCS \
RESCUE \
ROUTED \
@@ -151,10 +157,13 @@ __DEFAULT_YES_OPTIONS = \
SYSCONS \
SYSINSTALL \
TALK \
+TCP_WRAPPERS \
svn commit: r278191 - in stable/10: etc/rc.d tools/build/mk
Author: ngie
Date: Wed Feb 4 09:33:42 2015
New Revision: 278191
URL: https://svnweb.freebsd.org/changeset/base/278191
Log:
MFC r277733:
r277733:
Honor MK_AMD with etc/rc.d/amd
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/etc/rc.d/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/Makefile
==
--- stable/10/etc/rc.d/Makefile Wed Feb 4 09:31:10 2015(r278190)
+++ stable/10/etc/rc.d/Makefile Wed Feb 4 09:33:42 2015(r278191)
@@ -11,7 +11,6 @@ FILES=DAEMON \
accounting \
addswap \
adjkerntz \
- amd \
archdep \
atm1 \
atm2 \
@@ -164,6 +163,10 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_AMD} != "no"
+FILES+=amd
+.endif
+
.if ${MK_APM} != "no"
FILES+=apm
FILES+=apmd
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:31:10
2015(r278190)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:33:42
2015(r278191)
@@ -26,6 +26,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz
.if ${MK_AMD} == no
OLD_FILES+=etc/amd.map
+OLD_FILES+=etc/rc.d/amd
OLD_FILES+=usr/bin/pawd
OLD_FILES+=usr/sbin/amd
OLD_FILES+=usr/sbin/amq
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278190 - in stable/10: etc/rc.d tools/build/mk
Author: ngie
Date: Wed Feb 4 09:31:10 2015
New Revision: 278190
URL: https://svnweb.freebsd.org/changeset/base/278190
Log:
MFC r277732:
r277732:
Honor MK_API in etc/rc.d
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/etc/rc.d/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/Makefile
==
--- stable/10/etc/rc.d/Makefile Wed Feb 4 09:23:40 2015(r278189)
+++ stable/10/etc/rc.d/Makefile Wed Feb 4 09:31:10 2015(r278190)
@@ -12,8 +12,6 @@ FILES=DAEMON \
addswap \
adjkerntz \
amd \
- apm \
- apmd \
archdep \
atm1 \
atm2 \
@@ -166,6 +164,11 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_APM} != "no"
+FILES+=apm
+FILES+=apmd
+.endif
+
.if ${MK_BLUETOOTH} != "no"
_bluetooth=bluetooth
_bthidd= bthidd
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:23:40
2015(r278189)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:31:10
2015(r278190)
@@ -48,6 +48,8 @@ OLD_FILES+=usr/share/man/man8/wire-test.
.endif
.if ${MK_APM} == no
+OLD_FILES+=etc/rc.d/apm
+OLD_FILES+=etc/rc.d/apmd
OLD_FILES+=etc/apmd.conf
OLD_FILES+=usr/sbin/apm
OLD_FILES+=usr/share/examples/etc/apmd.conf
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278189 - in stable/9: etc/rc.d tools/build/mk
Author: ngie
Date: Wed Feb 4 09:23:40 2015
New Revision: 278189
URL: https://svnweb.freebsd.org/changeset/base/278189
Log:
MFC r277739:
r277739:
Honor MK_JAIL with etc/rc.d/jail
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/etc/rc.d/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/etc/rc.d/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/rc.d/Makefile
==
--- stable/9/etc/rc.d/Makefile Wed Feb 4 09:21:07 2015(r278188)
+++ stable/9/etc/rc.d/Makefile Wed Feb 4 09:23:40 2015(r278189)
@@ -63,7 +63,6 @@ FILES=DAEMON \
ipnat \
ipsec \
${_ipxrouted} \
- jail \
kadmind \
kerberos \
keyserv \
@@ -162,6 +161,10 @@ FILES= DAEMON \
_ipxrouted=ipxrouted
.endif
+.if ${MK_JAIL} != "no"
+FILES+=jail
+.endif
+
.if ${MK_OFED} != "no"
_opensm= opensm
.endif
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:21:07
2015(r278188)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:23:40
2015(r278189)
@@ -2236,6 +2236,7 @@ OLD_FILES+=usr/share/man/man8/IPXrouted.
.endif
.if ${MK_JAIL} == no
+OLD_FILES+=etc/rc.d/jail
OLD_FILES+=usr/sbin/jail
OLD_FILES+=usr/sbin/jexec
OLD_FILES+=usr/sbin/jls
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278188 - in stable/10: etc/rc.d tools/build/mk
Author: ngie
Date: Wed Feb 4 09:21:07 2015
New Revision: 278188
URL: https://svnweb.freebsd.org/changeset/base/278188
Log:
MFC r277731,r277734:
r277731:
Honor MK_LPR with etc/rc.d/lpd
Sponsored by: EMC / Isilon Storage Division
r277734:
Remove explicit inclusion of lpd from FILES
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/etc/rc.d/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/Makefile
==
--- stable/10/etc/rc.d/Makefile Wed Feb 4 09:16:14 2015(r278187)
+++ stable/10/etc/rc.d/Makefile Wed Feb 4 09:21:07 2015(r278188)
@@ -80,7 +80,6 @@ FILES=DAEMON \
local \
localpkg \
lockd \
- lpd \
mixer \
motd \
mountcritlocal \
@@ -193,6 +192,10 @@ _kfd= kfd
_kpasswdd= kpasswdd
.endif
+.if ${MK_LPR} != "no"
+FILES+=lpd
+.endif
+
.if ${MK_NS_CACHING} != "no"
_nscd= nscd
.endif
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:16:14
2015(r278187)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:21:07
2015(r278188)
@@ -3317,6 +3317,7 @@ OLD_FILES+=usr/share/man/man8/updatedb.8
.if ${MK_LPR} == no
OLD_FILES+=etc/hosts.lpd
OLD_FILES+=etc/printcap
+OLD_FILES+=etc/rc.d/lpd
OLD_FILES+=usr/bin/lp
OLD_FILES+=usr/bin/lpq
OLD_FILES+=usr/bin/lpr
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278186 - in stable/10: etc/defaults tools/build/mk
Author: ngie
Date: Wed Feb 4 09:14:07 2015
New Revision: 278186
URL: https://svnweb.freebsd.org/changeset/base/278186
Log:
MFC r277738:
r277738:
Honor MK_BLUETOOTH with etc/defaults/bluetooth.device.conf
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/etc/defaults/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/defaults/Makefile
==
--- stable/10/etc/defaults/Makefile Wed Feb 4 09:10:46 2015
(r278185)
+++ stable/10/etc/defaults/Makefile Wed Feb 4 09:14:07 2015
(r278186)
@@ -1,7 +1,13 @@
# $FreeBSD$
-FILES= bluetooth.device.conf devfs.rules periodic.conf rc.conf
+.include
+
+FILES= devfs.rules periodic.conf rc.conf
NO_OBJ=
FILESDIR= /etc/defaults
+.if ${MK_BLUETOOTH} != "no"
+FILES+=bluetooth.device.conf
+.endif
+
.include
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:10:46
2015(r278185)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:14:07
2015(r278186)
@@ -143,6 +143,8 @@ OLD_FILES+=usr/share/man/man8/authpf-noi
OLD_FILES+=etc/bluetooth/hcsecd.conf
OLD_FILES+=etc/bluetooth/hosts
OLD_FILES+=etc/bluetooth/protocols
+OLD_DIRS+=etc/bluetooth
+OLD_FILES+=etc/defaults/bluetooth.device.conf
OLD_FILES+=usr/bin/bthost
OLD_FILES+=usr/bin/btsockstat
OLD_FILES+=usr/bin/rfcomm_sppd
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278185 - in stable/10: etc/rc.d tools/build/mk
Author: ngie
Date: Wed Feb 4 09:10:46 2015
New Revision: 278185
URL: https://svnweb.freebsd.org/changeset/base/278185
Log:
MFC r277739:
r277739:
Honor MK_JAIL with etc/rc.d/jail
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/etc/rc.d/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/Makefile
==
--- stable/10/etc/rc.d/Makefile Wed Feb 4 08:33:04 2015(r278184)
+++ stable/10/etc/rc.d/Makefile Wed Feb 4 09:10:46 2015(r278185)
@@ -69,7 +69,6 @@ FILES=DAEMON \
${_ipxrouted} \
iscsictl \
iscsid \
- jail \
${_kadmind} \
${_kdc} \
keyserv \
@@ -183,6 +182,10 @@ FILES+=bsnmpd
_ipxrouted=ipxrouted
.endif
+.if ${MK_JAIL} != "no"
+FILES+=jail
+.endif
+
.if ${MK_KERBEROS} != "no"
_kadmind= kadmind
_kdc= kdc
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 08:33:04
2015(r278184)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 09:10:46
2015(r278185)
@@ -2143,6 +2143,7 @@ OLD_FILES+=usr/share/man/man8/IPXrouted.
.endif
.if ${MK_JAIL} == no
+OLD_FILES+=etc/rc.d/jail
OLD_FILES+=usr/sbin/jail
OLD_FILES+=usr/sbin/jexec
OLD_FILES+=usr/sbin/jls
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278184 - in head/sys/x86: include x86
Author: bryanv
Date: Wed Feb 4 08:33:04 2015
New Revision: 278184
URL: https://svnweb.freebsd.org/changeset/base/278184
Log:
Add interface to derive a TSC frequency from the pvclock
This can later use this to determine the TSC frequency like is done with
VMware, instead of using a DELAY loop that is not always accurate in an VM.
MFC after:1 month
Modified:
head/sys/x86/include/pvclock.h
head/sys/x86/x86/pvclock.c
Modified: head/sys/x86/include/pvclock.h
==
--- head/sys/x86/include/pvclock.h Wed Feb 4 08:26:43 2015
(r278183)
+++ head/sys/x86/include/pvclock.h Wed Feb 4 08:33:04 2015
(r278184)
@@ -51,6 +51,7 @@ struct pvclock_wall_clock {
void pvclock_resume(void);
uint64_t pvclock_get_last_cycles(void);
+uint64_t pvclock_tsc_freq(struct pvclock_vcpu_time_info *ti);
uint64_t pvclock_get_timecount(struct pvclock_vcpu_time_info *ti);
void pvclock_get_wallclock(struct pvclock_wall_clock *wc,
struct timespec *ts);
Modified: head/sys/x86/x86/pvclock.c
==
--- head/sys/x86/x86/pvclock.c Wed Feb 4 08:26:43 2015(r278183)
+++ head/sys/x86/x86/pvclock.c Wed Feb 4 08:33:04 2015(r278184)
@@ -58,6 +58,21 @@ pvclock_get_last_cycles(void)
return (atomic_load_acq_64(&pvclock_last_cycles));
}
+uint64_t
+pvclock_tsc_freq(struct pvclock_vcpu_time_info *ti)
+{
+ uint64_t freq;
+
+ freq = (10ULL << 32) / ti->tsc_to_system_mul;
+
+ if (ti->tsc_shift < 0)
+ freq <<= -ti->tsc_shift;
+ else
+ freq >>= ti->tsc_shift;
+
+ return (freq);
+}
+
/*
* Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction,
* yielding a 64-bit result.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r278183 - in head/sys: amd64/include conf dev/xen/timer i386/include i386/xen x86/include x86/x86
Author: bryanv
Date: Wed Feb 4 08:26:43 2015
New Revision: 278183
URL: https://svnweb.freebsd.org/changeset/base/278183
Log:
Generalized parts of the XEN timer code into a generic pvclock
KVM clock shares the same data structures between the guest and the host
as Xen so it makes sense to just have a single copy of this code.
Differential Revision: https://reviews.freebsd.org/D1429
Reviewed by: royger (eariler version)
MFC after:1 month
Added:
head/sys/amd64/include/pvclock.h (contents, props changed)
head/sys/i386/include/pvclock.h (contents, props changed)
head/sys/x86/include/pvclock.h (contents, props changed)
head/sys/x86/x86/pvclock.c (contents, props changed)
Modified:
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/dev/xen/timer/timer.c
head/sys/i386/xen/clock.c
Added: head/sys/amd64/include/pvclock.h
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/amd64/include/pvclock.hWed Feb 4 08:26:43 2015
(r278183)
@@ -0,0 +1,6 @@
+/*-
+ * This file is in the public domain.
+ */
+/* $FreeBSD$ */
+
+#include
Modified: head/sys/conf/files.amd64
==
--- head/sys/conf/files.amd64 Wed Feb 4 06:53:45 2015(r278182)
+++ head/sys/conf/files.amd64 Wed Feb 4 08:26:43 2015(r278183)
@@ -569,6 +569,7 @@ x86/x86/mptable.c optionalmptable
x86/x86/mptable_pci.c optionalmptable pci
x86/x86/msi.c optionalpci
x86/x86/nexus.cstandard
+x86/x86/pvclock.c standard
x86/x86/tsc.c standard
x86/x86/delay.cstandard
x86/xen/hvm.c optionalxenhvm
Modified: head/sys/conf/files.i386
==
--- head/sys/conf/files.i386Wed Feb 4 06:53:45 2015(r278182)
+++ head/sys/conf/files.i386Wed Feb 4 08:26:43 2015(r278183)
@@ -588,6 +588,7 @@ x86/x86/mptable_pci.c optional apic nat
x86/x86/msi.c optional apic pci
x86/x86/nexus.cstandard
x86/x86/tsc.c standard
+x86/x86/pvclock.c standard
x86/x86/delay.cstandard
x86/xen/hvm.c optional xenhvm
x86/xen/xen_intr.c optional xen | xenhvm
Modified: head/sys/dev/xen/timer/timer.c
==
--- head/sys/dev/xen/timer/timer.c Wed Feb 4 06:53:45 2015
(r278182)
+++ head/sys/dev/xen/timer/timer.c Wed Feb 4 08:26:43 2015
(r278183)
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
@@ -95,9 +96,6 @@ struct xentimer_softc {
struct eventtimer et;
};
-/* Last time; this guarantees a monotonically increasing clock. */
-volatile uint64_t xen_timer_last_time = 0;
-
static void
xentimer_identify(driver_t *driver, device_t parent)
{
@@ -148,128 +146,20 @@ xentimer_probe(device_t dev)
return (BUS_PROBE_NOWILDCARD);
}
-/*
- * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction,
- * yielding a 64-bit result.
- */
-static inline uint64_t
-scale_delta(uint64_t delta, uint32_t mul_frac, int shift)
-{
- uint64_t product;
-
- if (shift < 0)
- delta >>= -shift;
- else
- delta <<= shift;
-
-#if defined(__i386__)
- {
- uint32_t tmp1, tmp2;
-
- /**
-* For i386, the formula looks like:
-*
-* lower = (mul_frac * (delta & UINT_MAX)) >> 32
-* upper = mul_frac * (delta >> 32)
-* product = lower + upper
-*/
- __asm__ (
- "mul %5 ; "
- "mov %4,%%eax ; "
- "mov %%edx,%4 ; "
- "mul %5 ; "
- "xor %5,%5; "
- "add %4,%%eax ; "
- "adc %5,%%edx ; "
- : "=A" (product), "=r" (tmp1), "=r" (tmp2)
- : "a" ((uint32_t)delta), "1" ((uint32_t)(delta >> 32)),
- "2" (mul_frac) );
- }
-#elif defined(__amd64__)
- {
- unsigned long tmp;
-
- __asm__ (
- "mulq %[mul_frac] ; shrd $32, %[hi], %[lo]"
- : [lo]"=a" (product), [hi]"=d" (tmp)
- : "0" (delta), [mul_frac]"rm"((uint64_t)mul_frac));
- }
-#else
-#error "xentimer: unsupported architecture"
-#endif
-
- return (product);
-}
-
-static uint64_t
-get_nsec_offset(struct vcpu_time_info *tinfo)
-{
-
-
