Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Nov 2012 22:01:29 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r242933 - in head/sys: conf modules/mthca ofed/drivers/infiniband/core ofed/drivers/infiniband/ulp/sdp ofed/include/linux
Message-ID:  <201211122201.qACM1T1u015459@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Mon Nov 12 22:01:29 2012
New Revision: 242933
URL: http://svnweb.freebsd.org/changeset/base/242933

Log:
  Redo r242842, now actually fixing the warnings, as follows:
  - In sys/ofed/drivers/infiniband/core/cma.c, an enum struct member is
    interpreted as an int, so cast it to an int.
  - In sys/ofed/drivers/infiniband/core/ud_header.c, initialize the
    packet_length variable in ib_ud_header_init(), to prevent undefined
    behaviour.
  - In sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c, call rdma_notify()
    with the correct enum type and value.
  - In sys/ofed/include/linux/pci.h, change the PCI_DEVICE and PCI_VDEVICE
    macros to use C99 struct initializers, so additional members can be
    overridden.
  
  Reviewed by:	delphij, Garrett Cooper <yanegomi@gmail.com>
  MFC after:	1 week

Modified:
  head/sys/conf/kern.pre.mk
  head/sys/modules/mthca/Makefile
  head/sys/ofed/drivers/infiniband/core/cma.c
  head/sys/ofed/drivers/infiniband/core/ud_header.c
  head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
  head/sys/ofed/include/linux/pci.h

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Mon Nov 12 20:50:15 2012	(r242932)
+++ head/sys/conf/kern.pre.mk	Mon Nov 12 22:01:29 2012	(r242933)
@@ -156,7 +156,7 @@ NORMAL_LINT=	${LINT} ${LINTFLAGS} ${CFLA
 # Infiniband C flags.  Correct include paths and omit errors that linux
 # does not honor.
 OFEDINCLUDES=	-I$S/ofed/include/
-OFEDNOERR=	-Wno-cast-qual -Wno-pointer-arith -fms-extensions -Wno-switch -Wno-sometimes-uninitialized -Wno-conversion -Wno-initializer-overrides
+OFEDNOERR=	-Wno-cast-qual -Wno-pointer-arith -fms-extensions
 OFEDCFLAGS=	${CFLAGS:N-I*} ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR}
 OFED_C_NOIMP=	${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF}
 OFED_C=		${OFED_C_NOIMP} ${.IMPSRC}

Modified: head/sys/modules/mthca/Makefile
==============================================================================
--- head/sys/modules/mthca/Makefile	Mon Nov 12 20:50:15 2012	(r242932)
+++ head/sys/modules/mthca/Makefile	Mon Nov 12 22:01:29 2012	(r242933)
@@ -28,4 +28,4 @@ opt_inet6.h:
 
 .include <bsd.kmod.mk>
 
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions  -Wno-switch -Wno-sometimes-uninitialized -Wno-conversion -Wno-initializer-overrides
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions

Modified: head/sys/ofed/drivers/infiniband/core/cma.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/cma.c	Mon Nov 12 20:50:15 2012	(r242932)
+++ head/sys/ofed/drivers/infiniband/core/cma.c	Mon Nov 12 22:01:29 2012	(r242933)
@@ -1312,7 +1312,7 @@ static int cma_iw_handler(struct iw_cm_i
 		*sin = iw_event->local_addr;
 		sin = (struct sockaddr_in *) &id_priv->id.route.addr.dst_addr;
 		*sin = iw_event->remote_addr;
-		switch (iw_event->status) {
+		switch ((int)iw_event->status) {
 		case 0:
 			event.event = RDMA_CM_EVENT_ESTABLISHED;
 			break;

Modified: head/sys/ofed/drivers/infiniband/core/ud_header.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/ud_header.c	Mon Nov 12 20:50:15 2012	(r242932)
+++ head/sys/ofed/drivers/infiniband/core/ud_header.c	Mon Nov 12 22:01:29 2012	(r242933)
@@ -230,7 +230,7 @@ void ib_ud_header_init(int     		    pay
 		       int		    immediate_present,
 		       struct ib_ud_header *header)
 {
-	u16 packet_length;
+	u16 packet_length = 0;
 
 	memset(header, 0, sizeof *header);
 

Modified: head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c	Mon Nov 12 20:50:15 2012	(r242932)
+++ head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c	Mon Nov 12 22:01:29 2012	(r242933)
@@ -590,7 +590,7 @@ sdp_rx_comp_work(struct work_struct *wor
 	if (unlikely(!ssk->poll_cq)) {
 		struct rdma_cm_id *id = ssk->id;
 		if (id && id->qp)
-			rdma_notify(id, RDMA_CM_EVENT_ESTABLISHED);
+			rdma_notify(id, IB_EVENT_COMM_EST);
 		goto out;
 	}
 

Modified: head/sys/ofed/include/linux/pci.h
==============================================================================
--- head/sys/ofed/include/linux/pci.h	Mon Nov 12 20:50:15 2012	(r242932)
+++ head/sys/ofed/include/linux/pci.h	Mon Nov 12 22:01:29 2012	(r242933)
@@ -73,10 +73,12 @@ struct pci_device_id {
 #define	PCI_DEVICE_ID_MELLANOX_SINAI		0x6274
 
 
-#define PCI_VDEVICE(vendor, device)					\
-	    PCI_VENDOR_ID_##vendor, (device), PCI_ANY_ID, PCI_ANY_ID, 0, 0
-#define	PCI_DEVICE(vendor, device)					\
-	    (vendor), (device), PCI_ANY_ID, PCI_ANY_ID, 0, 0
+#define PCI_VDEVICE(_vendor, _device)					\
+	    .vendor = PCI_VENDOR_ID_##_vendor, .device = (_device),	\
+	    .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
+#define	PCI_DEVICE(_vendor, _device)					\
+	    .vendor = (_vendor), .device = (_device),			\
+	    .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
 
 #define	to_pci_dev(n)	container_of(n, struct pci_dev, dev)
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211122201.qACM1T1u015459>