* [PATCH net v1 0/2] amd-xgbe: AMD XGBE driver fixes 2017-01-20
@ 2017-01-20 18:13 Tom Lendacky
2017-01-20 18:14 ` [PATCH net v1 1/2] amd-xgbe: Add a hardware quirk for register definitions Tom Lendacky
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Tom Lendacky @ 2017-01-20 18:13 UTC (permalink / raw)
To: netdev; +Cc: David Miller
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.
---
Tom Lendacky (2):
amd-xgbe: Add a hardware quirk for register definitions
amd-xgbe: Check xgbe_init() return code
drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 ++
drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 8 +++++---
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +++-
drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 15 ++++++++++++++-
drivers/net/ethernet/amd/xgbe/xgbe.h | 2 ++
5 files changed, 26 insertions(+), 5 deletions(-)
--
Tom Lendacky
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net v1 1/2] amd-xgbe: Add a hardware quirk for register definitions
2017-01-20 18:13 [PATCH net v1 0/2] amd-xgbe: AMD XGBE driver fixes 2017-01-20 Tom Lendacky
@ 2017-01-20 18:14 ` Tom Lendacky
2017-01-20 18:14 ` [PATCH net v1 2/2] amd-xgbe: Check xgbe_init() return code Tom Lendacky
2017-01-22 21:54 ` [PATCH net v1 0/2] amd-xgbe: AMD XGBE driver fixes 2017-01-20 David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Tom Lendacky @ 2017-01-20 18:14 UTC (permalink / raw)
To: netdev; +Cc: David Miller
A newer version of the hardware is using the same PCI ids for the network
device but has altered register definitions for determining the window
settings for the indirect PCS access. Add support to check for this
hardware and if found use the new register values.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 ++
drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 4 ++--
drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 15 ++++++++++++++-
drivers/net/ethernet/amd/xgbe/xgbe.h | 2 ++
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
index 5b7ba25..8a280e7 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
@@ -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
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index aaf0350..c8e8a4a 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -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);
}
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
index e76b7f6..c2730f1 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
@@ -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);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
index f52a9bd..0010881 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
@@ -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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net v1 2/2] amd-xgbe: Check xgbe_init() return code
2017-01-20 18:13 [PATCH net v1 0/2] amd-xgbe: AMD XGBE driver fixes 2017-01-20 Tom Lendacky
2017-01-20 18:14 ` [PATCH net v1 1/2] amd-xgbe: Add a hardware quirk for register definitions Tom Lendacky
@ 2017-01-20 18:14 ` Tom Lendacky
2017-01-22 21:54 ` [PATCH net v1 0/2] amd-xgbe: AMD XGBE driver fixes 2017-01-20 David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Tom Lendacky @ 2017-01-20 18:14 UTC (permalink / raw)
To: netdev; +Cc: David Miller
The xgbe_init() routine returns a return code indicating success or
failure, but the return code is not checked. Add code to xgbe_init()
to issue a message when failures are seen and add code to check the
xgbe_init() return code.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 4 +++-
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index c8e8a4a..a7d16db 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -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
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 9943629..1c87cc2 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net v1 0/2] amd-xgbe: AMD XGBE driver fixes 2017-01-20
2017-01-20 18:13 [PATCH net v1 0/2] amd-xgbe: AMD XGBE driver fixes 2017-01-20 Tom Lendacky
2017-01-20 18:14 ` [PATCH net v1 1/2] amd-xgbe: Add a hardware quirk for register definitions Tom Lendacky
2017-01-20 18:14 ` [PATCH net v1 2/2] amd-xgbe: Check xgbe_init() return code Tom Lendacky
@ 2017-01-22 21:54 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2017-01-22 21:54 UTC (permalink / raw)
To: thomas.lendacky; +Cc: netdev
From: Tom Lendacky <thomas.lendacky@amd.com>
Date: Fri, 20 Jan 2017 12:13:52 -0600
> 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.
Series applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-22 21:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-20 18:13 [PATCH net v1 0/2] amd-xgbe: AMD XGBE driver fixes 2017-01-20 Tom Lendacky
2017-01-20 18:14 ` [PATCH net v1 1/2] amd-xgbe: Add a hardware quirk for register definitions Tom Lendacky
2017-01-20 18:14 ` [PATCH net v1 2/2] amd-xgbe: Check xgbe_init() return code Tom Lendacky
2017-01-22 21:54 ` [PATCH net v1 0/2] amd-xgbe: AMD XGBE driver fixes 2017-01-20 David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).