Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9804ddb authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[TG3]: misc. fixes 



Fix interrupt test handler by adding check for IRQ assertion in
PCI_STATE register in addition to the status block updated bit.

Add test for valid ethernet address in tg3_set_mac_addr().

Add tg3_bus_string() to setup the PCI bus speed/width string for all
PCI/PCIX/PCI Express devices. This is used to print the bus type
during init_one().

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c94e3941

drivers/net/tg3.c

+46 −7
Original line number Original line Diff line number Diff line
@@ -3389,7 +3389,8 @@ static irqreturn_t tg3_test_isr(int irq, void *dev_id, 
	struct tg3 *tp = netdev_priv(dev);

	struct tg3 *tp = netdev_priv(dev);

	struct tg3_hw_status *sblk = tp->hw_status;

	struct tg3_hw_status *sblk = tp->hw_status;





	if (sblk->status & SD_STATUS_UPDATED) {

	if ((sblk->status & SD_STATUS_UPDATED) ||

	    !(tr32(TG3PCI_PCISTATE) & PCISTATE_INT_NOT_ACTIVE)) {

		tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,

		tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,

			     0x00000001);

			     0x00000001);

		return IRQ_RETVAL(1);

		return IRQ_RETVAL(1);
@@ -5395,6 +5396,9 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p) 
	struct tg3 *tp = netdev_priv(dev);

	struct tg3 *tp = netdev_priv(dev);

	struct sockaddr *addr = p;

	struct sockaddr *addr = p;





	if (!is_valid_ether_addr(addr->sa_data))

		return -EINVAL;



	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);





	spin_lock_bh(&tp->lock);

	spin_lock_bh(&tp->lock);
@@ -10349,6 +10353,44 @@ static char * __devinit tg3_phy_string(struct tg3 *tp) 
	};

	};

}

}





static char * __devinit tg3_bus_string(struct tg3 *tp, char *str)

{

	if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {

		strcpy(str, "PCI Express");

		return str;

	} else if (tp->tg3_flags & TG3_FLAG_PCIX_MODE) {

		u32 clock_ctrl = tr32(TG3PCI_CLOCK_CTRL) & 0x1f;



		strcpy(str, "PCIX:");



		if ((clock_ctrl == 7) ||

		    ((tr32(GRC_MISC_CFG) & GRC_MISC_CFG_BOARD_ID_MASK) ==

		     GRC_MISC_CFG_BOARD_ID_5704CIOBE))

			strcat(str, "133MHz");

		else if (clock_ctrl == 0)

			strcat(str, "33MHz");

		else if (clock_ctrl == 2)

			strcat(str, "50MHz");

		else if (clock_ctrl == 4)

			strcat(str, "66MHz");

		else if (clock_ctrl == 6)

			strcat(str, "100MHz");

		else if (clock_ctrl == 7)

			strcat(str, "133MHz");

	} else {

		strcpy(str, "PCI:");

		if (tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED)

			strcat(str, "66MHz");

		else

			strcat(str, "33MHz");

	}

	if (tp->tg3_flags & TG3_FLAG_PCI_32BIT)

		strcat(str, ":32-bit");

	else

		strcat(str, ":64-bit");

	return str;

}



static struct pci_dev * __devinit tg3_find_5704_peer(struct tg3 *tp)

static struct pci_dev * __devinit tg3_find_5704_peer(struct tg3 *tp)

{

{

	struct pci_dev *peer;

	struct pci_dev *peer;
@@ -10411,6 +10453,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 
	struct net_device *dev;

	struct net_device *dev;

	struct tg3 *tp;

	struct tg3 *tp;

	int i, err, pci_using_dac, pm_cap;

	int i, err, pci_using_dac, pm_cap;

	char str[40];





	if (tg3_version_printed++ == 0)

	if (tg3_version_printed++ == 0)

		printk(KERN_INFO "%s", version);

		printk(KERN_INFO "%s", version);
@@ -10656,16 +10699,12 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 




	pci_set_drvdata(pdev, dev);

	pci_set_drvdata(pdev, dev);





	printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (PCI%s:%s:%s) %sBaseT Ethernet ",

	printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %sBaseT Ethernet ",

	       dev->name,

	       dev->name,

	       tp->board_part_number,

	       tp->board_part_number,

	       tp->pci_chip_rev_id,

	       tp->pci_chip_rev_id,

	       tg3_phy_string(tp),

	       tg3_phy_string(tp),

	       ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "X" : ""),

	       tg3_bus_string(tp, str),

	       ((tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED) ?

		((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "133MHz" : "66MHz") :

		((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "100MHz" : "33MHz")),

	       ((tp->tg3_flags & TG3_FLAG_PCI_32BIT) ? "32-bit" : "64-bit"),

	       (tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100" : "10/100/1000");

	       (tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100" : "10/100/1000");





	for (i = 0; i < 6; i++)

	for (i = 0; i < 6; i++)