From patchwork Mon Jun 5 14:14:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 103304 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2732698vqr; Mon, 5 Jun 2023 07:40:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Bkj95fTUOL8+9LR5gKdabcGewtVoygSbfrYOO5Jd3pIPTAQtORsztYcLjR7ayFCdMaUGB X-Received: by 2002:a17:903:1cf:b0:1aa:ff24:f8f0 with SMTP id e15-20020a17090301cf00b001aaff24f8f0mr4125686plh.4.1685976010378; Mon, 05 Jun 2023 07:40:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685976010; cv=none; d=google.com; s=arc-20160816; b=S+VWl33xqJpzXOyba4zqcBvYMXSvUcHNsO/QLaBd2H3PwNalrCZE42zXty0jnS/Et4 Tu5lVbCIad5OIFfPuCjEVhVD+kNThDWUDB+nehfj4QAsbx8xahGTT/OoZ+0iVhH3Z2oG fLFV4lyBlbCqy0ICE1J6G5HgbKKqZvl1U/zVUDxF45ZY7ya3IqJzNM7QAvcYMvZAmRX2 em060qHfpyDhCDoiPImP3/TV+GxceEbUMhznAjkVCgilMn6L1zFrmhsoozraEANMkp+A iFygWJc/gp1WGnA+ppUg7VuM9j4nWZw3ddDm2RdEyYifj55dqTy8GbS+EUHsvQX2SHJK bptw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=QY+lB4deJeNs+5LMljDCM92McOB3G+R8psZsInJgy3M=; b=zgx2I3dyySc480kMPjRHLFMyqmHdcoGkwamAMFJABE5IaInZzHgtRycIYWlVHHgZP8 7jAVvcY9fXCvm3skKwkABtB8NIKkmndIiLA9Gb0R6or5CsnR/Iq7iB+MW4O8PferfWH3 qpvy+gcDsCz3VduQhG+eVo8PRr1FlXx2AD6gdab3gMNf5u2kGVtj/KRtAOVNrQCuNGji vuC1I9QpEfbbPeHsBBkrATmhMZSqpQEbCfiGaTWv5BeiC9VphFcZtOcWvizBl6mmExcJ h/Sz9OVzpdXwL5z2/4gwTWVHx1n0l03HNdq+PHtIGV9lnljgR6HJhTdK+ugftOkBbgj2 ttbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=b8iO4zLS; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jd19-20020a170903261300b001a637201992si5324430plb.488.2023.06.05.07.39.56; Mon, 05 Jun 2023 07:40:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=b8iO4zLS; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233630AbjFEOPp (ORCPT + 99 others); Mon, 5 Jun 2023 10:15:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234908AbjFEOPJ (ORCPT ); Mon, 5 Jun 2023 10:15:09 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5349710FC; Mon, 5 Jun 2023 07:14:44 -0700 (PDT) Date: Mon, 05 Jun 2023 14:14:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1685974482; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QY+lB4deJeNs+5LMljDCM92McOB3G+R8psZsInJgy3M=; b=b8iO4zLSH2ChyHWOvlcws68+n3SmqOF36W1Z2lTfJckeyoCXEkkE0GDEkeAdrp2a/0PCcF OWJJTURbHR40gitdjJM+EOQq2r/Qb75J6JKA+0lp8OVwDVZNDUpyt7sLrIPKXWGoq/yMCs xcUNptNjCVIZuOW2s1MKyXgLopEXI0xEvXHZQHsTUfKVG0Hh1I6nksJwDO2ciJI3ltfbDF Wgore1tvWDFLIUHdN9mQq3m9rA9gcwlZxk1EZgTGDxCueIO9HLfhiqi/SkmUeslxhbqFHv Ba+D+N9doC/xUQiJWFnPLXkS7XUEEgRerqWHDy1Fwy9sdvLNAOOgq5yrPk+eTw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1685974483; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QY+lB4deJeNs+5LMljDCM92McOB3G+R8psZsInJgy3M=; b=1yLL548NyiRbbwUdmBKKzB0F+LbDC5U39ABeTTdOjmy6IpUril2K8AXb/FjJfyCF4QfRyl WouzzjeWikL78ACg== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: ras/core] x86/amd_nb: Re-sort and re-indent PCI defines Cc: "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230531094212.GHZHcWdMDkCpAp4daj@fat_crate.local> References: <20230531094212.GHZHcWdMDkCpAp4daj@fat_crate.local> MIME-Version: 1.0 Message-ID: <168597448250.404.11782473771242053949.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767873981356058012?= X-GMAIL-MSGID: =?utf-8?q?1767873981356058012?= The following commit has been merged into the ras/core branch of tip: Commit-ID: f5e87cd5114e9c6d15a12922f26bdd6e24e508ee Gitweb: https://git.kernel.org/tip/f5e87cd5114e9c6d15a12922f26bdd6e24e508ee Author: Borislav Petkov (AMD) AuthorDate: Wed, 31 May 2023 11:39:57 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Mon, 05 Jun 2023 12:26:54 +02:00 x86/amd_nb: Re-sort and re-indent PCI defines Sort them by family, model and type and align them vertically for better readability. No functional changes. Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20230531094212.GHZHcWdMDkCpAp4daj@fat_crate.local --- arch/x86/kernel/amd_nb.c | 49 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 8fd9554..035a3db 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -15,30 +15,31 @@ #include #include -#define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450 -#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 -#define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480 -#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 -#define PCI_DEVICE_ID_AMD_17H_MA0H_ROOT 0x14b5 -#define PCI_DEVICE_ID_AMD_19H_M10H_ROOT 0x14a4 -#define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 -#define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 -#define PCI_DEVICE_ID_AMD_MI200_ROOT 0x14bb -#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 -#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec -#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 -#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c -#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444 -#define PCI_DEVICE_ID_AMD_17H_MA0H_DF_F4 0x1728 -#define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654 -#define PCI_DEVICE_ID_AMD_19H_M10H_DF_F4 0x14b1 -#define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 -#define PCI_DEVICE_ID_AMD_19H_M40H_DF_F4 0x167d -#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e -#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4 -#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4 -#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc -#define PCI_DEVICE_ID_AMD_MI200_DF_F4 0x14d4 +#define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450 +#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 +#define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480 +#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 +#define PCI_DEVICE_ID_AMD_17H_MA0H_ROOT 0x14b5 +#define PCI_DEVICE_ID_AMD_19H_M10H_ROOT 0x14a4 +#define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 +#define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 +#define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 +#define PCI_DEVICE_ID_AMD_MI200_ROOT 0x14bb + +#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 +#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec +#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 +#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c +#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444 +#define PCI_DEVICE_ID_AMD_17H_MA0H_DF_F4 0x1728 +#define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654 +#define PCI_DEVICE_ID_AMD_19H_M10H_DF_F4 0x14b1 +#define PCI_DEVICE_ID_AMD_19H_M40H_DF_F4 0x167d +#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e +#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4 +#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4 +#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc +#define PCI_DEVICE_ID_AMD_MI200_DF_F4 0x14d4 /* Protect the PCI config register pairs used for SMN. */ static DEFINE_MUTEX(smn_mutex);