Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp6085859ybe; Tue, 10 Sep 2019 13:17:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDORL/5wiPYVnvLWgeLNeymuemCxbJ8/gUIOIiHdAzccd5ZDd3Er/IebU256Q3BpsGGvo4 X-Received: by 2002:a50:c94b:: with SMTP id p11mr30613647edh.115.1568146668579; Tue, 10 Sep 2019 13:17:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568146668; cv=none; d=google.com; s=arc-20160816; b=cqT4/ODBQkhtmR4bPtkdWXtZQLy3DQW4VKTtAO101WxWnn0XNkIYnPnV7AOvoKKAUK oft9Jp6/dIcde6aQg9O3kF1ABO0Zu27kraymSwZJWc6PSsnYX7+tMJcn2lk59lGPXR3r zaLGnpLCTtvsIUCFtdgOf/BMS3bjr9VNyB+8E/OL1x9cVmjePdZ45TXpOrbk/zFEHdZF 4TuJ2oAeZmm8Wxe19H7BEvzWBTn7BCZYv830VKTWuNx8Ap7XMLUDggkQeBpgpDuUdhYa tpE0YmM+8LdPZYsrx3WrJVYmflAaIZDjhpKPdBVa5sNrGEi4IRggISl2AdFdnRUyCFNg ybMA== 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=EzF/DK0WjIJjb9JT4cVhQ2QXbXMq1ytLZ1YBra4N3JU=; b=Z8+qQgBcJg45qn24vZf6y1Pe5KcbpzAXt/0gOGvBhwiM5Gy/XxAIkssOJBJlGfETp5 Zk87oOtY2MKIYGAASGGbt8l2t0qLR2rePLcxi/9XsdUhCptk96Qes/zzn+GuBXKVlLWi CcDFDONiYjiBQ88XEbjswtXEMB+5IPbpw8OH/CHqJ7wgb3oipDGMNDhAHD3rAnHGJs4G V5oftDNMPWUysa5Zf7hYM6+IIeIx6eXvmdUSwRJRcEM4JFRzqtdxh8o98rBEJcAbLUO2 FcJlu7Cek+LBQ4rJNYcI8Ckjq9eia7Tpvmaq+yt2VTKknJgS4M1ch5OofFfJDhGteG2U qZ0g== 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 s54si11281178edm.215.2019.09.10.13.17.24; Tue, 10 Sep 2019 13:17:48 -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 S2404043AbfIJOql (ORCPT + 99 others); Tue, 10 Sep 2019 10:46:41 -0400 Received: from mx0b-002e3701.pphosted.com ([148.163.143.35]:53199 "EHLO mx0b-002e3701.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393607AbfIJOqh (ORCPT ); Tue, 10 Sep 2019 10:46:37 -0400 Received: from pps.filterd (m0134425.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x8AEfMnk005081; Tue, 10 Sep 2019 14:46:22 GMT Received: from g4t3427.houston.hpe.com (g4t3427.houston.hpe.com [15.241.140.73]) by mx0b-002e3701.pphosted.com with ESMTP id 2uwx11svhe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Sep 2019 14:46:22 +0000 Received: from stormcage.eag.rdlabs.hpecorp.net (stormcage.eag.rdlabs.hpecorp.net [128.162.236.70]) by g4t3427.houston.hpe.com (Postfix) with ESMTP id 74AC15C; Tue, 10 Sep 2019 14:46:21 +0000 (UTC) Received: by stormcage.eag.rdlabs.hpecorp.net (Postfix, from userid 5508) id 2534C201FCF1B; Tue, 10 Sep 2019 09:46:21 -0500 (CDT) Message-Id: <20190910144610.075085694@stormcage.eag.rdlabs.hpecorp.net> References: <20190910144609.909602978@stormcage.eag.rdlabs.hpecorp.net> User-Agent: quilt/0.46-1 Date: Tue, 10 Sep 2019 09:46:10 -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 1/8] x86/platform/uv: Save OEM_ID from ACPI MADT probe Content-Disposition: inline; filename=save-oem_id 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 phishscore=0 spamscore=0 suspectscore=0 mlxlogscore=886 lowpriorityscore=0 mlxscore=0 bulkscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1906280000 definitions=main-1909100142 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Save the OEM_ID and OEM_TABLE_ID passed to the apic driver probe function for later use. Also, convert the char list arg passed from the kernel to a true null-terminated string. Signed-off-by: Mike Travis Reviewed-by: Steve Wahl Reviewed-by: Dimitri Sivanich --- arch/x86/kernel/apic/x2apic_uv_x.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) --- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c +++ linux/arch/x86/kernel/apic/x2apic_uv_x.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -31,6 +32,10 @@ static u64 gru_dist_base, gru_first_no static u64 gru_dist_lmask, gru_dist_umask; static union uvh_apicid uvh_apicid; +/* Unpack OEM/TABLE ID's to be NULL terminated strings */ +static u8 oem_id[ACPI_OEM_ID_SIZE + 1]; +static u8 oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1]; + /* Information derived from CPUID: */ static struct { unsigned int apicid_shift; @@ -248,11 +253,20 @@ static void __init uv_set_apicid_hibit(v } } -static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) +static void __init uv_stringify(int len, char *to, char *from) +{ + /* Relies on 'to' being NULL chars so result will be NULL terminated */ + strncpy(to, from, len-1); +} + +static int __init uv_acpi_madt_oem_check(char *_oem_id, char *_oem_table_id) { int pnodeid; int uv_apic; + uv_stringify(sizeof(oem_id), oem_id, _oem_id); + uv_stringify(sizeof(oem_table_id), oem_table_id, _oem_table_id); + if (strncmp(oem_id, "SGI", 3) != 0) { if (strncmp(oem_id, "NSGI", 4) == 0) { uv_hubless_system = true; --