All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Horia Geantă" <horia.geanta@nxp.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
	Scott Wood <oss@buserror.net>, Roy Pledge <roy.pledge@nxp.com>
Cc: "David S. Miller" <davem@davemloft.net>,
	<linux-crypto@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	Dan Douglass <dan.douglass@nxp.com>,
	Alexandru Porosanu <alexandru.porosanu@nxp.com>,
	Vakul Garg <vakul.garg@nxp.com>,
	Cristian Stoica <cristian.stoica@nxp.com>,
	Claudiu Manoil <claudiu.manoil@nxp.com>
Subject: [PATCH 2/7] soc/qman: add dedicated channel ID for CAAM
Date: Fri, 17 Mar 2017 12:05:57 +0200	[thread overview]
Message-ID: <20170317100602.2837-3-horia.geanta@nxp.com> (raw)
In-Reply-To: <20170317100602.2837-1-horia.geanta@nxp.com>

Add and export the ID of the channel serviced by the
CAAM (Cryptographic Acceleration and Assurance Module) DCP.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
---
 drivers/soc/fsl/qbman/qman_ccsr.c | 6 +++++-
 include/soc/fsl/qman.h            | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c
index f4e6e70de259..90bc40c48675 100644
--- a/drivers/soc/fsl/qbman/qman_ccsr.c
+++ b/drivers/soc/fsl/qbman/qman_ccsr.c
@@ -34,6 +34,8 @@ u16 qman_ip_rev;
 EXPORT_SYMBOL(qman_ip_rev);
 u16 qm_channel_pool1 = QMAN_CHANNEL_POOL1;
 EXPORT_SYMBOL(qm_channel_pool1);
+u16 qm_channel_caam = QMAN_CHANNEL_CAAM;
+EXPORT_SYMBOL(qm_channel_caam);
 
 /* Register offsets */
 #define REG_QCSP_LIO_CFG(n)	(0x0000 + ((n) * 0x10))
@@ -720,8 +722,10 @@ static int fsl_qman_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	if ((qman_ip_rev & 0xff00) >= QMAN_REV30)
+	if ((qman_ip_rev & 0xff00) >= QMAN_REV30) {
 		qm_channel_pool1 = QMAN_CHANNEL_POOL1_REV3;
+		qm_channel_caam = QMAN_CHANNEL_CAAM_REV3;
+	}
 
 	ret = zero_priv_mem(dev, node, fqd_a, fqd_sz);
 	WARN_ON(ret);
diff --git a/include/soc/fsl/qman.h b/include/soc/fsl/qman.h
index 4de1ffcc8982..10b549783ec5 100644
--- a/include/soc/fsl/qman.h
+++ b/include/soc/fsl/qman.h
@@ -36,8 +36,11 @@
 /* Hardware constants */
 #define QM_CHANNEL_SWPORTAL0 0
 #define QMAN_CHANNEL_POOL1 0x21
+#define QMAN_CHANNEL_CAAM 0x80
 #define QMAN_CHANNEL_POOL1_REV3 0x401
+#define QMAN_CHANNEL_CAAM_REV3 0x840
 extern u16 qm_channel_pool1;
+extern u16 qm_channel_caam;
 
 /* Portal processing (interrupt) sources */
 #define QM_PIRQ_CSCI	0x00100000	/* Congestion State Change */
-- 
2.12.0.264.gd6db3f216544

WARNING: multiple messages have this Message-ID (diff)
From: horia.geanta@nxp.com (Horia Geantă)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/7] soc/qman: add dedicated channel ID for CAAM
Date: Fri, 17 Mar 2017 12:05:57 +0200	[thread overview]
Message-ID: <20170317100602.2837-3-horia.geanta@nxp.com> (raw)
In-Reply-To: <20170317100602.2837-1-horia.geanta@nxp.com>

Add and export the ID of the channel serviced by the
CAAM (Cryptographic Acceleration and Assurance Module) DCP.

Signed-off-by: Horia Geant? <horia.geanta@nxp.com>
---
 drivers/soc/fsl/qbman/qman_ccsr.c | 6 +++++-
 include/soc/fsl/qman.h            | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c
index f4e6e70de259..90bc40c48675 100644
--- a/drivers/soc/fsl/qbman/qman_ccsr.c
+++ b/drivers/soc/fsl/qbman/qman_ccsr.c
@@ -34,6 +34,8 @@ u16 qman_ip_rev;
 EXPORT_SYMBOL(qman_ip_rev);
 u16 qm_channel_pool1 = QMAN_CHANNEL_POOL1;
 EXPORT_SYMBOL(qm_channel_pool1);
