diff options
Diffstat (limited to 'arch/powerpc/sysdev/fsl_msi.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_msi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index 51ffafae561e..63c5f04ea580 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c | |||
| @@ -236,7 +236,6 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
| 236 | u32 intr_index; | 236 | u32 intr_index; |
| 237 | u32 have_shift = 0; | 237 | u32 have_shift = 0; |
| 238 | struct fsl_msi_cascade_data *cascade_data; | 238 | struct fsl_msi_cascade_data *cascade_data; |
| 239 | unsigned int ret; | ||
| 240 | 239 | ||
| 241 | cascade_data = irq_get_handler_data(irq); | 240 | cascade_data = irq_get_handler_data(irq); |
| 242 | msi_data = cascade_data->msi_data; | 241 | msi_data = cascade_data->msi_data; |
| @@ -268,7 +267,9 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
| 268 | case FSL_PIC_IP_IPIC: | 267 | case FSL_PIC_IP_IPIC: |
| 269 | msir_value = fsl_msi_read(msi_data->msi_regs, msir_index * 0x4); | 268 | msir_value = fsl_msi_read(msi_data->msi_regs, msir_index * 0x4); |
| 270 | break; | 269 | break; |
| 271 | case FSL_PIC_IP_VMPIC: | 270 | #ifdef CONFIG_EPAPR_PARAVIRT |
| 271 | case FSL_PIC_IP_VMPIC: { | ||
| 272 | unsigned int ret; | ||
| 272 | ret = fh_vmpic_get_msir(virq_to_hw(irq), &msir_value); | 273 | ret = fh_vmpic_get_msir(virq_to_hw(irq), &msir_value); |
| 273 | if (ret) { | 274 | if (ret) { |
| 274 | pr_err("fsl-msi: fh_vmpic_get_msir() failed for " | 275 | 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) | |||
| 277 | } | 278 | } |
| 278 | break; | 279 | break; |
| 279 | } | 280 | } |
| 281 | #endif | ||
| 282 | } | ||
| 280 | 283 | ||
| 281 | while (msir_value) { | 284 | while (msir_value) { |
| 282 | intr_index = ffs(msir_value) - 1; | 285 | intr_index = ffs(msir_value) - 1; |
| @@ -508,10 +511,12 @@ static const struct of_device_id fsl_of_msi_ids[] = { | |||
| 508 | .compatible = "fsl,ipic-msi", | 511 | .compatible = "fsl,ipic-msi", |
| 509 | .data = &ipic_msi_feature, | 512 | .data = &ipic_msi_feature, |
| 510 | }, | 513 | }, |
| 514 | #ifdef CONFIG_EPAPR_PARAVIRT | ||
| 511 | { | 515 | { |
| 512 | .compatible = "fsl,vmpic-msi", | 516 | .compatible = "fsl,vmpic-msi", |
| 513 | .data = &vmpic_msi_feature, | 517 | .data = &vmpic_msi_feature, |
| 514 | }, | 518 | }, |
| 519 | #endif | ||
| 515 | {} | 520 | {} |
| 516 | }; | 521 | }; |
| 517 | 522 | ||
