Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fc24d8c authored by Yijing Wang's avatar Yijing Wang Committed by Joerg Roedel
Browse files

iommu/irq_remapping: Fix the regression of hpet irq remapping 



Commit 71054d88 ("x86, hpet: Introduce x86_msi_ops.setup_hpet_msi")
introduced x86_msi_ops.setup_hpet_msi to setup hpet MSI irq
when irq remapping enabled. This caused a regression of
hpet MSI irq remapping.

Original code flow before commit 71054d88:
hpet_setup_msi_irq()
	arch_setup_hpet_msi()
		setup_hpet_msi_remapped()
			remap_ops->setup_hpet_msi()
				alloc_irte()
		msi_compose_msg()
		hpet_msi_write()
		...

Current code flow after commit 71054d88:
hpet_setup_msi_irq()
	x86_msi.setup_hpet_msi()
		setup_hpet_msi_remapped()
			intel_setup_hpet_msi()
				alloc_irte()

Currently, we only call alloc_irte() for hpet MSI, but
do not composed and wrote its msg...

Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent fb3e3065

drivers/iommu/amd_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -4233,7 +4233,7 @@ static int msi_setup_irq(struct pci_dev *pdev, unsigned int irq, 
	return 0;

}



static int setup_hpet_msi(unsigned int irq, unsigned int id)

static int alloc_hpet_msi(unsigned int irq, unsigned int id)

{

	struct irq_2_irte *irte_info;

	struct irq_cfg *cfg;
@@ -4272,6 +4272,6 @@ struct irq_remap_ops amd_iommu_irq_ops = { 
	.compose_msi_msg	= compose_msi_msg,

	.msi_alloc_irq		= msi_alloc_irq,

	.msi_setup_irq		= msi_setup_irq,

	.setup_hpet_msi		= setup_hpet_msi,

	.alloc_hpet_msi		= alloc_hpet_msi,

};

#endif

drivers/iommu/intel_irq_remapping.c

+2 −2
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ static int intel_msi_setup_irq(struct pci_dev *pdev, unsigned int irq, 
	return ret;

}



static int intel_setup_hpet_msi(unsigned int irq, unsigned int id)

static int intel_alloc_hpet_msi(unsigned int irq, unsigned int id)

{

	int ret = -1;

	struct intel_iommu *iommu;
@@ -1170,5 +1170,5 @@ struct irq_remap_ops intel_irq_remap_ops = { 
	.compose_msi_msg	= intel_compose_msi_msg,

	.msi_alloc_irq		= intel_msi_alloc_irq,

	.msi_setup_irq		= intel_msi_setup_irq,

	.setup_hpet_msi		= intel_setup_hpet_msi,

	.alloc_hpet_msi		= intel_alloc_hpet_msi,

};

drivers/iommu/irq_remapping.c

+9 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <asm/processor.h>

#include <asm/x86_init.h>

#include <asm/apic.h>

#include <asm/hpet.h>



#include "irq_remapping.h"
@@ -345,10 +346,16 @@ static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq, 


int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)

{

	if (!remap_ops || !remap_ops->setup_hpet_msi)

	int ret;



	if (!remap_ops || !remap_ops->alloc_hpet_msi)

		return -ENODEV;



	return remap_ops->setup_hpet_msi(irq, id);

	ret = remap_ops->alloc_hpet_msi(irq, id);

	if (ret)

		return -EINVAL;



	return default_setup_hpet_msi(irq, id);

}



void panic_if_irq_remap(const char *msg)

drivers/iommu/irq_remapping.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct irq_remap_ops { 
	int (*msi_setup_irq)(struct pci_dev *, unsigned int, int, int);



	/* Setup interrupt remapping for an HPET MSI */

	int (*setup_hpet_msi)(unsigned int, unsigned int);

	int (*alloc_hpet_msi)(unsigned int, unsigned int);

};



extern struct irq_remap_ops intel_irq_remap_ops;