From mboxrd@z Thu Jan 1 00:00:00 1970 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 724792066DF; Wed, 4 Dec 2024 17:11:48 +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=1733332308; cv=none; b=az92GJoSV122ZeQPUnwcN2li4nMREwmHQkuz5nU1/qniMXWbZDn01zCKFvVyvlrXK22W4tCFCV0mEnto0k1ABZ1vDads9Gu3O3uAJGXogCcyOHX3Za0peljVs0puR6G6rfyX306eCyJG7cYzbhm62zrTUPAt66LHonsvJaWhqTU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733332308; c=relaxed/simple; bh=ckDMjVDSyBTqcPOpG8jfSlViv6qZAcYWL7qVzsWgtYM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lhmRhscA7lmo9t0LHaIXaIVHCjHwwvQMVu0tckEo/WZO4hFUrKK3tbB0J8YHvX1J9fI8ARKhG322dPx72fr5z9jgs0yTsq8AHtOzLbd97FXiudg7J72dvmw4gassXnojLpIMQlje0JlK/JLV+UUf+WxbCQ2K1AH1crzo78YcCdU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O+0y34dH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O+0y34dH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96631C4CED1; Wed, 4 Dec 2024 17:11:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733332308; bh=ckDMjVDSyBTqcPOpG8jfSlViv6qZAcYWL7qVzsWgtYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O+0y34dH1JxPON9SVzJD7sKA8r22l82AakgPqymQo8nMI1eBeZJvejIM/+n8SOIAb CYg48uDbDk+HpLDzAncNhJvZ7TY2FFrrbYORLF6/dUYe9VRwWG4vTs0ucBfgHMj9Nx Xqon6oBYfWEESUbBLR9D1YLPCOwzPnQuMe0RinYeXuc2pu859noaf1bfd4vLkUO++8 BmqmhAIoCPeR7wxdk+WsQc5H3LEdY+mAG+rVVA3tRCBlHNOWW3D8KaAZaoZYAwL6fm 0ikjTOjqnQurTZERBbUuQ0yHB4HiFMvfnC9+FDeLWflyPibXWovSmW1umpeGUf5qZ5 7b8JTqMum/New== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mengyuan Lou , Bjorn Helgaas , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 10/15] PCI: Add ACS quirk for Wangxun FF5xxx NICs Date: Wed, 4 Dec 2024 10:59:58 -0500 Message-ID: <20241204160010.2216008-10-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241204160010.2216008-1-sashal@kernel.org> References: <20241204160010.2216008-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.1 Content-Transfer-Encoding: 8bit From: Mengyuan Lou [ Upstream commit aa46a3736afcb7b0793766d22479b8b99fc1b322 ] Wangxun FF5xxx NICs are similar to SFxxx, RP1000 and RP2000 NICs. They may be multi-function devices, but they do not advertise an ACS capability. But the hardware does isolate FF5xxx functions as though it had an ACS capability and PCI_ACS_RR and PCI_ACS_CR were set in the ACS Control register, i.e., all peer-to-peer traffic is directed upstream instead of being routed internally. Add ACS quirk for FF5xxx NICs in pci_quirk_wangxun_nic_acs() so the functions can be in independent IOMMU groups. Link: https://lore.kernel.org/r/E16053DB2B80E9A5+20241115024604.30493-1-mengyuanlou@net-swift.com Signed-off-by: Mengyuan Lou Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/pci/quirks.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index dccb60c1d9cc3..8103bc24a54ea 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4996,18 +4996,21 @@ static int pci_quirk_brcm_acs(struct pci_dev *dev, u16 acs_flags) } /* - * Wangxun 10G/1G NICs have no ACS capability, and on multi-function - * devices, peer-to-peer transactions are not be used between the functions. - * So add an ACS quirk for below devices to isolate functions. + * Wangxun 40G/25G/10G/1G NICs have no ACS capability, but on + * multi-function devices, the hardware isolates the functions by + * directing all peer-to-peer traffic upstream as though PCI_ACS_RR and + * PCI_ACS_CR were set. * SFxxx 1G NICs(em). * RP1000/RP2000 10G NICs(sp). + * FF5xxx 40G/25G/10G NICs(aml). */ static int pci_quirk_wangxun_nic_acs(struct pci_dev *dev, u16 acs_flags) { switch (dev->device) { - case 0x0100 ... 0x010F: - case 0x1001: - case 0x2001: + case 0x0100 ... 0x010F: /* EM */ + case 0x1001: case 0x2001: /* SP */ + case 0x5010: case 0x5025: case 0x5040: /* AML */ + case 0x5110: case 0x5125: case 0x5140: /* AML */ return pci_acs_ctrl_enabled(acs_flags, PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF); } -- 2.43.0