From patchwork Thu Oct 13 22:54:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 2437 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp515884wrs; Thu, 13 Oct 2022 15:58:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6gID/4YlWnQ6Fx/T3HulZbb10k9M7DcO3Uas87oQYIkuT/m7L96R6X4Pxfv5+YF2gi5pzn X-Received: by 2002:a17:90a:f417:b0:20b:6d04:a502 with SMTP id ch23-20020a17090af41700b0020b6d04a502mr14382357pjb.76.1665701935319; Thu, 13 Oct 2022 15:58:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665701935; cv=none; d=google.com; s=arc-20160816; b=rCmL7+LonLTDQ71ZQAx6cYZ7rCgynT1GStF6eWHe1u/AtRvxhF+frBVq4SUY1nb8Ym vBQAqJ1uHFScnn+fJKcG88HSMzzxVHcYvPNCky96zVQUvFZFzTkFJ5AYCF8gcVpKj1iA dWppU9PVdNf7ilG0FlJ3I5TUGCZWAyfVfWCadYmVz0Xrot9Qhjl5H0sKjEgVumkvEL3A fXU1h0Y32Qlyz71fpr3e3detNBdkRI+l4TW8D0mHj3rG5a3MVOk8un5TMVZkquowD9zb rLHR/ozkiJtKsdkBLrypvGKv4FHfzvpERCFoJwG0jkxrFdElsE8+IJ2qNBBXTBk+jQjH tCsw== 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=EmeC5W4SgMXX7DzCgLdfC0R/GNDpaHn49LNW4hu0Ruc=; b=ORij6RpvnAI5Z4cFcpHaRvgFOAiTXoXVuG0MYu6youpsZD60gfJ7vn6ZMRntnrvtMu cSz1CWv09i79e2zKw8Lkv4bDZSG0KtkB3moG8UJVsKVTGwuFVLiUrBAIR3Qeie8+wT7m /p3ov8XBOfo5pIThub1gSoXBwl0+EUg/0Wn4cfudDzLLVSI0v0Ta0mS4TZSyxJw9omXI vyhuawEKLVBgNXBv5p2fUHqubo9jCMRpYsIKeLyuvfMGY1mK8ydp+JRBjyvXs3z8qDg/ mlHFTAAHAQnkziR2B9GupNAzsIyQvOQWlvlV4yPMi4ImtzqtCsr2d30mqXKsKUtXQiyT CliA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aLOPDkrI; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t8-20020a170902e84800b0017f863024acsi1192951plg.235.2022.10.13.15.58.43; Thu, 13 Oct 2022 15:58:55 -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=@kernel.org header.s=k20201202 header.b=aLOPDkrI; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229650AbiJMWy4 (ORCPT + 99 others); Thu, 13 Oct 2022 18:54:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbiJMWyw (ORCPT ); Thu, 13 Oct 2022 18:54:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5356321E0F; Thu, 13 Oct 2022 15:54:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4FAB1B820BB; Thu, 13 Oct 2022 22:54:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3B3DC433D6; Thu, 13 Oct 2022 22:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665701687; bh=wY5aP2fq2o1Ri1eqe3JUjMm0lwpYU44WlaPlKlU03BM=; h=From:To:Cc:Subject:Date:From; b=aLOPDkrIBZygrHleN4/P+l/SirzmF+Vu7b7D+uGGVT0rc6M9o38pUOl0goEX871FM byrxvc8Is0qWR6yQpd7sgzOe740c3PvzlpUhwJeErE9r1BpH1G+2nRQSFw+9nduiBX kKB7k2GQMlT5EuGi4RrxGApu4gbXZiiDV6KnKAy+btBgO6hFysPYCXLeSklKQo4hgb aPkyDY/HKrYmN2+S5yp8nnpTjPXHpuQP45dt1oHn5ScIprJbtSLw/N8LKWQNxj3zTq gXbcUL54ybkRjQRVO0U1DUILqPlofbohnc4XD5PDotalYAX3U9qukOU1yg0QOyppmG Eo1xieoxRARuA== From: Bjorn Helgaas To: Joerg Roedel Cc: Suravee Suthikulpanit , iommu@lists.linux.dev, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH] PCI: Rename PCI_DEVICE_ID_RD890_IOMMU to PCI_DEVICE_ID_ATI_RD890_IOMMU Date: Thu, 13 Oct 2022 17:54:40 -0500 Message-Id: <20221013225440.3336168-1-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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?1746615072399438370?= X-GMAIL-MSGID: =?utf-8?q?1746615072399438370?= From: Bjorn Helgaas PCI_DEVICE_ID_RD890_IOMMU is a device ID in the ATI vendor ID namespace. Rename it accordingly and move it to the list of ATI device IDs. No functional change intended. Signed-off-by: Bjorn Helgaas --- drivers/iommu/amd/amd_iommu.h | 2 +- include/linux/pci_ids.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h index c160a332ce33..61749d52ba05 100644 --- a/drivers/iommu/amd/amd_iommu.h +++ b/drivers/iommu/amd/amd_iommu.h @@ -82,7 +82,7 @@ extern int amd_iommu_complete_ppr(struct pci_dev *pdev, u32 pasid, static inline bool is_rd890_iommu(struct pci_dev *pdev) { return (pdev->vendor == PCI_VENDOR_ID_ATI) && - (pdev->device == PCI_DEVICE_ID_RD890_IOMMU); + (pdev->device == PCI_DEVICE_ID_ATI_RD890_IOMMU); } static inline bool iommu_feature(struct amd_iommu *iommu, u64 mask) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index b362d90eb9b0..be2910028e27 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -382,6 +382,8 @@ #define PCI_DEVICE_ID_ATI_RS350_133 0x7831 #define PCI_DEVICE_ID_ATI_RS350_166 0x7832 #define PCI_DEVICE_ID_ATI_RS350_200 0x7833 +/* AMD RD890 Chipset */ +#define PCI_DEVICE_ID_ATI_RD890_IOMMU 0x5a23 #define PCI_DEVICE_ID_ATI_RS400_100 0x5a30 #define PCI_DEVICE_ID_ATI_RS400_133 0x5a31 #define PCI_DEVICE_ID_ATI_RS400_166 0x5a32 @@ -416,9 +418,6 @@ #define PCI_DEVICE_ID_VLSI_82C147 0x0105 #define PCI_DEVICE_ID_VLSI_VAS96011 0x0702 -/* AMD RD890 Chipset */ -#define PCI_DEVICE_ID_RD890_IOMMU 0x5a23 - #define PCI_VENDOR_ID_ADL 0x1005 #define PCI_DEVICE_ID_ADL_2301 0x2301