+u16 qm_channel_caam = QMAN_CHANNEL_CAAM;
+EXPORT_SYMBOL(qm_channel_caam);
 
 /* Register offsets */
 #define REG_QCSP_LIO_CFG(n)	(0x0000 + ((n) * 0x10))
@@ -720,8 +722,10 @@ static int fsl_qman_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	if ((qman_ip_rev & 0xff00) >= QMAN_REV30)
+	if ((qman_ip_rev & 0xff00) >= QMAN_REV30) {
 		qm_channel_pool1 = QMAN_CHANNEL_POOL1_REV3;
+		qm_channel_caam = QMAN_CHANNEL_CAAM_REV3;
+	}
 
 	ret = zero_priv_mem(dev, node, fqd_a, fqd_sz);
 	WARN_ON(ret);
diff --git a/include/soc/fsl/qman.h b/include/soc/fsl/qman.h
index 4de1ffcc8982..10b549783ec5 100644
--- a/include/soc/fsl/qman.h
+++ b/include/soc/fsl/qman.h
@@ -36,8 +36,11 @@
 /* Hardware constants */
 #define QM_CHANNEL_SWPORTAL0 0
 #define QMAN_CHANNEL_POOL1 0x21
+#define QMAN_CHANNEL_CAAM 0x80
 #define QMAN_CHANNEL_POOL1_REV3 0x401
+#define QMAN_CHANNEL_CAAM_REV3 0x840
 extern u16 qm_channel_pool1;
+extern u16 qm_channel_caam;
 
 /* Portal processing (interrupt) sources */
 #define QM_PIRQ_CSCI	0x00100000	/* Congestion State Change */
-- 
2.12.0.264.gd6db3f216544

  parent reply	other threads:[~2017-03-17 10:06 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-17 10:05 [PATCH 0/7] crypto: caam - add Queue Interface (QI) support Horia Geantă
2017-03-17 10:05 ` Horia Geantă
2017-03-17 10:05 ` [PATCH 1/7] soc/qman: export volatile dequeue related structs Horia Geantă
2017-03-17 10:05   ` Horia Geantă
2017-03-17 10:05 ` Horia Geantă [this message]
2017-03-17 10:05   ` [PATCH 2/7] soc/qman: add dedicated channel ID for CAAM Horia Geantă
2017-03-17 10:05 ` [PATCH 3/7] soc/qman: export non-programmable FQD fields query Horia Geantă
2017-03-17 10:05   ` Horia Geantă
2017-03-17 10:05 ` [PATCH 4/7] soc/qman: add macros needed by caam/qi driver Horia Geantă
2017-03-17 10:05   ` Horia Geantă
2017-03-17 10:06 ` [PATCH 5/7] crypto: caam - avoid double inclusion in desc_constr.h Horia Geantă
2017-03-17 10:06   ` Horia Geantă
2017-03-17 10:06 ` [PATCH 6/7] crypto: caam - add Queue Interface (QI) backend support Horia Geantă
2017-03-17 10:06   ` Horia Geantă
2017-03-17 10:06 ` [PATCH 7/7] crypto: caam/qi - add ablkcipher and authenc algorithms Horia Geantă
2017-03-17 10:06   ` Horia Geantă
2017-04-04  5:03   ` [7/7] " Michael Ellerman
2017-04-04  5:03     ` Michael Ellerman
2017-04-04 12:42     ` Horia Geantă
2017-04-04 12:42       ` Horia Geantă
2017-04-04 13:28     ` Laurentiu Tudor
2017-04-04 13:28       ` Laurentiu Tudor
2017-04-04 13:28       ` Laurentiu Tudor
2017-04-05 10:06       ` Michael Ellerman
2017-04-05 10:06         ` Michael Ellerman
2017-04-05 11:49         ` Laurentiu Tudor
2017-04-05 11:49           ` Laurentiu Tudor
2017-04-05 11:49           ` Laurentiu Tudor
2017-04-07 13:21           ` Michael Ellerman
2017-04-07 13:21             ` Michael Ellerman
2017-04-07 14:00             ` Laurentiu Tudor
2017-04-07 14:00               ` Laurentiu Tudor
2017-04-07 14:00               ` Laurentiu Tudor
2017-03-24 14:13 ` [PATCH 0/7] crypto: caam - add Queue Interface (QI) support Herbert Xu
2017-03-24 14:13   ` Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170317100602.2837-3-horia.geanta@nxp.com \
    --to=horia.geanta@nxp.com \
    --cc=alexandru.porosanu@nxp.com \
    --cc=claudiu.manoil@nxp.com \
    --cc=cristian.stoica@nxp.com \
    --cc=dan.douglass@nxp.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=oss@buserror.net \
    --cc=roy.pledge@nxp.com \
    --cc=vakul.garg@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.