From patchwork Mon Sep 26 11:08:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 675093 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 3sjLpg0zBbz9s5g for ; Mon, 26 Sep 2016 21:10:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966746AbcIZLJr (ORCPT ); Mon, 26 Sep 2016 07:09:47 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:63833 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966552AbcIZLIe (ORCPT ); Mon, 26 Sep 2016 07:08:34 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.38.120]) by mrelayeu.kundenserver.de (mreue001) with ESMTPSA (Nemesis) id 0M8WFH-1b2a7J1735-00wED9; Mon, 26 Sep 2016 13:08:22 +0200 From: Stefan Wahren To: "David S. Miller" , Greg Kroah-Hartman , Jiri Slaby Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH RFC v2 net-next 6/8] net: qualcomm: prepare frame decoding for UART driver Date: Mon, 26 Sep 2016 13:08:04 +0200 Message-Id: <1474888086-514-7-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1474888086-514-1-git-send-email-stefan.wahren@i2se.com> References: <1474888086-514-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:XVTvXcXr587V8APjHuC5WZk74kDVri3chhuKisGqaD8k3xlyzRG YuHOfZd3hBOAqItneTN7HuZwyxJqrOhijO9ZNgpLV+dPDpjPRih6+0FALBYV6nkntx7dMOt zNCl5zbD1wBBI0hXkaWolsQlTe6/PfFQKdamdGhZaY8nK6pGzucVgWSZourzAPtM1bOs0P0 i2tKjFjbrBSAWWVYCxaYQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:gkClIQYoiGA=:N50yQP5HHKnapQol9o9RjL TzeB3nw9RupttWkkcRYaySFGMrFrH4JC+PWcWc2FbRP9GxcYuV7HWZzZeX31wmJLqLhsD0qRQ S0nfMVk4gf/aJgsTq5tqFog9kGMWhdX+qGpp4JCkZZPepe0ynEgpUie+jpMlz5Eaqfqwqz6W7 qTHWd8bTx804YYYNnWjbhAs7ROvzbTErn7LFI5nMP7DKUt18cZzAIX/ijBN/8rF4XymxbHlPo 6zvTg8vTPRugYSJULHG0w0pT4bhdt+qhq2wOvb9/1KnRvTkcEzlZoSJJIOaVg7ej/yFG+ben6 qHRPjAeoURtJG987vu8+i1JIa994DauylmKoOK+8UXrJirzvb30v1Af/bzZx989A1+lbMC+2C +E0xoBphqqyCpfAMqbBdiAGKjS168vnm5/erx/Q5rUFXZ4SzVb3NkmVLuzYhTF3azMA1JqEHS ORt47YQ2L81vGvBYlht3W9BX0Ng8z6yFFOJjKRTXf1gox/PiiSnKjW1RIbpfZhSEztAgmbKGX sTO+kfav3KH/gtXrIwH+m39xLcrx8W3wNVnr7LA/TAihJVPhrTPXEQeHqbuHy7lO/vpJPdVPB xum/Z9nZIxRSHFcTu7blnEnVzSX3E4sul7yXI5UnVEpOb02JKAOVTxgQ0+lNp0n34lGvK7dHR wudwplcFWI6En5L63CRDAMTb07MGn+qXBTUlaX0vTlHzHc2RWRjVjOjou7wcRrDNyz0E= 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_common.c | 12 ++++++------ drivers/net/ethernet/qualcomm/qca_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_common.c b/drivers/net/ethernet/qualcomm/qca_common.c index 9020c57..7eefdad 100644 --- a/drivers/net/ethernet/qualcomm/qca_common.c +++ b/drivers/net/ethernet/qualcomm/qca_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_ETHMINLEN) { 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_common.h b/drivers/net/ethernet/qualcomm/qca_common.h index 0fafaaf..c93cfdf07 100644 --- a/drivers/net/ethernet/qualcomm/qca_common.h +++ b/drivers/net/ethernet/qualcomm/qca_common.h @@ -62,6 +62,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, @@ -102,6 +103,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) */ s16 offset; @@ -114,9 +117,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 e0a5020..36ac07d 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -638,7 +638,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);