From patchwork Sat May 19 16:52:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10412907 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5101B6032C for ; Sat, 19 May 2018 16:53:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B453285C5 for ; Sat, 19 May 2018 16:53:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C74028623; Sat, 19 May 2018 16:53:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB518285C5 for ; Sat, 19 May 2018 16:53:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752414AbeESQw5 (ORCPT ); Sat, 19 May 2018 12:52:57 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:50914 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbeESQw4 (ORCPT ); Sat, 19 May 2018 12:52:56 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id F039460385; Sat, 19 May 2018 16:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526748775; bh=G4XTUHeXaj+O7VIeUp19a2h+O3Je7WjvCjvKUMUZNSo=; h=From:To:Cc:Subject:Date:From; b=DWNvCL1bwftwkkMDPBnGT9pGmaMUrUknDQKMHXF6Duan/2ERWIvPwXy/CPgbrhn3c BA/CcwXigiGj3K+/B+ToZBc5RUUZZvxTCIVV0Ri+CoEPsb6KUxsGNZH2SURCU/EXSw 8ObrSZlklVn6QvxrafoFP17YI7GAC9NSGAq0pAdo= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 936FB602B6; Sat, 19 May 2018 16:52:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526748775; bh=G4XTUHeXaj+O7VIeUp19a2h+O3Je7WjvCjvKUMUZNSo=; h=From:To:Cc:Subject:Date:From; b=DWNvCL1bwftwkkMDPBnGT9pGmaMUrUknDQKMHXF6Duan/2ERWIvPwXy/CPgbrhn3c BA/CcwXigiGj3K+/B+ToZBc5RUUZZvxTCIVV0Ri+CoEPsb6KUxsGNZH2SURCU/EXSw 8ObrSZlklVn6QvxrafoFP17YI7GAC9NSGAq0pAdo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 936FB602B6 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Bjorn Helgaas , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] PCI: Do not enable PASID when End-to-End TLP is not supported Date: Sat, 19 May 2018 12:52:49 -0400 Message-Id: <1526748769-701-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A PCIe endpoint carries the process address space identifier (PASID) in the TLP prefix as part of the memory read/write transaction. The address information in the TLP is relevant only for a given PASID context. A translation agent takes PASID value and the address information from the TLP to look up the physical address in the system. If a bridge drops the TLP prefix, the translation agent can resolve the address to an incorrect location and cause data corruption. Prevent this condition by requiring End-to-End TLP prefix to be supported on the entire data path between the endpoint and the root port. Signed-off-by: Sinan Kaya --- drivers/pci/ats.c | 16 ++++++++++++++++ include/uapi/linux/pci_regs.h | 1 + 2 files changed, 17 insertions(+) diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c index 89305b5..0bcded5 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -265,7 +265,9 @@ EXPORT_SYMBOL_GPL(pci_reset_pri); int pci_enable_pasid(struct pci_dev *pdev, int features) { u16 control, supported; + struct pci_dev *bridge; int pos; + u32 cap; if (WARN_ON(pdev->pasid_enabled)) return -EBUSY; @@ -274,6 +276,20 @@ int pci_enable_pasid(struct pci_dev *pdev, int features) if (!pos) return -EINVAL; + bridge = pci_upstream_bridge(pdev); + while (bridge) { + if (!pci_find_capability(bridge, PCI_CAP_ID_EXP)) + return -EINVAL; + + if (pcie_capability_read_dword(bridge, PCI_EXP_DEVCAP2, &cap)) + return -EINVAL; + + if (!(cap & PCI_EXP_DEVCAP2_E2ETLP)) + return -EINVAL; + + bridge = pci_upstream_bridge(bridge); + } + pci_read_config_word(pdev, pos + PCI_PASID_CAP, &supported); supported &= PCI_PASID_CAP_EXEC | PCI_PASID_CAP_PRIV; diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index 103ba79..d91dea5 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -634,6 +634,7 @@ #define PCI_EXP_DEVCAP2_OBFF_MASK 0x000c0000 /* OBFF support mechanism */ #define PCI_EXP_DEVCAP2_OBFF_MSG 0x00040000 /* New message signaling */ #define PCI_EXP_DEVCAP2_OBFF_WAKE 0x00080000 /* Re-use WAKE# for OBFF */ +#define PCI_EXP_DEVCAP2_E2ETLP 0x00200000 /* End-to-End TLP Prefix */ #define PCI_EXP_DEVCTL2 40 /* Device Control 2 */ #define PCI_EXP_DEVCTL2_COMP_TIMEOUT 0x000f /* Completion Timeout Value */ #define PCI_EXP_DEVCTL2_COMP_TMOUT_DIS 0x0010 /* Completion Timeout Disable */