From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6AA3FA04DD for ; Wed, 28 Oct 2020 11:56:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 63D6ECB06; Wed, 28 Oct 2020 11:56:44 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by dpdk.org (Postfix) with ESMTP id AA4C1CB00 for ; Wed, 28 Oct 2020 11:56:41 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id h22so4318782wmb.0 for ; Wed, 28 Oct 2020 03:56:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UoXfhG5H5rejuh2wf8ldz0QPyGy9ShBtN3+cqdXQ9ts=; b=Nr+7KuzJiReVMiKnBPrghIZKJpYMbQp/r9cgl7nalJqXXlDkysBUe/xN/XXkpXime+ 56nnvOFf2S3H0iEbKvVqbRTzldfi3HFO/RNvl+XI2M5c1POKJWFNummIy5EU+YP0c0gu RgOf7VRx8hgRUHNobgA148FpRpkqmHlQk4tZz4Oj8oYuoIVAgLXkc1lBrPUWxTiIYtG6 VeOeK4YPoJj+DWN12xWPx5pHxNx/4rFWoRjzDxSGknAbKLIIm5WhEoUux5pWrtmoDisN S4DPDtLnHkSF+nmV8zeOd3bK5TtEiZnoxlh7WNmIKHcxdQKIz33fgv9beskgLbScdUu8 8Bdw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=UoXfhG5H5rejuh2wf8ldz0QPyGy9ShBtN3+cqdXQ9ts=; b=q11+MsvLQtmrZolyRJwhUO2MUNzOd6LhaZOQSOVBHQYq+6fVqWtOZeGr8yCooDPxh+ HWikgEWQujhgcrZ+Cq3CZS9LORxKdrE4LRbEnO1P0+eCMD9ECOFyNbqraBiCcObFCzSb dFjuhH7/3mHbeHAmbjguMsbqIYe8Nnrp1GWwGdUK889VCxU9k+pkuEPBF2n3YJ90pYw8 gKHDlKSOyhN8Ch9gpgdMiOzvAXDcO07ZJGQv88i8tLXOpRM81dWdPs1BvXtCJDnv+jgy DQwtcCnBhzBWqJccXPGbFRyiQbJQB1ObMlsGs8S7RT9aC85mhuB4L41VlshvypV+lADa Likw== X-Gm-Message-State: AOAM530DMfwLVbajfgJ1qCEAyPsEVMTIUD+m3CTMa3HEYbgHqGbn/Jx7 ePLlodC+YVP1vQPj/l0949lqBmoZbQcSVBxX X-Google-Smtp-Source: ABdhPJzpqpJ8fzSDI48FZiAy9P1lx45A/a0+RwS/ihAxCDrO4xlGnUf8+BmSPKXabkCbXx+u327jig== X-Received: by 2002:a1c:2681:: with SMTP id m123mr7270353wmm.138.1603882600205; Wed, 28 Oct 2020 03:56:40 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 24sm5673714wmg.8.2020.10.28.03.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:56:39 -0700 (PDT) From: luca.boccassi@gmail.com To: Gagandeep Singh Cc: Akhil Goyal , dpdk stable Date: Wed, 28 Oct 2020 10:45:58 +0000 Message-Id: <20201028104606.3504127-199-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/caam_jr: fix device tree parsing for SEC_ERA' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 88abf42899163beb1f7a5b54360d6da851a19670 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Mon, 19 Oct 2020 17:48:01 +0800 Subject: [PATCH] crypto/caam_jr: fix device tree parsing for SEC_ERA [ upstream commit c6887eca58ac0aeb2aa54b58d881d1bbf5543d96 ] Previously, SEC_ERA was hardcoded and it was removed in [1]. Now when that hardcoded was removed, it is supposed to be read from the device tree but it is not done correctly. This patch calls a necessary API of_init() before using any of_* APIs to retrieve information from the device tree and if reading integer value that must be converted to cpu endianness before using it. [1] eef9e0412a84 ("drivers/crypto: fix build with -fno-common") Fixes: 1d678de329ab ("crypto/caam_jr: add basic job ring routines") Signed-off-by: Gagandeep Singh Acked-by: Akhil Goyal --- drivers/crypto/caam_jr/caam_jr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c index 86aa9a103e..d6fa8cf7e8 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c @@ -2398,6 +2398,8 @@ init_error: static int cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) { + int ret; + struct rte_cryptodev_pmd_init_params init_params = { "", sizeof(struct sec_job_ring_t), @@ -2414,6 +2416,12 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) input_args = rte_vdev_device_args(vdev); rte_cryptodev_pmd_parse_input_args(&init_params, input_args); + ret = of_init(); + if (ret) { + RTE_LOG(ERR, PMD, + "of_init failed\n"); + return -EINVAL; + } /* if sec device version is not configured */ if (!rta_get_sec_era()) { const struct device_node *caam_node; @@ -2424,7 +2432,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) NULL); if (prop) { rta_set_sec_era( - INTL_SEC_ERA(cpu_to_caam32(*prop))); + INTL_SEC_ERA(rte_be_to_cpu_32(*prop))); break; } } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:17.857654307 +0000 +++ 0199-crypto-caam_jr-fix-device-tree-parsing-for-SEC_ERA.patch 2020-10-28 10:35:11.808834498 +0000 @@ -1,8 +1,10 @@ -From c6887eca58ac0aeb2aa54b58d881d1bbf5543d96 Mon Sep 17 00:00:00 2001 +From 88abf42899163beb1f7a5b54360d6da851a19670 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Mon, 19 Oct 2020 17:48:01 +0800 Subject: [PATCH] crypto/caam_jr: fix device tree parsing for SEC_ERA +[ upstream commit c6887eca58ac0aeb2aa54b58d881d1bbf5543d96 ] + Previously, SEC_ERA was hardcoded and it was removed in [1]. Now when that hardcoded was removed, it is supposed to be read from the device tree but it is not done correctly. @@ -14,7 +16,6 @@ [1] eef9e0412a84 ("drivers/crypto: fix build with -fno-common") Fixes: 1d678de329ab ("crypto/caam_jr: add basic job ring routines") -Cc: stable@dpdk.org Signed-off-by: Gagandeep Singh Acked-by: Akhil Goyal @@ -23,10 +24,10 @@ 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c -index c004ec4077..3fb3fe0f8a 100644 +index 86aa9a103e..d6fa8cf7e8 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c -@@ -2388,6 +2388,8 @@ init_error: +@@ -2398,6 +2398,8 @@ init_error: static int cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) { @@ -35,7 +36,7 @@ struct rte_cryptodev_pmd_init_params init_params = { "", sizeof(struct sec_job_ring_t), -@@ -2404,6 +2406,12 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) +@@ -2414,6 +2416,12 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) input_args = rte_vdev_device_args(vdev); rte_cryptodev_pmd_parse_input_args(&init_params, input_args); @@ -48,7 +49,7 @@ /* if sec device version is not configured */ if (!rta_get_sec_era()) { const struct device_node *caam_node; -@@ -2414,7 +2422,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) +@@ -2424,7 +2432,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) NULL); if (prop) { rta_set_sec_era(