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

Commit 6b6c1cd7 authored by Tomas Henzl's avatar Tomas Henzl Committed by James Bottomley
Browse files

hpsa: dont meddle with hw which isn't ours (cciss) 



The hpsa driver touches the hardware before checking the pci-id table.
This way, especially in kdump, it may confuse the proper driver (cciss).

Signed-off-by: default avatarTomas Henzl <thenzl@redhat.com>
Acked-by: default avatarDon Brace <Don.Brace@pmcs.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent b9ea9dcd

drivers/scsi/hpsa.c

+11 −10
Original line number Diff line number Diff line
@@ -5733,7 +5733,7 @@ static int controller_reset_failed(struct CfgTable __iomem *cfgtable) 
/* This does a hard reset of the controller using PCI power management

 * states or the using the doorbell register.

 */

static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)

static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev, u32 board_id)

{

	u64 cfg_offset;

	u32 cfg_base_addr;
@@ -5744,7 +5744,6 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev) 
	int rc;

	struct CfgTable __iomem *cfgtable;

	u32 use_doorbell;

	u32 board_id;

	u16 command_register;



	/* For controllers as old as the P600, this is very nearly
@@ -5760,11 +5759,6 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev) 
	 * using the doorbell register.

	 */



	rc = hpsa_lookup_board_id(pdev, &board_id);

	if (rc < 0) {

		dev_warn(&pdev->dev, "Board ID not found\n");

		return rc;

	}

	if (!ctlr_is_resettable(board_id)) {

		dev_warn(&pdev->dev, "Controller not resettable\n");

		return -ENODEV;
@@ -6346,7 +6340,7 @@ static void hpsa_hba_inquiry(struct ctlr_info *h) 
	}

}



static int hpsa_init_reset_devices(struct pci_dev *pdev)

static int hpsa_init_reset_devices(struct pci_dev *pdev, u32 board_id)

{

	int rc, i;

	void __iomem *vaddr;
@@ -6382,7 +6376,7 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev) 
	iounmap(vaddr);



	/* Reset the controller with a PCI power-cycle or via doorbell */

	rc = hpsa_kdump_hard_reset_controller(pdev);

	rc = hpsa_kdump_hard_reset_controller(pdev, board_id);



	/* -ENOTSUPP here means we cannot reset the controller

	 * but it's already (and still) up and running in
@@ -6843,11 +6837,18 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct ctlr_info *h;

	int try_soft_reset = 0;

	unsigned long flags;

	u32 board_id;



	if (number_of_controllers == 0)

		printk(KERN_INFO DRIVER_NAME "\n");



	rc = hpsa_init_reset_devices(pdev);

	rc = hpsa_lookup_board_id(pdev, &board_id);

	if (rc < 0) {

		dev_warn(&pdev->dev, "Board ID not found\n");

		return rc;

	}



	rc = hpsa_init_reset_devices(pdev, board_id);

	if (rc) {

		if (rc != -ENOTSUPP)

			return rc;