Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp570644pxu; Thu, 3 Dec 2020 07:28:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIIQuPqxKZ8q6MwaKce/WK2dtTzZjX0tbrfoeJpaBZYbVeM2W4NDtb0jKb8UHfyjlFwsop X-Received: by 2002:aa7:c892:: with SMTP id p18mr3372093eds.64.1607009325864; Thu, 03 Dec 2020 07:28:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607009325; cv=none; d=google.com; s=arc-20160816; b=MsRrErPMduQ9OoqIwIx3qeDhgas+AkLcAefSa5C26KhQUAIYSIlzRuYohmrcMScJyS BIDSRLTZ9ENvn/o8Orexclgdx5dNIi0D5HLZRbiW6P6ohogf0+imaN0X/SnjiRk7pPBj GxtniQf4CVNiIF5R6dE6FQb/DqzIjzC4Cme9Q+g8zzUE1nZmMgFbTBRxce2x/wkd3SMH 44ISzOdWf20RKU9whdG014kQeLfWw3uExA4PH8kKNokcbqjgEtqBkgUTLGYltEGnJPx3 auhbCXIKdrHxeQfgXxf00DBIdLG+i7OVm16NvwvTidas1lLjbxYORJJOinP9PZZnl4VU Klqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=5VtHZKKZ25YZXJfM+LeO3yfzrQRS17P/tGLiFL7aoHI=; b=cVsObJ5Y9klMIv84GwlyY5Slghzb4NAZaKwj8UBAd/kwrdYPE4rn7WOG0kF31emSgp Ph6TbQHMxU3WHpf/pGUoksnFwIJEbImOkSpCCrpJ+iN5fI6IdPEOP8sMaRohe34VW68O nkmxwjUT37iCEBmqoLgf2Knc01vbSg2Mw4nSudrwgQoA9KWCVR1wud0CMqeQ/iUKi/5p AiYw/i12I4cerB2gEoR6nSXavJQJtCt3VzL96uGlTJrTMjYHZ9nQlaKUCsHuKaDZfTOS X1EtMkETbKc2D8TEwmzu9zP25YV2t1+SKyUi4ffQkV5AVc8oS1T+T6LMluKyzjOo3f5G vE8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=Abt5gpdp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y12si1305907ejw.561.2020.12.03.07.28.13; Thu, 03 Dec 2020 07:28:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=Abt5gpdp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730984AbgLCPYy (ORCPT + 99 others); Thu, 3 Dec 2020 10:24:54 -0500 Received: from mx0a-002e3701.pphosted.com ([148.163.147.86]:18798 "EHLO mx0a-002e3701.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726751AbgLCPYy (ORCPT ); Thu, 3 Dec 2020 10:24:54 -0500 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 0B3F821Q010480; Thu, 3 Dec 2020 15:23:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pps0720; bh=5VtHZKKZ25YZXJfM+LeO3yfzrQRS17P/tGLiFL7aoHI=; b=Abt5gpdpSdWUcuWHnsgZT6zgv86OkDksQ3tqjKszxMMrhjYfc9uw3a7XyTXpje16vIUo f8Z1hzHLdmI4+7qYa0Bs5w1BvnQfEctAiGEPT4jrAWMrkLx46F1IMA9uHZNcPqqBdSrP XnDUCANAg9S85teycFyLj9IIkh6WVa9maHGZuO+uTEnr1pX5MFVE+RRUApdc/Aq7AXxj YsbP0Q88HnNY8YNRQrT4M0/Ums+ixb5otVGqgxWT+3vGWHdYNkeF69LSvvRwkVVqfinZ EzHKa10suwcUp9xj8akiUfG0Vu2Q9ay7TgHMaOcsgTlYQ+xK7KK97vtHvCoWpIcwE8Rp 1A== Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) by mx0b-002e3701.pphosted.com with ESMTP id 35714tgsn7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Dec 2020 15:23:48 +0000 Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g9t5009.houston.hpe.com (Postfix) with ESMTP id 2DD2166; Thu, 3 Dec 2020 15:23:47 +0000 (UTC) Received: from dog.eag.rdlabs.hpecorp.net (dog.eag.rdlabs.hpecorp.net [128.162.243.181]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 17EB548; Thu, 3 Dec 2020 15:23:45 +0000 (UTC) From: Mike Travis To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Hans de Goede , Steve Wahl , x86@kernel.org Cc: Mike Travis , Dimitri Sivanich , Russ Anderson , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH] Fix UV4 Hub Revision adjustment Date: Thu, 3 Dec 2020 09:22:52 -0600 Message-Id: <20201203152252.371199-1-mike.travis@hpe.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-12-03_08:2020-12-03,2020-12-03 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 mlxlogscore=999 impostorscore=0 mlxscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 bulkscore=0 suspectscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012030093 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix UV4 Hub Revision adjustment as Hub chip starts with revision 1. Incorrectly identifies UV4 as UV4A and UV4A as UV5. Fixes 647128f1536ef: x86/platform/uv: Update UV MMRs for UV5 Signed-off-by: Mike Travis Acked-by: Dimitri Sivanich --- arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 1b98f8c12b96..235f5cde06fc 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -161,7 +161,7 @@ static int __init early_set_hub_type(void) /* UV4/4A only have a revision difference */ case UV4_HUB_PART_NUMBER: uv_min_hub_revision_id = node_id.s.revision - + UV4_HUB_REVISION_BASE; + + UV4_HUB_REVISION_BASE - 1; uv_hub_type_set(UV4); if (uv_min_hub_revision_id == UV4A_HUB_REVISION_BASE) uv_hub_type_set(UV4|UV4A); -- 2.21.0