From patchwork Mon Jun 12 22:40:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: srinivas pandruvada X-Patchwork-Id: 106944 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp185172vqr; Mon, 12 Jun 2023 16:08:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ75hYglhJF9fuanbZ+i/t3Oi7iRQkdESvMKtbmYsym1pv3AiCDgfQA1GXvcDWKceqww+KRl X-Received: by 2002:aa7:ce13:0:b0:50d:fcfb:861b with SMTP id d19-20020aa7ce13000000b0050dfcfb861bmr6581170edv.0.1686611303850; Mon, 12 Jun 2023 16:08:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686611303; cv=none; d=google.com; s=arc-20160816; b=IQaT3Y1vv/uSUHI/tuSTx/H5gfp/GuO2XajCwVxNqGvxQI+kLZGghHYhQYn50O9LCT ssRvGo086c0L+lneNY/Aq074VJxlLKKNK3u0hJipZhTHAOtBngS7BFeaFGquizpEGhm2 JGec3wqVbQYdG19v3KJ23ryQ6Fiw5lZuvYWyMP+vHDwtWGPXb1fva9gtk2Z4/8UCRHhk tz+uhOvR7FRiwF/4hjwrqBti7SdYl0TWuClyH+8pwq3FVO/SD5MgaVPHe00hrbtMMpSo 4qblbobdIfuRXE1XgwM+bFC8wX9tR/x07lvzTxWSSTenvvPVuIIj2FrhA7N11iHYhh2a 1vdw== 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 :dkim-signature; bh=TFpWC3yzw4z1tyRKbOkU323jj4cV/McIQVAfSmc7Fgs=; b=QuH4rYAV/cVdVfc4H65B6OnP7/GkzALvhMOnPFk3Yg/5EzoceopaQpoPsiAeA5MP67 Oid/dT/LJVQdZZHXlnrQz1x66q+0slbEwUjULWJ4x9xDE4rL3+5tyekP2JO/UQElcLtv 0T4ckKs1pS8q1S//HdNTZy1G4UlooF1dljY6V6FzQLNADi0g/pcOlUAePLuFh0Xd0MG4 U4eLGaSF3nIJCIz1wPpuU5vNL8BzTxM3zQV07PYxJFmtam/e4SpM0M3vGKhLl3fJNUPv 5aJ1tIyEgfD4zV0WXD7tuBjm4CshlqxwLOVin/EjUaIAPesZ76VeX2fQaX0+f/Ffoh5Q deCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cdegRwzG; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q4-20020a056402032400b00514a14a94e5si6576350edw.175.2023.06.12.16.07.59; Mon, 12 Jun 2023 16:08:23 -0700 (PDT) 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; dkim=pass header.i=@intel.com header.s=Intel header.b=cdegRwzG; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233431AbjFLWkk (ORCPT + 99 others); Mon, 12 Jun 2023 18:40:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238008AbjFLWkh (ORCPT ); Mon, 12 Jun 2023 18:40:37 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F9D1171F; Mon, 12 Jun 2023 15:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686609636; x=1718145636; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W0g3K9LOGENgGUyAE6TRJpAv9/VDpuKKRjJ9zM72D7k=; b=cdegRwzGWE9VoAhcMTJCeK+VZMCt6Ff/8GhAenx5zJPkbJJjdA9j/osB +FHh9dfSyHYrQh92/g0kuJwpmjwtGGpqvQ1MgnepQbZX26yB1QMWWkOnd GOPPACfq0o+pR2Z7dVu4s9wBRWngZRnP+pG7Qi62/IbOFV8ueuD7mOv0U bYkWV9YX8cehmWHp60srhdfxfZq2nd21hGS50nUh87WLFWO5a/jsLhO4k W9sRCu48FGM0W6qZHFTlwz3y0GLTI8wUlUgtmBRvW/z1DMfGA97VzPbqa dOxEkZ643vUDAiGcayMYqdosuoHl9sa/wyttODcFjHhyEoqt4Kc07jq0p A==; X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="347829710" X-IronPort-AV: E=Sophos;i="6.00,238,1681196400"; d="scan'208";a="347829710" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2023 15:40:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="688805722" X-IronPort-AV: E=Sophos;i="6.00,238,1681196400"; d="scan'208";a="688805722" Received: from spandruv-desk.jf.intel.com ([10.54.75.8]) by orsmga006.jf.intel.com with ESMTP; 12 Jun 2023 15:40:35 -0700 From: Srinivas Pandruvada To: hdegoede@redhat.com, markgross@kernel.org Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Pandruvada Subject: [PATCH 1/2] platform/x86: ISST: Reset default callback on unregister Date: Mon, 12 Jun 2023 15:40:32 -0700 Message-Id: <20230612224033.2382527-2-srinivas.pandruvada@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230612224033.2382527-1-srinivas.pandruvada@linux.intel.com> References: <20230612224033.2382527-1-srinivas.pandruvada@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768540134250789180?= X-GMAIL-MSGID: =?utf-8?q?1768540134250789180?= When multiple clients are registered and some of those modules are removed, the default IOCTL callback for those clients are still not NULL. Calling them will result in crash. Set the default IOCTL callback pointer to NULL on unregister. Signed-off-by: Srinivas Pandruvada --- drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c index e0572a29212e..352bf5118d17 100644 --- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c +++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c @@ -831,6 +831,7 @@ void isst_if_cdev_unregister(int device_type) { isst_misc_unreg(); mutex_lock(&punit_misc_dev_open_lock); + punit_callbacks[device_type].def_ioctl = NULL; punit_callbacks[device_type].registered = 0; if (device_type == ISST_IF_DEV_MBOX) isst_delete_hash(); From patchwork Mon Jun 12 22:40:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: srinivas pandruvada X-Patchwork-Id: 106945 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp185180vqr; Mon, 12 Jun 2023 16:08:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5+rN5PB4r22htNjOA+g+QpQbzfY4ycWMGm+JKiM3qcrOBLWQWdVftlwwbLxwx9cxjS4BEx X-Received: by 2002:a17:907:842:b0:974:419d:7837 with SMTP id ww2-20020a170907084200b00974419d7837mr9967321ejb.34.1686611305073; Mon, 12 Jun 2023 16:08:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686611305; cv=none; d=google.com; s=arc-20160816; b=ODCDOSIhArxQbitFqtXtog7BYGH0amdTIbFWEuBuG5zAxtaeENruaP1k79KHsfDBhb a+ep/MGW6K5QvFUnQCNJM2ceGpm/CNwsPoV8KbKNwC6t/b7Loex2MMXSkWA6ywajug4E NIozTuesrHb65v0kxLY0qj+/95NqEEZhROQYcC3i8+utnflroJ0BIJArwB6259JRsusr ZfHUcJmJo93X3dWcssXB7gG40knIhTfgnKZB0MrvsQWo26N0QRSAZfHOqyNOIcVd02Ru hWusgsZ7wCeGQId1e4a7vfdcRWGikOkx9eYzYWQMn9zRu8fgA5+WpNCV4uJPAs2Wp3ZO wzsw== 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 :dkim-signature; bh=lSaUiBOJXwLNH8+cTHLZCA7zeOct8klIK4RsKFlM430=; b=yA+fMsGEEF2ZAjMpVqk8pSoeKSIKJaracbu7gLsfDdft/MsKOsXp/Cwm1RfDh4oKLQ zfzi1+rOcAq89te5sT1Kqk2TdRyqM3GBJRy9kcMhaHkPrr0znm0Z52kfamQCykVeYLyg veZZ77ahdmoswxQ23amKE5AKFOBBsFzN4BD6D+fsH79hhczBPcndrV0iO0WZhz4y67qV 1Lp0JFLHChanEKnqmNhPU5z4OIASBlBI7mXWgFHnF61c1LpTkjSHqtUOgmDXxqsAnEEr ERRzZprJi7OsnFaPWFvrxEn2eaDVn9rirKsNccLPb6uy54Gjp2DYc3htXB8hv0dXhGoy 2zZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Jk+OiHaU; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j8-20020a170906254800b009659e77ef5dsi3079910ejb.481.2023.06.12.16.08.01; Mon, 12 Jun 2023 16:08:25 -0700 (PDT) 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; dkim=pass header.i=@intel.com header.s=Intel header.b=Jk+OiHaU; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238892AbjFLWkn (ORCPT + 99 others); Mon, 12 Jun 2023 18:40:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238880AbjFLWki (ORCPT ); Mon, 12 Jun 2023 18:40:38 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26B911701; Mon, 12 Jun 2023 15:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686609637; x=1718145637; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nmy6zHBx+bkBSYjlmBky7iQxIWpRhMEDa79EgpifsIM=; b=Jk+OiHaUmGtAzT4Qz74/yKmZBG/24TmDSYjxtBK2iaTWUxRbZ1przRXJ Of8uo+yDgyAuhZ6WlmYrORVxYUCpy3q8d26lnPVNxmr02fbEhFFLdaa3b mOdCf8dLZN1zKJopMjdJrT+jabPmf3KEXjr0TtevU81tDHgrfLKYAdmuM 3ZqJJ97+vJctFNPBQ8hAcwSP/sztPH/A0uDRBB19iypI7xdjKcAqM9SVV jb58Vmo13RDMnynyClIKzRG0M+NdihEON3L7fOkw7EowFP7hqtSfGlozw +4sIoPdZeiTH1NlpGwAuO/0vGlH+tsP7gurz+Y8hhKHrwPPq5czK4tsM0 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="347829715" X-IronPort-AV: E=Sophos;i="6.00,238,1681196400"; d="scan'208";a="347829715" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2023 15:40:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="688805723" X-IronPort-AV: E=Sophos;i="6.00,238,1681196400"; d="scan'208";a="688805723" Received: from spandruv-desk.jf.intel.com ([10.54.75.8]) by orsmga006.jf.intel.com with ESMTP; 12 Jun 2023 15:40:35 -0700 From: Srinivas Pandruvada To: hdegoede@redhat.com, markgross@kernel.org Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Pandruvada Subject: [PATCH 2/2] platform/x86: ISST: Fix usage counter Date: Mon, 12 Jun 2023 15:40:33 -0700 Message-Id: <20230612224033.2382527-3-srinivas.pandruvada@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230612224033.2382527-1-srinivas.pandruvada@linux.intel.com> References: <20230612224033.2382527-1-srinivas.pandruvada@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768540135976295010?= X-GMAIL-MSGID: =?utf-8?q?1768540135976295010?= On multi package system, the TPMI SST instance is getting allocated again as the usage counter is not getting incremented. Here the instance is allocated only when the usage count is zero. There is no need to allocate again. Increment usage ID on successful return from isst_if_cdev_register(). Signed-off-by: Srinivas Pandruvada --- drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c index 664d2ee60385..63faa2ea8327 100644 --- a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c +++ b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c @@ -1414,6 +1414,8 @@ int tpmi_sst_init(void) ret = isst_if_cdev_register(ISST_IF_DEV_TPMI, &cb); if (ret) kfree(isst_common.sst_inst); + else + ++isst_core_usage_count; init_done: mutex_unlock(&isst_tpmi_dev_lock); return ret;