On Thu, Oct 01 2020 at 16:26, Megha Dey wrote:
> On 9/30/2020 11:32 AM, Thomas Gleixner wrote:
>> diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c
>> index 8f4ce72570ce..0c1ea8ceec31 100644
>> --- a/drivers/iommu/intel/irq_remapping.c
>> +++ b/drivers/iommu/intel/irq_remapping.c
>> @@ -1271,6 +1271,16 @@ static struct irq_chip intel_ir_chip = {
>> .irq_set_vcpu_affinity = intel_ir_set_vcpu_affinity,
>> };
>>
>> +static void irte_prepare_msg(struct msi_msg *msg, int index, int subhandle)
>> +{
>> + msg->address_hi = MSI_ADDR_BASE_HI;
>> + msg->data = sub_handle;
>> + msg->address_lo = MSI_ADDR_BASE_LO | MSI_ADDR_IR_EXT_INT |
>> + MSI_ADDR_IR_SHV |
>> + MSI_ADDR_IR_INDEX1(index) |
>> + MSI_ADDR_IR_INDEX2(index);
>> +}
>> +
>> static void intel_irq_remapping_prepare_irte(struct intel_ir_data *data,
>> struct irq_cfg *irq_cfg,
>> struct irq_alloc_info *info,
>> @@ -1312,19 +1322,18 @@ static void intel_irq_remapping_prepare_irte(struct intel_ir_data *data,
>> break;
>>
>> case X86_IRQ_ALLOC_TYPE_HPET:
>> + set_hpet_sid(irte, info->hpet_id);
>> + irte_prepare_msg(msg, index, sub_handle);
>> + break;
>> +
>> case X86_IRQ_ALLOC_TYPE_MSI:
>> case X86_IRQ_ALLOC_TYPE_MSIX:
>> - if (info->type == X86_IRQ_ALLOC_TYPE_HPET)
>> - set_hpet_sid(irte, info->hpet_id);
>> - else
>> - set_msi_sid(irte, info->msi_dev);
>> -
>> - msg->address_hi = MSI_ADDR_BASE_HI;
>> - msg->data = sub_handle;
>> - msg->address_lo = MSI_ADDR_BASE_LO | MSI_ADDR_IR_EXT_INT |
>> - MSI_ADDR_IR_SHV |
>> - MSI_ADDR_IR_INDEX1(index) |
>> - MSI_ADDR_IR_INDEX2(index);
>> + set_msi_sid(irte, info->msi_dev);
>> + irte_prepare_msg(msg, index, sub_handle);
>> + break;
>> +
>> + case X86_IRQ_ALLOC_TYPE_DEV_MSI:
>> + irte_prepare_msg(msg, index, sub_handle);
>> break;
>>
>> default:
>>
>> Hmm?
>
> ok so I have no clue what happened here. This was the patch that was
> sent out:
> and this does not have the above change. Not sure what happened here.
Of course it was not there. I added this in my reply obviously for
illustration. It's not '> ' quoted, right?
Thanks,
tglx
