dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

powerpc/fsl-soc: use CONFIG_EPAPR_PARAVIRT for hcalls 

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Scott Wood 2012-07-03 05:48:55 +00:00 committed by Alexander Graf
parent 4065639724
commit 305bcf2612
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/sysdev/fsl_msi.c
View File

@ -236,7 +236,6 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
u32 intr_index; u32 intr_index;
u32 have_shift = 0; u32 have_shift = 0;
struct fsl_msi_cascade_data *cascade_data; struct fsl_msi_cascade_data *cascade_data;
unsigned int ret;
cascade_data = irq_get_handler_data(irq); cascade_data = irq_get_handler_data(irq);
msi_data = cascade_data->msi_data; 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: case FSL_PIC_IP_IPIC:
msir_value = fsl_msi_read(msi_data->msi_regs, msir_index * 0x4); msir_value = fsl_msi_read(msi_data->msi_regs, msir_index * 0x4);
break; 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); ret = fh_vmpic_get_msir(virq_to_hw(irq), &msir_value);
if (ret) { if (ret) {
pr_err("fsl-msi: fh_vmpic_get_msir() failed for " 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; break;
} }
#endif
}
while (msir_value) { while (msir_value) {
intr_index = ffs(msir_value) - 1; intr_index = ffs(msir_value) - 1;
@ -508,10 +511,12 @@ static const struct of_device_id fsl_of_msi_ids[] = {
.compatible = "fsl,ipic-msi", .compatible = "fsl,ipic-msi",
.data = (void *)&ipic_msi_feature, .data = (void *)&ipic_msi_feature,
}, },
#ifdef CONFIG_EPAPR_PARAVIRT
{ {
.compatible = "fsl,vmpic-msi", .compatible = "fsl,vmpic-msi",
.data = (void *)&vmpic_msi_feature, .data = (void *)&vmpic_msi_feature,
}, },
#endif
{} {}
}; };

2
arch/powerpc/sysdev/fsl_soc.c
View File

@ -253,6 +253,7 @@ struct platform_diu_data_ops diu_ops;
EXPORT_SYMBOL(diu_ops); EXPORT_SYMBOL(diu_ops);
#endif #endif
#ifdef CONFIG_EPAPR_PARAVIRT
/* /*
* Restart the current partition * Restart the current partition
* *
@ -278,3 +279,4 @@ void fsl_hv_halt(void)
pr_info("hv exit\n"); pr_info("hv exit\n");
fh_partition_stop(-1); fh_partition_stop(-1);
} }
#endif