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

Commit 8701f185 authored by Wayne Boyer's avatar Wayne Boyer Committed by James Bottomley
Browse files

[SCSI] ipr: add endian swap enablement for 64 bit adapters 



A change in the hardware design of the chip for the new adapters changes the
default endianness of MMIO operations.  This patch adds a register definition
which when written to with a predefined value will change the endianness
back to what the driver expects.

This patch also fixes two problems found during testing.

First, the first reserved field in the ipr_hostrcb64_fabirc_desc structure only
reserved one byte.  The correct amount to reserve is 2 bytes.

Second, the reserved field of the ipr_hostrcb64_error structure only reserved
2 bytes.  The correct amount to reserve is 16 bytes.

Signed-off-by: default avatarWayne Boyer <wayneb@linux.vnet.ibm.com>
Acked-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent da2907ff

drivers/scsi/ipr.c

+17 −2
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ static const struct ipr_chip_cfg_t ipr_chip_cfg[] = { 
			.clr_uproc_interrupt_reg32 = 0x0002C,

			.init_feedback_reg = 0x0005C,

			.dump_addr_reg = 0x00064,

			.dump_data_reg = 0x00068

			.dump_data_reg = 0x00068,

			.endian_swap_reg = 0x00084

		}

	},

};
@@ -7208,6 +7209,12 @@ static int ipr_reset_enable_ioa(struct ipr_cmnd *ipr_cmd) 
	ipr_init_ioa_mem(ioa_cfg);



	ioa_cfg->allow_interrupts = 1;

	if (ioa_cfg->sis64) {

		/* Set the adapter to the correct endian mode. */

		writel(IPR_ENDIAN_SWAP_KEY, ioa_cfg->regs.endian_swap_reg);

		int_reg = readl(ioa_cfg->regs.endian_swap_reg);

	}



	int_reg = readl(ioa_cfg->regs.sense_interrupt_reg32);



	if (int_reg & IPR_PCII_IOA_TRANS_TO_OPER) {
@@ -7365,6 +7372,7 @@ static void ipr_get_unit_check_buffer(struct ipr_ioa_cfg *ioa_cfg) 
static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd)

{

	struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;

	volatile u32 int_reg;

	int rc;



	ENTER;
@@ -7383,6 +7391,12 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd) 


	ipr_fail_all_ops(ioa_cfg);



	if (ioa_cfg->sis64) {

		/* Set the adapter to the correct endian mode. */

		writel(IPR_ENDIAN_SWAP_KEY, ioa_cfg->regs.endian_swap_reg);

		int_reg = readl(ioa_cfg->regs.endian_swap_reg);

	}



	if (ioa_cfg->ioa_unit_checked) {

		ioa_cfg->ioa_unit_checked = 0;

		ipr_get_unit_check_buffer(ioa_cfg);
@@ -7547,7 +7561,7 @@ static int ipr_reset_wait_to_start_bist(struct ipr_cmnd *ipr_cmd) 
}



/**

 * ipr_reset_alert_part2 - Alert the adapter of a pending reset

 * ipr_reset_alert - Alert the adapter of a pending reset

 * @ipr_cmd:	ipr command struct

 *

 * Description: This function alerts the adapter that it will be reset.
@@ -8318,6 +8332,7 @@ static void __devinit ipr_init_ioa_cfg(struct ipr_ioa_cfg *ioa_cfg, 
		t->init_feedback_reg = base + p->init_feedback_reg;

		t->dump_addr_reg = base + p->dump_addr_reg;

		t->dump_data_reg = base + p->dump_data_reg;

		t->endian_swap_reg = base + p->endian_swap_reg;

	}

}

drivers/scsi/ipr.h

+7 −2
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ struct ipr_hostrcb64_fabric_desc { 
	__be16 length;

	u8 descriptor_id;



	u8 reserved;

	u8 reserved[2];

	u8 path_state;



	u8 reserved2[2];
@@ -1054,7 +1054,7 @@ struct ipr_hostrcb64_error { 
	__be64 fd_lun;

	u8 fd_res_path[8];

	__be64 time_stamp;

	u8 reserved[2];

	u8 reserved[16];

	union {

		struct ipr_hostrcb_type_ff_error type_ff_error;

		struct ipr_hostrcb_type_12_error type_12_error;
@@ -1254,6 +1254,9 @@ struct ipr_interrupt_offsets { 


	unsigned long dump_addr_reg;

	unsigned long dump_data_reg;



#define IPR_ENDIAN_SWAP_KEY		0x000C0C00

	unsigned long endian_swap_reg;

};



struct ipr_interrupts {
@@ -1279,6 +1282,8 @@ struct ipr_interrupts { 


	void __iomem *dump_addr_reg;

	void __iomem *dump_data_reg;



	void __iomem *endian_swap_reg;

};



struct ipr_chip_cfg_t {