From patchwork Wed Sep 27 08:04:26 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: 145237 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2469687vqu; Wed, 27 Sep 2023 01:17:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsDgQhX8oFWinBXPggtIVTLMzPcO0Zl8VVD1DQSFZxzXp+q+ULY2ojqeCZ5y+pc8URX1+j X-Received: by 2002:a17:90b:4a8e:b0:26b:48e8:cd76 with SMTP id lp14-20020a17090b4a8e00b0026b48e8cd76mr1024893pjb.37.1695802668210; Wed, 27 Sep 2023 01:17:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695802668; cv=none; d=google.com; s=arc-20160816; b=CnAUVFDjXLLJdYNS5Kc6u+GN4bC1LBaKe3uuDrsvcqO7bY5miJELIYaUDHFIs+FDsz amHAepD0KOZNP1QpIyyw13gpsMPKnoDm9i9c6hPxy7z3ZN7A2++chkNdoLACelSj6TlR W0L9XzjuUueRPWQWrr5dVNs7jM+lAFe5ksb0KSO0dfq6XkUUieRJt5PrBdh7wpnpJmsA sE4qndxpF5fRS3e9XZOK7Vg2mlz2HfE1Wdg+T7hme1kvKUaKIPlcS8ybsr0KogYHYOZw qiUAvEG/iXW6Nf/qSa/ogSIcjCljrZTGFxyt1BzbOeQlDYkh0SVciHT8FODHC60mar0M oLfw== 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=6y4/x56gepc6BHyqsAM4Ueox9yfbDdfnwV5Rb7kalmc=; fh=VO8wCz7JTDh9pkTx9BDWfjINW6HT6deBZtkwtSbSzj0=; b=PRB4n8kHrjQPMv76r6OgXifPLivpo4vXE2QEYcV1DcbGsOX7iKoKq73sTbb9f6USBB pERLgOulm7K+/aYdmYG4Bn3pOh7eocl2vnoM6WEzNN8vZMGvDVbWV/jjVd9ue9S46WUP CVzstoJAMOkdc0Jcr358xClv7Mh4IikH5TOwnqAIbUmVJTgm3VxvlLwnMfnqCB2A86Q2 lKDQaLN4v3n9Px2NjhfMsFSUzr4PdqVESaLcZhMVeG0jdq3goQbsQcBUYH+L8qMoe8Ex azU/hNvDT7Bg8QXttNh/nil+RWT/kdob62i9571dkakHUVg97LLzdBPehulmXMtIxq/8 dewg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ed1X0SRm; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id o12-20020a17090ab88c00b0026d55291b15si569856pjr.0.2023.09.27.01.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 01:17:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ed1X0SRm; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 909FB806B057; Wed, 27 Sep 2023 01:05:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230035AbjI0IEd (ORCPT + 23 others); Wed, 27 Sep 2023 04:04:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229993AbjI0IEa (ORCPT ); Wed, 27 Sep 2023 04:04:30 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 300F5BF; Wed, 27 Sep 2023 01:04:28 -0700 (PDT) Date: Wed, 27 Sep 2023 08:04:26 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695801867; 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=6y4/x56gepc6BHyqsAM4Ueox9yfbDdfnwV5Rb7kalmc=; b=ed1X0SRmdE5ubj1DS54klTu122q/zgYbeX1W55si6TaDBwdI/rvds6+UO3UsuslblxlIRU 18SnbTLBbsT0if4pxP9NJNNJF3N9FLjvjDo/T41Mv8amwLf4EUivSOQEoGIFx3dmSIuwot a1O469gVVXjNHZfBzQZZ8f6qsooX0KLV9qcbzbJRBgtK60tS+CFUsAl8fBd18JOUZPoKol irCkWkSY89aeHD8Z0HDuDBBKTTmMtNtae6gfzC6eYmSwPcwUDe/cR2mr/jFO5hEwmPEeyH bqi4aGGVcPageakXg13v6OM1WIoCpNhh9sv7neFrLzKj8hww5TgZhd6ww3J9XQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695801867; 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=6y4/x56gepc6BHyqsAM4Ueox9yfbDdfnwV5Rb7kalmc=; b=1ASpo4EyjBRB36zgcBSEfxUNjzEW24Npry1n3o38gHzKClv53g9MIb990wTgZdDd327zIN DI9+p8skCQpF9gCg== From: "tip-bot2 for Muralidhara M K" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/platform] x86/amd_nb: Add AMD Family MI300 PCI IDs Cc: Muralidhara M K , Suma Hegde , Ingo Molnar , Bjorn Helgaas , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230926051932.193239-1-suma.hegde@amd.com> References: <20230926051932.193239-1-suma.hegde@amd.com> MIME-Version: 1.0 Message-ID: <169580186617.27769.8445368377007522193.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 27 Sep 2023 01:05:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778108906839722540 X-GMAIL-MSGID: 1778177978931155519 The following commit has been merged into the x86/platform branch of tip: Commit-ID: 24775700eaa93ff83b2a0f1e005879cdf186cdd9 Gitweb: https://git.kernel.org/tip/24775700eaa93ff83b2a0f1e005879cdf186cdd9 Author: Muralidhara M K AuthorDate: Tue, 26 Sep 2023 05:19:32 Committer: Ingo Molnar CommitterDate: Wed, 27 Sep 2023 09:53:23 +02:00 x86/amd_nb: Add AMD Family MI300 PCI IDs Add new Root, Device 18h Function 3, and Function 4 PCI IDS for AMD F19h Model 90h-9fh (MI300A). Signed-off-by: Muralidhara M K Signed-off-by: Suma Hegde Signed-off-by: Ingo Molnar Acked-by: Bjorn Helgaas Link: https://lore.kernel.org/r/20230926051932.193239-1-suma.hegde@amd.com --- arch/x86/kernel/amd_nb.c | 5 +++++ include/linux/pci_ids.h | 1 + 2 files changed, 6 insertions(+) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 356de95..10c2a3c 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -27,6 +27,7 @@ #define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT 0x153a #define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507 #define PCI_DEVICE_ID_AMD_MI200_ROOT 0x14bb +#define PCI_DEVICE_ID_AMD_MI300_ROOT 0x14f8 #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec @@ -43,6 +44,7 @@ #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4 0x12c4 #define PCI_DEVICE_ID_AMD_MI200_DF_F4 0x14d4 +#define PCI_DEVICE_ID_AMD_MI300_DF_F4 0x152c /* Protect the PCI config register pairs used for SMN. */ static DEFINE_MUTEX(smn_mutex); @@ -62,6 +64,7 @@ static const struct pci_device_id amd_root_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_ROOT) }, {} }; @@ -93,6 +96,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F3) }, {} }; @@ -115,6 +119,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F4) }, {} }; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 5fb3d4c..91b457d 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -579,6 +579,7 @@ #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3 #define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb #define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3 +#define PCI_DEVICE_ID_AMD_MI300_DF_F3 0x152b #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 #define PCI_DEVICE_ID_AMD_LANCE 0x2000 #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001