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

Commit 305bcf26 authored by Scott Wood's avatar Scott Wood Committed by Alexander Graf
Browse files

powerpc/fsl-soc: use CONFIG_EPAPR_PARAVIRT for hcalls 



Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarStuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 40656397

arch/powerpc/sysdev/fsl_msi.c

+7 −2
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) 
	u32 intr_index;

	u32 have_shift = 0;

	struct fsl_msi_cascade_data *cascade_data;

	unsigned int ret;



	cascade_data = irq_get_handler_data(irq);

	msi_data = cascade_data->msi_data;
@@ -268,7 +267,9 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) 
	case FSL_PIC_IP_IPIC:

		msir_value = fsl_msi_read(msi_data->msi_regs, msir_index * 0x4);

		break;

	case FSL_PIC_IP_VMPIC:

#ifdef CONFIG_EPAPR_PARAVIRT

	case FSL_PIC_IP_VMPIC: {

		unsigned int ret;

		ret = fh_vmpic_get_msir(virq_to_hw(irq), &msir_value);

		if (ret) {

			pr_err("fsl-msi: fh_vmpic_get_msir() failed for "
@@ -277,6 +278,8 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) 
		}

		break;

	}

#endif

	}



	while (msir_value) {

		intr_index = ffs(msir_value) - 1;
@@ -508,10 +511,12 @@ static const struct of_device_id fsl_of_msi_ids[] = { 
		.compatible = "fsl,ipic-msi",

		.data = (void *)&ipic_msi_feature,

	},

#ifdef CONFIG_EPAPR_PARAVIRT

	{

		.compatible = "fsl,vmpic-msi",

		.data = (void *)&vmpic_msi_feature,

	},

#endif

	{}

};

arch/powerpc/sysdev/fsl_soc.c

+2 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ struct platform_diu_data_ops diu_ops; 
EXPORT_SYMBOL(diu_ops);

#endif



#ifdef CONFIG_EPAPR_PARAVIRT

/*

 * Restart the current partition

 *
@@ -278,3 +279,4 @@ void fsl_hv_halt(void) 
	pr_info("hv exit\n");

	fh_partition_stop(-1);

}

#endif