linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
To: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com,
	linux-scsi@vger.kernel.org
Cc: Scott.Benesh@microsemi.com, tom.white@microsemi.com,
	aacraid@microsemi.com,
	"Guilherme G . Piccoli" <gpiccoli@linux.vnet.ibm.com>,
	Bart Van Assche <Bart.VanAssche@wdc.com>
Subject: [PATCH v2 12/30] scsi: aacraid: Add target setup helper function
Date: Tue, 26 Dec 2017 20:34:33 -0800	[thread overview]
Message-ID: <20171227043451.27813-13-RaghavaAditya.Renukunta@microsemi.com> (raw)
In-Reply-To: <20171227043451.27813-1-RaghavaAditya.Renukunta@microsemi.com>

Add helper function to setup targets devices and create the base for the
upcoming patches

Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>

---
Changes in V2:
None

 drivers/scsi/aacraid/aachba.c  | 18 +++++++++++++-----
 drivers/scsi/aacraid/aacraid.h |  2 +-
 drivers/scsi/aacraid/commsup.c |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 801aff0..5a95883 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1860,7 +1860,7 @@ static void aac_set_safw_attr_all_targets(struct aac_dev *dev,
  *	Execute a CISS REPORT PHYS LUNS and process the results into
  *	the current hba_map.
  */
-int aac_get_safw_ciss_luns(struct aac_dev *dev, int rescan)
+static int aac_get_safw_ciss_luns(struct aac_dev *dev, int rescan)
 {
 	int rcode = -ENOMEM;
 	int datasize;
@@ -1898,6 +1898,16 @@ int aac_get_safw_ciss_luns(struct aac_dev *dev, int rescan)
 	return rcode;
 }
 
+static int aac_setup_safw_targets(struct aac_dev *dev, int rescan)
+{
+	return aac_get_safw_ciss_luns(dev, rescan);
+}
+
+int aac_setup_safw_adapter(struct aac_dev *dev, int rescan)
+{
+	return aac_setup_safw_targets(dev, rescan);
+}
+
 int aac_get_adapter_info(struct aac_dev* dev)
 {
 	struct fib* fibptr;
@@ -2001,10 +2011,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
 	}
 
 	if (!dev->sync_mode && dev->sa_firmware &&
-		dev->supplement_adapter_info.virt_device_bus != 0xffff) {
-		/* Thor SA Firmware -> CISS_REPORT_PHYSICAL_LUNS */
-		rcode = aac_get_safw_ciss_luns(dev, AAC_INIT);
-	}
+		dev->supplement_adapter_info.virt_device_bus != 0xffff)
+		rcode = aac_setup_safw_adapter(dev, AAC_INIT);
 
 	if (!dev->in_reset) {
 		char buffer[16];
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index d81d0aa..5690767 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -2639,7 +2639,7 @@ static inline int aac_adapter_check_health(struct aac_dev *dev)
 
 int aac_acquire_irq(struct aac_dev *dev);
 void aac_free_irq(struct aac_dev *dev);
-int aac_get_safw_ciss_luns(struct aac_dev *dev, int rescan);
+int aac_setup_safw_adapter(struct aac_dev *dev, int rescan);
 const char *aac_driverinfo(struct Scsi_Host *);
 void aac_fib_vector_assign(struct aac_dev *dev);
 struct fib *aac_fib_alloc(struct aac_dev *dev);
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 82ddc74..f3077b3 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1945,7 +1945,7 @@ static void aac_handle_sa_aif(struct aac_dev *dev, struct fib *fibptr)
 			for (target = 0; target < AAC_MAX_TARGETS; target++)
 				dev->hba_map[bus][target].new_devtype = 0;
 
-		rcode = aac_get_safw_ciss_luns(dev, AAC_RESCAN);
+		rcode = aac_setup_safw_adapter(dev, AAC_RESCAN);
 
 		aac_resolve_luns(dev);
 
-- 
2.9.4

  parent reply	other threads:[~2017-12-27  4:35 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-27  4:34 [PATCH 00/30] aacraid: Refactor for sas transport and bug fixes Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 01/30] scsi: aacraid: Fix udev inquiry race condition Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 02/30] scsi: aacraid: Do not attempt abort when Fw panicked Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 03/30] scsi: aacraid: Fix hang in kdump Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 04/30] scsi: aacraid: Do not remove offlined devices Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 05/30] scsi: aacraid: Fix ioctl reset hang Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 06/30] scsi: aacraid: Allow reset_host sysfs var to recover Panicked Fw Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 07/30] scsi: aacraid: Refactor reset_host store function Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 08/30] scsi: aacraid: Move code to wait for IO completion to shutdown func Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 09/30] scsi: aacraid: Create bmic submission function from bmic identify Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 10/30] scsi: aacraid: Change phy luns function to use common bmic function Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 11/30] scsi: aacraid: Refactor and rename to make mirror existing changes Raghava Aditya Renukunta
2017-12-27  4:34 ` Raghava Aditya Renukunta [this message]
2017-12-27  4:34 ` [PATCH v2 13/30] scsi: aacraid: Untangle targets setup from report phy luns Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 14/30] scsi: aacraid: Move function around to match existing code Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 15/30] scsi: aacraid: Create helper functions to get lun info Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 16/30] scsi: aacraid: Save bmic phy information for each phy Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 17/30] scsi: aacraid: Add helper function to set queue depth Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 18/30] scsi: aacraid: Merge func to get container information Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 19/30] scsi: aacraid: Process hba and container hot plug events in single function Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 20/30] scsi: aacraid: Added macros to help loop through known buses and targets Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 21/30] scsi: aacraid: Refactor resolve luns code and scsi functions Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 22/30] scsi: aacraid: Merge adapter setup with resolve luns Raghava Aditya Renukunta
2018-01-03 10:02   ` Nikola Pajkovsky
2018-01-03 17:00     ` Raghava Aditya Renukunta
2018-01-04 12:36       ` Nikola Pajkovsky
2017-12-27  4:34 ` [PATCH v2 23/30] scsi: aacraid: Block concurrent hotplug event handling Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 24/30] scsi: aacraid: Use hotplug handling function in place of scsi_scan_host Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 25/30] scsi: aacraid: Reschedule host scan in case of failure Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 26/30] scsi: aacraid: Fix hang while scanning in eh recovery Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 27/30] scsi: aacraid: Skip schedule rescan in case of kdump Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 28/30] scsi: aacraid: Remove unused rescan variable Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 29/30] scsi: aacraid: Remove AAC_HIDE_DISK check in queue command Raghava Aditya Renukunta
2017-12-27  4:34 ` [PATCH v2 30/30] scsi: aacraid: Update driver version to 50877 Raghava Aditya Renukunta
2018-01-04  4:28 ` [PATCH 00/30] aacraid: Refactor for sas transport and bug fixes Martin K. Petersen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171227043451.27813-13-RaghavaAditya.Renukunta@microsemi.com \
    --to=raghavaaditya.renukunta@microsemi.com \
    --cc=Bart.VanAssche@wdc.com \
    --cc=Scott.Benesh@microsemi.com \
    --cc=aacraid@microsemi.com \
    --cc=gpiccoli@linux.vnet.ibm.com \
    --cc=jejb@linux.vnet.ibm.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=tom.white@microsemi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).