Commit 834695ee authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents 57fa442c c54772e7

drivers/net/myri10ge/myri10ge.c

+11 −13
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ struct myri10ge_priv { 
	struct work_struct watchdog_work;

	struct timer_list watchdog_timer;

	int watchdog_tx_done;

	int watchdog_tx_req;

	int watchdog_resets;

	int tx_linearized;

	int pause;
@@ -448,6 +449,7 @@ static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size) 
	struct mcp_gen_header *hdr;

	size_t hdr_offset;

	int status;

	unsigned i;



	if ((status = request_firmware(&fw, mgp->fw_name, dev)) < 0) {

		dev_err(dev, "Unable to load %s firmware image via hotplug\n",
@@ -479,18 +481,12 @@ static int myri10ge_load_hotplug_firmware(struct myri10ge_priv *mgp, u32 * size) 
		goto abort_with_fw;



	crc = crc32(~0, fw->data, fw->size);

	if (mgp->tx.boundary == 2048) {

		/* Avoid PCI burst on chipset with unaligned completions. */

		int i;

		__iomem u32 *ptr = (__iomem u32 *) (mgp->sram +

						    MYRI10GE_FW_OFFSET);

		for (i = 0; i < fw->size / 4; i++) {

			__raw_writel(((u32 *) fw->data)[i], ptr + i);

			wmb();

		}

	} else {

		myri10ge_pio_copy(mgp->sram + MYRI10GE_FW_OFFSET, fw->data,

				  fw->size);

	for (i = 0; i < fw->size; i += 256) {

		myri10ge_pio_copy(mgp->sram + MYRI10GE_FW_OFFSET + i,

				  fw->data + i,

				  min(256U, (unsigned)(fw->size - i)));

		mb();

		readb(mgp->sram);

	}

	/* corruption checking is good for parity recovery and buggy chipset */

	memcpy_fromio(fw->data, mgp->sram + MYRI10GE_FW_OFFSET, fw->size);
@@ -2547,7 +2543,8 @@ static void myri10ge_watchdog_timer(unsigned long arg) 


	mgp = (struct myri10ge_priv *)arg;

	if (mgp->tx.req != mgp->tx.done &&

	    mgp->tx.done == mgp->watchdog_tx_done)

	    mgp->tx.done == mgp->watchdog_tx_done &&

	    mgp->watchdog_tx_req != mgp->watchdog_tx_done)

		/* nic seems like it might be stuck.. */

		schedule_work(&mgp->watchdog_work);

	else
@@ -2556,6 +2553,7 @@ static void myri10ge_watchdog_timer(unsigned long arg) 
			  jiffies + myri10ge_watchdog_timeout * HZ);



	mgp->watchdog_tx_done = mgp->tx.done;

	mgp->watchdog_tx_req = mgp->tx.req;

}



static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

drivers/net/phy/phy.c

+2 −6
Original line number Diff line number Diff line
@@ -419,9 +419,8 @@ void phy_start_machine(struct phy_device *phydev, 


/* phy_stop_machine

 *

 * description: Stops the state machine timer, sets the state to

 *   UP (unless it wasn't up yet), and then frees the interrupt,

 *   if it is in use. This function must be called BEFORE

 * description: Stops the state machine timer, sets the state to UP

 *   (unless it wasn't up yet). This function must be called BEFORE

 *   phy_detach.

 */

void phy_stop_machine(struct phy_device *phydev)
@@ -433,9 +432,6 @@ void phy_stop_machine(struct phy_device *phydev) 
		phydev->state = PHY_UP;

	spin_unlock(&phydev->lock);



	if (phydev->irq != PHY_POLL)

		phy_stop_interrupts(phydev);



	phydev->adjust_state = NULL;

}