From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1BB561FCE for ; Thu, 15 May 2025 16:23:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747326239; cv=none; b=BcAQQZ+pkyV2ZVCfVBMbI8aNyKGURZYfIp9mL9ckKGPiiMLEXXJ5MloRq5ICPy6b8ERJhEVOnnsOOXusIQvyKq6vkaF85OYEsgpwhTa3ZzGdTFsuYrD/P+G2RuRbw1VPSr2iAQ6F/R8Nfl/FVD7AGaqYWIHhGCt52AnNh8mm6nU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747326239; c=relaxed/simple; bh=De8gD+9gUKLnUqpjC3dWFqNBGjlV77MBwaJxHKmIwhM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PlVfY4STbqAwKjhpVwiwjCmBT+fuB5xG7b6yM8zLIxdNv7KHBnDY4j4JcsZ3awnG2+LReY6NButuZRNvysaxaQnaW63edE/zYDTf4To5EflbnzZCmU08Gvu+X9ERmW8tuxDUjZFuVsls04Wyf0Q2n2tzWgKdMtGZlIPLFHKYnbc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hLUBFb4e; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hLUBFb4e" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DC7AC4CEE7; Thu, 15 May 2025 16:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747326239; bh=De8gD+9gUKLnUqpjC3dWFqNBGjlV77MBwaJxHKmIwhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hLUBFb4eipIYaOqPk0fsgQK3X/bqPEoNq8pwrgY5g1fPgn2Bd+N96JQ5FNf/bEPWL bW8KL1hWfYrURHJMLI+LKhLcrmp/AAlNR0OA45t16LGgHNyzl3b5TTwdvwE1G3HTgc 2aOWzivlzZo/KtHI1H+KOwaQVMNwByOWfSwY3bjVJP7zOih5ZlzxXoyFPU/KcKuuJE ih4M6Yhr5O1VlID3moWOwsw+6etuPlAb78mzrT9WG2Pd5Vh2PoFKSadToaz7wTQEGs ZCtilkJoPMLEioXsgwIykyU4mtiJRrhB9gseZ9HU10Y8FA8nU9WjFPmVrwDDB66mkx Olnu2HH8uwB4A== From: Mario Limonciello To: Shyam Sundar S K , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: Hans de Goede , platform-driver-x86@vger.kernel.org (open list:AMD PMF DRIVER), Mario Limonciello , Dan Carpenter Subject: [PATCH v4 3/3] platform/x86/amd: pmf: Simplify error flow in amd_pmf_init_smart_pc() Date: Thu, 15 May 2025 11:23:51 -0500 Message-ID: <20250515162351.2111468-4-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515162351.2111468-1-superm1@kernel.org> References: <20250515162351.2111468-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mario Limonciello commit 5b1122fc4995f ("platform/x86/amd/pmf: fix cleanup in amd_pmf_init_smart_pc()") adjusted the error handling flow to use a ladder but this isn't actually needed because work is only scheduled in amd_pmf_start_policy_engine() and with device managed cleanups pointers for allocations don't need to be freed. Adjust the error flow to a single call to amd_pmf_deinit_smart_pc() for the cases that need to clean up. Cc: Dan Carpenter Link: https://lore.kernel.org/r/20250512211154.2510397-4-superm1@kernel.org Signed-off-by: Mario Limonciello --- drivers/platform/x86/amd/pmf/tee-if.c | 55 ++++++++------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/drivers/platform/x86/amd/pmf/tee-if.c b/drivers/platform/x86/amd/pmf/tee-if.c index 1b268fffe96e2..1363d03c457ca 100644 --- a/drivers/platform/x86/amd/pmf/tee-if.c +++ b/drivers/platform/x86/amd/pmf/tee-if.c @@ -524,64 +524,45 @@ int amd_pmf_init_smart_pc(struct amd_pmf_dev *dev) ret = amd_pmf_set_dram_addr(dev, true); if (ret) - goto err_cancel_work; + return ret; dev->policy_base = devm_ioremap_resource(dev->dev, dev->res); - if (IS_ERR(dev->policy_base)) { - ret = PTR_ERR(dev->policy_base); - goto err_cancel_work; - } + if (IS_ERR(dev->policy_base)) + return PTR_ERR(dev->policy_base); dev->policy_buf = devm_kzalloc(dev->dev, dev->policy_sz, GFP_KERNEL); - if (!dev->policy_buf) { - ret = -ENOMEM; - goto err_cancel_work; - } + if (!dev->policy_buf) + return -ENOMEM; memcpy_fromio(dev->policy_buf, dev->policy_base, dev->policy_sz); if (!amd_pmf_pb_valid(dev)) { dev_info(dev->dev, "No Smart PC policy present\n"); - ret = -EINVAL; - goto err_cancel_work; + return -EINVAL; } amd_pmf_hex_dump_pb(dev); dev->prev_data = devm_kzalloc(dev->dev, sizeof(*dev->prev_data), GFP_KERNEL); - if (!dev->prev_data) { - ret = -ENOMEM; - goto err_cancel_work; - } + if (!dev->prev_data) + return -ENOMEM; for (i = 0; i < ARRAY_SIZE(amd_pmf_ta_uuid); i++) { ret = amd_pmf_tee_init(dev, &amd_pmf_ta_uuid[i]); if (ret) - goto err_cancel_work; + return ret; ret = amd_pmf_start_policy_engine(dev); - switch (ret) { - case TA_PMF_TYPE_SUCCESS: - status = true; - break; - case TA_ERROR_CRYPTO_INVALID_PARAM: - case TA_ERROR_CRYPTO_BIN_TOO_LARGE: - amd_pmf_tee_deinit(dev); - status = false; - break; - default: - ret = -EINVAL; - amd_pmf_tee_deinit(dev); - goto err_cancel_work; - } - + dev_dbg(dev->dev, "start policy engine ret: %d\n", ret); + status = ret == TA_PMF_TYPE_SUCCESS; if (status) break; + amd_pmf_tee_deinit(dev); } if (!status && !pb_side_load) { ret = -EINVAL; - goto err_cancel_work; + goto err; } if (pb_side_load) @@ -589,16 +570,12 @@ int amd_pmf_init_smart_pc(struct amd_pmf_dev *dev) ret = amd_pmf_register_input_device(dev); if (ret) - goto err_pmf_remove_pb; + goto err; return 0; -err_pmf_remove_pb: - if (pb_side_load && dev->esbin) - amd_pmf_remove_pb(dev); - amd_pmf_tee_deinit(dev); -err_cancel_work: - cancel_delayed_work_sync(&dev->pb_work); +err: + amd_pmf_deinit_smart_pc(dev); return ret; } -- 2.43.0