From patchwork Tue Aug 25 00:11:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: babu moger X-Patchwork-Id: 43680 Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7P0CIdK013511 for ; Tue, 25 Aug 2009 00:12:18 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 711016199B9; Mon, 24 Aug 2009 20:12:17 -0400 (EDT) Received: from int-mx03.intmail.prod.int.phx2.redhat.com (nat-pool.util.phx.redhat.com [10.8.5.200]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n7P0CEcX026000 for ; Mon, 24 Aug 2009 20:12:15 -0400 Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com [10.5.110.7]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7P0CEFr029066 for ; Mon, 24 Aug 2009 20:12:14 -0400 Received: from exprod7og116.obsmtp.com (exprod7og116.obsmtp.com [64.18.2.219]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7P0C0Io029309 for ; Mon, 24 Aug 2009 20:12:01 -0400 Received: from source ([147.145.40.20]) by exprod7ob116.postini.com ([64.18.6.12]) with SMTP ID DSNKSpMsSm7WxuXxrMxPfGHZB8gbOCkG7D2O@postini.com; Mon, 24 Aug 2009 17:12:01 PDT Received: from milmhbs0.lsil.com (mhbs.lsil.com [147.145.1.30]) by mail0.lsil.com (8.12.11/8.12.11) with ESMTP id n7P0BlIl027206; Mon, 24 Aug 2009 17:11:52 -0700 (PDT) Received: from coshub01.lsi.com (coshub01.co.lsil.com [172.21.36.64]) by milmhbs0.lsil.com (8.12.11/8.12.11) with ESMTP id n7P0BntO009691; Mon, 24 Aug 2009 17:11:49 -0700 Received: from cosmail01.lsi.com ([172.21.36.24]) by coshub01.lsi.com ([172.21.36.64]) with mapi; Mon, 24 Aug 2009 18:11:47 -0600 From: "Moger, Babu" To: Linux SCSI Mailing list Date: Mon, 24 Aug 2009 18:11:46 -0600 Thread-Topic: [PATCH 1/3] scsi_dh_rdac: Adding more debug options for scsi rdac handler Thread-Index: AcolGKIohClMV6XARDKrgdxAH4Jl3w== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.7 X-Scanned-By: MIMEDefang 2.39 X-RedHat-Spam-Score: -4 (RCVD_IN_DNSWL_MED) X-MIME-Autoconverted: from base64 to 8bit by listman.util.phx.redhat.com id n7P0CEcX026000 X-loop: dm-devel@redhat.com Cc: device-mapper development , "Chauhan, Vijay" , "Stankey, Robert" Subject: [dm-devel] [PATCH 1/3] scsi_dh_rdac: Adding more debug options for scsi rdac handler X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Adding the code to read the debug information during activate. This patch collects the information about storage and controllers during rdac_activate. Signed-off-by: Babu Moger --- -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c.orig 2009-08-24 11:54:41.000000000 -0500 +++ linux-2.6.31-rc5/drivers/scsi/device_handler/scsi_dh_rdac.c 2009-08-24 12:08:33.000000000 -0500 @@ -112,6 +112,7 @@ struct c9_inquiry { #define SUBSYS_ID_LEN 16 #define SLOT_ID_LEN 2 +#define ARRAY_LABEL_LEN 31 struct c4_inquiry { u8 peripheral_info; @@ -135,6 +136,8 @@ struct rdac_controller { struct rdac_pg_legacy legacy; struct rdac_pg_expanded expanded; } mode_select; + u8 index; + u8 array_name[ARRAY_LABEL_LEN]; }; struct c8_inquiry { u8 peripheral_info; @@ -324,6 +327,13 @@ static struct rdac_controller *get_contr /* initialize fields of controller */ memcpy(ctlr->subsys_id, subsys_id, SUBSYS_ID_LEN); memcpy(ctlr->slot_id, slot_id, SLOT_ID_LEN); + + /* update the controller index */ + if (slot_id[1] == 0x31) + ctlr->index = 0; + else + ctlr->index = 1; + kref_init(&ctlr->kref); ctlr->use_ms10 = -1; list_add(&ctlr->node, &ctlr_list); @@ -381,6 +391,26 @@ static int get_lun(struct scsi_device *s return err; } +static int get_array_name(struct scsi_device *sdev, struct rdac_dh_data *h) +{ + int err, i; + struct c8_inquiry *inqp; + + err = submit_inquiry(sdev, 0xC8, sizeof(struct c8_inquiry), h); + if (err == SCSI_DH_OK) { + inqp = &h->inq.c8; + if (inqp->page_code != 0xc8) + return SCSI_DH_NOSYS; + + for(i=0; i<30; ++i) + h->ctlr->array_name[i] = inqp->array_user_label[(2*i)+1]; + + h->ctlr->array_name[30] = '\0'; + } + + return err; +} + static int check_ownership(struct scsi_device *sdev, struct rdac_dh_data *h) { int err; @@ -529,6 +559,10 @@ static int rdac_activate(struct scsi_dev err = initialize_controller(sdev, h); if (err != SCSI_DH_OK) goto done; + + err = get_array_name(sdev, h); + if (err != SCSI_DH_OK) + goto done; } if (h->ctlr->use_ms10 == -1) {