From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
To: joro@8bytes.org, mst@redhat.com
Cc: iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org,
devicetree@vger.kernel.org,
virtualization@lists.linux-foundation.org,
virtio-dev@lists.oasis-open.org, jasowang@redhat.com,
robh+dt@kernel.org, mark.rutland@arm.com,
Lorenzo.Pieralisi@arm.com, robin.murphy@arm.com,
bhelgaas@google.com, frowand.list@gmail.com,
kvmarm@lists.cs.columbia.edu, eric.auger@redhat.com,
tnowicki@caviumnetworks.com, kevin.tian@intel.com,
bauerman@linux.ibm.com
Subject: [PATCH v8 3/7] of: Allow the iommu-map property to omit untranslated devices
Date: Thu, 30 May 2019 18:09:25 +0100 [thread overview]
Message-ID: <20190530170929.19366-4-jean-philippe.brucker@arm.com> (raw)
In-Reply-To: <20190530170929.19366-1-jean-philippe.brucker@arm.com>
In PCI root complex nodes, the iommu-map property describes the IOMMU that
translates each endpoint. On some platforms, the IOMMU itself is presented
as a PCI endpoint (e.g. AMD IOMMU and virtio-iommu). This isn't supported
by the current OF driver, which expects all endpoints to have an IOMMU.
Allow the iommu-map property to have gaps.
Relaxing of_map_rid() also allows the msi-map property to have gaps, which
is invalid since MSIs always reach an MSI controller. In that case
pci_msi_setup_msi_irqs() will return an error when attempting to find the
device's MSI domain.
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
---
drivers/of/base.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 20e0e7ee4edf..55e7f5bb0549 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2294,8 +2294,12 @@ int of_map_rid(struct device_node *np, u32 rid,
return 0;
}
- pr_err("%pOF: Invalid %s translation - no match for rid 0x%x on %pOF\n",
- np, map_name, rid, target && *target ? *target : NULL);
- return -EFAULT;
+ pr_info("%pOF: no %s translation for rid 0x%x on %pOF\n", np, map_name,
+ rid, target && *target ? *target : NULL);
+
+ /* Bypasses translation */
+ if (id_out)
+ *id_out = rid;
+ return 0;
}
EXPORT_SYMBOL_GPL(of_map_rid);
--
2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
To: joro@8bytes.org, mst@redhat.com
Cc: mark.rutland@arm.com, virtio-dev@lists.oasis-open.org,
kevin.tian@intel.com, tnowicki@caviumnetworks.com,
frowand.list@gmail.com, devicetree@vger.kernel.org,
linux-pci@vger.kernel.org, jasowang@redhat.com,
virtualization@lists.linux-foundation.org,
iommu@lists.linux-foundation.org, robh+dt@kernel.org,
bhelgaas@google.com, robin.murphy@arm.com,
kvmarm@lists.cs.columbia.edu
Subject: [PATCH v8 3/7] of: Allow the iommu-map property to omit untranslated devices
Date: Thu, 30 May 2019 18:09:25 +0100 [thread overview]
Message-ID: <20190530170929.19366-4-jean-philippe.brucker@arm.com> (raw)
In-Reply-To: <20190530170929.19366-1-jean-philippe.brucker@arm.com>
In PCI root complex nodes, the iommu-map property describes the IOMMU that
translates each endpoint. On some platforms, the IOMMU itself is presented
as a PCI endpoint (e.g. AMD IOMMU and virtio-iommu). This isn't supported
by the current OF driver, which expects all endpoints to have an IOMMU.
Allow the iommu-map property to have gaps.
Relaxing of_map_rid() also allows the msi-map property to have gaps, which
is invalid since MSIs always reach an MSI controller. In that case
pci_msi_setup_msi_irqs() will return an error when attempting to find the
device's MSI domain.
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
---
drivers/of/base.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 20e0e7ee4edf..55e7f5bb0549 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2294,8 +2294,12 @@ int of_map_rid(struct device_node *np, u32 rid,
return 0;
}
- pr_err("%pOF: Invalid %s translation - no match for rid 0x%x on %pOF\n",
- np, map_name, rid, target && *target ? *target : NULL);
- return -EFAULT;
+ pr_info("%pOF: no %s translation for rid 0x%x on %pOF\n", np, map_name,
+ rid, target && *target ? *target : NULL);
+
+ /* Bypasses translation */
+ if (id_out)
+ *id_out = rid;
+ return 0;
}
EXPORT_SYMBOL_GPL(of_map_rid);
--
2.21.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
To: joro@8bytes.org, mst@redhat.com
Cc: virtio-dev@lists.oasis-open.org, kevin.tian@intel.com,
Lorenzo.Pieralisi@arm.com, tnowicki@caviumnetworks.com,
frowand.list@gmail.com, devicetree@vger.kernel.org,
linux-pci@vger.kernel.org, jasowang@redhat.com,
virtualization@lists.linux-foundation.org,
iommu@lists.linux-foundation.org, robh+dt@kernel.org,
bhelgaas@google.com, robin.murphy@arm.com,
kvmarm@lists.cs.columbia.edu, bauerman@linux.ibm.com
Subject: [PATCH v8 3/7] of: Allow the iommu-map property to omit untranslated devices
Date: Thu, 30 May 2019 18:09:25 +0100 [thread overview]
Message-ID: <20190530170929.19366-4-jean-philippe.brucker@arm.com> (raw)
In-Reply-To: <20190530170929.19366-1-jean-philippe.brucker@arm.com>
In PCI root complex nodes, the iommu-map property describes the IOMMU that
translates each endpoint. On some platforms, the IOMMU itself is presented
as a PCI endpoint (e.g. AMD IOMMU and virtio-iommu). This isn't supported
by the current OF driver, which expects all endpoints to have an IOMMU.
Allow the iommu-map property to have gaps.
Relaxing of_map_rid() also allows the msi-map property to have gaps, which
is invalid since MSIs always reach an MSI controller. In that case
pci_msi_setup_msi_irqs() will return an error when attempting to find the
device's MSI domain.
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
---
drivers/of/base.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 20e0e7ee4edf..55e7f5bb0549 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2294,8 +2294,12 @@ int of_map_rid(struct device_node *np, u32 rid,
return 0;
}
- pr_err("%pOF: Invalid %s translation - no match for rid 0x%x on %pOF\n",
- np, map_name, rid, target && *target ? *target : NULL);
- return -EFAULT;
+ pr_info("%pOF: no %s translation for rid 0x%x on %pOF\n", np, map_name,
+ rid, target && *target ? *target : NULL);
+
+ /* Bypasses translation */
+ if (id_out)
+ *id_out = rid;
+ return 0;
}
EXPORT_SYMBOL_GPL(of_map_rid);
--
2.21.0
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
To: joro@8bytes.org, mst@redhat.com
Cc: iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org,
devicetree@vger.kernel.org,
virtualization@lists.linux-foundation.org,
virtio-dev@lists.oasis-open.org, jasowang@redhat.com,
robh+dt@kernel.org, mark.rutland@arm.com,
Lorenzo.Pieralisi@arm.com, robin.murphy@arm.com,
bhelgaas@google.com, frowand.list@gmail.com,
kvmarm@lists.cs.columbia.edu, eric.auger@redhat.com,
tnowicki@caviumnetworks.com, kevin.tian@intel.com,
bauerman@linux.ibm.com
Subject: [virtio-dev] [PATCH v8 3/7] of: Allow the iommu-map property to omit untranslated devices
Date: Thu, 30 May 2019 18:09:25 +0100 [thread overview]
Message-ID: <20190530170929.19366-4-jean-philippe.brucker@arm.com> (raw)
In-Reply-To: <20190530170929.19366-1-jean-philippe.brucker@arm.com>
In PCI root complex nodes, the iommu-map property describes the IOMMU that
translates each endpoint. On some platforms, the IOMMU itself is presented
as a PCI endpoint (e.g. AMD IOMMU and virtio-iommu). This isn't supported
by the current OF driver, which expects all endpoints to have an IOMMU.
Allow the iommu-map property to have gaps.
Relaxing of_map_rid() also allows the msi-map property to have gaps, which
is invalid since MSIs always reach an MSI controller. In that case
pci_msi_setup_msi_irqs() will return an error when attempting to find the
device's MSI domain.
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
---
drivers/of/base.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 20e0e7ee4edf..55e7f5bb0549 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2294,8 +2294,12 @@ int of_map_rid(struct device_node *np, u32 rid,
return 0;
}
- pr_err("%pOF: Invalid %s translation - no match for rid 0x%x on %pOF\n",
- np, map_name, rid, target && *target ? *target : NULL);
- return -EFAULT;
+ pr_info("%pOF: no %s translation for rid 0x%x on %pOF\n", np, map_name,
+ rid, target && *target ? *target : NULL);
+
+ /* Bypasses translation */
+ if (id_out)
+ *id_out = rid;
+ return 0;
}
EXPORT_SYMBOL_GPL(of_map_rid);
--
2.21.0
---------------------------------------------------------------------
To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org
For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org
next prev parent reply other threads:[~2019-05-30 17:09 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-30 17:09 [PATCH v8 0/7] Add virtio-iommu driver Jean-Philippe Brucker
2019-05-30 17:09 ` [virtio-dev] " Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` [PATCH v8 1/7] dt-bindings: virtio-mmio: Add IOMMU description Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` [virtio-dev] " Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` [PATCH v8 2/7] dt-bindings: virtio: Add virtio-pci-iommu node Jean-Philippe Brucker
2019-05-30 17:09 ` [virtio-dev] " Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:45 ` Michael S. Tsirkin
2019-05-30 17:45 ` [virtio-dev] " Michael S. Tsirkin
2019-05-30 17:45 ` Michael S. Tsirkin
2019-05-30 17:45 ` Michael S. Tsirkin
2019-05-31 11:13 ` [virtio-dev] " Jean-Philippe Brucker
2019-05-31 11:13 ` Jean-Philippe Brucker
2019-05-31 11:13 ` [virtio-dev] " Jean-Philippe Brucker
2019-05-31 11:13 ` Jean-Philippe Brucker
2019-05-31 11:13 ` Jean-Philippe Brucker
2019-05-31 11:13 ` Jean-Philippe Brucker
2019-06-16 20:04 ` Michael S. Tsirkin
2019-06-16 20:04 ` [virtio-dev] " Michael S. Tsirkin
2019-06-16 20:04 ` Michael S. Tsirkin
2019-06-16 20:04 ` Michael S. Tsirkin
2019-06-16 20:04 ` Michael S. Tsirkin
2019-06-16 20:04 ` Michael S. Tsirkin
2019-05-30 17:45 ` Michael S. Tsirkin
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker [this message]
2019-05-30 17:09 ` [virtio-dev] [PATCH v8 3/7] of: Allow the iommu-map property to omit untranslated devices Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` [PATCH v8 4/7] PCI: OF: Initialize dev->fwnode appropriately Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` [virtio-dev] " Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` [PATCH v8 5/7] iommu: Add virtio-iommu driver Jean-Philippe Brucker
2019-05-30 17:09 ` [virtio-dev] " Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-06-14 7:33 ` Auger Eric
2019-06-14 7:33 ` Auger Eric
2019-06-14 7:33 ` [virtio-dev] " Auger Eric
2019-06-14 7:33 ` Auger Eric
2019-06-14 7:33 ` Auger Eric
2019-06-14 7:33 ` Auger Eric
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` [PATCH v8 6/7] iommu/virtio: Add probe request Jean-Philippe Brucker
2019-05-30 17:09 ` [virtio-dev] " Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` [PATCH v8 7/7] iommu/virtio: Add event queue Jean-Philippe Brucker
2019-05-30 17:09 ` [virtio-dev] " Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-05-30 17:09 ` Jean-Philippe Brucker
2019-06-13 15:54 ` [PATCH v8 0/7] Add virtio-iommu driver Auger Eric
2019-06-13 15:54 ` Auger Eric
2019-06-13 15:54 ` [virtio-dev] " Auger Eric
2019-06-13 15:54 ` Auger Eric
2019-06-13 15:54 ` Auger Eric
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190530170929.19366-4-jean-philippe.brucker@arm.com \
--to=jean-philippe.brucker@arm.com \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=bauerman@linux.ibm.com \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=eric.auger@redhat.com \
--cc=frowand.list@gmail.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jasowang@redhat.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-pci@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mst@redhat.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=tnowicki@caviumnetworks.com \
--cc=virtio-dev@lists.oasis-open.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.