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

Commit a5b9b5a2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'amd-xgbe-fixes' 



Tom Lendacky says:

====================
amd-xgbe: AMD XGBE driver fixes 2017-01-20

This patch series addresses some issues in the AMD XGBE driver.

The following fixes are included in this driver update series:

- Add a fix for a version of the hardware that uses different register
  offset values for a device with the same PCI device ID
- Add support to check the return code from the xgbe_init() function

This patch series is based on net.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b6677449 738f7f64

drivers/net/ethernet/amd/xgbe/xgbe-common.h

+2 −0
Original line number Diff line number Diff line
@@ -891,6 +891,8 @@ 
#define PCS_V1_WINDOW_SELECT		0x03fc

#define PCS_V2_WINDOW_DEF		0x9060

#define PCS_V2_WINDOW_SELECT		0x9064

#define PCS_V2_RV_WINDOW_DEF		0x1060

#define PCS_V2_RV_WINDOW_SELECT		0x1064



/* PCS register entry bit positions and sizes */

#define PCS_V2_WINDOW_DEF_OFFSET_INDEX	6

drivers/net/ethernet/amd/xgbe/xgbe-dev.c

+5 −3
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad, 
	offset = pdata->xpcs_window + (mmd_address & pdata->xpcs_window_mask);



	spin_lock_irqsave(&pdata->xpcs_lock, flags);

	XPCS32_IOWRITE(pdata, PCS_V2_WINDOW_SELECT, index);

	XPCS32_IOWRITE(pdata, pdata->xpcs_window_sel_reg, index);

	mmd_data = XPCS16_IOREAD(pdata, offset);

	spin_unlock_irqrestore(&pdata->xpcs_lock, flags);
@@ -1183,7 +1183,7 @@ static void xgbe_write_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad, 
	offset = pdata->xpcs_window + (mmd_address & pdata->xpcs_window_mask);



	spin_lock_irqsave(&pdata->xpcs_lock, flags);

	XPCS32_IOWRITE(pdata, PCS_V2_WINDOW_SELECT, index);

	XPCS32_IOWRITE(pdata, pdata->xpcs_window_sel_reg, index);

	XPCS16_IOWRITE(pdata, offset, mmd_data);

	spin_unlock_irqrestore(&pdata->xpcs_lock, flags);

}
@@ -3407,8 +3407,10 @@ static int xgbe_init(struct xgbe_prv_data *pdata) 


	/* Flush Tx queues */

	ret = xgbe_flush_tx_queues(pdata);

	if (ret)

	if (ret) {

		netdev_err(pdata->netdev, "error flushing TX queues\n");

		return ret;

	}



	/*

	 * Initialize DMA related features

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+3 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,9 @@ static int xgbe_start(struct xgbe_prv_data *pdata) 


	DBGPR("-->xgbe_start\n");



	hw_if->init(pdata);

	ret = hw_if->init(pdata);

	if (ret)

		return ret;



	xgbe_napi_enable(pdata, 1);

drivers/net/ethernet/amd/xgbe/xgbe-pci.c

+14 −1
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	struct xgbe_prv_data *pdata;

	struct device *dev = &pdev->dev;

	void __iomem * const *iomap_table;

	struct pci_dev *rdev;

	unsigned int ma_lo, ma_hi;

	unsigned int reg;

	int bar_mask;
@@ -326,8 +327,20 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (netif_msg_probe(pdata))

		dev_dbg(dev, "xpcs_regs  = %p\n", pdata->xpcs_regs);



	/* Set the PCS indirect addressing definition registers */

	rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));

	if (rdev &&

	    (rdev->vendor == PCI_VENDOR_ID_AMD) && (rdev->device == 0x15d0)) {

		pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;

		pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;

	} else {

		pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;

		pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;

	}

	pci_dev_put(rdev);



	/* Configure the PCS indirect addressing support */

	reg = XPCS32_IOREAD(pdata, PCS_V2_WINDOW_DEF);

	reg = XPCS32_IOREAD(pdata, pdata->xpcs_window_def_reg);

	pdata->xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, OFFSET);

	pdata->xpcs_window <<= 6;

	pdata->xpcs_window_size = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, SIZE);

drivers/net/ethernet/amd/xgbe/xgbe.h

+2 −0
Original line number Diff line number Diff line
@@ -955,6 +955,8 @@ struct xgbe_prv_data { 


	/* XPCS indirect addressing lock */

	spinlock_t xpcs_lock;

	unsigned int xpcs_window_def_reg;

	unsigned int xpcs_window_sel_reg;

	unsigned int xpcs_window;

	unsigned int xpcs_window_size;

	unsigned int xpcs_window_mask;