Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   laurentiu.tudor@nxp.com
To:     gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Cc:     ioana.ciornei@nxp.com, diana.craciun@oss.nxp.com,
        jon@solid-run.com, Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [PATCH 5/6] bus: fsl-mc: move uapi misc dev create/remove in probe and remove
Date:   Tue,  8 Feb 2022 16:59:27 +0200
Message-Id: <20220208145928.12468-6-laurentiu.tudor@nxp.com>
In-Reply-To: <20220208145928.12468-1-laurentiu.tudor@nxp.com>
References: <20220208145928.12468-1-laurentiu.tudor@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bPc9ZkscoVtNMpfH1wHqFaVZm27rDo3Qvs41mH/vMnjNrqWVXjLyQpzjRojQ?=
 =?us-ascii?Q?Uu4E7ZIeRC2olBnzhIgQchNSu5LxtXGSMSVZYB2+YMxCyX+uqNLFN4RGinHB?=
 =?us-ascii?Q?CsPhWY18sdEOX6pjy79od0bok8qffsNv63ldV/xAB2hbmYwi38chpm6RRtP1?=
 =?us-ascii?Q?kt7eiLDnPTHo92y8cUyHx0fzGXj6KROe+P4O29YVTXLXX7t+BTTx84sEhXpl?=
 =?us-ascii?Q?NnYCEwvGVWeIVNGUH/xgjG5Mo7kvqQLpwSAzPUaUpG3ckxF3gsl3J13eOKPO?=
 =?us-ascii?Q?e/99Gag1XktLZJb445aKDspNM7eMRQV2WiUZL8aYGpkWEQwyZHKT5B2Be1yL?=
 =?us-ascii?Q?laYjkOd1ypMSBYzCFQw3xZguqMLg/hyxB4M+SHG44H7SJUvCSwAffyE1lBRs?=
 =?us-ascii?Q?mje379bkDepMt/08yfW94o7aKRIpeSaTNWvv49EmqpbAE0N7krB06k1joc2j?=
 =?us-ascii?Q?+ubP+huUdUZ4b7e45vHFslZ7wR9vJkU7rkmJbJ2EzI3+vGOfFEzq5rIj7o7E?=
 =?us-ascii?Q?nGbIIC7H3NP3Xj9XC2upqE6S5RJk/VN/ro7IshbUVgIqFI0NNjM6MtICMgod?=
 =?us-ascii?Q?nUw1irzpwRbv3N3ftkKhe2HJC6a0fB+xITgEB4F55tjS035f9C2cRJCIhne5?=
 =?us-ascii?Q?YPbyDxZiQQ3ENH86+Mh9vLokVM1IuUn9kP5O1UqUCkPmd7vztwSPktv8Dv29?=
 =?us-ascii?Q?t04ZoQYdnuZKkopCkXUXctrnxf/dgmjKEbAXSF7Z+tiM/3eMzxUQWtE9iSAc?=
 =?us-ascii?Q?RED+cEYKZ3slWDjDglCXbcx21Zpp3T44GDuzNWujnjeRfvVZLd55nKP4xqLi?=
 =?us-ascii?Q?psagYr91VRwUPzIW9ljxLZh4SVVyH9OxxnnGandYKCMkSypBbVvO45AqmtNn?=
 =?us-ascii?Q?GpoQqbYyVuRb4uFw6hs45lXLfYUSNGigiCuWcs5yyaeSnuJUk1bHlifPKrlY?=
 =?us-ascii?Q?rmx2KHQY5eYREYT34+YWDwHBgR3Q6oKk4eLA2/Ody53sqATvSLrWZpkVYjmg?=
 =?us-ascii?Q?nkVF9k/KVe5KNI3LNAK6fsZppA0VNrSPpZDQI3Q7gYzi0r43Fc8jWBq7cwHo?=
 =?us-ascii?Q?3qJ0WaTsAsNu4Vgr0qbJKs4o+emVYa/sfneYNIMa8C1j3QWHQTbGUqYSCI1L?=
 =?us-ascii?Q?6fCPZ+to9ZlMA518fKN4qijaKUTsQgRzjhvXHOB+t18jfVWOCeEkQjlp0oJI?=
 =?us-ascii?Q?jdpUgGSS2AkiP24pWqfrZw03Zxa1a8TWy1kfuQLL5zV2WSBVN/RSYmnu1fWx?=
 =?us-ascii?Q?XYLDwiasCpD4fH2C+3Za8spNzB2x3Y9TL16yahexh0KMt4KoSMKOfu55kjKo?=
 =?us-ascii?Q?QDaLpKQXqqe4m88ULH4TngyyFUYS7lYKk3M39wTqAadfPvABV69CryRu/19j?=
 =?us-ascii?Q?/sAbWqoeq13jooV1ewosaM01M3mYvMiWyyQiSmswQGFM7RHWnxpFwjMNdIhR?=
 =?us-ascii?Q?oIMcF048T1OuusH+McnTzDg2pNlMxMY9OvramLOrHbFia+w8hDpeKcoMMopT?=
 =?us-ascii?Q?bxM6THtCjSKOV6Ueb6DofvvvysBJyHr4rxTotZPkprezndiHABBME0o8AGUB?=
 =?us-ascii?Q?fqLomlkujebdjLEJjBFKl9LM2afUVeHsVYd3a8TyaiLXb7HLphf8mqn9Fokl?=
 =?us-ascii?Q?Uw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dd72cb19-e644-4aad-49dd-08d9eb13a391
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 14:59:43.2312
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 7h/Va3q6pmSgjd/zbNuMffUz5E/fSCH+3FsUH91KLPBbbE6Dora1qIfDr/0npnGV9Q1ooKtg2wdSG9Cnk1tU4Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB3018
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,T_SCC_BODY_TEXT_LINE
        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

