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

Commit a9098b37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] hpsa: Disable ASPM
  [SCSI] aacraid: controller hangs if kernel uses non-default ASPM policy
  [SCSI] mpt2sas: add missing allocation.
  [SCSI] Silencing 'killing requests for dead queue'
  [SCSI] fix WARNING: at drivers/scsi/scsi_lib.c:1704
parents fec6489f e5a44df8

drivers/scsi/aacraid/linit.c

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/slab.h>

#include <linux/mutex.h>

#include <linux/spinlock.h>
@@ -1109,6 +1110,9 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
		unique_id++;

	}



	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |

			       PCIE_LINK_STATE_CLKPM);



	error = pci_enable_device(pdev);

	if (error)

		goto out;

drivers/scsi/hpsa.c

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/interrupt.h>

#include <linux/types.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/delay.h>
@@ -3922,6 +3923,10 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h) 
		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");

		return -ENODEV;

	}



	pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |

			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);



	err = pci_enable_device(h->pdev);

	if (err) {

		dev_warn(&h->pdev->dev, "unable to enable PCI device\n");

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+5 −0
Original line number Diff line number Diff line
@@ -2802,6 +2802,11 @@ _scsih_error_recovery_delete_devices(struct MPT2SAS_ADAPTER *ioc) 


	if (ioc->is_driver_loading)

		return;



	fw_event = kzalloc(sizeof(struct fw_event_work), GFP_ATOMIC);

	if (!fw_event)

		return;



	fw_event->event = MPT2SAS_REMOVE_UNRESPONDING_DEVICES;

	fw_event->ioc = ioc;

	_scsih_fw_event_add(ioc, fw_event);

drivers/scsi/scsi_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -1409,6 +1409,8 @@ static void scsi_kill_request(struct request *req, struct request_queue *q) 


	blk_start_request(req);



	scmd_printk(KERN_INFO, cmd, "killing request\n");



	sdev = cmd->device;

	starget = scsi_target(sdev);

	shost = sdev->host;
@@ -1490,7 +1492,6 @@ static void scsi_request_fn(struct request_queue *q) 
	struct request *req;



	if (!sdev) {

		printk("scsi: killing requests for dead queue\n");

		while ((req = blk_peek_request(q)) != NULL)

			scsi_kill_request(req, q);

		return;

drivers/scsi/scsi_scan.c

+1 −5
Original line number Diff line number Diff line
@@ -319,11 +319,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, 
	return sdev;



out_device_destroy:

	scsi_device_set_state(sdev, SDEV_DEL);

	transport_destroy_device(&sdev->sdev_gendev);

	put_device(&sdev->sdev_dev);

	scsi_free_queue(sdev->request_queue);

	put_device(&sdev->sdev_gendev);

	__scsi_remove_device(sdev);

out:

	if (display_failure_msg)

		printk(ALLOC_FAILURE_MSG, __func__);