From patchwork Fri Feb 10 08:59:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shivasharan S X-Patchwork-Id: 9566209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B42860216 for ; Fri, 10 Feb 2017 09:08:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A6F928544 for ; Fri, 10 Feb 2017 09:08:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F36AC28551; Fri, 10 Feb 2017 09:08:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A944528544 for ; Fri, 10 Feb 2017 09:08:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752603AbdBJJIw (ORCPT ); Fri, 10 Feb 2017 04:08:52 -0500 Received: from mail-pg0-f46.google.com ([74.125.83.46]:36221 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752558AbdBJJIu (ORCPT ); Fri, 10 Feb 2017 04:08:50 -0500 Received: by mail-pg0-f46.google.com with SMTP id v184so9023619pgv.3 for ; Fri, 10 Feb 2017 01:08:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5x6fAsw/CU2unRxNaZFSRCoHHmwZxYaBi7hOfr86D6c=; b=cx1wbh9n3YazWdlQknQe5wvDnry9tR2ocnlgBE0Vzfh5+UdypPkaA6Z5BWwVDJ6DKm qQSCUs0Crofy88UADvPIZnDZ4so5dYVIyeJjSYcz0CBxSFa3mEP5PtASht9n/0wNGhAm OkldUiwc7h7pisTYTNKdMu7Xy3WJdADOQWtxE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5x6fAsw/CU2unRxNaZFSRCoHHmwZxYaBi7hOfr86D6c=; b=koIo/BKXkB4E4WEeCR/rS/lyfi27rpWQwGN0BtOGRYg6wET924HH5rXQl+EBkVq3N6 pk6N90hUqxIFJtbNtraWNgM/Z26wgHkvlLTDeKtEQyYC0cJzgE1+/jomFwfiI9btutrH cK6VnH47vmZpzjQEBRmoiUMM+1Dhx69EFw6lyeaJr13On3Pnnz4dN4YOZ9c8NK0nWnDs sw2CPfA2WoB66hnow7oliXUiBr/292wRfBW2MweBRNRc4lUtHeXdXKyMsVkwKTViBcBk 63AOoWx8DOF4nfDtYpAP7SqY7JkHPG6o2EY8tq1F9EMhhMMD6GLH8kxUBkerMsc+GprQ 7m8A== X-Gm-Message-State: AMke39nsRdnqJ24+8IHMOjgYXkIdhtZOiFrumTiGjJTXFxJ6BvK6Wpzmczh4Mhn/7NarbcJr X-Received: by 10.98.192.72 with SMTP id x69mr8943653pff.129.1486717299488; Fri, 10 Feb 2017 01:01:39 -0800 (PST) Received: from dhcp-135-24-192-142.localdomain ([192.19.239.250]) by smtp.gmail.com with ESMTPSA id b7sm3432956pfg.53.2017.02.10.01.01.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Feb 2017 01:01:39 -0800 (PST) From: Shivasharan S To: linux-scsi@vger.kernel.org Cc: martin.petersen@oracle.com, thenzl@redhat.com, jejb@linux.vnet.ibm.com, kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, hare@suse.com, Shivasharan S Subject: [PATCH v3 06/39] megaraid_sas: RAID map is accessed for SYS PDs when use_seqnum_jbod_fp is not set Date: Fri, 10 Feb 2017 00:59:06 -0800 Message-Id: <1486717179-23320-7-git-send-email-shivasharan.srikanteshwara@broadcom.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1486717179-23320-1-git-send-email-shivasharan.srikanteshwara@broadcom.com> References: <1486717179-23320-1-git-send-email-shivasharan.srikanteshwara@broadcom.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Shivasharan S Signed-off-by: Kashyap Desai Reviewed-by: Hannes Reinecke Reviewed-by: Tomas Henzl --- drivers/scsi/megaraid/megaraid_sas_base.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 6ca49ef..67a205a 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -1756,28 +1756,31 @@ void megasas_update_sdev_properties(struct scsi_device *sdev) fusion = instance->ctrl_context; mr_device_priv_data = sdev->hostdata; - if (!fusion) + if (!fusion || !mr_device_priv_data) return; - if (!MEGASAS_IS_LOGICAL(sdev) && - instance->use_seqnum_jbod_fp) { - pd_index = (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) + - sdev->id; - pd_sync = (void *)fusion->pd_seq_sync - [(instance->pd_seq_map_id - 1) & 1]; - mr_device_priv_data->is_tm_capable = - pd_sync->seq[pd_index].capability.tmCapable; - } else { + if (MEGASAS_IS_LOGICAL(sdev)) { device_id = ((sdev->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) + sdev->id; local_map_ptr = fusion->ld_drv_map[(instance->map_id & 1)]; ld = MR_TargetIdToLdGet(device_id, local_map_ptr); + if (ld >= instance->fw_supported_vd_count) + return; raid = MR_LdRaidGet(ld, local_map_ptr); if (raid->capability.ldPiMode == MR_PROT_INFO_TYPE_CONTROLLER) - blk_queue_update_dma_alignment(sdev->request_queue, 0x7); + blk_queue_update_dma_alignment(sdev->request_queue, + 0x7); + mr_device_priv_data->is_tm_capable = raid->capability.tmCapable; + } else if (instance->use_seqnum_jbod_fp) { + pd_index = (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) + + sdev->id; + pd_sync = (void *)fusion->pd_seq_sync + [(instance->pd_seq_map_id - 1) & 1]; + mr_device_priv_data->is_tm_capable = + pd_sync->seq[pd_index].capability.tmCapable; } }