---

yaml
---
r: 76799
b: refs/heads/master
c: 9ab4295
h: refs/heads/master
i:
  76797: 72c1143
  76795: 7918623
  76791: 876bc6b
  76783: 1d04729
  76767: c192a5f
  76735: e2597d1
  76671: fa98c8f
  76543: b89e3e9
  76287: 9c66f64
  75775: 83ddbd3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 457fe7b8a6822907cbe65897dc81b83d9df5bcbf
+refs/heads/master: 9ab4295d1d9ab10a249aea002060685f935a528c

trunk/drivers/infiniband/hw/ipath/ipath_intr.c

@@ -920,29 +920,6 @@ static noinline void ipath_bad_regread(struct ipath_devdata *dd)
 	}
 }
 
-static void handle_port_pioavail(struct ipath_devdata *dd)
-{
-	u32 i;
-	/*
-	 * start from port 1, since for now port 0  is never using
-	 * wait_event for PIO
-	 */
-	for (i = 1; dd->ipath_portpiowait && i < dd->ipath_cfgports; i++) {
-		struct ipath_portdata *pd = dd->ipath_pd[i];
-
-		if (pd && pd->port_cnt &&
-		    dd->ipath_portpiowait & (1U << i)) {
-			clear_bit(i, &dd->ipath_portpiowait);
-			if (test_bit(IPATH_PORT_WAITING_PIO,
-				     &pd->port_flag)) {
-				clear_bit(IPATH_PORT_WAITING_PIO,
-					  &pd->port_flag);
-				wake_up_interruptible(&pd->port_wait);
-			}
-		}
-	}
-}
-
 static void handle_layer_pioavail(struct ipath_devdata *dd)
 {
 	int ret;
@@ -1195,9 +1172,6 @@ irqreturn_t ipath_intr(int irq, void *data)
 		ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl,
 				 dd->ipath_sendctrl);
 
-		if (dd->ipath_portpiowait)
-			handle_port_pioavail(dd);
-
 		handle_layer_pioavail(dd);
 	}
 

trunk/drivers/infiniband/hw/ipath/ipath_kernel.h

@@ -457,8 +457,6 @@ struct ipath_devdata {
 	unsigned long ipath_rcvctrl;
 	/* shadow kr_sendctrl */
 	unsigned long ipath_sendctrl;
-	/* ports waiting for PIOavail intr */
-	unsigned long ipath_portpiowait;
 	unsigned long ipath_lastcancel; /* to not count armlaunch after cancel */
 
 	/* value we put in kr_rcvhdrcnt */
@@ -759,8 +757,6 @@ int ipath_set_rx_pol_inv(struct ipath_devdata *dd, u8 new_pol_inv);
 /* portdata flag bit offsets */
 		/* waiting for a packet to arrive */
 #define IPATH_PORT_WAITING_RCV   2
-		/* waiting for a PIO buffer to be available */
-#define IPATH_PORT_WAITING_PIO   3
 		/* master has not finished initializing */
 #define IPATH_PORT_MASTER_UNINIT 4
 		/* waiting for an urgent packet to arrive */