Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87215/?format=api
{ "id": 87215, "url": "https://patches.dpdk.org/api/patches/87215/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210125152544.2879-1-heinrich.kuhn@netronome.com/", "project": { "id": 1, "url": "https://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": "<20210125152544.2879-1-heinrich.kuhn@netronome.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210125152544.2879-1-heinrich.kuhn@netronome.com", "date": "2021-01-25T15:25:44", "name": "net/nfp: read chip model from PluDevice register", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "1b1b836af2eb2e7c30fac4c84b05381d63341aba", "submitter": { "id": 1523, "url": "https://patches.dpdk.org/api/people/1523/?format=api", "name": "Heinrich Kuhn", "email": "heinrich.kuhn@netronome.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210125152544.2879-1-heinrich.kuhn@netronome.com/mbox/", "series": [ { "id": 14931, "url": "https://patches.dpdk.org/api/series/14931/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14931", "date": "2021-01-25T15:25:44", "name": "net/nfp: read chip model from PluDevice register", "version": 1, "mbox": "https://patches.dpdk.org/series/14931/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/87215/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/87215/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 81085A052A;\n\tMon, 25 Jan 2021 16:26:10 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3B0FF140F8C;\n\tMon, 25 Jan 2021 16:26:10 +0100 (CET)", "from mail-ed1-f46.google.com (mail-ed1-f46.google.com\n [209.85.208.46])\n by mails.dpdk.org (Postfix) with ESMTP id 57EE1140F67\n for <dev@dpdk.org>; Mon, 25 Jan 2021 16:26:08 +0100 (CET)", "by mail-ed1-f46.google.com with SMTP id a14so4518933edu.7\n for <dev@dpdk.org>; Mon, 25 Jan 2021 07:26:08 -0800 (PST)", "from localhost.localdomain (dsl-197-245-67-23.voxdsl.co.za.\n [197.245.67.23])\n by smtp.gmail.com with ESMTPSA id b17sm412917edv.56.2021.01.25.07.26.05\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Mon, 25 Jan 2021 07:26:06 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=netronome-com.20150623.gappssmtp.com; s=20150623;\n h=from:to:cc:subject:date:message-id:mime-version\n :content-transfer-encoding;\n bh=7lQkRpgr1IQOBOu7Tad026Rp7uy6d41gB6H4PSBt6zI=;\n b=UYiciuIOQZTrwtGz0ZablQ3UPG6xqnb9yPStHYnSSBBNJ+HitR9lckiW0emJGqbBRB\n Sz8EZFHpkQNFfuc6IsWOAen0q/1BF9owXynhIsFMIx8BTJPyQ4yDmS/zCzJKOytZRq/P\n T6lNKMCL709vglywe9aGzfd/9AdfV65SGOKiPAB9cP0kbKQkL7A0QBTdD7ZEXyoa0yoM\n 5oa37lXljU6TQO+P2TTkSRQFCXh+tpLql23HiF5qd4LdO4IsR6iEonEnjuH3xYAfQ0nK\n QY/vnUvFSLNgbI5K840imk9OD6SeIMwNcRUhNCl+IhMeCjUy+laITVzxy0OgzgCkFIER\n JsVA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n :content-transfer-encoding;\n bh=7lQkRpgr1IQOBOu7Tad026Rp7uy6d41gB6H4PSBt6zI=;\n b=d0AJ00Uh7b/669oQ+NRMWZTR8VvpcuxhXgBUYeHBFo9YeU5GXmXEALy0GDLTH5KWQ+\n qZ984anLyRRcvNpKznq9ipxvWtLdfGpsx84RSpEXajkoSKU+j+IjN2BuXCZaVWhv8dAS\n VyAFHiAnS8nkCRSjaCkYV94YKw+2xunBFu7tnflkA/2vCyNBG8dUNV7vgyH0uRfibmK5\n lwGgdmTp3ZcJ+5v7Xy6m671iTy75mfMa9HIQebBtm+h3CwYu9dyewDEDlrdN8NTNmoer\n RxGImaZdu8Rcn/HO+zH4U6FyDZi/zem2PaDw8g4mfnc8dEWNeto/0ALJfXIeMGOYIPmo\n MzSQ==", "X-Gm-Message-State": "AOAM530XPZ+4QehSI8IeAwJ3vri33Mv4Ok1ZF8+5zR0k2OW5hVtoqm60\n ZFuvLhnuZlB9Ki9DSMSng5dEJyuml9Bhx5OSclMa9akQqZ+zaMavVImQNvZVrYctKr7tZu8yugO\n ozZas2gYkccdX4/ttBkjEyHCNdPUQsfn5YjVLMja8Xq3Vsk5UgK3S0ro8Mqu3ofMtqT8=", "X-Google-Smtp-Source": "\n ABdhPJyFv2b0WTJr7AS9VuHFUL/tn+kdKYpIWQ5ahq3OJSZaDGunJTgsBLh7xXDa5ugVK7sO9N2rAA==", "X-Received": "by 2002:aa7:d304:: with SMTP id p4mr883675edq.144.1611588367878;\n Mon, 25 Jan 2021 07:26:07 -0800 (PST)", "From": "Heinrich Kuhn <heinrich.kuhn@netronome.com>", "To": "dev@dpdk.org", "Cc": "Heinrich Kuhn <heinrich.kuhn@netronome.com>, stable@dpdk.org,\n Louis Peens <louis.peens@netronome.com>,\n Simon Horman <simon.horman@netronome.com>", "Date": "Mon, 25 Jan 2021 17:25:44 +0200", "Message-Id": "<20210125152544.2879-1-heinrich.kuhn@netronome.com>", "X-Mailer": "git-send-email 2.30.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH] net/nfp: read chip model from PluDevice register", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "For newer smartNIC NVRAM versions the chip model should be read from the\nPluDevice register as it provides the authoritative chip model/revision.\nThis method of reading the chip model is backwards compatible with\nlegacy NVRAM versions too.\n\nSince the model number is purely used for reporting purposes, follow the\nhardware team convention of subtracting 0x10 from the PluDevice register\nto obtain the chip model/revision number.\n\nFixes: c7e9729da (\"net/nfp: support CPP\")\nCc: stable@dpdk.org\n\nSigned-off-by: Heinrich Kuhn <heinrich.kuhn@netronome.com>\nReviewed-by: Louis Peens <louis.peens@netronome.com>\nSigned-off-by: Simon Horman <simon.horman@netronome.com>\n---\n drivers/net/nfp/nfpcore/nfp_cpp.h | 2 +-\n drivers/net/nfp/nfpcore/nfp_cppcore.c | 49 ++++++++++++---------------\n 2 files changed, 23 insertions(+), 28 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h\nindex 1427954c1..08d656da1 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -170,7 +170,7 @@ void *nfp_cpp_priv(struct nfp_cpp *cpp);\n */\n void *nfp_cpp_area_priv(struct nfp_cpp_area *cpp_area);\n \n-uint32_t __nfp_cpp_model_autodetect(struct nfp_cpp *cpp);\n+uint32_t __nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model);\n \n /*\n * NFP CPP core interface for CPP clients.\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex dec4a8b6d..6d629430d 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -22,8 +22,9 @@\n \n #define NFP_PL_DEVICE_ID 0x00000004\n #define NFP_PL_DEVICE_ID_MASK 0xff\n-\n-#define NFP6000_ARM_GCSR_SOFTMODEL0 0x00400144\n+#define NFP_PL_DEVICE_PART_MASK 0xffff0000\n+#define NFP_PL_DEVICE_MODEL_MASK (NFP_PL_DEVICE_PART_MASK | \\\n+\t\t\t\t\t\tNFP_PL_DEVICE_ID_MASK)\n \n void\n nfp_cpp_priv_set(struct nfp_cpp *cpp, void *priv)\n@@ -46,13 +47,18 @@ nfp_cpp_model_set(struct nfp_cpp *cpp, uint32_t model)\n uint32_t\n nfp_cpp_model(struct nfp_cpp *cpp)\n {\n+\tint err;\n+\tuint32_t model;\n+\n \tif (!cpp)\n \t\treturn NFP_CPP_MODEL_INVALID;\n \n-\tif (cpp->model == 0)\n-\t\tcpp->model = __nfp_cpp_model_autodetect(cpp);\n+\terr = __nfp_cpp_model_autodetect(cpp, &model);\n \n-\treturn cpp->model;\n+\tif (err < 0)\n+\t\treturn err;\n+\n+\treturn model;\n }\n \n void\n@@ -389,9 +395,6 @@ nfp_xpb_to_cpp(struct nfp_cpp *cpp, uint32_t *xpb_addr)\n \tuint32_t xpb;\n \tint island;\n \n-\tif (!NFP_CPP_MODEL_IS_6000(cpp->model))\n-\t\treturn 0;\n-\n \txpb = NFP_CPP_ID(14, NFP_CPP_ACTION_RW, 0);\n \n \t/*\n@@ -796,29 +799,21 @@ nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset,\n * as those are model-specific\n */\n uint32_t\n-__nfp_cpp_model_autodetect(struct nfp_cpp *cpp)\n+__nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model)\n {\n-\tuint32_t arm_id = NFP_CPP_ID(NFP_CPP_TARGET_ARM, 0, 0);\n-\tuint32_t model = 0;\n-\n-\tif (nfp_cpp_readl(cpp, arm_id, NFP6000_ARM_GCSR_SOFTMODEL0, &model))\n-\t\treturn 0;\n-\n-\tif (NFP_CPP_MODEL_IS_6000(model)) {\n-\t\tuint32_t tmp;\n-\n-\t\tnfp_cpp_model_set(cpp, model);\n+\tuint32_t reg;\n+\tint err;\n \n-\t\t/* The PL's PluDeviceID revision code is authoratative */\n-\t\tmodel &= ~0xff;\n-\t\tif (nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) +\n-\t\t\t\t NFP_PL_DEVICE_ID, &tmp))\n-\t\t\treturn 0;\n+\terr = nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) + NFP_PL_DEVICE_ID,\n+\t\t\t ®);\n+\tif (err < 0)\n+\t\treturn err;\n \n-\t\tmodel |= (NFP_PL_DEVICE_ID_MASK & tmp) - 0x10;\n-\t}\n+\t*model = reg & NFP_PL_DEVICE_MODEL_MASK;\n+\tif (*model & NFP_PL_DEVICE_ID_MASK)\n+\t\t*model -= 0x10;\n \n-\treturn model;\n+\treturn 0;\n }\n \n /*\n", "prefixes": [] }