Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/106003/?format=api
{ "id": 106003, "url": "http://patches.dpdk.org/api/patches/106003/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220118073739.2652-2-wei.huang@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220118073739.2652-2-wei.huang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220118073739.2652-2-wei.huang@intel.com", "date": "2022-01-18T07:37:36", "name": "[v2,1/4] raw/ifpga/base: fix SPI transaction", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "1ef4876c32e0d8bb5e5916f04157bbd637a2eaa1", "submitter": { "id": 2033, "url": "http://patches.dpdk.org/api/people/2033/?format=api", "name": "Wei Huang", "email": "wei.huang@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220118073739.2652-2-wei.huang@intel.com/mbox/", "series": [ { "id": 21224, "url": "http://patches.dpdk.org/api/series/21224/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=21224", "date": "2022-01-18T07:37:35", "name": "Fix bugs found in raw/ifpga development for arrow creek", "version": 2, "mbox": "http://patches.dpdk.org/series/21224/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/106003/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/106003/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 3ECF1A00C3;\n\tTue, 18 Jan 2022 08:40:55 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D5D4F42704;\n\tTue, 18 Jan 2022 08:40:47 +0100 (CET)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n by mails.dpdk.org (Postfix) with ESMTP id 79CF74067E;\n Tue, 18 Jan 2022 08:40:45 +0100 (CET)", "from orsmga004.jf.intel.com ([10.7.209.38])\n by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 17 Jan 2022 23:40:44 -0800", "from unknown (HELO localhost.localdomain.sh.intel.com)\n ([10.238.175.107])\n by orsmga004.jf.intel.com with ESMTP; 17 Jan 2022 23:40:43 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1642491645; x=1674027645;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=m6uXnOd8btdxVPCNwl+4PJgv0K68JznsKpsWez+BFfE=;\n b=ZiU4MA/n121wtvJU3KPAQrfYrJ3sq3YtC7T1kpSOX8G97cCO69jBu9i3\n rl66gy++vqXFa8aLErOTWaAXo+sqtErV5aL+1fb+d1cIS2Qq9GW7aQGAG\n /oHs0kVtmASXV5FbLRCWQSzlYa6JEX+9DtB3brFpxPoB2QBMFFlk5rMzW\n ERLCnLRvTlK/JaPPQTD74tZeKJ5HnavEY8xcAhjP9pTXRCdLLhq8rOWqH\n Fxsd2MU5ETUJyM4J4jVci+pwz0o1FTtMbdhXZTbtXwAqyRyOzyzc75MOl\n 0OxCuLA4+Dne64e7oruMYdZY2hoalb3bDbQ9z0M1r0kph2N2G5agmnQkE Q==;", "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10230\"; a=\"225436382\"", "E=Sophos;i=\"5.88,296,1635231600\"; d=\"scan'208\";a=\"225436382\"", "E=Sophos;i=\"5.88,296,1635231600\"; d=\"scan'208\";a=\"625422763\"" ], "X-ExtLoop1": "1", "From": "Wei Huang <wei.huang@intel.com>", "To": "dev@dpdk.org,\n\trosen.xu@intel.com,\n\tqi.z.zhang@intel.com", "Cc": "stable@dpdk.org,\n\ttianfei.zhang@intel.com,\n\tferruh.yigit@intel.com", "Subject": "[PATCH v2 1/4] raw/ifpga/base: fix SPI transaction", "Date": "Tue, 18 Jan 2022 02:37:36 -0500", "Message-Id": "<20220118073739.2652-2-wei.huang@intel.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20220118073739.2652-1-wei.huang@intel.com>", "References": "<20220118031738.2059-1-wei.huang@intel.com>\n <20220118073739.2652-1-wei.huang@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Tianfei Zhang <tianfei.zhang@intel.com>\n\nWhen EOP is detected, 2 more bytes should be received\n(may be a SPI_PACKET_ESC before last valid byte) then\nrx should be finished.\n\nFixes: 96ebfcf8 (\"raw/ifpga/base: add SPI and MAX10 device driver\")\nCc: stable@dpdk.org\n\nSigned-off-by: Tianfei Zhang <tianfei.zhang@intel.com>\n---\n drivers/raw/ifpga/base/opae_spi.c | 12 ++\n drivers/raw/ifpga/base/opae_spi.h | 4 +\n drivers/raw/ifpga/base/opae_spi_transaction.c | 215 +++++++++++++++-----------\n 3 files changed, 140 insertions(+), 91 deletions(-)", "diff": "diff --git a/drivers/raw/ifpga/base/opae_spi.c b/drivers/raw/ifpga/base/opae_spi.c\nindex 9efeecb..ca3d41f 100644\n--- a/drivers/raw/ifpga/base/opae_spi.c\n+++ b/drivers/raw/ifpga/base/opae_spi.c\n@@ -239,6 +239,18 @@ int spi_command(struct altera_spi_device *dev, unsigned int chip_select,\n \treturn 0;\n }\n \n+int spi_write(struct altera_spi_device *dev, unsigned int chip_select,\n+\t\tunsigned int wlen, void *wdata)\n+{\n+\treturn spi_command(dev, chip_select, wlen, wdata, 0, NULL);\n+}\n+\n+int spi_read(struct altera_spi_device *dev, unsigned int chip_select,\n+\t\tunsigned int rlen, void *rdata)\n+{\n+\treturn spi_command(dev, chip_select, 0, NULL, rlen, rdata);\n+}\n+\n struct altera_spi_device *altera_spi_alloc(void *base, int type)\n {\n \tstruct altera_spi_device *spi_dev =\ndiff --git a/drivers/raw/ifpga/base/opae_spi.h b/drivers/raw/ifpga/base/opae_spi.h\nindex af11656..bcff67d 100644\n--- a/drivers/raw/ifpga/base/opae_spi.h\n+++ b/drivers/raw/ifpga/base/opae_spi.h\n@@ -117,6 +117,10 @@ struct spi_tran_header {\n \tu32 addr;\n };\n \n+int spi_read(struct altera_spi_device *dev, unsigned int chip_select,\n+\t\tunsigned int rlen, void *rdata);\n+int spi_write(struct altera_spi_device *dev, unsigned int chip_select,\n+\t\tunsigned int wlen, void *wdata);\n int spi_command(struct altera_spi_device *dev, unsigned int chip_select,\n \t\tunsigned int wlen, void *wdata, unsigned int rlen, void *rdata);\n void spi_cs_deactivate(struct altera_spi_device *dev);\ndiff --git a/drivers/raw/ifpga/base/opae_spi_transaction.c b/drivers/raw/ifpga/base/opae_spi_transaction.c\nindex 006cdb4..cd50d40 100644\n--- a/drivers/raw/ifpga/base/opae_spi_transaction.c\n+++ b/drivers/raw/ifpga/base/opae_spi_transaction.c\n@@ -40,7 +40,7 @@ static void print_buffer(const char *string, void *buffer, int len)\n \tprintf(\"%s print buffer, len=%d\\n\", string, len);\n \n \tfor (i = 0; i < len; i++)\n-\t\tprintf(\"%x \", *(p+i));\n+\t\tprintf(\"%02x \", *(p+i));\n \tprintf(\"\\n\");\n }\n #else\n@@ -72,43 +72,6 @@ static void reorder_phy_data(u8 bits_per_word,\n \t}\n }\n \n-enum {\n-\tSPI_FOUND_SOP,\n-\tSPI_FOUND_EOP,\n-\tSPI_NOT_FOUND,\n-};\n-\n-static int resp_find_sop_eop(unsigned char *resp, unsigned int len,\n-\t\tint flags)\n-{\n-\tint ret = SPI_NOT_FOUND;\n-\n-\tunsigned char *b = resp;\n-\n-\t/* find SOP */\n-\tif (flags != SPI_FOUND_SOP) {\n-\t\twhile (b < resp + len && *b != SPI_PACKET_SOP)\n-\t\t\tb++;\n-\n-\t\tif (*b != SPI_PACKET_SOP)\n-\t\t\tgoto done;\n-\n-\t\tret = SPI_FOUND_SOP;\n-\t}\n-\n-\t/* find EOP */\n-\twhile (b < resp + len && *b != SPI_PACKET_EOP)\n-\t\tb++;\n-\n-\tif (*b != SPI_PACKET_EOP)\n-\t\tgoto done;\n-\n-\tret = SPI_FOUND_EOP;\n-\n-done:\n-\treturn ret;\n-}\n-\n static void phy_tx_pad(unsigned char *phy_buf, unsigned int phy_buf_len,\n \t\tunsigned int *aligned_len)\n {\n@@ -137,6 +100,104 @@ static void phy_tx_pad(unsigned char *phy_buf, unsigned int phy_buf_len,\n \t\t*p++ = SPI_BYTE_IDLE;\n }\n \n+#define RX_ALL_IDLE_DATA (SPI_BYTE_IDLE << 24 | SPI_BYTE_IDLE << 16 |\t\\\n+\t\t\t SPI_BYTE_IDLE << 8 | SPI_BYTE_IDLE)\n+\n+static bool all_idle_data(u8 *rxbuf)\n+{\n+\treturn *(u32 *)rxbuf == RX_ALL_IDLE_DATA;\n+}\n+\n+static unsigned char *find_eop(u8 *rxbuf, u32 BPW)\n+{\n+\treturn memchr(rxbuf, SPI_PACKET_EOP, BPW);\n+}\n+\n+static int do_spi_txrx(struct spi_transaction_dev *dev,\n+\t\tunsigned char *tx_buffer,\n+\t\tunsigned int tx_len, unsigned char *rx_buffer,\n+\t\tunsigned int rx_len,\n+\t\tunsigned int *actual_rx)\n+{\n+\tunsigned int rx_cnt = 0;\n+\tint ret = 0;\n+\tunsigned int BPW = 4;\n+\tbool eop_found = false;\n+\tunsigned char *eop;\n+\tunsigned char *ptr;\n+\tunsigned char *rxbuf = rx_buffer;\n+\tint add_byte = 0;\n+\tunsigned long ticks;\n+\tunsigned long timeout;\n+\n+\t/* send command */\n+\tret = spi_write(dev->dev, dev->chipselect, tx_len, tx_buffer);\n+\tif (ret)\n+\t\treturn -EBUSY;\n+\n+\ttimeout = rte_get_timer_cycles() +\n+\t\t\t\tmsecs_to_timer_cycles(2000);\n+\n+\t/* read out data */\n+\twhile (rx_cnt < rx_len) {\n+\t\tret = spi_read(dev->dev, dev->chipselect, BPW, rxbuf);\n+\t\tif (ret)\n+\t\t\treturn -EBUSY;\n+\n+\t\t/* skip all of invalid data */\n+\t\tif (!eop_found && all_idle_data(rxbuf)) {\n+\t\t\tticks = rte_get_timer_cycles();\n+\t\t\tif (!time_after(ticks, timeout)) {\n+\t\t\t\tcontinue;\n+\t\t\t} else {\n+\t\t\t\tdev_err(dev, \"read spi data timeout\\n\");\n+\t\t\t\treturn -ETIMEDOUT;\n+\t\t\t}\n+\t\t}\n+\n+\t\trx_cnt += BPW;\n+\t\tif (!eop_found) {\n+\t\t\t/* EOP is found, we read 2 more bytes and exit. */\n+\t\t\teop = find_eop(rxbuf, BPW);\n+\t\t\tif (eop) {\n+\t\t\t\tif ((BPW + rxbuf - eop) > 2) {\n+\t\t\t\t\t/*\n+\t\t\t\t\t * check if the last 2 bytes are already\n+\t\t\t\t\t * received in current word.\n+\t\t\t\t\t */\n+\t\t\t\t\tbreak;\n+\t\t\t\t} else if ((BPW + rxbuf - eop) == 2) {\n+\t\t\t\t\t/*\n+\t\t\t\t\t * skip if last byte is not SPI_BYTE_ESC\n+\t\t\t\t\t * or SPI_PACKET_ESC. this is the valid\n+\t\t\t\t\t * end of a response too.\n+\t\t\t\t\t */\n+\t\t\t\t\tptr = eop + 1;\n+\n+\t\t\t\t\tif (*ptr != SPI_BYTE_ESC &&\n+\t\t\t\t\t\t\t*ptr != SPI_PACKET_ESC)\n+\t\t\t\t\t\tbreak;\n+\n+\t\t\t\t\tadd_byte = 1;\n+\t\t\t\t} else {\n+\t\t\t\t\tadd_byte = 2;\n+\t\t\t\t}\n+\n+\t\t\t\trx_len = min(rx_len,\n+\t\t\t\t\t\tIFPGA_ALIGN(rx_cnt +\n+\t\t\t\t\t\t\tadd_byte, BPW));\n+\t\t\t\teop_found = true;\n+\t\t\t}\n+\t\t}\n+\t\trxbuf += BPW;\n+\t}\n+\n+\t*actual_rx = rx_cnt;\n+\tprint_buffer(\"found valid data:\", rx_buffer, rx_cnt);\n+\n+\treturn ret;\n+}\n+\n static int byte_to_core_convert(struct spi_transaction_dev *dev,\n \t\tunsigned int send_len, unsigned char *send_data,\n \t\tunsigned int resp_len, unsigned char *resp_data,\n@@ -148,15 +209,9 @@ static int byte_to_core_convert(struct spi_transaction_dev *dev,\n \tunsigned char *resp_packet = dev->buffer->bytes_resp;\n \tunsigned char *p;\n \tunsigned char current_byte;\n-\tunsigned char *tx_buffer;\n \tunsigned int tx_len = 0;\n-\tunsigned char *rx_buffer;\n-\tunsigned int rx_len = 0;\n-\tint retry = 0;\n-\tint spi_flags;\n-\tunsigned long timeout = msecs_to_timer_cycles(1000);\n-\tunsigned long ticks;\n \tunsigned int resp_max_len = 2 * resp_len;\n+\tunsigned int actual_rx;\n \n \tprint_buffer(\"before bytes:\", send_data, send_len);\n \n@@ -190,48 +245,15 @@ static int byte_to_core_convert(struct spi_transaction_dev *dev,\n \n \tprint_buffer(\"after order to spi:\", send_packet, tx_len);\n \n-\t/* call spi */\n-\ttx_buffer = send_packet;\n-\trx_buffer = resp_packet;\n-\trx_len = resp_max_len;\n-\tspi_flags = SPI_NOT_FOUND;\n-\n-read_again:\n-\tret = spi_command(dev->dev, dev->chipselect, tx_len, tx_buffer,\n-\t\t\trx_len, rx_buffer);\n+\tret = do_spi_txrx(dev, send_packet, tx_len, resp_packet,\n+\t\t\tresp_max_len, &actual_rx);\n \tif (ret)\n-\t\treturn -EBUSY;\n-\n-\tprint_buffer(\"read from spi:\", rx_buffer, rx_len);\n-\n-\t/* look for SOP firstly*/\n-\tret = resp_find_sop_eop(rx_buffer, rx_len - 1, spi_flags);\n-\tif (ret != SPI_FOUND_EOP) {\n-\t\ttx_buffer = NULL;\n-\t\ttx_len = 0;\n-\t\tticks = rte_get_timer_cycles();\n-\t\tif (time_after(ticks, timeout) &&\n-\t\t\t\tretry++ > SPI_MAX_RETRY) {\n-\t\t\tdev_err(NULL, \"Have retry %d, found invalid packet data\\n\",\n-\t\t\t\tretry);\n-\t\t\treturn -EBUSY;\n-\t\t}\n-\n-\t\tif (ret == SPI_FOUND_SOP) {\n-\t\t\trx_buffer += rx_len;\n-\t\t\tresp_max_len += rx_len;\n-\t\t}\n-\n-\t\tspi_flags = ret;\n-\t\tgoto read_again;\n-\t}\n-\n-\tprint_buffer(\"found valid data:\", resp_packet, resp_max_len);\n+\t\treturn ret;\n \n \t/* analyze response packet */\n \ti = 0;\n \tp = resp_data;\n-\twhile (i < resp_max_len) {\n+\twhile (i < actual_rx) {\n \t\tcurrent_byte = resp_packet[i];\n \t\tswitch (current_byte) {\n \t\tcase SPI_BYTE_IDLE:\n@@ -337,9 +359,13 @@ static int packet_to_byte_conver(struct spi_transaction_dev *dev,\n \t\tcurrent_byte = resp_packet[i];\n \n \t\tswitch (current_byte) {\n-\t\tcase SPI_PACKET_ESC:\n-\t\tcase SPI_PACKET_CHANNEL:\n \t\tcase SPI_PACKET_SOP:\n+\t\t\tdev_err(dev, \"error on get SOP after SOP\\n\");\n+\t\t\treturn -EINVAL;\n+\t\tcase SPI_PACKET_CHANNEL:\n+\t\t\ti += 2;\n+\t\t\tbreak;\n+\t\tcase SPI_PACKET_ESC:\n \t\t\ti++;\n \t\t\tcurrent_byte = resp_packet[i];\n \t\t\t*p++ = xor_20(current_byte);\n@@ -348,23 +374,30 @@ static int packet_to_byte_conver(struct spi_transaction_dev *dev,\n \t\tcase SPI_PACKET_EOP:\n \t\t\ti++;\n \t\t\tcurrent_byte = resp_packet[i];\n-\t\t\tif (current_byte == SPI_PACKET_ESC ||\n-\t\t\t\t\tcurrent_byte == SPI_PACKET_CHANNEL ||\n-\t\t\t\t\tcurrent_byte == SPI_PACKET_SOP) {\n+\t\t\tswitch (current_byte) {\n+\t\t\tcase SPI_PACKET_ESC:\n \t\t\t\ti++;\n \t\t\t\tcurrent_byte = resp_packet[i];\n \t\t\t\t*p++ = xor_20(current_byte);\n-\t\t\t} else\n+\t\t\t\tbreak;\n+\t\t\tcase SPI_PACKET_CHANNEL:\n+\t\t\tcase SPI_PACKET_SOP:\n+\t\t\tcase SPI_PACKET_EOP:\n+\t\t\t\tdev_err(dev, \"error get SOP/EOP after EOP\\n\");\n+\t\t\t\treturn -EINVAL;\n+\t\t\tdefault:\n \t\t\t\t*p++ = current_byte;\n-\t\t\ti = valid_resp_len;\n-\t\t\tbreak;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tgoto done;\n+\n \t\tdefault:\n \t\t\t*p++ = current_byte;\n \t\t\ti++;\n \t\t}\n-\n \t}\n \n+done:\n \t*valid = p - resp_buf;\n \n \tprint_buffer(\"after packet:\", resp_buf, *valid);\n", "prefixes": [ "v2", "1/4" ] }