From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

When devices are owned by VFIO lets not allow user-space to play with
them through the restool management interface thus breaking isolation.
Drop restool misc device creation and destruction from the common
dprc_setup() and dprc_cleanup() functions (shared with fsl-mc VFIO)
and open code it drpc driver's probe and remove ops.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
 drivers/bus/fsl-mc/dprc-driver.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c
index 8482c4fca835..82bf3fe09273 100644
--- a/drivers/bus/fsl-mc/dprc-driver.c
+++ b/drivers/bus/fsl-mc/dprc-driver.c
@@ -618,7 +618,6 @@ int dprc_setup(struct fsl_mc_device *mc_dev)
 	struct irq_domain *mc_msi_domain;
 	bool mc_io_created = false;
 	bool msi_domain_set = false;
-	bool uapi_created = false;
 	u16 major_ver, minor_ver;
 	size_t region_size;
 	int error;
@@ -651,11 +650,6 @@ int dprc_setup(struct fsl_mc_device *mc_dev)
 			return error;
 
 		mc_io_created = true;
-	} else {
-		error = fsl_mc_uapi_create_device_file(mc_bus);
-		if (error < 0)
-			return -EPROBE_DEFER;
-		uapi_created = true;
 	}
 
 	mc_msi_domain = fsl_mc_find_msi_domain(&mc_dev->dev);
@@ -713,9 +707,6 @@ int dprc_setup(struct fsl_mc_device *mc_dev)
 		mc_dev->mc_io = NULL;
 	}
 
-	if (uapi_created)
-		fsl_mc_uapi_remove_device_file(mc_bus);
-
 	return error;
 }
 EXPORT_SYMBOL_GPL(dprc_setup);
@@ -734,9 +725,15 @@ static int dprc_probe(struct fsl_mc_device *mc_dev)
 {
 	int error;
 
+	if (fsl_mc_is_root_dprc(&mc_dev->dev)) {
+		error = fsl_mc_uapi_create_device_file(to_fsl_mc_bus(mc_dev));
+		if (error < 0)
+			return -EPROBE_DEFER;
+	}
+
 	error = dprc_setup(mc_dev);
 	if (error < 0)
-		return error;
+		goto uapi_cleanup;
 
 	/*
 	 * Discover MC objects in DPRC object:
@@ -759,6 +756,10 @@ static int dprc_probe(struct fsl_mc_device *mc_dev)
 	device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove);
 dprc_cleanup:
 	dprc_cleanup(mc_dev);
+uapi_cleanup:
+	if (fsl_mc_is_root_dprc(&mc_dev->dev))
+		fsl_mc_uapi_remove_device_file(to_fsl_mc_bus(mc_dev));
+
 	return error;
 }
 
@@ -792,7 +793,6 @@ static void dprc_teardown_irq(struct fsl_mc_device *mc_dev)
 
 int dprc_cleanup(struct fsl_mc_device *mc_dev)
 {
-	struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);
 	int error;
 
 	/* this function should be called only for DPRCs, it
@@ -821,8 +821,6 @@ int dprc_cleanup(struct fsl_mc_device *mc_dev)
 	if (!fsl_mc_is_root_dprc(&mc_dev->dev)) {
 		fsl_destroy_mc_io(mc_dev->mc_io);
 		mc_dev->mc_io = NULL;
-	} else {
-		fsl_mc_uapi_remove_device_file(mc_bus);
 	}
 
 	return 0;
@@ -854,6 +852,9 @@ static int dprc_remove(struct fsl_mc_device *mc_dev)
 
 	device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove);
 
+	if (fsl_mc_is_root_dprc(&mc_dev->dev))
+		fsl_mc_uapi_remove_device_file(to_fsl_mc_bus(mc_dev));
+
 	dprc_cleanup(mc_dev);
 
 	dev_info(&mc_dev->dev, "DPRC device unbound from driver");
-- 
2.17.1