From patchwork Tue Jan 29 09:38:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shivasharan S X-Patchwork-Id: 10785887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A785F922 for ; Tue, 29 Jan 2019 09:38:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 998992A6B3 for ; Tue, 29 Jan 2019 09:38:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DF0A2ABB3; Tue, 29 Jan 2019 09:38:29 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,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 3429F2A6B3 for ; Tue, 29 Jan 2019 09:38:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727550AbfA2Ji2 (ORCPT ); Tue, 29 Jan 2019 04:38:28 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:44458 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726456AbfA2Ji2 (ORCPT ); Tue, 29 Jan 2019 04:38:28 -0500 Received: by mail-pf1-f195.google.com with SMTP id u6so9386643pfh.11 for ; Tue, 29 Jan 2019 01:38:28 -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=Bdur965b8C0C1O/dMoWAGoC3xxdY5VoEUL9M85i8hRo=; b=hmqS+hpm2GXR3yH4B9mvdgtya+qjpN6UgUp8WsIIpQKFDt/XSFZmD2nH03UbZpOIZ7 19+/FQ2ON4rYKcNyXNIV58tLMHilww6VkE6Qs2JsVgsYoad4nB/2lp814qYekXQQNM8m B1ul+PRwvhRZZ3Lfp81fyVxA+q28itGKPfev4= 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=Bdur965b8C0C1O/dMoWAGoC3xxdY5VoEUL9M85i8hRo=; b=mpaRukfWyzCxQowX6U6f/eZs4AsqUpdt60J1D0bYOGCQFpsNuD+SQ/oChlw8wM+d7C z/KJyqL+581bAWuvRQnsNCpHzSXMkvpQoeSkAGdq8DCbHffufI/L4S9Z0sKL119XVXPd Fzz81vXsfd5gfKE20vWio55CT0h/uDnJorUDE/nAhp053Woocf7whgqwCTYyOpLwxK4X E+vp/FAFAKH/9SBRiaNVZe5Ik9Hh2amVUBouuJmzcP9M3zdCfsvSJhQ3YXEYqBGGZnJt JSIAOJwcte1s+pwcbgV4ym2vKuifMaqSCQ7aM3St8dFVyEE5uZmFsRsCLTOIieY4kaFY l0Iw== X-Gm-Message-State: AJcUukfNCz1jtPcfmlFrxLGUvL+0xWOYaHwvwBOVZ2AWRa9aRMEZR46r owu5jVpR090GC6DEOUhhkjbroM+fdosLM796UpI1+iwvv3iLGdCgBvjOuItY145S4haJ00aMPnQ bODsJCdmZrar/r2Ef6/n+xq4kFtP4sw2RV/1SDwijE37y5yYnEgeNBms24WSXjMOoBbpIhpIU8w 2NSBdaBLba37eigu66AgSj X-Google-Smtp-Source: ALg8bN5DxX5QpKDRF/qYBQwyTBwxtkZ88zFmFqrg4AWx4S4QmDJnaf79ojQBW8pbL1Waa01VzS/Ilw== X-Received: by 2002:a63:4f20:: with SMTP id d32mr22932126pgb.47.1548754707173; Tue, 29 Jan 2019 01:38:27 -0800 (PST) Received: from dhcp-135-24-192-142.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id u126sm87232494pgb.2.2019.01.29.01.38.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 01:38:26 -0800 (PST) From: Shivasharan S To: linux-scsi@vger.kernel.org Cc: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, kiran-kumar.kasturi@broadcom.com, sankar.patra@broadcom.com, sasikumar.pc@broadcom.com, Shivasharan S Subject: [PATCH V3 1/3] megaraid_sas: Rework code to get PD and LD list Date: Tue, 29 Jan 2019 01:38:12 -0800 Message-Id: <1548754694-5280-2-git-send-email-shivasharan.srikanteshwara@broadcom.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1548754694-5280-1-git-send-email-shivasharan.srikanteshwara@broadcom.com> References: <1548754694-5280-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 During FW init, combine the code to get the PD and LD list from FW into a single function. This patch is in preparation for adding support for HOST_DEVICE_LIST DCMD. Signed-off-by: Shivasharan S --- drivers/scsi/megaraid/megaraid_sas_base.c | 44 ++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index f7bdd783360a..8cd84abcce2b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -5319,6 +5319,33 @@ static void megasas_setup_reply_map(struct megasas_instance *instance) instance->reply_map[cpu] = cpu % instance->msix_vectors; } +/** + * megasas_get_device_list - Get the PD and LD device list from FW. + * @instance: Adapter soft state + * @return: Success or failure + * + * Issue DCMDs to Firmware to get the PD and LD list. + */ +static +int megasas_get_device_list(struct megasas_instance *instance) +{ + memset(instance->pd_list, 0, + (MEGASAS_MAX_PD * sizeof(struct megasas_pd_list))); + memset(instance->ld_ids, 0xff, MEGASAS_MAX_LD_IDS); + + if (megasas_get_pd_list(instance) < 0) { + dev_err(&instance->pdev->dev, "failed to get PD list\n"); + return FAILED; + } + + if (megasas_ld_list_query(instance, + MR_LD_QUERY_TYPE_EXPOSED_TO_HOST)) { + dev_err(&instance->pdev->dev, "failed to get LD list\n"); + return FAILED; + } + + return SUCCESS; +} /** * megasas_init_fw - Initializes the FW * @instance: Adapter soft state @@ -5571,18 +5598,13 @@ static int megasas_init_fw(struct megasas_instance *instance) megasas_setup_jbod_map(instance); - /** for passthrough - * the following function will get the PD LIST. - */ - memset(instance->pd_list, 0, - (MEGASAS_MAX_PD * sizeof(struct megasas_pd_list))); - if (megasas_get_pd_list(instance) < 0) { - dev_err(&instance->pdev->dev, "failed to get PD list\n"); + if (megasas_get_device_list(instance) != SUCCESS) { + dev_err(&instance->pdev->dev, + "%s: megasas_get_device_list failed\n", + __func__); goto fail_get_ld_pd_list; } - memset(instance->ld_ids, 0xff, MEGASAS_MAX_LD_IDS); - /* stream detection initialization */ if (instance->adapter_type >= VENTURA_SERIES) { fusion->stream_detect_by_ld = @@ -5612,10 +5634,6 @@ static int megasas_init_fw(struct megasas_instance *instance) } } - if (megasas_ld_list_query(instance, - MR_LD_QUERY_TYPE_EXPOSED_TO_HOST)) - goto fail_get_ld_pd_list; - /* * Compute the max allowed sectors per IO: The controller info has two * limits on max sectors. Driver should use the minimum of these two.