michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/interrupt_controller: Add source id to VT-D interrupt remap

Browse source 
Change the API and apply that change where relevant.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2021-04-06 13:29:27 +02:00 • committed by Anas Nashif
commit 4090962386
4 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/core/pcie.c
View file

@ -161,6 +161,7 @@ void pcie_conf_write(pcie_bdf_t bdf, unsigned int reg, uint32_t data)
#ifdef CONFIG_INTEL_VTD_ICTL #ifdef CONFIG_INTEL_VTD_ICTL
#include <drivers/interrupt_controller/intel_vtd.h> #include <drivers/interrupt_controller/intel_vtd.h>
#include <arch/x86/acpi.h>
static const struct device *vtd; static const struct device *vtd;
@ -290,11 +291,18 @@ bool arch_pcie_msi_vector_connect(msi_vector_t *vector,
{ {
#ifdef CONFIG_INTEL_VTD_ICTL #ifdef CONFIG_INTEL_VTD_ICTL
if (vector->arch.remap) { if (vector->arch.remap) {
union acpi_dmar_id id;
if (!get_vtd()) { if (!get_vtd()) {
return false; return false;
} }
vtd_remap(vtd, vector->arch.irte, vector->arch.vector, flags); id.bits.bus = PCIE_BDF_TO_BUS(vector->bdf);
id.bits.device = PCIE_BDF_TO_DEV(vector->bdf);
id.bits.function = PCIE_BDF_TO_FUNC(vector->bdf);
vtd_remap(vtd, vector->arch.irte, vector->arch.vector,
flags, id.raw);
} }
#endif /* CONFIG_INTEL_VTD_ICTL */ #endif /* CONFIG_INTEL_VTD_ICTL */

8
drivers/interrupt_controller/intc_intel_vtd.c
View file

@ -346,7 +346,8 @@ static uint32_t vtd_ictl_remap_msi(const struct device *dev,
static int vtd_ictl_remap(const struct device *dev, static int vtd_ictl_remap(const struct device *dev,
uint8_t irte_idx, uint8_t irte_idx,
uint16_t vector, uint16_t vector,
uint32_t flags) uint32_t flags,
uint16_t src_id)
{ {
struct vtd_ictl_data *data = dev->data; struct vtd_ictl_data *data = dev->data;
union vtd_irte irte = { 0 }; union vtd_irte irte = { 0 };
@ -362,6 +363,11 @@ static int vtd_ictl_remap(const struct device *dev,
irte.bits.dst_id = 0xFF << 8; irte.bits.dst_id = 0xFF << 8;
} }
if (src_id != USHRT_MAX) {
irte.bits.src_validation_type = 1;
irte.bits.src_id = src_id;
}
delivery_mode = (flags & IOAPIC_DELIVERY_MODE_MASK); delivery_mode = (flags & IOAPIC_DELIVERY_MODE_MASK);
if ((delivery_mode != IOAPIC_FIXED) || if ((delivery_mode != IOAPIC_FIXED) ||
(delivery_mode != IOAPIC_LOW)) { (delivery_mode != IOAPIC_LOW)) {

7
drivers/interrupt_controller/intc_ioapic.c
View file

@ -120,8 +120,11 @@ static void IoApicRedUpdateLo(unsigned int irq, uint32_t value,
!defined(CONFIG_INTEL_VTD_ICTL_XAPIC_PASSTHROUGH) !defined(CONFIG_INTEL_VTD_ICTL_XAPIC_PASSTHROUGH)
#include <drivers/interrupt_controller/intel_vtd.h> #include <drivers/interrupt_controller/intel_vtd.h>
#include <arch/x86/acpi.h>
static const struct device *vtd; static const struct device *vtd;
static uint16_t ioapic_id;
static bool get_vtd(void) static bool get_vtd(void)
{ {
@ -137,6 +140,8 @@ static bool get_vtd(void)
#define DT_DRV_COMPAT DRV_COMPAT_BAK #define DT_DRV_COMPAT DRV_COMPAT_BAK
#undef DRV_COMPAT_BAK #undef DRV_COMPAT_BAK
ioapic_id = z_acpi_get_dev_id_from_dmar(ACPI_DRHD_DEV_SCOPE_IOAPIC);
return vtd == NULL ? false : true; return vtd == NULL ? false : true;
} }
#endif /* CONFIG_INTEL_VTD_ICTL && !INTEL_VTD_ICTL_XAPIC_PASSTHROUGH */ #endif /* CONFIG_INTEL_VTD_ICTL && !INTEL_VTD_ICTL_XAPIC_PASSTHROUGH */
@ -400,7 +405,7 @@ void z_ioapic_irq_set(unsigned int irq, unsigned int vector, uint32_t flags)
(flags & IOAPIC_POLARITY_MASK); (flags & IOAPIC_POLARITY_MASK);
ioApicRedSetLo(irq, rteValue); ioApicRedSetLo(irq, rteValue);
vtd_remap(vtd, irte_idx, vector, flags); vtd_remap(vtd, irte_idx, vector, flags, ioapic_id);
} else { } else {
no_vtd: no_vtd:
#else #else

9
include/drivers/interrupt_controller/intel_vtd.h
View file

@ -18,7 +18,8 @@ typedef uint32_t (*vtd_remap_msi_f)(const struct device *dev,
typedef int (*vtd_remap_f)(const struct device *dev, typedef int (*vtd_remap_f)(const struct device *dev,
uint8_t irte_idx, uint8_t irte_idx,
uint16_t vector, uint16_t vector,
uint32_t flags); uint32_t flags,
uint16_t src_id);
typedef int (*vtd_set_irte_vector_f)(const struct device *dev, typedef int (*vtd_set_irte_vector_f)(const struct device *dev,
uint8_t irte_idx, uint8_t irte_idx,
@ -102,18 +103,20 @@ static inline uint32_t vtd_remap_msi(const struct device *dev,
* @param irte_idx A previoulsy allocated irte entry index number * @param irte_idx A previoulsy allocated irte entry index number
* @param vector An allocated interrupt vector * @param vector An allocated interrupt vector
* @param flags interrupt flags * @param flags interrupt flags
* @param src_id a valid source ID or USHRT_MAX if none
* *
* @return 0 on success, a negative errno otherwise * @return 0 on success, a negative errno otherwise
*/ */
static inline int vtd_remap(const struct device *dev, static inline int vtd_remap(const struct device *dev,
uint8_t irte_idx, uint8_t irte_idx,
uint16_t vector, uint16_t vector,
uint32_t flags) uint32_t flags,
uint16_t src_id)
{ {
const struct vtd_driver_api *api = const struct vtd_driver_api *api =
(const struct vtd_driver_api *)dev->api; (const struct vtd_driver_api *)dev->api;
return api->remap(dev, irte_idx, vector, flags); return api->remap(dev, irte_idx, vector, flags, src_id);
} }
/** /**