Acked-by: Brian King <brking@xxxxxxxxxxxxxxxxxx>
On 05/10/2010 11:14 AM, Wayne Boyer wrote:
> Fix ipr_reset_enable_ioa() to read the correct IOA to host interrupt register
> address for 64 bit adapters. We need to read the lower 32 bits, not the upper
> 32 bits.
>
> Also change the write of the 64 bit mask value to a single writeq instead
> of two writel calls.
>
> Finally, use the correct u8 type for the type field in the ipr_resource_entry
> structure.
>
> Signed-off-by: Wayne Boyer <wayneb@xxxxxxxxxxxxxxxxxx>
> ---
>
> drivers/scsi/ipr.c | 12 ++++++++----
> drivers/scsi/ipr.h | 2 +-
> 2 files changed, 9 insertions(+), 5 deletions(-)
>
> Index: b/drivers/scsi/ipr.c
> ===================================================================
> --- a/drivers/scsi/ipr.c 2010-05-07 09:46:11.000000000 -0700
> +++ b/drivers/scsi/ipr.c 2010-05-07 09:46:12.000000000 -0700
> @@ -7184,13 +7184,14 @@ static int ipr_reset_enable_ioa(struct i
> {
> struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
> volatile u32 int_reg;
> + volatile u64 maskval;
>
> ENTER;
> ipr_cmd->job_step = ipr_ioafp_identify_hrrq;
> ipr_init_ioa_mem(ioa_cfg);
>
> ioa_cfg->allow_interrupts = 1;
> - int_reg = readl(ioa_cfg->regs.sense_interrupt_reg);
> + int_reg = readl(ioa_cfg->regs.sense_interrupt_reg32);
>
> if (int_reg & IPR_PCII_IOA_TRANS_TO_OPER) {
> writel((IPR_PCII_ERROR_INTERRUPTS | IPR_PCII_HRRQ_UPDATED),
> @@ -7202,9 +7203,12 @@ static int ipr_reset_enable_ioa(struct i
> /* Enable destructive diagnostics on IOA */
> writel(ioa_cfg->doorbell, ioa_cfg->regs.set_uproc_interrupt_reg32);
>
> - writel(IPR_PCII_OPER_INTERRUPTS, ioa_cfg->regs.clr_interrupt_mask_reg32);
> - if (ioa_cfg->sis64)
> - writel(IPR_PCII_IPL_STAGE_CHANGE, ioa_cfg->regs.clr_interrupt_mask_reg);
> + if (ioa_cfg->sis64) {
> + maskval = IPR_PCII_IPL_STAGE_CHANGE;
> + maskval = (maskval << 32) | IPR_PCII_OPER_INTERRUPTS;
> + writeq(maskval, ioa_cfg->regs.clr_interrupt_mask_reg);
> + } else
> + writel(IPR_PCII_OPER_INTERRUPTS, ioa_cfg->regs.clr_interrupt_mask_reg32);
>
> int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
>
> Index: b/drivers/scsi/ipr.h
> ===================================================================
> --- a/drivers/scsi/ipr.h 2010-05-07 09:46:11.000000000 -0700
> +++ b/drivers/scsi/ipr.h 2010-05-07 09:46:12.000000000 -0700
> @@ -1201,7 +1201,7 @@ struct ipr_resource_entry {
> u8 flags;
> __be16 res_flags;
>
> - __be32 type;
> + u8 type;
>
> u8 qmodel;
> struct ipr_std_inq_data std_inq_data;
>
--
Brian King
Linux on Power Virtualization
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
