linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Herve Codina <herve.codina@bootlin.com>
To: Herve Codina <herve.codina@bootlin.com>,
	Christophe Leroy <christophe.leroy@csgroup.eu>,
	Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	Conor Dooley <conor+dt@kernel.org>,
	Qiang Zhao <qiang.zhao@nxp.com>, Li Yang <leoyang.li@nxp.com>,
	Mark Brown <broonie@kernel.org>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 29/36] soc: fsl: cpm1: qmc: Handle RPACK initialization
Date: Thu,  8 Aug 2024 09:11:22 +0200	[thread overview]
Message-ID: <20240808071132.149251-30-herve.codina@bootlin.com> (raw)
In-Reply-To: <20240808071132.149251-1-herve.codina@bootlin.com>

Current code handles the CPM1 version of QMC, RPACK does not need to
be initialized. This is not the case in the QUICC Engine (QE) version.

In preparation of the support for QE, initialize the RPACK register
when the receiver is initialized and each time it is restarted.

This additional RPACK initialization has no impact in the CPM1 version
of QMC.

Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
 drivers/soc/fsl/qe/qmc.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/soc/fsl/qe/qmc.c b/drivers/soc/fsl/qe/qmc.c
index 272da250a763..63af2608c3cd 100644
--- a/drivers/soc/fsl/qe/qmc.c
+++ b/drivers/soc/fsl/qe/qmc.c
@@ -221,6 +221,7 @@ struct qmc_data {
 	u32 zistate; /* Initial ZISTATE value */
 	u32 zdstate_hdlc; /* Initial ZDSTATE value (HDLC mode) */
 	u32 zdstate_transp; /* Initial ZDSTATE value (Transparent mode) */
+	u32 rpack; /* Initial RPACK value */
 };
 
 struct qmc {
@@ -552,6 +553,7 @@ int qmc_chan_read_submit(struct qmc_chan *chan, dma_addr_t addr, size_t length,
 	/* Restart receiver if needed */
 	if (chan->is_rx_halted && !chan->is_rx_stopped) {
 		/* Restart receiver */
+		qmc_write32(chan->s_param + QMC_SPE_RPACK, chan->qmc->data->rpack);
 		qmc_write32(chan->s_param + QMC_SPE_ZDSTATE,
 			    chan->mode == QMC_TRANSPARENT ?
 				chan->qmc->data->zdstate_transp :
@@ -980,6 +982,7 @@ static int qmc_chan_start_rx(struct qmc_chan *chan)
 	}
 
 	/* Restart the receiver */
+	qmc_write32(chan->s_param + QMC_SPE_RPACK, chan->qmc->data->rpack);
 	qmc_write32(chan->s_param + QMC_SPE_ZDSTATE,
 		    chan->mode == QMC_TRANSPARENT ?
 			chan->qmc->data->zdstate_transp :
@@ -1405,6 +1408,7 @@ static int qmc_setup_chan(struct qmc *qmc, struct qmc_chan *chan)
 	qmc_write32(chan->s_param + QMC_SPE_TSTATE, chan->qmc->data->tstate);
 	qmc_write32(chan->s_param + QMC_SPE_RSTATE, chan->qmc->data->rstate);
 	qmc_write32(chan->s_param + QMC_SPE_ZISTATE, chan->qmc->data->zistate);
+	qmc_write32(chan->s_param + QMC_SPE_RPACK, chan->qmc->data->rpack);
 	if (chan->mode == QMC_TRANSPARENT) {
 		qmc_write32(chan->s_param + QMC_SPE_ZDSTATE, chan->qmc->data->zdstate_transp);
 		qmc_write16(chan->s_param + QMC_SPE_TMRBLR, 60);
@@ -1544,6 +1548,8 @@ static void qmc_irq_gint(struct qmc *qmc)
 			/* Restart the receiver if needed */
 			spin_lock_irqsave(&chan->rx_lock, flags);
 			if (chan->rx_pending && !chan->is_rx_stopped) {
+				qmc_write32(chan->s_param + QMC_SPE_RPACK,
+					    chan->qmc->data->rpack);
 				qmc_write32(chan->s_param + QMC_SPE_ZDSTATE,
 					    chan->mode == QMC_TRANSPARENT ?
 						chan->qmc->data->zdstate_transp :
@@ -1810,6 +1816,7 @@ static const struct qmc_data qmc_data_cpm1 = {
 	.zistate = 0x00000100,
 	.zdstate_hdlc = 0x00000080,
 	.zdstate_transp = 0x18000080,
+	.rpack = 0x00000000,
 };
 
 static const struct of_device_id qmc_id_table[] = {
-- 
2.45.0


  parent reply	other threads:[~2024-08-08  7:31 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-08  7:10 [PATCH v2 00/36] soc: fsl: Add support for QUICC Engine TSA and QMC Herve Codina
2024-08-08  7:10 ` [PATCH v2 01/36] soc: fsl: cpm1: qmc: Update TRNSYNC only in transparent mode Herve Codina
2024-08-23  8:03   ` Christophe Leroy
2024-08-08  7:10 ` [PATCH v2 02/36] soc: fsl: cpm1: qmc: Enable TRNSYNC only when needed Herve Codina
2024-08-23  8:03   ` Christophe Leroy
2024-08-08  7:10 ` [PATCH v2 03/36] soc: fsl: cpm1: tsa: Fix tsa_write8() Herve Codina
2024-08-23  8:04   ` Christophe Leroy
2024-08-08  7:10 ` [PATCH v2 04/36] soc: fsl: cpm1: tsa: Use BIT(), GENMASK() and FIELD_PREP() macros Herve Codina
2024-08-23  8:04   ` Christophe Leroy
2024-08-08  7:10 ` [PATCH v2 05/36] soc: fsl: cpm1: tsa: Fix blank line and spaces Herve Codina
2024-08-23  8:04   ` Christophe Leroy
2024-08-08  7:10 ` [PATCH v2 06/36] soc: fsl: cpm1: tsa: Add missing spinlock comment Herve Codina
2024-08-23  8:05   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 07/36] dt-bindings: soc: fsl: cpm_qe: Add QUICC Engine (QE) TSA controller Herve Codina
2024-08-13 19:01   ` Rob Herring (Arm)
2024-08-23  8:05   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 08/36] soc: fsl: cpm1: tsa: Remove unused registers offset definition Herve Codina
2024-08-23  8:05   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 09/36] soc: fsl: cpm1: tsa: Use ARRAY_SIZE() instead of hardcoded integer values Herve Codina
2024-08-23  8:05   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 10/36] soc: fsl: cpm1: tsa: Make SIRAM entries specific to CPM1 Herve Codina
2024-08-23  8:06   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 11/36] soc: fsl: cpm1: tsa: Introduce tsa_setup() and its CPM1 compatible version Herve Codina
2024-08-23  8:06   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 12/36] soc: fsl: cpm1: tsa: Isolate specific CPM1 part from tsa_serial_{dis}connect() Herve Codina
2024-08-23  8:07   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 13/36] soc: fsl: cpm1: tsa: Introduce tsa_version Herve Codina
2024-08-23  8:08   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 14/36] soc: fsl: cpm1: tsa: Add support for QUICC Engine (QE) implementation Herve Codina
2024-08-23  8:08   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 15/36] MAINTAINERS: Add QE files related to the Freescale TSA controller Herve Codina
2024-08-23  8:08   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 16/36] soc: fsl: cpm1: tsa: Introduce tsa_serial_get_num() Herve Codina
2024-08-23  8:09   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 17/36] soc: fsl: cpm1: qmc: Rename QMC_TSA_MASK Herve Codina
2024-08-23  8:09   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 18/36] soc: fsl: cpm1: qmc: Use BIT(), GENMASK() and FIELD_PREP() macros Herve Codina
2024-08-23  8:07   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 19/36] soc: fsl: cpm1: qmc: Fix blank line and spaces Herve Codina
2024-08-23  8:07   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 20/36] soc: fsl: cpm1: qmc: Remove unneeded parenthesis Herve Codina
2024-08-23  8:09   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 21/36] soc: fsl: cpm1: qmc: Fix 'transmiter' typo Herve Codina
2024-08-23  8:10   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 22/36] soc: fsl: cpm1: qmc: Add missing spinlock comment Herve Codina
2024-08-23  8:10   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 23/36] dt-bindings: soc: fsl: cpm_qe: Add QUICC Engine (QE) QMC controller Herve Codina
2024-08-13 19:12   ` Rob Herring
2024-08-23  8:11   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 24/36] soc: fsl: cpm1: qmc: Introduce qmc_data structure Herve Codina
2024-08-23  8:11   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 25/36] soc: fsl: cpm1: qmc: Re-order probe() operations Herve Codina
2024-08-23  8:11   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 26/36] soc: fsl: cpm1: qmc: Introduce qmc_init_resource() and its CPM1 version Herve Codina
2024-08-23  8:11   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 27/36] soc: fsl: cpm1: qmc: Introduce qmc_{init,exit}_xcc() and their " Herve Codina
2024-08-23  8:12   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 28/36] soc: fsl: cpm1: qmc: Rename qmc_chan_command() Herve Codina
2024-08-23  8:12   ` Christophe Leroy
2024-08-08  7:11 ` Herve Codina [this message]
2024-08-23  8:13   ` [PATCH v2 29/36] soc: fsl: cpm1: qmc: Handle RPACK initialization Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 30/36] soc: fsl: cpm1: qmc: Rename SCC_GSMRL_MODE_QMC Herve Codina
2024-08-23  8:13   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 31/36] soc: fsl: cpm1: qmc: Introduce qmc_version Herve Codina
2024-08-23  8:13   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 32/36] soc: fsl: qe: Add resource-managed muram allocators Herve Codina
2024-08-23  8:13   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 33/36] soc: fsl: qe: Add missing PUSHSCHED command Herve Codina
2024-08-23  8:14   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 34/36] soc: fsl: cpm1: qmc: Add support for QUICC Engine (QE) implementation Herve Codina
2024-08-23  8:14   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 35/36] soc: fsl: cpm1: qmc: Handle QUICC Engine (QE) soft-qmc firmware Herve Codina
2024-08-23  8:14   ` Christophe Leroy
2024-08-08  7:11 ` [PATCH v2 36/36] MAINTAINERS: Add QE files related to the Freescale QMC controller Herve Codina
2024-08-23  8:15   ` Christophe Leroy
2024-09-03  8:44 ` [PATCH v2 00/36] soc: fsl: Add support for QUICC Engine TSA and QMC Christophe Leroy

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=20240808071132.149251-30-herve.codina@bootlin.com \
    --to=herve.codina@bootlin.com \
    --cc=broonie@kernel.org \
    --cc=christophe.leroy@csgroup.eu \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=krzk+dt@kernel.org \
    --cc=leoyang.li@nxp.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=qiang.zhao@nxp.com \
    --cc=robh@kernel.org \
    --cc=thomas.petazzoni@bootlin.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).