Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp4392348ybp; Mon, 7 Oct 2019 07:50:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqzZtBWC+RFZbDBkWvvdf3npwpnCe8H9oFKQc3MPXzKLcBQNud+5lKx07oIHQC6DOflSXXUY X-Received: by 2002:aa7:db02:: with SMTP id t2mr29120315eds.252.1570459843882; Mon, 07 Oct 2019 07:50:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570459843; cv=none; d=google.com; s=arc-20160816; b=Fs0mNc12W+533HyFMaUmj3S7ntch6Lru6oUMyzaQzxfpbELGb1YeRCmQ7w7hiAQb6Y OcoMs7iQH7saOXAElQuoUC2N4S5Y4RYFhLRxT/z8sec8fzi2GuqDz6Ss7Sp8CAzjiTes 1CtKNDzHUk1Pwqrx0FAmIiOwLE37OpI2H29exkiF3ztk9ylKfDmMIAGi10MDkjPASkwc 2z+WL9vd2J8e4SnF8bOtrVL+H93xTca7+TD9t9bN7tLHCZzhbWev/irFLge8AiuErNal bnS84Lw2UUwkBHY490IQUP1Pz7kBLByXfU+HloP2gfDZLYrddoxjTVBxNLLl1GZqu+IY QsWA== 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 :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=MlbCb5Rla3vgZGe1aFCG+S9tvh4W5Sc6NlYBmw1TxYM=; b=EkM5SJV/2eWvmXLA/D2MpTsnm3doSEoWRuMISeuz3NYw2EAddGdyZr9uNfRcvCW1AS BBF3byYm+zd8d1UEaqaVkvPud/1UeC7DSW5zw51utKtH8Ja6oA5OewgtI74/wiBm1XSF EmUnybOAGaFLjiceJvYcrRCHoPPT13w6qzwqHLjZW6rnxYHaU5g70NHiS4vqiAwfpQ6f qnxnRtD2Rax+SZz/KsPF4FrD1N6HlqPq/PDbr78Fl1B782F3IuGt+RMSHty8IxwQEQqJ 4ZEXnW/XNfFLFizSUKiePekp4lejCMD/Addn5wQp7SGa4mj4gVxvmM/RjiEL2Asybubw zv/g== 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 b42si8660911eda.367.2019.10.07.07.50.20; Mon, 07 Oct 2019 07:50:43 -0700 (PDT) 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 S1727711AbfJGOtw (ORCPT + 99 others); Mon, 7 Oct 2019 10:49:52 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:44524 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728692AbfJGOtq (ORCPT ); Mon, 7 Oct 2019 10:49:46 -0400 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1iHUKP-0006Ag-MD; Mon, 07 Oct 2019 16:49:37 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 1269B1C0DC9; Mon, 7 Oct 2019 16:49:32 +0200 (CEST) Date: Mon, 07 Oct 2019 14:49:32 -0000 From: "tip-bot2 for Mike Travis" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/platform] x86/platform/uv: Add return code to UV BIOS Init function Cc: Mike Travis , Steve Wahl , Dimitri Sivanich , Andrew Morton , Borislav Petkov , Christoph Hellwig , "H. Peter Anvin" , Hedi Berriche , Justin Ernst , Linus Torvalds , Peter Zijlstra , Russ Anderson , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org In-Reply-To: <20190910145839.895739629@stormcage.eag.rdlabs.hpecorp.net> References: <20190910145839.895739629@stormcage.eag.rdlabs.hpecorp.net> MIME-Version: 1.0 Message-ID: <157045977203.9978.7836033501229160408.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/platform branch of tip: Commit-ID: 9743cb68f736d986481edba4d00de454d2faa0ec Gitweb: https://git.kernel.org/tip/9743cb68f736d986481edba4d00de454d2faa0ec Author: Mike Travis AuthorDate: Tue, 10 Sep 2019 09:58:42 -05:00 Committer: Ingo Molnar CommitterDate: Mon, 07 Oct 2019 13:42:10 +02:00 x86/platform/uv: Add return code to UV BIOS Init function Add a return code to the UV BIOS init function that indicates the successful initialization of the kernel/BIOS callback interface. Signed-off-by: Mike Travis Reviewed-by: Steve Wahl Reviewed-by: Dimitri Sivanich Cc: Andrew Morton Cc: Borislav Petkov Cc: Christoph Hellwig Cc: H. Peter Anvin Cc: Hedi Berriche Cc: Justin Ernst Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Russ Anderson Cc: Thomas Gleixner Link: https://lkml.kernel.org/r/20190910145839.895739629@stormcage.eag.rdlabs.hpecorp.net Signed-off-by: Ingo Molnar --- arch/x86/include/asm/uv/bios.h | 2 +- arch/x86/platform/uv/bios_uv.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h index 6e7caf6..389174e 100644 --- a/arch/x86/include/asm/uv/bios.h +++ b/arch/x86/include/asm/uv/bios.h @@ -138,7 +138,7 @@ extern s64 uv_bios_change_memprotect(u64, u64, enum uv_memprotect); extern s64 uv_bios_reserved_page_pa(u64, u64 *, u64 *, u64 *); extern int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus); -extern void uv_bios_init(void); +extern int uv_bios_init(void); extern unsigned long sn_rtc_cycles_per_second; extern int uv_type; diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c index c2ee319..ece9cb9 100644 --- a/arch/x86/platform/uv/bios_uv.c +++ b/arch/x86/platform/uv/bios_uv.c @@ -184,20 +184,20 @@ int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus) } EXPORT_SYMBOL_GPL(uv_bios_set_legacy_vga_target); -void uv_bios_init(void) +int uv_bios_init(void) { uv_systab = NULL; if ((uv_systab_phys == EFI_INVALID_TABLE_ADDR) || !uv_systab_phys || efi_runtime_disabled()) { pr_crit("UV: UVsystab: missing\n"); - return; + return -EEXIST; } uv_systab = ioremap(uv_systab_phys, sizeof(struct uv_systab)); if (!uv_systab || strncmp(uv_systab->signature, UV_SYSTAB_SIG, 4)) { pr_err("UV: UVsystab: bad signature!\n"); iounmap(uv_systab); - return; + return -EINVAL; } /* Starting with UV4 the UV systab size is variable */ @@ -208,8 +208,9 @@ void uv_bios_init(void) uv_systab = ioremap(uv_systab_phys, size); if (!uv_systab) { pr_err("UV: UVsystab: ioremap(%d) failed!\n", size); - return; + return -EFAULT; } } pr_info("UV: UVsystab: Revision:%x\n", uv_systab->revision); + return 0; }