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 AC2D3216E2D; Thu, 12 Dec 2024 17:50:36 +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=1734025836; cv=none; b=RwI65vb4DaZEvw+l6u7VJLkgvcTWe0BooWb4gxFMAf6iGrkOqV+rc3Uld3ft5Myhwo744m3JJZRPt0w4gQRhAoApokApPfYG1i8S+LQniOIa4wqH9UXNMI7W+/fpf3oPSfxXcC6RxKe99bSx2LMi9yDPqwxuLMdOlhc5c3uiTbQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734025836; c=relaxed/simple; bh=FlwGuCikLk3G1IP3LF9ISHY9EUdPSvIxJrilQnIf82M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A+bviRLHahkaXQpsNCQK68ekXUkMB6RVFhFXzWRxUcfuVSG+szHQJEqgTc9Kc97sFtc9WWlGFCUXcBrYOu8l7yV+qxJCDvHOczwwQJ+NF2bOsiZa8WalnFWeLukuzpamqHJQzgYgWHs2IfI5Iv1dZNUWw+Rmf0MvUp6fOcKR138= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Jx2Hiq6J; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Jx2Hiq6J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 287ECC4CECE; Thu, 12 Dec 2024 17:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734025836; bh=FlwGuCikLk3G1IP3LF9ISHY9EUdPSvIxJrilQnIf82M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jx2Hiq6J8c+D7oE7x+HPcdlcrUYCE8OCuLrYgjsSHBs6Se79gv1LWnFodZ2P9XOUW /VRqr5IyOXTe3pn6TwxoSBVrWWhs5tkiOCoN9eGfx/PoCqqFSVjpcQmgKxiNASAR8i vTCz5J1EgwlbU8429mj/JgagWUguIMYpl3/fO7r8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mengyuan Lou , Bjorn Helgaas , Sasha Levin Subject: [PATCH 5.4 302/321] PCI: Add ACS quirk for Wangxun FF5xxx NICs Date: Thu, 12 Dec 2024 16:03:40 +0100 Message-ID: <20241212144241.904534948@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144229.291682835@linuxfoundation.org> References: <20241212144229.291682835@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ 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 b60954b04a077..6a2d64d050c04 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4870,18 +4870,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