From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 287CEA052A for ; Mon, 25 Jan 2021 16:26:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0F275140F67; Mon, 25 Jan 2021 16:26:09 +0100 (CET) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mails.dpdk.org (Postfix) with ESMTP id 27F26140F67 for ; Mon, 25 Jan 2021 16:26:08 +0100 (CET) Received: by mail-ed1-f46.google.com with SMTP id d22so15854949edy.1 for ; Mon, 25 Jan 2021 07:26:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7lQkRpgr1IQOBOu7Tad026Rp7uy6d41gB6H4PSBt6zI=; b=UYiciuIOQZTrwtGz0ZablQ3UPG6xqnb9yPStHYnSSBBNJ+HitR9lckiW0emJGqbBRB Sz8EZFHpkQNFfuc6IsWOAen0q/1BF9owXynhIsFMIx8BTJPyQ4yDmS/zCzJKOytZRq/P T6lNKMCL709vglywe9aGzfd/9AdfV65SGOKiPAB9cP0kbKQkL7A0QBTdD7ZEXyoa0yoM 5oa37lXljU6TQO+P2TTkSRQFCXh+tpLql23HiF5qd4LdO4IsR6iEonEnjuH3xYAfQ0nK QY/vnUvFSLNgbI5K840imk9OD6SeIMwNcRUhNCl+IhMeCjUy+laITVzxy0OgzgCkFIER JsVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7lQkRpgr1IQOBOu7Tad026Rp7uy6d41gB6H4PSBt6zI=; b=kem0lpT8FnaB8XpbLmGRyBaJNhueWIrbD3mUjrVutLkThUyhufI8USaFCamtJKPAf8 7OZCycwJq9bGylC2TjbL7UGBgVfpzzO/GorbwHcbRzUZnCeEJka8VQfsFcHudt1z9oCz 2uZDR4VZ/8AVxydhAOqQdEZweuUb3Mc/DJfoVFWGHxsDFlG4V4olei5UG8N+HNy8JIpN LR/LxyXL67TH2hDuFEO9tR+lHOWyIj15aMEj/FniXr1BHYj4XVtu0nxq6oUIB05upzQC pDVa+Fu87qbNxQGuA5t8q+tVqE7jNb7UH9kCv+ix9xEjLB8WhCCQLY9JQtELvjyzIAIu Oc4Q== X-Gm-Message-State: AOAM532569wqW48T6H/+JjkRs9ApbPTm9AdkAAK5LR+qF8Kqf2gbjb3g fVwXwJIjsO3GGsIX76fXtvYQ X-Google-Smtp-Source: ABdhPJyFv2b0WTJr7AS9VuHFUL/tn+kdKYpIWQ5ahq3OJSZaDGunJTgsBLh7xXDa5ugVK7sO9N2rAA== X-Received: by 2002:aa7:d304:: with SMTP id p4mr883675edq.144.1611588367878; Mon, 25 Jan 2021 07:26:07 -0800 (PST) Received: from localhost.localdomain (dsl-197-245-67-23.voxdsl.co.za. [197.245.67.23]) by smtp.gmail.com with ESMTPSA id b17sm412917edv.56.2021.01.25.07.26.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jan 2021 07:26:06 -0800 (PST) From: Heinrich Kuhn To: dev@dpdk.org Cc: Heinrich Kuhn , stable@dpdk.org, Louis Peens , Simon Horman 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-stable] [dpdk-dev] [PATCH] net/nfp: read chip model from PluDevice register X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" For newer smartNIC NVRAM versions the chip model should be read from the PluDevice register as it provides the authoritative chip model/revision. This method of reading the chip model is backwards compatible with legacy NVRAM versions too. Since the model number is purely used for reporting purposes, follow the hardware team convention of subtracting 0x10 from the PluDevice register to obtain the chip model/revision number. Fixes: c7e9729da ("net/nfp: support CPP") Cc: stable@dpdk.org Signed-off-by: Heinrich Kuhn Reviewed-by: Louis Peens Signed-off-by: Simon Horman --- drivers/net/nfp/nfpcore/nfp_cpp.h | 2 +- drivers/net/nfp/nfpcore/nfp_cppcore.c | 49 ++++++++++++--------------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h index 1427954c1..08d656da1 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp.h +++ b/drivers/net/nfp/nfpcore/nfp_cpp.h @@ -170,7 +170,7 @@ void *nfp_cpp_priv(struct nfp_cpp *cpp); */ void *nfp_cpp_area_priv(struct nfp_cpp_area *cpp_area); -uint32_t __nfp_cpp_model_autodetect(struct nfp_cpp *cpp); +uint32_t __nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model); /* * NFP CPP core interface for CPP clients. diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c index dec4a8b6d..6d629430d 100644 --- a/drivers/net/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c @@ -22,8 +22,9 @@ #define NFP_PL_DEVICE_ID 0x00000004 #define NFP_PL_DEVICE_ID_MASK 0xff - -#define NFP6000_ARM_GCSR_SOFTMODEL0 0x00400144 +#define NFP_PL_DEVICE_PART_MASK 0xffff0000 +#define NFP_PL_DEVICE_MODEL_MASK (NFP_PL_DEVICE_PART_MASK | \ + NFP_PL_DEVICE_ID_MASK) void nfp_cpp_priv_set(struct nfp_cpp *cpp, void *priv) @@ -46,13 +47,18 @@ nfp_cpp_model_set(struct nfp_cpp *cpp, uint32_t model) uint32_t nfp_cpp_model(struct nfp_cpp *cpp) { + int err; + uint32_t model; + if (!cpp) return NFP_CPP_MODEL_INVALID; - if (cpp->model == 0) - cpp->model = __nfp_cpp_model_autodetect(cpp); + err = __nfp_cpp_model_autodetect(cpp, &model); - return cpp->model; + if (err < 0) + return err; + + return model; } void @@ -389,9 +395,6 @@ nfp_xpb_to_cpp(struct nfp_cpp *cpp, uint32_t *xpb_addr) uint32_t xpb; int island; - if (!NFP_CPP_MODEL_IS_6000(cpp->model)) - return 0; - xpb = NFP_CPP_ID(14, NFP_CPP_ACTION_RW, 0); /* @@ -796,29 +799,21 @@ nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset, * as those are model-specific */ uint32_t -__nfp_cpp_model_autodetect(struct nfp_cpp *cpp) +__nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model) { - uint32_t arm_id = NFP_CPP_ID(NFP_CPP_TARGET_ARM, 0, 0); - uint32_t model = 0; - - if (nfp_cpp_readl(cpp, arm_id, NFP6000_ARM_GCSR_SOFTMODEL0, &model)) - return 0; - - if (NFP_CPP_MODEL_IS_6000(model)) { - uint32_t tmp; - - nfp_cpp_model_set(cpp, model); + uint32_t reg; + int err; - /* The PL's PluDeviceID revision code is authoratative */ - model &= ~0xff; - if (nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) + - NFP_PL_DEVICE_ID, &tmp)) - return 0; + err = nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) + NFP_PL_DEVICE_ID, + ®); + if (err < 0) + return err; - model |= (NFP_PL_DEVICE_ID_MASK & tmp) - 0x10; - } + *model = reg & NFP_PL_DEVICE_MODEL_MASK; + if (*model & NFP_PL_DEVICE_ID_MASK) + *model -= 0x10; - return model; + return 0; } /* -- 2.30.0