From patchwork Sat Apr 23 21:43:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Heimpold X-Patchwork-Id: 614101 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 3qsmGb0XL2z9t3t for ; Sun, 24 Apr 2016 07:44:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=heimpold.de header.i=@heimpold.de header.b=YUgF8TYW; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752469AbcDWVoS (ORCPT ); Sat, 23 Apr 2016 17:44:18 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.217]:28841 "EHLO mo4-p00-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752392AbcDWVoH (ORCPT ); Sat, 23 Apr 2016 17:44:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1461447844; l=1460; s=domk; d=heimpold.de; h=References:In-Reply-To:Date:Subject:Cc:To:From; bh=n9O92kESxp2DMX3padZ5EyK4UwyVLsJkeaJz7ROemXs=; b=YUgF8TYWWGJF8NgdIAttu8qdNlp1f6z5RXmrqeRPKIa8E8jXdA01km8AaPTGIqjoDIO t8Trk25HVvtaH/hl7IHZqU0LV1jwQd9HmrRqgw9b6I2Kn9ZnrkBz0RqPbDAvKLDDMj6fj f93YyJiDXHftl6WD+eQBLPo4LohMRUIaC84= X-RZG-AUTH: :O2kGeEG7b/pS1EW8QnKjhhg/vO4pzqdNys2z+NfqLSUoNNCTudAAFEJqC9JBN4JMEFSjTQ== X-RZG-CLASS-ID: mo00 Received: from tonne.mhei.heimpold.itr (p4FC8EF46.dip0.t-ipconnect.de [79.200.239.70]) by post.strato.de (RZmta 37.24 DYNA|AUTH) with ESMTPA id j00f20s3NLi4ZRD; Sat, 23 Apr 2016 23:44:04 +0200 (CEST) Received: from kerker.fritz.box (kerker.mhei.heimpold.itr [192.168.8.1]) by tonne.mhei.heimpold.itr (Postfix) with ESMTP id 883C724AD5; Sat, 23 Apr 2016 23:44:04 +0200 (CEST) From: Michael Heimpold To: Jonathan Cameron , "Andrew F . Davis" , Mark Brown , netdev@vger.kernel.org, Claudio Lanconelli Cc: Michael Heimpold Subject: [PATCH net-next 1/2] net: ethernet: enc28j60: support half-duplex SPI controllers Date: Sat, 23 Apr 2016 23:43:19 +0200 Message-Id: <1461447800-11381-2-git-send-email-mhei@heimpold.de> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461447800-11381-1-git-send-email-mhei@heimpold.de> References: <1461447800-11381-1-git-send-email-mhei@heimpold.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current spi_read_buf function fails on SPI host masters which are only half-duplex capable. Splitting the Tx and Rx part solves this issue. Tested on Raspberry Pi (full duplex) and I2SE Duckbill (half duplex). Signed-off-by: Michael Heimpold --- drivers/net/ethernet/microchip/enc28j60.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c index 86ea17e..b723622 100644 --- a/drivers/net/ethernet/microchip/enc28j60.c +++ b/drivers/net/ethernet/microchip/enc28j60.c @@ -89,22 +89,26 @@ spi_read_buf(struct enc28j60_net *priv, int len, u8 *data) { u8 *rx_buf = priv->spi_transfer_buf + 4; u8 *tx_buf = priv->spi_transfer_buf; - struct spi_transfer t = { + struct spi_transfer tx = { .tx_buf = tx_buf, + .len = SPI_OPLEN, + }; + struct spi_transfer rx = { .rx_buf = rx_buf, - .len = SPI_OPLEN + len, + .len = len, }; struct spi_message msg; int ret; tx_buf[0] = ENC28J60_READ_BUF_MEM; - tx_buf[1] = tx_buf[2] = tx_buf[3] = 0; /* don't care */ spi_message_init(&msg); - spi_message_add_tail(&t, &msg); + spi_message_add_tail(&tx, &msg); + spi_message_add_tail(&rx, &msg); + ret = spi_sync(priv->spi, &msg); if (ret == 0) { - memcpy(data, &rx_buf[SPI_OPLEN], len); + memcpy(data, rx_buf, len); ret = msg.status; } if (ret && netif_msg_drv(priv))