Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp5700246ybe; Tue, 10 Sep 2019 07:36:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxmez5jO9igmAVruG8vtEgnSPY/j0IBHfYVar5MfThy+Mj3AP63LvdJNKiVegm4I+G4HCaY X-Received: by 2002:a17:906:f2d3:: with SMTP id gz19mr25161405ejb.306.1568126199679; Tue, 10 Sep 2019 07:36:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568126199; cv=none; d=google.com; s=arc-20160816; b=PxSMGlkqh+RDZ5LwI805SLGWdDUfB7Y4s00Wrap2e0Tn2pu1EFwoQTxZpyDRXDrs+a pr0wKBzc03sML2zq5yiBLLJ2020+Hy5zqDA6zLqXq8TS4j4MGQcf+TqPTKcBPJy9uUUh Sgmgi90XnrLfIYLcRU+aWydhF0h3dhdI9Z9CvRlnQgyMs4uZSzvX+O2nLhe++u48aATV 9zo40WhwBqHCZW8foxz7vjK8bTAp/DR+I/bvkJ9a4PaFEf0Qv6PwB5GuOOB0l4KyAnoe 3dunBpSB5+OuFzxJ8rSW3kdRYaLxM8Kbml6eLBgcDED+STdKPXW/qXC7zCCEwBDLdsGf 853g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition:subject:cc:to:from :date:user-agent:references:message-id; bh=/3eaNmo/EbgG52J0N/9K7uHlcMPESZIS8GbJnbwAx/k=; b=FYbdQMDCVo5EO7Mz7uAEVPuYizm6RlhN5g/DNsRmgVNNoYwpJVzxmMJWmMM/qqK69Y z8bHEMvhudfaMRzzWxm3bV9WYeS2ueK6FXLY/oTdXERXQ9zQm1FxmUuCWHDEJN+0pqTF sctKw75aP/miBQ9coU5kEZKtvPgjFMQBuJA9NhBbQpi95zjoF+wCmUf9YBhOohZiFY2+ m7b5vSleESR5n3ib12OmnehTZ7JOi4YMztlcGG2slXXu0VV63ezweAR6NbtQ/DD2g401 Mbi+30OFJOXgp2/6d/sivz1ZlLFTSwA6TMYJqAAejNxtA9WOmZ+fTexfHiDspc6+rLCw bhlg== 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=hpe.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z6si1253053edp.79.2019.09.10.07.36.15; Tue, 10 Sep 2019 07:36:39 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=hpe.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388546AbfIJOc1 (ORCPT + 99 others); Tue, 10 Sep 2019 10:32:27 -0400 Received: from mx0a-002e3701.pphosted.com ([148.163.147.86]:16744 "EHLO mx0a-002e3701.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388437AbfIJOcE (ORCPT ); Tue, 10 Sep 2019 10:32:04 -0400 Received: from pps.filterd (m0134420.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x8AER1TJ009269; Tue, 10 Sep 2019 14:31:48 GMT Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0b-002e3701.pphosted.com with ESMTP id 2uxbxdsn5n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Sep 2019 14:31:47 +0000 Received: from stormcage.eag.rdlabs.hpecorp.net (stormcage.eag.rdlabs.hpecorp.net [128.162.236.70]) by g4t3426.houston.hpe.com (Postfix) with ESMTP id 52EB15F; Tue, 10 Sep 2019 14:31:46 +0000 (UTC) Received: by stormcage.eag.rdlabs.hpecorp.net (Postfix, from userid 5508) id 150A2201FCF18; Tue, 10 Sep 2019 09:31:46 -0500 (CDT) Message-Id: <20190910143101.249984917@stormcage.eag.rdlabs.hpecorp.net> References: <20190910143100.962781883@stormcage.eag.rdlabs.hpecorp.net> User-Agent: quilt/0.46-1 Date: Tue, 10 Sep 2019 09:31:03 -0500 From: Mike Travis To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Andrew Morton , Borislav Petkov , Christoph Hellwig Cc: Dimitri Sivanich , Russ Anderson , Hedi Berriche , Steve Wahl , Justin Ernst , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/8] x86/platform/uv: Add return code to UV BIOS Init function Content-Disposition: inline; filename=add-bios_init-rc X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.70,1.0.8 definitions=2019-09-10_10:2019-09-10,2019-09-10 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 priorityscore=1501 bulkscore=0 suspectscore=0 adultscore=0 lowpriorityscore=0 mlxscore=0 malwarescore=0 spamscore=0 impostorscore=0 clxscore=1015 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1906280000 definitions=main-1909100141 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/x86/include/asm/uv/bios.h | 2 +- arch/x86/platform/uv/bios_uv.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) --- linux.orig/arch/x86/include/asm/uv/bios.h +++ linux/arch/x86/include/asm/uv/bios.h @@ -138,7 +138,7 @@ extern s64 uv_bios_change_memprotect(u64 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; --- linux.orig/arch/x86/platform/uv/bios_uv.c +++ linux/arch/x86/platform/uv/bios_uv.c @@ -184,20 +184,20 @@ int uv_bios_set_legacy_vga_target(bool d } 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; } --