Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2649087lqp; Mon, 25 Mar 2024 05:41:23 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCW12NJpDoPxaXuo1QY1CAr0ROaL+xt/mdzosDVcPqQWA9MQKG8AuDXolSooYMSpPwvLvb70Uv9PKqXpZSN5PnOMYWSf9+DLleAI3hEcTw== X-Google-Smtp-Source: AGHT+IE9JtRyMMNODJjBbBSGIljmQyKRqsJm5XPqZL/Y5ZRFeXYlPcwi4B4o8JmxiJlE3ZvY6mWO X-Received: by 2002:a17:906:ae45:b0:a4a:3b69:66a0 with SMTP id lf5-20020a170906ae4500b00a4a3b6966a0mr1344252ejb.15.1711370483649; Mon, 25 Mar 2024 05:41:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711370483; cv=pass; d=google.com; s=arc-20160816; b=gnPHTDlkZ/0bH/zHrA4hd+cfJ9YKKqkCbtrwZwP6XjUEZsdZgt/FtHeiVO9Ka8Is/T ZrSXyT06V1UcmEr8s+j+HDDyD8ZVA4Utg0i7H6TsorjbkaDHScaIOLRr9K5CXhmE1pHb 27hURbBYTj0rhlPZNdMJX6WvdIz2KAjEcEU1IpyBSteKeR9bNuoHvIdfhi/VN/qvsOKX dxDkDu9g8JJyo7Sz2dCi3r5XNV+Rjk2k2NaZy4Ony5bESgzSTGtOFftBx076RVHPLBs1 2kz2yAWd9UCpW79K4GFL7n8bHYoWI+gKuHhjgwksFT3sXxTpo/2JyW41yTwU92KQh9ZL cHmA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=/pG7BnTVXmjKgkWvQWP3waCqSA92+NBqP0xXMBOfZS8=; fh=PXKk0h5tOYrfvLOsca+I8y9oqIXj3i9JJuE9vl6NMgM=; b=f/gF71gyXxFo/bLmr9+GrjWKm2rtNKjrTPud1hWtsZu55PthAC+zIbjX6H/nOq+Dqb qod0ebQ6DaxjWSe/o11BBgY3xjHHPFuMZMBD4NGiyU8gDYbrPtMD4uuABAMNuLn3AMa6 UQCXTRE9lXqe7adIqUFzpXEcXX73qR5Y8AEJt8eb5kjVsgpxF/2TWuorAvMhBDDOu5He OfEXyyXvXTiPGmv0DYLYklCSGLIyM+cGXGPjjRuF/e2kZ9PSFy6Pq2qz3nDlPrOvrcJY vlLdQGEwC1wMe2tB2dd95y43jL6EkKM/06yDKeW/Zg0XvmIvD0QRi6Nfb9sKjku3wQ6+ 0tIA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="qa/X5yWD"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116499-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116499-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id si25-20020a170906ced900b00a4714e036fesi2429731ejb.956.2024.03.25.05.41.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 05:41:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116499-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="qa/X5yWD"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116499-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116499-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 43F5B1F393B6 for ; Mon, 25 Mar 2024 12:41:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E5BC1A434F; Mon, 25 Mar 2024 07:32:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qa/X5yWD" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7605A1802C4; Mon, 25 Mar 2024 07:10:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711350600; cv=none; b=Bq+sjz4gPAsR30Lg6OWNo4CP0Fzc3oilurWYQ4L0TOYEn3ascsufDMenxnXD+0ibkzCttktXYtpa2q88K/r6HEiBPxhl6I9wxAzVs8MAUfj2KzpmJlQx5c+SEcvtq9ple2eW/qSwWSEqHdb6MOuZLuOGczBUVzl1/fsBvnVFJuY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711350600; c=relaxed/simple; bh=25LpLFDUK7yCKsArH1FwhXbVER4eRwrvFSgeehcEArs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ULmtWOzo1ksRYt1y2LOMHUaYeWym2te7MKEXIrGtFJhQOlsAv6/oQuGRShKUbL006IO29Uba0/fagE/63vihSzqrYLOoc3NxhnCchNn3rCMZdUTV8IeDFgtUVCAXshd3BnfaeVtXyl0H8SICvW4bXZcIgLN46HnAT9rfbiQmfhE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qa/X5yWD; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8644C433C7; Mon, 25 Mar 2024 07:09:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711350600; bh=25LpLFDUK7yCKsArH1FwhXbVER4eRwrvFSgeehcEArs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qa/X5yWDz6dwe5dMyQx+NAYSgAguUFLGgjV7qf/kSfDLz28KlIGCuz4ecgRcuRYEh MhMiBUGzmFjtWmCAW0g9zX1kk2TOIKNVnDVC1T3sPMaChkpUjwVoK66HXkjzQXaxwj obD0t0C9/R5oKN4/8kDBhoa/ji2zAPXTS5eoEIB2xHuTLdip8GhIUzq4NDe0OHtYxO /4MgNB27YKEAwlbKfQlIOeH+HtbNt+CqYPkNeLL6SQY8VeocEspxjnKCMtA8Hcxi7g e0qJ/Vo/kdc3N0oBfTC4d6XUKQkha+tp1pJ6MfAqLplXdY4MJZaC2hvLasDeZ7E+SA lWK7hbwqZQHCg== From: Damien Le Moal To: linux-pci@vger.kernel.org, Bjorn Helgaas , Manivannan Sadhasivami , linux-scsi@vger.kernel.org, "Martin K . Petersen" , Jaroslav Kysela , linux-sound@vger.kernel.org, Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-serial@vger.kernel.org, Hans de Goede , platform-driver-x86@vger.kernel.org, ntb@lists.linux.dev, Lee Jones , David Airlie , amd-gfx@lists.freedesktop.org, Jason Gunthorpe , linux-rdma@vger.kernel.org, "David S . Miller" , Eric Dumazet , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/28] PCI: documentation: Use PCI_IRQ_INTX Date: Mon, 25 Mar 2024 16:09:14 +0900 Message-ID: <20240325070944.3600338-4-dlemoal@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240325070944.3600338-1-dlemoal@kernel.org> References: <20240325070944.3600338-1-dlemoal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change all references to PCI_IRQ_LEGACY to PCI_IRQ_INTX in the PCI documentation to reflect that PCI_IRQ_LEGACY is deprecated. Signed-off-by: Damien Le Moal --- Documentation/PCI/msi-howto.rst | 2 +- Documentation/PCI/pci.rst | 2 +- Documentation/translations/zh_CN/PCI/msi-howto.rst | 2 +- Documentation/translations/zh_CN/PCI/pci.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/PCI/msi-howto.rst b/Documentation/PCI/msi-howto.rst index 783d30b7bb42..0692c9aec66f 100644 --- a/Documentation/PCI/msi-howto.rst +++ b/Documentation/PCI/msi-howto.rst @@ -103,7 +103,7 @@ min_vecs argument set to this limit, and the PCI core will return -ENOSPC if it can't meet the minimum number of vectors. The flags argument is used to specify which type of interrupt can be used -by the device and the driver (PCI_IRQ_LEGACY, PCI_IRQ_MSI, PCI_IRQ_MSIX). +by the device and the driver (PCI_IRQ_INTX, PCI_IRQ_MSI, PCI_IRQ_MSIX). A convenient short-hand (PCI_IRQ_ALL_TYPES) is also available to ask for any possible kind of interrupt. If the PCI_IRQ_AFFINITY flag is set, pci_alloc_irq_vectors() will spread the interrupts around the available CPUs. diff --git a/Documentation/PCI/pci.rst b/Documentation/PCI/pci.rst index cced568d78e9..dd7b1c0c21da 100644 --- a/Documentation/PCI/pci.rst +++ b/Documentation/PCI/pci.rst @@ -335,7 +335,7 @@ causes the PCI support to program CPU vector data into the PCI device capability registers. Many architectures, chip-sets, or BIOSes do NOT support MSI or MSI-X and a call to pci_alloc_irq_vectors with just the PCI_IRQ_MSI and PCI_IRQ_MSIX flags will fail, so try to always -specify PCI_IRQ_LEGACY as well. +specify PCI_IRQ_INTX as well. Drivers that have different interrupt handlers for MSI/MSI-X and legacy INTx should chose the right one based on the msi_enabled diff --git a/Documentation/translations/zh_CN/PCI/msi-howto.rst b/Documentation/translations/zh_CN/PCI/msi-howto.rst index 1b9b5ea790d8..95baadf767e4 100644 --- a/Documentation/translations/zh_CN/PCI/msi-howto.rst +++ b/Documentation/translations/zh_CN/PCI/msi-howto.rst @@ -88,7 +88,7 @@ MSI功能。 如果设备对最小数量的向量有要求,驱动程序可以传递一个min_vecs参数,设置为这个限制, 如果PCI核不能满足最小数量的向量,将返回-ENOSPC。 -flags参数用来指定设备和驱动程序可以使用哪种类型的中断(PCI_IRQ_LEGACY, PCI_IRQ_MSI, +flags参数用来指定设备和驱动程序可以使用哪种类型的中断(PCI_IRQ_INTX, PCI_IRQ_MSI, PCI_IRQ_MSIX)。一个方便的短语(PCI_IRQ_ALL_TYPES)也可以用来要求任何可能的中断类型。 如果PCI_IRQ_AFFINITY标志被设置,pci_alloc_irq_vectors()将把中断分散到可用的CPU上。 diff --git a/Documentation/translations/zh_CN/PCI/pci.rst b/Documentation/translations/zh_CN/PCI/pci.rst index 83c2a41d38d3..347f5c3f5ce9 100644 --- a/Documentation/translations/zh_CN/PCI/pci.rst +++ b/Documentation/translations/zh_CN/PCI/pci.rst @@ -304,7 +304,7 @@ MSI-X可以分配几个单独的向量。 的PCI_IRQ_MSI和/或PCI_IRQ_MSIX标志来启用MSI功能。这将导致PCI支持将CPU向量数 据编程到PCI设备功能寄存器中。许多架构、芯片组或BIOS不支持MSI或MSI-X,调用 ``pci_alloc_irq_vectors`` 时只使用PCI_IRQ_MSI和PCI_IRQ_MSIX标志会失败, -所以尽量也要指定 ``PCI_IRQ_LEGACY`` 。 +所以尽量也要指定 ``PCI_IRQ_INTX`` 。 对MSI/MSI-X和传统INTx有不同中断处理程序的驱动程序应该在调用 ``pci_alloc_irq_vectors`` 后根据 ``pci_dev``结构体中的 ``msi_enabled`` -- 2.44.0