Commit 5aa1c988 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull first round of SCSI updates from James "Jej B" Bottomley:
 "The patch set is mostly driver updates (qla4, qla2 [ISF support
  updates], lpfc, aacraid [dual firmware image support]) and a few bug
  fixes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (47 commits)
  [SCSI] iscsi_tcp: support PF_MEMALLOC/__GFP_MEMALLOC
  [SCSI] libiscsi: avoid unnecessary multiple NULL assignments
  [SCSI] qla4xxx: Update driver version to 5.03.00-k8
  [SCSI] qla4xxx: Added print statements to display AENs
  [SCSI] qla4xxx: Use correct value for max flash node entries
  [SCSI] qla4xxx: Restrict logout from boot target session using session id
  [SCSI] qla4xxx: Use correct flash ddb offset for ISP40XX
  [SCSI] isci: add CONFIG_PM_SLEEP to suspend/resume functions
  [SCSI] scsi_dh_alua: Add module parameter to allow failover to non preferred path without STPG
  [SCSI] qla2xxx: Update the driver version to 8.05.00.03-k.
  [SCSI] qla2xxx: Obtain loopback iteration count from bsg request.
  [SCSI] qla2xxx: Add clarifying printk to thermal access fail cases.
  [SCSI] qla2xxx: Remove duplicated include form qla_isr.c
  [SCSI] qla2xxx: Enhancements to support ISPFx00.
  [SCSI] qla4xxx: Update driver version to 5.03.00-k7
  [SCSI] qla4xxx: Replace dev type macros with generic portal type macros
  [SCSI] scsi_transport_iscsi: Declare portal type string macros for generic use
  [SCSI] qla4xxx: Add flash node mgmt support
  [SCSI] libiscsi: export function iscsi_switch_str_param
  [SCSI] scsi_transport_iscsi: Add flash node mgmt support
  ...
parents 6da6dc23 9e45dd73

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6236,7 +6236,7 @@ S: Supported 
F:	drivers/scsi/pmcraid.*



PMC SIERRA PM8001 DRIVER

M:	jack_wang@usish.com

M:	xjtuwjp@gmail.com

M:	lindar_liu@usish.com

L:	linux-scsi@vger.kernel.org

S:	Supported

drivers/scsi/aacraid/aacraid.h

+5 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 *----------------------------------------------------------------------------*/



#ifndef AAC_DRIVER_BUILD

# define AAC_DRIVER_BUILD 30000

# define AAC_DRIVER_BUILD 30200

# define AAC_DRIVER_BRANCH "-ms"

#endif

#define MAXIMUM_NUM_CONTAINERS	32
@@ -1918,6 +1918,10 @@ extern struct aac_common aac_config; 
#define	MONITOR_PANIC			0x00000020

#define	KERNEL_UP_AND_RUNNING		0x00000080

#define	KERNEL_PANIC			0x00000100

#define	FLASH_UPD_PENDING		0x00002000

#define	FLASH_UPD_SUCCESS		0x00004000

#define	FLASH_UPD_FAILED		0x00008000

#define	FWUPD_TIMEOUT			(5 * 60)



/*

 *	Doorbell bit defines

drivers/scsi/aacraid/comminit.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ int aac_send_shutdown(struct aac_dev * dev) 
	cmd = (struct aac_close *) fib_data(fibctx);



	cmd->command = cpu_to_le32(VM_CloseAll);

	cmd->cid = cpu_to_le32(0xffffffff);

	cmd->cid = cpu_to_le32(0xfffffffe);



	status = aac_fib_send(ContainerCommand,

			  fibctx,

drivers/scsi/aacraid/src.c

+25 −1
Original line number Diff line number Diff line
@@ -702,6 +702,28 @@ int aac_srcv_init(struct aac_dev *dev) 
	if ((aac_reset_devices || reset_devices) &&

		!aac_src_restart_adapter(dev, 0))

		++restart;

	/*

	 *	Check to see if flash update is running.

	 *	Wait for the adapter to be up and running. Wait up to 5 minutes

	 */

	status = src_readl(dev, MUnit.OMR);

	if (status & FLASH_UPD_PENDING) {

		start = jiffies;

		do {

			status = src_readl(dev, MUnit.OMR);

			if (time_after(jiffies, start+HZ*FWUPD_TIMEOUT)) {

				printk(KERN_ERR "%s%d: adapter flash update failed.\n",

					dev->name, instance);

				goto error_iounmap;

			}

		} while (!(status & FLASH_UPD_SUCCESS) &&

			 !(status & FLASH_UPD_FAILED));

		/* Delay 10 seconds.

		 * Because right now FW is doing a soft reset,

		 * do not read scratch pad register at this time

		 */

		ssleep(10);

	}

	/*

	 *	Check to see if the board panic'd while booting.

	 */
@@ -730,7 +752,9 @@ int aac_srcv_init(struct aac_dev *dev) 
	/*

	 *	Wait for the adapter to be up and running. Wait up to 3 minutes

	 */

	while (!((status = src_readl(dev, MUnit.OMR)) & KERNEL_UP_AND_RUNNING)) {

	while (!((status = src_readl(dev, MUnit.OMR)) &

		KERNEL_UP_AND_RUNNING) ||

		status == 0xffffffff) {

		if ((restart &&

		  (status & (KERNEL_PANIC|SELF_TEST_FAILED|MONITOR_PANIC))) ||

		  time_after(jiffies, start+HZ*startup_timeout)) {

drivers/scsi/csiostor/csio_hw.c

+0 −5
Original line number Diff line number Diff line
@@ -3892,7 +3892,6 @@ csio_process_fwevtq_entry(struct csio_hw *hw, void *wr, uint32_t len, 
			  struct csio_fl_dma_buf *flb, void *priv)

{

	__u8 op;

	__be64 *data;

	void *msg = NULL;

	uint32_t msg_len = 0;

	bool msg_sg = 0;
@@ -3908,8 +3907,6 @@ csio_process_fwevtq_entry(struct csio_hw *hw, void *wr, uint32_t len, 
		msg = (void *) flb;

		msg_len = flb->totlen;

		msg_sg = 1;



		data = (__be64 *) msg;

	} else if (op == CPL_FW6_MSG || op == CPL_FW4_MSG) {



		CSIO_INC_STATS(hw, n_cpl_fw6_msg);
@@ -3917,8 +3914,6 @@ csio_process_fwevtq_entry(struct csio_hw *hw, void *wr, uint32_t len, 
		msg = (void *)((uintptr_t)wr + sizeof(__be64));

		msg_len = (op == CPL_FW6_MSG) ? sizeof(struct cpl_fw6_msg) :

			   sizeof(struct cpl_fw4_msg);



		data = (__be64 *) msg;

	} else {

		csio_warn(hw, "unexpected CPL %#x on FW event queue\n", op);

		CSIO_INC_STATS(hw, n_cpl_unexp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE