Received: by 10.223.176.5 with SMTP id f5csp1420820wra; Fri, 9 Feb 2018 19:52:03 -0800 (PST) X-Google-Smtp-Source: AH8x227Umc+0vWcOM/HSt5ixfGkJL3nIKkCbW1K49Q2VqESFWkIraIGSQWChgEXOXF8siL46IQSS X-Received: by 10.99.115.67 with SMTP id d3mr4188274pgn.223.1518234723060; Fri, 09 Feb 2018 19:52:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518234723; cv=none; d=google.com; s=arc-20160816; b=Wvmow5HU+ene3SQYZ9ZlY0+O9mmA1nnCSB3Zwdo9kxuDO1Ss8WCRyoE1/Jjs/irDHY UWS0IqqgaPxnCs6HKZWnGv/dOeL6BwOQaxb19eCtKfaNgLv+Hi/WAyaImaCDnlOG2VqF DW6J61KBKKacej8HfIlevbv8bC2Ihovz1WpUQIHjCGjBFgj8f8R/pt+YGzsSlCE2EQ1c USrmkcFWUQ4YwVmdY1B8AFXkh7+eARKRkHm47+0RnOnusbFWnN7en/S0qHlMt7fivajW C/x9Zo79OHxg9X0Im3TosKhSPYRfjbBZcW5dq+iOWciKJiySDDp2d7l0m5SYOlC6X7uT uXZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from:arc-authentication-results; bh=fV9Xw0zIaLjq010pW3cSuYjyH4PDA9g+DIMN0+5sv/w=; b=itBsAdc1VojYmVxT39Shkc9yHIpTfE+wXsZopR0mmKDp+6tHfLMAs8KYPzsva0Z4xF NqcT8An1jOV6lE9BkxbWY47zyWbQ/Xo1rfS6AXDiBJMD5RZMLaxC4h9rKHCVyn4ZJZas XW3qr8xFkgV9C+9oC6ZpFVdiPPYMyMsvbFWan3QclIblJZdcu9Rd3+WfKipUnmeoh2Od 0I6tqNt36OuWCySHXdtP4O9v5W+GJnNZOHSzxcEdMjS+AhB1auGcBGMfKXm7dzuUHG70 CKJNEirAoX1OResJCJ8ZQSkhyGmVuK/ebJlJp1nU8stZ3CqWef3xLis58YggKDy34bsc 9MXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p88si2730438pfj.124.2018.02.09.19.51.48; Fri, 09 Feb 2018 19:52:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752166AbeBJDuK (ORCPT + 99 others); Fri, 9 Feb 2018 22:50:10 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44216 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750942AbeBJDtf (ORCPT ); Fri, 9 Feb 2018 22:49:35 -0500 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w1A3nEA0146212 for ; Fri, 9 Feb 2018 22:49:35 -0500 Received: from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207]) by mx0a-001b2d01.pphosted.com with ESMTP id 2g1hjcnprd-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 09 Feb 2018 22:49:35 -0500 Received: from localhost by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 9 Feb 2018 22:49:34 -0500 Received: from b01cxnp23032.gho.pok.ibm.com (9.57.198.27) by e17.ny.us.ibm.com (146.89.104.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 9 Feb 2018 22:49:31 -0500 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w1A3nVr542664042; Sat, 10 Feb 2018 03:49:31 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DF8DDAE034; Fri, 9 Feb 2018 22:50:50 -0500 (EST) Received: from suka-w540.usor.ibm.com (unknown [9.70.94.25]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP id 49D0DAE03C; Fri, 9 Feb 2018 22:50:50 -0500 (EST) From: Sukadev Bhattiprolu To: Michael Ellerman Cc: Benjamin Herrenschmidt , mikey@neuling.org, hbabu@us.ibm.com, linuxppc-dev@ozlabs.org, Subject: [PATCH 2/4] powerpc/vas: Fix cleanup when VAS is not configured Date: Fri, 9 Feb 2018 19:49:25 -0800 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518234567-24869-1-git-send-email-sukadev@linux.vnet.ibm.com> References: <1518234567-24869-1-git-send-email-sukadev@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18021003-0040-0000-0000-000003F1910B X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008507; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000251; SDB=6.00987497; UDB=6.00501244; IPR=6.00766854; BA=6.00005821; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00019472; XFM=3.00000015; UTC=2018-02-10 03:49:33 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18021003-0041-0000-0000-000007E706E3 Message-Id: <1518234567-24869-2-git-send-email-sukadev@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-02-10_01:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802100047 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When VAS is not configured in the system, make sure to remove the VAS debugfs directory and unregister the platform driver. Signed-off-by: Sukadev Bhattiprolu --- arch/powerpc/platforms/powernv/vas-debug.c | 5 +++++ arch/powerpc/platforms/powernv/vas.c | 5 ++++- arch/powerpc/platforms/powernv/vas.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/powernv/vas-debug.c b/arch/powerpc/platforms/powernv/vas-debug.c index b4de4c6..e6e4067 100644 --- a/arch/powerpc/platforms/powernv/vas-debug.c +++ b/arch/powerpc/platforms/powernv/vas-debug.c @@ -207,3 +207,8 @@ void vas_init_dbgdir(void) if (IS_ERR(vas_debugfs)) vas_debugfs = NULL; } + +void vas_cleanup_dbgdir(void) +{ + debugfs_remove_recursive(vas_debugfs); +} diff --git a/arch/powerpc/platforms/powernv/vas.c b/arch/powerpc/platforms/powernv/vas.c index aebbe95..f83e27d8 100644 --- a/arch/powerpc/platforms/powernv/vas.c +++ b/arch/powerpc/platforms/powernv/vas.c @@ -169,8 +169,11 @@ static int __init vas_init(void) found++; } - if (!found) + if (!found) { + platform_driver_unregister(&vas_driver); + vas_cleanup_dbgdir(); return -ENODEV; + } pr_devel("Found %d instances\n", found); diff --git a/arch/powerpc/platforms/powernv/vas.h b/arch/powerpc/platforms/powernv/vas.h index ae0100f..2645613 100644 --- a/arch/powerpc/platforms/powernv/vas.h +++ b/arch/powerpc/platforms/powernv/vas.h @@ -406,6 +406,7 @@ extern struct mutex vas_mutex; extern struct vas_instance *find_vas_instance(int vasid); extern void vas_init_dbgdir(void); +extern void vas_cleanup_dbgdir(void); extern void vas_instance_init_dbgdir(struct vas_instance *vinst); extern void vas_window_init_dbgdir(struct vas_window *win); extern void vas_window_free_dbgdir(struct vas_window *win); -- 2.7.4