michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/interrupt_controller: Generate proper MSI address on VT-D

Browse source 
SHV bit depends on the number of vectors allocated.
If it's facing a multi-vector MSI array, it will set the bit.
If not the bit must be 0.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2021-03-23 14:43:03 +01:00 • committed by Anas Nashif
commit 4047b793c8
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,7 +187,7 @@ uint32_t pcie_msi_map(unsigned int irq,
ARG_UNUSED(irq); ARG_UNUSED(irq);
#if defined(CONFIG_INTEL_VTD_ICTL) #if defined(CONFIG_INTEL_VTD_ICTL)
return vtd_remap_msi(vtd, vector); return vtd_remap_msi(vtd, vector, n_vector);
#else #else
return 0xFEE00000U; /* standard delivery to BSP local APIC */ return 0xFEE00000U; /* standard delivery to BSP local APIC */
#endif #endif

7
drivers/interrupt_controller/intc_intel_vtd.c
View file

@ -68,9 +68,12 @@ static int vtd_ictl_allocate_entries(const struct device *dev,
} }
static uint32_t vtd_ictl_remap_msi(const struct device *dev, static uint32_t vtd_ictl_remap_msi(const struct device *dev,
msi_vector_t *vector) msi_vector_t *vector,
uint8_t n_vector)
{ {
return VTD_MSI_MAP(vector->arch.irte); uint32_t shv = (n_vector > 1) ? VTD_INT_SHV : 0;
return VTD_MSI_MAP(vector->arch.irte, shv);
} }
static int vtd_ictl_remap(const struct device *dev, static int vtd_ictl_remap(const struct device *dev,

4
drivers/interrupt_controller/intc_intel_vtd.h
View file

@ -12,8 +12,8 @@
/* We don't care about int_idx[15], since the size is fixed to 256, /* We don't care about int_idx[15], since the size is fixed to 256,
* it's always 0 * it's always 0
*/ */
#define VTD_MSI_MAP(int_idx) \ #define VTD_MSI_MAP(int_idx, shv) \
((0x0FEE << 20) | (int_idx << 5) | VTD_INT_SHV | VTD_INT_FORMAT) ((0x0FEE00000U) | (int_idx << 5) | shv | VTD_INT_FORMAT)
/* Interrupt Remapping Table Entry (IRTE) for Remapped Interrupts */ /* Interrupt Remapping Table Entry (IRTE) for Remapped Interrupts */
struct vtd_irte { struct vtd_irte {

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

@ -12,7 +12,8 @@ typedef int (*vtd_alloc_entries_f)(const struct device *dev,
uint8_t n_entries); uint8_t n_entries);
typedef uint32_t (*vtd_remap_msi_f)(const struct device *dev, typedef uint32_t (*vtd_remap_msi_f)(const struct device *dev,
msi_vector_t *vector); msi_vector_t *vector,
uint8_t n_vector);
typedef int (*vtd_remap_f)(const struct device *dev, typedef int (*vtd_remap_f)(const struct device *dev,
msi_vector_t *vector); msi_vector_t *vector);
@ -46,17 +47,19 @@ static inline int vtd_allocate_entries(const struct device *dev,
* @brief Generate the MSI Message Address data for the given vector * @brief Generate the MSI Message Address data for the given vector
* *
* @param dev Pointer to the device structure for the driver instance * @param dev Pointer to the device structure for the driver instance
* @param vector A valid allocated MSI vector * @param vector A valid allocated MSI vector array
* @param n_vector the size of the vector array
* *
* @return The MSI Message Address value * @return The MSI Message Address value
*/ */
static inline uint32_t vtd_remap_msi(const struct device *dev, static inline uint32_t vtd_remap_msi(const struct device *dev,
msi_vector_t *vector) msi_vector_t *vector,
uint8_t n_vector)
{ {
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_msi(dev, vector); return api->remap_msi(dev, vector, n_vector);
} }
/** /**