From patchwork Thu Nov 10 01:50:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huisong Li X-Patchwork-Id: 17904 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp670242wru; Wed, 9 Nov 2022 17:55:12 -0800 (PST) X-Google-Smtp-Source: AMsMyM7DuXdxKmVo7IakxFmEnF+YeAjvoQo+Is65T1PDjIsSy3UXdilPwzPqyvGdcW5q1E4iQZGv X-Received: by 2002:a17:906:65c6:b0:73c:8897:65b0 with SMTP id z6-20020a17090665c600b0073c889765b0mr58844383ejn.322.1668045311864; Wed, 09 Nov 2022 17:55:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668045311; cv=none; d=google.com; s=arc-20160816; b=RF6S7RG93Fgpmv5+v/sIgYcnr907TP68VA8iWs9I27wY3gDxA+6AhVbmu87egYdumd p1Ztgtl6tatRUc7zx3DdObO+EQDlR+cgfS7IKBo88ocyiJGR+iM2/oFD4yFjbs0XrGRu K5/dB+egq7jintoqEi5P4GazbvUfUmErBiMo//0AS3VcH9Kn3zsdDR0dNt10QrrFxCUw cFMQ7BlMXjAVwbQ0rSP31Kp9ETHhqwHmwJ7SgEA5rdRF9z/qmctKzR8Ya5oL9MpXZDrK bnUwuXCIrBlXjGaKiRaOc/xbCwTK/okKtk6NFWzUC63S1ulpEgu88tiShE2N1rdMQxN8 PBpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=K0XdXqbqnX07GQiyNVYevlvuJHQS/aEz3KuFo5AcalU=; b=KET2Ud3Ra1rba/yF3ymrOO/foRPmQ/i6ukgUcppbNtFN0dw/uekVaUxvPRQtJRdUfg by76KKCx1eJEKe2hmRGLslcK8c3bBeaOR33yyQGdWX2GVyxWPzHfDydcC2zW/yilS8LS FMerw2y2riKOQmgsW6L5qBeIFdrVUcGPI0i0MaFqqmHmgc5QboLuPAzRzgSQ0d6KlgOR VYrqLixg4wemO32fitJEnSbk7jdWVc8x3rUdep9wVxnKsfN3SYuc3/ue2BnIAnQAEX8w OWaNO7+fWpOWHeAlH936YrnFbOfjnd+vnz5KIU7KVzNYSPpuFmCOMM2ssYbq6bsFhjtd 7MkA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f12-20020a17090660cc00b007ad855bc09csi13636580ejk.595.2022.11.09.17.54.48; Wed, 09 Nov 2022 17:55:11 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232322AbiKJBw7 (ORCPT + 99 others); Wed, 9 Nov 2022 20:52:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232142AbiKJBwu (ORCPT ); Wed, 9 Nov 2022 20:52:50 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 136ADBC85; Wed, 9 Nov 2022 17:52:50 -0800 (PST) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N74XB2WGqzJnZL; Thu, 10 Nov 2022 09:49:46 +0800 (CST) Received: from kwepemm600004.china.huawei.com (7.193.23.242) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 10 Nov 2022 09:52:48 +0800 Received: from localhost.localdomain (10.28.79.22) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 10 Nov 2022 09:52:47 +0800 From: Huisong Li To: , CC: , , , , , , , , , , , Subject: [PATCH 3/3] mailbox: pcc: fix 'pcc_chan_count' when fail to initialize PCC Date: Thu, 10 Nov 2022 09:50:34 +0800 Message-ID: <20221110015034.7943-4-lihuisong@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20221110015034.7943-1-lihuisong@huawei.com> References: <20221110015034.7943-1-lihuisong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.28.79.22] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749072280682433464?= X-GMAIL-MSGID: =?utf-8?q?1749072280682433464?= 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 --- 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; } /*