Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp1211547ybx; Thu, 7 Nov 2019 08:48:59 -0800 (PST) X-Google-Smtp-Source: APXvYqx/uyAPFDCPqrje1Q6VJ7ytdUVun2X3iKS2c2FAb0CCaE3yy7GWiQLxuiX1wwm4pQ6dks7Z X-Received: by 2002:a17:906:d793:: with SMTP id pj19mr3952999ejb.303.1573145339376; Thu, 07 Nov 2019 08:48:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573145339; cv=none; d=google.com; s=arc-20160816; b=aJfSw+FykYKC7aUKfRwibde4vJLPIO6JVfTFXDE6BO3hd7ODjRgabzgWGPi8I0m6zM Q/YEXYDtGoFADWn2VzLzsh9s61fksUUYjI0xkl5dOP8LlkbVPmYTnyReC5Za9Iu3vLRt 4/Ov34vUBjsKslT/S3CSOYvtYho1n1bTJ4052TkWBBKOjj14ix3P+FGDnIS6SByVxydg O0sFpP64STyyRXPLL2GLRn4lblIKJKUNQ2fUgfcNiotf3ibCP16LkxjuIrLCDgYpP1w0 OBeWeTk48JHr+2lDPOChPhM5TKUvkxkyOUGVk+lm4h48b8THXCEIpX+J8VzmCDL6hTgh rNBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=mB+GpLVnIZJlp9sdfDtPf6/v8svFJ+wXIyIEHIp0JJE=; b=Do7/4UNSs7/2X7bwGWbQUlb18dDFfX859vNs+3H0hwA+2G1uZ8e6J+x0WdeP8PRAlQ XsPTqvz9yf3fmMYmn6TsasGbOEjIj+Odo63VtDUPLmEeitSEcqXE71uYERaOzGoWYJYg hl4YKQR+ovlcPpJI/SnY0Uh5CihXLL2TBoITnwhQw05tcyHKcPnT0z5WL6TxcAHEcBYC rGfR8F+DVUJCG7MPyMgGkeKIr/kjT+EELOyNe9scJYZBpRfDCl1cKzZP5nRsj2VXk+FF t+/wnGSnD5kj7o1JdJM/NkqRcgHLWNWkMt26x67fntV2QHUn6/SrtcT0Vf76PYbP1iKp GONw== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c15si1889473ejd.74.2019.11.07.08.48.34; Thu, 07 Nov 2019 08:48:59 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729775AbfKGQsE (ORCPT + 99 others); Thu, 7 Nov 2019 11:48:04 -0500 Received: from mx2.suse.de ([195.135.220.15]:38182 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726810AbfKGQsE (ORCPT ); Thu, 7 Nov 2019 11:48:04 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id BBAA5AE2D; Thu, 7 Nov 2019 16:48:02 +0000 (UTC) From: Michal Suchanek To: linuxppc-dev@lists.ozlabs.org Cc: Michal Suchanek , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Hari Bathini , Mahesh Salgaonkar , linux-kernel@vger.kernel.org Subject: [PATCH v3] powerpc/fadump: when fadump is supported register the fadump sysfs files. Date: Thu, 7 Nov 2019 17:47:57 +0100 Message-Id: <20191107164757.15140-1-msuchanek@suse.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191023175651.24833-1-msuchanek@suse.de> References: <20191023175651.24833-1-msuchanek@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently it is not possible to distinguish the case when fadump is supported by firmware and disabled in kernel and completely unsupported using the kernel sysfs interface. User can investigate the devicetree but it is more reasonable to provide sysfs files in case we get some fadumpv2 in the future. With this patch sysfs files are available whenever fadump is supported by firmware. There is duplicate message about lack of support by firmware in fadump_reserve_mem and setup_fadump. Remove the duplicate message in setup_fadump. Signed-off-by: Michal Suchanek --- v2: move the sysfs initialization earlier to avoid condition nesting v3: remove duplicate message --- arch/powerpc/kernel/fadump.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index ed59855430b9..ff0114aeba9b 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -1466,16 +1466,15 @@ static void fadump_init_files(void) */ int __init setup_fadump(void) { - if (!fw_dump.fadump_enabled) - return 0; - - if (!fw_dump.fadump_supported) { - printk(KERN_ERR "Firmware-assisted dump is not supported on" - " this hardware\n"); + if (!fw_dump.fadump_supported) return 0; - } + fadump_init_files(); fadump_show_config(); + + if (!fw_dump.fadump_enabled) + return 1; + /* * If dump data is available then see if it is valid and prepare for * saving it to the disk. @@ -1492,8 +1491,6 @@ int __init setup_fadump(void) else if (fw_dump.reserve_dump_area_size) fw_dump.ops->fadump_init_mem_struct(&fw_dump); - fadump_init_files(); - return 1; } subsys_initcall(setup_fadump); -- 2.23.0