Attachment 155223 Details for Bug 240938 – patch for megaraid sas driver

[patch] patch for megaraid sas driver

linux-2.6.9-55.EL-scsi-megaraid_sas-fix.patch (text/plain), 2.94 KB, created by Haruo Tomita on 2007-05-23 06:14:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Haruo Tomita

Created: 2007-05-23 06:14:13 UTC

Size: 2.94 KB

patch

obsolete

>diff -urpN linux-2.6.9-55.EL.orig/drivers/scsi/megaraid/megaraid_sas.c linux-2.6.9-55.EL/drivers/scsi/megaraid/megaraid_sas.c
>--- linux-2.6.9-55.EL.orig/drivers/scsi/megaraid/megaraid_sas.c	2007-05-08 16:03:20.000000000 +0900
>+++ linux-2.6.9-55.EL/drivers/scsi/megaraid/megaraid_sas.c	2007-05-10 12:32:49.000000000 +0900
>@@ -88,6 +88,7 @@ static u32 megasas_dbg_lvl;
> static int
> megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status);
> static void megasas_flush_cache(struct megasas_instance *instance);
>+static void megasas_complete_cmd_dpc(unsigned long instance_addr);
> static irqreturn_t megasas_isr(int irq, void *devp, struct pt_regs *regs);
> 
> /**
>@@ -870,7 +871,15 @@ megasas_queue_command(struct scsi_cmnd *
> 	if (MEGASAS_IS_LOGICAL(scmd)) {
> 		switch (scmd->cmnd[0]) {
> 			case SYNCHRONIZE_CACHE:
>-				if (crashdump_mode()) 
>+				if (!crashdump_mode()) {
>+					/*
>+					 * FW takes care of flush cache
>+					 * on its own.
>+					 * No need to send it down.
>+					 */
>+					scmd->result = DID_OK << 16;
>+					goto out_done;
>+				} else
> 					megasas_flush_cache(instance);
> 			case REQUEST_SENSE:
> 			case MODE_SELECT:
>@@ -1370,6 +1379,14 @@ megasas_deplete_reply_queue(struct megas
> 	if(instance->instancet->clear_intr(instance->reg_set))
> 		return IRQ_NONE;
> 
>+	/*
>+	 * In crash dump mode, Complete cmds from here.
>+	 */
>+	if (crashdump_mode()) {
>+		megasas_complete_cmd_dpc((unsigned long)instance);
>+ 		return IRQ_HANDLED;
>+	}
>+
> 	/* 
> 	* Schedule the tasklet for cmd completion 
> 	*/
>@@ -1540,7 +1557,7 @@ static void megasas_teardown_frame_pool(
> 				      cmd->frame_phys_addr);
> 
> 		if (cmd->sense)
>-			pci_pool_free(instance->sense_dma_pool, cmd->frame,
>+			pci_pool_free(instance->sense_dma_pool, cmd->sense,
> 				      cmd->sense_phys_addr);
> 	}
> 
>@@ -1821,7 +1838,7 @@ megasas_get_ctrl_info(struct megasas_ins
>  *
>  * Tasklet to complete cmds
>  */
>-void megasas_complete_cmd_dpc(unsigned long instance_addr)
>+static void megasas_complete_cmd_dpc(unsigned long instance_addr)
> {
> 	u32 producer;
> 	u32 consumer;
>@@ -2634,8 +2651,8 @@ static void megasas_detach_one(struct pc
>  */
> static void megasas_shutdown(struct device *device)
> {
>-	struct megasas_instance *instance = (struct megasas_instance *)
>-	    dev_get_drvdata(device);
>+	struct pci_dev *pdev = to_pci_dev(device);
>+	struct megasas_instance *instance = pci_get_drvdata(pdev);
> 	megasas_flush_cache(instance);
> }
> 
>diff -urpN linux-2.6.9-55.EL.orig/drivers/scsi/megaraid/megaraid_sas.h linux-2.6.9-55.EL/drivers/scsi/megaraid/megaraid_sas.h
>--- linux-2.6.9-55.EL.orig/drivers/scsi/megaraid/megaraid_sas.h	2007-05-08 16:03:20.000000000 +0900
>+++ linux-2.6.9-55.EL/drivers/scsi/megaraid/megaraid_sas.h	2007-05-10 12:33:21.000000000 +0900
>@@ -29,11 +29,6 @@
> #define	PCI_DEVICE_ID_LSI_VERDE_ZCR		0x0413
> 
> /*
>- * Device IDs
>- */
>-#define	PCI_DEVICE_ID_LSI_VERDE_ZCR		0x0413
>-
>-/*
>  * =====================================
>  * MegaRAID SAS MFI firmware definitions
>  * =====================================

Actions: View | Diff

Attachments on bug 240938: 155222 | 155223