Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sean Anderson <sean.anderson@seco.com>
To:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Madalin Bucur <madalin.bucur@nxp.com>, netdev@vger.kernel.org
Cc:     Paolo Abeni <pabeni@redhat.com>,
        Eric Dumazet <edumazet@google.com>,
        linux-arm-kernel@lists.infradead.org,
        Russell King <linux@armlinux.org.uk>,
        linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>,
        Li Yang <leoyang.li@nxp.com>, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH net-next v3 36/47] soc: fsl: qbman: Add helper for sanity checking cgr ops
Date:   Fri, 15 Jul 2022 17:59:43 -0400
Message-Id: <20220715215954.1449214-37-sean.anderson@seco.com>
In-Reply-To: <20220715215954.1449214-1-sean.anderson@seco.com>
References: <20220715215954.1449214-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ldXyVvx9BMmKoG3jpYddFHeF9uJEAw1Mrhnz0fdcEuLXFYJ0ALYczouA1WUq?=
 =?us-ascii?Q?USWiy+ixWYaBn47qud03UCUFmdEuM5yfQqpamSSLGT7qWcYn5hsHhMmtOIrr?=
 =?us-ascii?Q?a7h77gErB8xvszlGPtHze3mFiBS0ibwcqaS9i7leBvxLdtb8yfHv8NAdAEsJ?=
 =?us-ascii?Q?cVY8hXxCtfXPjXQchWcsA+ZQ8GhLrzV3y/XMf6Fzd0SwuMOiqLWQSkyHq7MF?=
 =?us-ascii?Q?qYFd9stPMTQitB1vRbXB08K43zRyjeeMcBLfoBhAmjSUZ0NBInoQ/aPKMsCU?=
 =?us-ascii?Q?O/sd1H/qfgOOjluRn9pFMALtIDPT6ljiP1z8RujqlFRplU3yJ2XvbY4iETYC?=
 =?us-ascii?Q?pzMgOmoknsfPLfxiDr1qr/qE9PemHINvYrQlWC4f5Df6hul09HT4F0RGbvip?=
 =?us-ascii?Q?ugEtSpf69Dykl8ibyGfiJZ+HiULpfZ1hxTgFcONqwrmKf3jm+DiGmHafBBwu?=
 =?us-ascii?Q?8dwZar9kI5O+ZEoRNpr73hYjgLVyLcNgcvt5SngSQftPpFt2Fw/0rzAfiyEx?=
 =?us-ascii?Q?EfBzdPkjhCY/S5env2Y9WTgeyyDt4G24p4YwQAdH64XiLIz0HJKNJU+9jCyb?=
 =?us-ascii?Q?Kf88gVZCUgsmRiUOyyM3enpKER0oNLUvfiFLMvKY2eKALYR2kF2T1pLbwm9W?=
 =?us-ascii?Q?Q3r4/myHfdrz4VAVUK4eiw272LRMxvpIDrR2rQgFe5NuLQb2kG8Q2NdTL2JI?=
 =?us-ascii?Q?hbFeZrSUZJL85GRXE+f9sPvVVqDcra63+BtltV1ThR0c3g0cIRZkgJQm+4sP?=
 =?us-ascii?Q?ixNbcwLVMudCe30GGYKm4gHIz0hpQ/L/oQrtnnbKboywHPqDOki24YCLv5/7?=
 =?us-ascii?Q?8gG+FiezW/MMnB27yv9NjO8No3SVxVqIHbk5Wp7/2I95fYIc9Sj717Wnk2G4?=
 =?us-ascii?Q?CL8mhRkvzVQjW8uQf59c+lXV5RgbeTnIIIrKpLMgZnie5XGr0b427GeZdvjR?=
 =?us-ascii?Q?ro0KbOI/pT010NGobtwMdzt+LhduwuGUSQbaPmqdx6vqsUd43K5tYNF9RF9k?=
 =?us-ascii?Q?Jv61IrOFXx8AuxbF5y9PrLAKZ76uyXMMfusY7Aif1b626AaZvkyOfqfAxHKR?=
 =?us-ascii?Q?HVbWH9HekJim62qhxRjemTm28h23jSmX5mas+Otcm59mWT1OF9oSDKQFi4Nt?=
 =?us-ascii?Q?0TAX8Z9LSzm5UNmyx8xEtO5cugxk3r2kKotaQTucWGUKos8h8t/yJrpEYk6K?=
 =?us-ascii?Q?ldCQOuO+ONO6XqqvWe96yFNAUykCOClAx5o2QIDKOXJ78A1k/a4n5AN3maNj?=
 =?us-ascii?Q?4FrZyGQ4/BAqyvUm8z3fXdZCPKTK85GDGhyTys/ZQ8FF5pzBDOp6abA+1VhQ?=
 =?us-ascii?Q?vMUn137jKPekLg9hOQC1zo0qsD8ps9UnocLfPOWH+wfUQRbwsjbvfM3RXdE6?=
 =?us-ascii?Q?PrvPGpcrpREedEUBqVPNkWPk/mYdObV+IP+KbW5tL0hVsOhRTEB2OSqoHc9y?=
 =?us-ascii?Q?Yy3jAPRnquzMgUGmYP76psavt2TlqHmwujnadsoPQig42ECVSIwdu8854tGV?=
 =?us-ascii?Q?y5uV8Jm/FV7v96TFGCj/2iDA9RG6v/t/m8gLmhLF/5jEJhm+l3JBfEbmg1EQ?=
 =?us-ascii?Q?ZZhM7Qpfc4gs/UjjUinsolJ/6qb7P8V+9uHRzfSycVkCIV+W2NNdYB5j2h26?=
 =?us-ascii?Q?Sg=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: db3bb590-b0e3-45c1-5fe8-08da66ad94d8
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4973.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2022 22:01:34.0023
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 7mIyAnRXk7Zbtp4/R6+c63KJj99jXsoWc2ZXg23Ecn+KLvoOsW9tSwpcxKeu1YzPyZe00QUy+abzVhCAU1Wxjw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR03MB8433
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This breaks out/combines get_affine_portal and the cgr sanity check in
preparation for the next commit. No functional change intended.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

(no changes since v2)

Changes in v2:
- New

 drivers/soc/fsl/qbman/qman.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index fde4edd83c14..eb6600aab09b 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -2483,13 +2483,8 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,
 }
 EXPORT_SYMBOL(qman_create_cgr);
 
-int qman_delete_cgr(struct qman_cgr *cgr)
+static struct qman_portal *qman_cgr_get_affine_portal(struct qman_cgr *cgr)
 {
-	unsigned long irqflags;
-	struct qm_mcr_querycgr cgr_state;
-	struct qm_mcc_initcgr local_opts;
-	int ret = 0;
-	struct qman_cgr *i;
 	struct qman_portal *p = get_affine_portal();
 
 	if (cgr->chan != p->config->channel) {
@@ -2497,10 +2492,25 @@ int qman_delete_cgr(struct qman_cgr *cgr)
 		dev_err(p->config->dev, "CGR not owned by current portal");
 		dev_dbg(p->config->dev, " create 0x%x, delete 0x%x\n",
 			cgr->chan, p->config->channel);
-
-		ret = -EINVAL;
-		goto put_portal;
+		put_affine_portal();
+		return NULL;
 	}
+
+	return p;
+}
+
+int qman_delete_cgr(struct qman_cgr *cgr)
+{
+	unsigned long irqflags;
+	struct qm_mcr_querycgr cgr_state;
+	struct qm_mcc_initcgr local_opts;
+	int ret = 0;
+	struct qman_cgr *i;
+	struct qman_portal *p = qman_cgr_get_affine_portal(cgr);
+
+	if (!p)
+		return -EINVAL;
+
 	memset(&local_opts, 0, sizeof(struct qm_mcc_initcgr));
 	spin_lock_irqsave(&p->cgr_lock, irqflags);
 	list_del(&cgr->node);
@@ -2528,7 +2538,6 @@ int qman_delete_cgr(struct qman_cgr *cgr)
 		list_add(&cgr->node, &p->cgr_cbs);
 release_lock:
 	spin_unlock_irqrestore(&p->cgr_lock, irqflags);
-put_portal:
 	put_affine_portal();
 	return ret;
 }
-- 
2.35.1.1320.gc452695387.dirty