aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qualcomm
diff options
context:
space:
mode:
authorStefan Wahren <stefan.wahren@i2se.com>2021-05-08 14:36:34 +0200
committerDavid S. Miller <davem@davemloft.net>2021-05-10 14:29:18 -0700
commit6e03f3ff29c1b479cd10cab0d1c4530bafad601c (patch)
treebd2bd35ef9b44baa98f7d59f90721866ec712cfd /drivers/net/ethernet/qualcomm
parentnet: qca_spi: Avoid reading signature three times in a row (diff)
downloadlinux-dev-6e03f3ff29c1b479cd10cab0d1c4530bafad601c.tar.xz
linux-dev-6e03f3ff29c1b479cd10cab0d1c4530bafad601c.zip
net: qca_spi: Avoid re-sync for single signature error
Setting a new network key would cause a reset of the QCA7000. Usually the driver only notice the SPI interrupt and a single signature error. So avoid the whole re-sync process (possible packet loss, transmit queue stop and no carrier for at least 1 second) in this case. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qualcomm')
-rw-r--r--drivers/net/ethernet/qualcomm/qca_spi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c
index 3e2a54c2fc83..0937ceb08296 100644
--- a/drivers/net/ethernet/qualcomm/qca_spi.c
+++ b/drivers/net/ethernet/qualcomm/qca_spi.c
@@ -524,8 +524,11 @@ qcaspi_qca7k_sync(struct qcaspi *qca, int event)
switch (qca->sync) {
case QCASPI_SYNC_READY:
- /* Read signature, if not valid go to unknown state. */
+ /* Check signature twice, if not valid go to unknown state. */
qcaspi_read_register(qca, SPI_REG_SIGNATURE, &signature);
+ if (signature != QCASPI_GOOD_SIGNATURE)
+ qcaspi_read_register(qca, SPI_REG_SIGNATURE, &signature);
+
if (signature != QCASPI_GOOD_SIGNATURE) {
qca->sync = QCASPI_SYNC_UNKNOWN;
netdev_dbg(qca->net_dev, "sync: bad signature, restart\n");