From: Huisong Li <lihuisong@huawei.com>
To: <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <rafael@kernel.org>, <sudeep.holla@arm.com>,
<rafael.j.wysocki@intel.com>, <wanghuiqiang@huawei.com>,
<zhangzekun11@huawei.com>, <wangxiongfeng2@huawei.com>,
<tanxiaofei@huawei.com>, <guohanjun@huawei.com>,
<xiexiuqi@huawei.com>, <wangkefeng.wang@huawei.com>,
<huangdaode@huawei.com>, <lihuisong@huawei.com>
Subject: [PATCH 3/3] mailbox: pcc: fix 'pcc_chan_count' when fail to initialize PCC
Date: Thu, 10 Nov 2022 09:50:34 +0800 [thread overview]
Message-ID: <20221110015034.7943-4-lihuisong@huawei.com> (raw)
In-Reply-To: <20221110015034.7943-1-lihuisong@huawei.com>
Currently, 'pcc_chan_count' is a non-zero value if PCC subspaces are parsed
successfully and subsequent processes is failure during initializing PCC
process. This may cause that pcc_mbox_request_channel() can still be
executed successfully , which will misleads the caller that this channel is
available.
Fixes: ce028702ddbc ("mailbox: pcc: Move bulk of PCCT parsing into pcc_mbox_probe")
Signed-off-by: Huisong Li <lihuisong@huawei.com>
---
drivers/mailbox/pcc.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index 7cee37dd3b73..47d70c5884e3 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -294,6 +294,7 @@ pcc_mbox_request_channel(struct mbox_client *cl, int subspace_id)
pr_err("Channel not found for idx: %d\n", subspace_id);
return ERR_PTR(-EBUSY);
}
+
dev = chan->mbox->dev;
spin_lock_irqsave(&chan->lock, flags);
@@ -735,7 +736,8 @@ static int __init pcc_init(void)
if (ret) {
pr_debug("ACPI PCC probe failed.\n");
- return -ENODEV;
+ ret = -ENODEV;
+ goto out;
}
pcc_pdev = platform_create_bundle(&pcc_mbox_driver,
@@ -743,10 +745,13 @@ static int __init pcc_init(void)
if (IS_ERR(pcc_pdev)) {
pr_debug("Err creating PCC platform bundle\n");
- return PTR_ERR(pcc_pdev);
+ ret = PTR_ERR(pcc_pdev);
+ goto out;
}
- return 0;
+out:
+ pcc_chan_count = 0;
+ return ret;
}
/*
--
2.22.0
next prev parent reply other threads:[~2022-11-10 1:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-10 1:50 [PATCH 0/3] ACPI: PCC: optimize pcc codes and fix one bug Huisong Li
2022-11-10 1:50 ` [PATCH 1/3] mailbox: pcc: rename platform interrupt bit macro name Huisong Li
2022-11-10 10:25 ` Sudeep Holla
2022-11-10 12:17 ` lihuisong (C)
2022-11-10 19:29 ` Rafael J. Wysocki
2022-11-11 1:10 ` lihuisong (C)
2022-11-10 1:50 ` [PATCH 2/3] ACPI: PCC: add check for platform interrupt Huisong Li
2022-11-10 10:36 ` Sudeep Holla
2022-11-10 12:08 ` lihuisong (C)
2022-11-10 1:50 ` Huisong Li [this message]
2022-11-10 10:44 ` [PATCH 3/3] mailbox: pcc: fix 'pcc_chan_count' when fail to initialize PCC Sudeep Holla
2022-11-10 12:10 ` lihuisong (C)
2022-11-11 2:44 ` [PATCH V2 0/2] optimize pcc code and fix one bug Huisong Li
2022-11-11 2:44 ` [PATCH V2 1/2] ACPI: PCC: add check for platform interrupt Huisong Li
2022-11-11 14:26 ` Sudeep Holla
2022-11-12 1:27 ` lihuisong (C)
2022-11-11 2:44 ` [PATCH V2 2/2] mailbox: pcc: fix 'pcc_chan_count' when fail to initialize PCC Huisong Li
2022-11-11 14:14 ` Sudeep Holla
2022-11-12 2:05 ` [PATCH V3 0/2] Optimize PCC OpRegion code and reset pcc_chan_count Huisong Li
2022-11-12 2:05 ` [PATCH V3 1/2] ACPI: PCC: Setup PCC Opregion handler only if platform interrupt is available Huisong Li
2022-11-12 2:05 ` [PATCH V3 2/2] mailbox: pcc: Reset pcc_chan_count to zero in case of PCC probe failure Huisong Li
2022-11-23 18:28 ` [PATCH V3 0/2] Optimize PCC OpRegion code and reset pcc_chan_count Rafael J. Wysocki
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=20221110015034.7943-4-lihuisong@huawei.com \
--to=lihuisong@huawei.com \
--cc=guohanjun@huawei.com \
--cc=huangdaode@huawei.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rafael@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=tanxiaofei@huawei.com \
--cc=wanghuiqiang@huawei.com \
--cc=wangkefeng.wang@huawei.com \
--cc=wangxiongfeng2@huawei.com \
--cc=xiexiuqi@huawei.com \
--cc=zhangzekun11@huawei.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