From patchwork Wed May 10 08:53:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 760502 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wN9FD08Wfz9s2Q for ; Wed, 10 May 2017 19:00:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753128AbdEJJAh (ORCPT ); Wed, 10 May 2017 05:00:37 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:63528 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752562AbdEJIxu (ORCPT ); Wed, 10 May 2017 04:53:50 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.47.221]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LdVp4-1dpisp3174-00iipu; Wed, 10 May 2017 10:53:33 +0200 From: Stefan Wahren To: Rob Herring , "David S. Miller" Cc: Mark Rutland , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, Stefan Wahren Subject: [PATCH v5 10/17] net: qualcomm: prepare frame decoding for UART driver Date: Wed, 10 May 2017 10:53:21 +0200 Message-Id: <1494406408-31760-11-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1494406408-31760-1-git-send-email-stefan.wahren@i2se.com> References: <1494406408-31760-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:x43sSon//+Y6P0VovdBrVn7nUKkFPq/PUBpFJVVkZzhA3COpBqi Qx6UDQAUFq7YF/Jf6qxRuYoIOZfCqxn+HyKfNxOZDlMPHrBIKf6Bs5JXmEKfcMKKKAu/I1A D+GhGoL5XdR7y6ZVxao7iVfe1EuYFGuw86sBestOKdTrH/u5N/BMKovh/9R6N0ZeIexMWbc ALXSL5DrdzZFL5Rp/rs+g== X-UI-Out-Filterresults: notjunk:1; V01:K0:gBF9LQ+gG7I=:GbVuqGp7v/VotIgxTr+KiV 5H2ZDajvZsTLpkc5if65ua1fu6QbLHsyISNKgmxi0NX+HKIOmxyspnIxVJR5PLlx4xr6neSUr OJeLJmJR1say/iAYTxyjMFLfIaVgofaKUkuE+oA9lUHV1Cejo79OrK2XonGulEFamrPqRMFX4 iFisOxYvY30x++7bRHRlp7xP8TDgbYBhq8Lm3YUZnkJWUGgIiPyi988YbmEzpXOhz9uPTUTyd OXuGvsJHP8t5+DHSLIAnXGB1U2kxamZypFyAycgO2g35Sz1fP+ZVO8hnG8Npd1fYsyHVT+Z9i n9MCC2hZm6sdTVsQkItUwcZc2KlJQoLrsuVIHZbHgtK5z+eVX85mpdhP38qOU2y+veGBeWu/X G+YsqOd1UC5eY1t5BcAmQbqZDq1rt9E59vCE8lO2eKzu9hXFsM2XJyUWmQVY1A0v6jj0cZY3i ezuPE9ElAsKa18IJx73e2mSOx1X5cREnN8TELceAwqKPKe9AVyRkd1kHYZvWG7fAUxWZrr5t8 hKAPj16y/9FWGMDNk4QWh+cxaV4gf9gbrPmx9ueQCssoNX90Y2ZmhgjLutx62SqYr3wA1xoZ0 OBXbpR5W7zH0BTUS+5v5vOHmW33hBY1f/t0YELOqYtkLnGNFR/d/bfrtqEBqW5h6LQEr9Ty5m rzTtVdVN+R3NLyrUzHODyoxMChINuUISgJiR53tlK4VUHYRSI4+nTfIuFCIDedXKtaCg= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Unfortunately the frame format is not exactly identical between SPI and UART. In case of SPI there is an additional HW length at the beginning. So store the initial state to make the decoding state machine more flexible and easy to extend for UART support. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_7k_common.c | 12 ++++++------ drivers/net/ethernet/qualcomm/qca_7k_common.h | 8 ++++++-- drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/qca_7k_common.c b/drivers/net/ethernet/qualcomm/qca_7k_common.c index 6d17fbd..0d3daa9 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k_common.c +++ b/drivers/net/ethernet/qualcomm/qca_7k_common.c @@ -83,7 +83,7 @@ qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_by if (recv_byte != 0x00) { /* first two bytes of length must be 0 */ - handle->state = QCAFRM_HW_LEN0; + handle->state = handle->init; } break; case QCAFRM_HW_LEN2: @@ -97,7 +97,7 @@ qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_by case QCAFRM_WAIT_AA4: if (recv_byte != 0xAA) { ret = QCAFRM_NOHEAD; - handle->state = QCAFRM_HW_LEN0; + handle->state = handle->init; } else { handle->state--; } @@ -119,7 +119,7 @@ qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_by len = handle->offset; if (len > buf_len || len < QCAFRM_MIN_LEN) { ret = QCAFRM_INVLEN; - handle->state = QCAFRM_HW_LEN0; + handle->state = handle->init; } else { handle->state = (enum qcafrm_state)(len + 1); /* Remaining number of bytes. */ @@ -135,7 +135,7 @@ qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_by case QCAFRM_WAIT_551: if (recv_byte != 0x55) { ret = QCAFRM_NOTAIL; - handle->state = QCAFRM_HW_LEN0; + handle->state = handle->init; } else { handle->state = QCAFRM_WAIT_552; } @@ -143,11 +143,11 @@ qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_by case QCAFRM_WAIT_552: if (recv_byte != 0x55) { ret = QCAFRM_NOTAIL; - handle->state = QCAFRM_HW_LEN0; + handle->state = handle->init; } else { ret = handle->offset; /* Frame is fully received. */ - handle->state = QCAFRM_HW_LEN0; + handle->state = handle->init; } break; } diff --git a/drivers/net/ethernet/qualcomm/qca_7k_common.h b/drivers/net/ethernet/qualcomm/qca_7k_common.h index 5df7c65..07bdd6c 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k_common.h +++ b/drivers/net/ethernet/qualcomm/qca_7k_common.h @@ -61,6 +61,7 @@ #define QCAFRM_ERR_BASE -1000 enum qcafrm_state { + /* HW length is only available on SPI */ QCAFRM_HW_LEN0 = 0x8000, QCAFRM_HW_LEN1 = QCAFRM_HW_LEN0 - 1, QCAFRM_HW_LEN2 = QCAFRM_HW_LEN1 - 1, @@ -101,6 +102,8 @@ enum qcafrm_state { struct qcafrm_handle { /* Current decoding state */ enum qcafrm_state state; + /* Initial state depends on connection type */ + enum qcafrm_state init; /* Offset in buffer (borrowed for length too) */ u16 offset; @@ -113,9 +116,10 @@ u16 qcafrm_create_header(u8 *buf, u16 len); u16 qcafrm_create_footer(u8 *buf); -static inline void qcafrm_fsm_init(struct qcafrm_handle *handle) +static inline void qcafrm_fsm_init_spi(struct qcafrm_handle *handle) { - handle->state = QCAFRM_HW_LEN0; + handle->init = QCAFRM_HW_LEN0; + handle->state = handle->init; } /* Gather received bytes and try to extract a full Ethernet frame diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 2bc3ba4..b7073a9 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -637,7 +637,7 @@ qcaspi_netdev_open(struct net_device *dev) qca->intr_req = 1; qca->intr_svc = 0; qca->sync = QCASPI_SYNC_UNKNOWN; - qcafrm_fsm_init(&qca->frm_handle); + qcafrm_fsm_init_spi(&qca->frm_handle); qca->spi_thread = kthread_run((void *)qcaspi_spi_thread, qca, "%s", dev->name);