Commit ced3fcae authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller

amd-xgbe: Mask auto-negotiation interrupts in ISR

Currently the auto-negotiation interrupt handling disables the irq
instead of masking off the interrupts. This was done because the phy
library was originally used to read and write the PCS registers, which
could not be performed in interrupt context. Now that the phy library is
no longer used to read and write the PCS registers the interrupts can be
masked off in the interrupt service routine eliminating the need to call
disable_irq/enable_irq. This also requires changing the protection mutex
to a spinlock.
Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3727d61
...@@ -1022,6 +1022,7 @@ static int xgbe_config_rx_mode(struct xgbe_prv_data *pdata) ...@@ -1022,6 +1022,7 @@ static int xgbe_config_rx_mode(struct xgbe_prv_data *pdata)
static int xgbe_read_mmd_regs(struct xgbe_prv_data *pdata, int prtad, static int xgbe_read_mmd_regs(struct xgbe_prv_data *pdata, int prtad,
int mmd_reg) int mmd_reg)
{ {
unsigned long flags;
unsigned int mmd_address; unsigned int mmd_address;
int mmd_data; int mmd_data;
...@@ -1039,10 +1040,10 @@ static int xgbe_read_mmd_regs(struct xgbe_prv_data *pdata, int prtad, ...@@ -1039,10 +1040,10 @@ static int xgbe_read_mmd_regs(struct xgbe_prv_data *pdata, int prtad,
* register offsets must therefore be adjusted by left shifting the * register offsets must therefore be adjusted by left shifting the
* offset 2 bits and reading 32 bits of data. * offset 2 bits and reading 32 bits of data.
*/ */
mutex_lock(&pdata->xpcs_mutex); spin_lock_irqsave(&pdata->xpcs_lock, flags);
XPCS_IOWRITE(pdata, PCS_MMD_SELECT << 2, mmd_address >> 8); XPCS_IOWRITE(pdata, PCS_MMD_SELECT << 2, mmd_address >> 8);
mmd_data = XPCS_IOREAD(pdata, (mmd_address & 0xff) << 2); mmd_data = XPCS_IOREAD(pdata, (mmd_address & 0xff) << 2);
mutex_unlock(&pdata->xpcs_mutex); spin_unlock_irqrestore(&pdata->xpcs_lock, flags);
return mmd_data; return mmd_data;
} }
...@@ -1051,6 +1052,7 @@ static void xgbe_write_mmd_regs(struct xgbe_prv_data *pdata, int prtad, ...@@ -1051,6 +1052,7 @@ static void xgbe_write_mmd_regs(struct xgbe_prv_data *pdata, int prtad,
int mmd_reg, int mmd_data) int mmd_reg, int mmd_data)
{ {
unsigned int mmd_address; unsigned int mmd_address;
unsigned long flags;
if (mmd_reg & MII_ADDR_C45) if (mmd_reg & MII_ADDR_C45)
mmd_address = mmd_reg & ~MII_ADDR_C45; mmd_address = mmd_reg & ~MII_ADDR_C45;
...@@ -1066,10 +1068,10 @@ static void xgbe_write_mmd_regs(struct xgbe_prv_data *pdata, int prtad, ...@@ -1066,10 +1068,10 @@ static void xgbe_write_mmd_regs(struct xgbe_prv_data *pdata, int prtad,
* register offsets must therefore be adjusted by left shifting the * register offsets must therefore be adjusted by left shifting the
* offset 2 bits and reading 32 bits of data. * offset 2 bits and reading 32 bits of data.
*/ */
mutex_lock(&pdata->xpcs_mutex); spin_lock_irqsave(&pdata->xpcs_lock, flags);
XPCS_IOWRITE(pdata, PCS_MMD_SELECT << 2, mmd_address >> 8); XPCS_IOWRITE(pdata, PCS_MMD_SELECT << 2, mmd_address >> 8);
XPCS_IOWRITE(pdata, (mmd_address & 0xff) << 2, mmd_data); XPCS_IOWRITE(pdata, (mmd_address & 0xff) << 2, mmd_data);
mutex_unlock(&pdata->xpcs_mutex); spin_unlock_irqrestore(&pdata->xpcs_lock, flags);
} }
static int xgbe_tx_complete(struct xgbe_ring_desc *rdesc) static int xgbe_tx_complete(struct xgbe_ring_desc *rdesc)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* License 1: GPLv2 * License 1: GPLv2
* *
* Copyright (c) 2014 Advanced Micro Devices, Inc. * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.
* *
* This file is free software; you may copy, redistribute and/or modify * This file is free software; you may copy, redistribute and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
* *
* License 2: Modified BSD * License 2: Modified BSD
* *
* Copyright (c) 2014 Advanced Micro Devices, Inc. * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -363,7 +363,7 @@ static int xgbe_probe(struct platform_device *pdev) ...@@ -363,7 +363,7 @@ static int xgbe_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, netdev); platform_set_drvdata(pdev, netdev);
spin_lock_init(&pdata->lock); spin_lock_init(&pdata->lock);
mutex_init(&pdata->xpcs_mutex); spin_lock_init(&pdata->xpcs_lock);
mutex_init(&pdata->rss_mutex); mutex_init(&pdata->rss_mutex);
spin_lock_init(&pdata->tstamp_lock); spin_lock_init(&pdata->tstamp_lock);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* License 1: GPLv2 * License 1: GPLv2
* *
* Copyright (c) 2014 Advanced Micro Devices, Inc. * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.
* *
* This file is free software; you may copy, redistribute and/or modify * This file is free software; you may copy, redistribute and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
* *
* License 2: Modified BSD * License 2: Modified BSD
* *
* Copyright (c) 2014 Advanced Micro Devices, Inc. * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -626,10 +626,22 @@ static irqreturn_t xgbe_an_isr(int irq, void *data) ...@@ -626,10 +626,22 @@ static irqreturn_t xgbe_an_isr(int irq, void *data)
netif_dbg(pdata, intr, pdata->netdev, "AN interrupt received\n"); netif_dbg(pdata, intr, pdata->netdev, "AN interrupt received\n");
/* Interrupt reason must be read and cleared outside of IRQ context */ /* Disable AN interrupts */
disable_irq_nosync(pdata->an_irq); XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INTMASK, 0);
/* Save the interrupt(s) that fired */
pdata->an_int = XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_AN_INT);
queue_work(pdata->an_workqueue, &pdata->an_irq_work); if (pdata->an_int) {
/* Clear the interrupt(s) that fired and process them */
XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INT, ~pdata->an_int);
queue_work(pdata->an_workqueue, &pdata->an_irq_work);
} else {
/* Enable AN interrupts */
XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INTMASK,
XGBE_AN_INT_MASK);
}
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -673,34 +685,26 @@ static void xgbe_an_state_machine(struct work_struct *work) ...@@ -673,34 +685,26 @@ static void xgbe_an_state_machine(struct work_struct *work)
struct xgbe_prv_data, struct xgbe_prv_data,
an_work); an_work);
enum xgbe_an cur_state = pdata->an_state; enum xgbe_an cur_state = pdata->an_state;
unsigned int int_reg, int_mask;
mutex_lock(&pdata->an_mutex); mutex_lock(&pdata->an_mutex);
/* Read the interrupt */ if (!pdata->an_int)
int_reg = XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_AN_INT);
if (!int_reg)
goto out; goto out;
next_int: next_int:
if (int_reg & XGBE_AN_PG_RCV) { if (pdata->an_int & XGBE_AN_PG_RCV) {
pdata->an_state = XGBE_AN_PAGE_RECEIVED; pdata->an_state = XGBE_AN_PAGE_RECEIVED;
int_mask = XGBE_AN_PG_RCV; pdata->an_int &= ~XGBE_AN_PG_RCV;
} else if (int_reg & XGBE_AN_INC_LINK) { } else if (pdata->an_int & XGBE_AN_INC_LINK) {
pdata->an_state = XGBE_AN_INCOMPAT_LINK; pdata->an_state = XGBE_AN_INCOMPAT_LINK;
int_mask = XGBE_AN_INC_LINK; pdata->an_int &= ~XGBE_AN_INC_LINK;
} else if (int_reg & XGBE_AN_INT_CMPLT) { } else if (pdata->an_int & XGBE_AN_INT_CMPLT) {
pdata->an_state = XGBE_AN_COMPLETE; pdata->an_state = XGBE_AN_COMPLETE;
int_mask = XGBE_AN_INT_CMPLT; pdata->an_int &= ~XGBE_AN_INT_CMPLT;
} else { } else {
pdata->an_state = XGBE_AN_ERROR; pdata->an_state = XGBE_AN_ERROR;
int_mask = 0;
} }
/* Clear the interrupt to be processed */
int_reg &= ~int_mask;
XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INT, int_reg);
pdata->an_result = pdata->an_state; pdata->an_result = pdata->an_state;
again: again:
...@@ -740,14 +744,14 @@ static void xgbe_an_state_machine(struct work_struct *work) ...@@ -740,14 +744,14 @@ static void xgbe_an_state_machine(struct work_struct *work)
} }
if (pdata->an_state == XGBE_AN_NO_LINK) { if (pdata->an_state == XGBE_AN_NO_LINK) {
int_reg = 0; pdata->an_int = 0;
XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INT, 0); XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INT, 0);
} else if (pdata->an_state == XGBE_AN_ERROR) { } else if (pdata->an_state == XGBE_AN_ERROR) {
netdev_err(pdata->netdev, netdev_err(pdata->netdev,
"error during auto-negotiation, state=%u\n", "error during auto-negotiation, state=%u\n",
cur_state); cur_state);
int_reg = 0; pdata->an_int = 0;
XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INT, 0); XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INT, 0);
} }
...@@ -765,11 +769,12 @@ static void xgbe_an_state_machine(struct work_struct *work) ...@@ -765,11 +769,12 @@ static void xgbe_an_state_machine(struct work_struct *work)
if (cur_state != pdata->an_state) if (cur_state != pdata->an_state)
goto again; goto again;
if (int_reg) if (pdata->an_int)
goto next_int; goto next_int;
out: out:
enable_irq(pdata->an_irq); /* Enable AN interrupts on the way out */
XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_AN_INTMASK, XGBE_AN_INT_MASK);
mutex_unlock(&pdata->an_mutex); mutex_unlock(&pdata->an_mutex);
} }
......
...@@ -774,8 +774,8 @@ struct xgbe_prv_data { ...@@ -774,8 +774,8 @@ struct xgbe_prv_data {
/* Overall device lock */ /* Overall device lock */
spinlock_t lock; spinlock_t lock;
/* XPCS indirect addressing mutex */ /* XPCS indirect addressing lock */
struct mutex xpcs_mutex; spinlock_t xpcs_lock;
/* RSS addressing mutex */ /* RSS addressing mutex */
struct mutex rss_mutex; struct mutex rss_mutex;
...@@ -927,6 +927,7 @@ struct xgbe_prv_data { ...@@ -927,6 +927,7 @@ struct xgbe_prv_data {
u32 serdes_dfe_tap_ena[XGBE_SPEEDS]; u32 serdes_dfe_tap_ena[XGBE_SPEEDS];
/* Auto-negotiation state machine support */ /* Auto-negotiation state machine support */
unsigned int an_int;
struct mutex an_mutex; struct mutex an_mutex;
enum xgbe_an an_result; enum xgbe_an an_result;
enum xgbe_an an_state; enum xgbe_an an_state;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment