From patchwork Tue Mar 22 12:21:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Saxena X-Patchwork-Id: 553848 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE155C4332F for ; Tue, 22 Mar 2022 12:22:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233485AbiCVMXo (ORCPT ); Tue, 22 Mar 2022 08:23:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233486AbiCVMXc (ORCPT ); Tue, 22 Mar 2022 08:23:32 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D6D78594F for ; Tue, 22 Mar 2022 05:22:05 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id m11-20020a17090a7f8b00b001beef6143a8so1994751pjl.4 for ; Tue, 22 Mar 2022 05:22:05 -0700 (PDT) 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 :mime-version; bh=yMtSbVWU3mjUEszQbVhbuP+4Rh097vOncCiKrLGAha8=; b=YIG4r2hA7jt8Arf5aQ1svR4Z26IQdvvximHcRkSkAd8Q6UBwszkZsvSeO876WoLTLJ sg6ef/N+O0NkcU60CNwEfCN9ORoeeV5C9w/UxrcHV2tvlQ5XWP/MORczWzJ/u4mYk8Y3 1Yx66sL6atq32a5teIK2VIkPiCXTQ/kfRs4uQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=yMtSbVWU3mjUEszQbVhbuP+4Rh097vOncCiKrLGAha8=; b=cFDKonchYDuBN7DOsf+2F2ULAAt6wZp716cnqm+GBBvLEJKWnoebbWzMA7KPWbL5Vv mja/lPnP/jPZA+Een0lwaPcDeu8qya5SipR3ofzriXaynGlYQfTwswr7jGgzYMJ7KqyV Z7EIX4xPuQYi8L44XcBvhZHQbUde5Umj0BY5vL+c2UWejoZqlUlAQIKE1BMkYKK51lfJ qxf96mHyel9Ny/Rzx61J/ki6O7dvrMs9qvAh790X1MbjkSiHNqTU1f6guhJdDPnioJGP mbBcWfpdbuCWfHgSIfViXS12/mbuhZkJHSwcCKnJH8hvJNpz1aI4V9YbHL9nKt7OmNHU rOkg== X-Gm-Message-State: AOAM530/nfnAcrrn5t0ZFwo7IBUnMnkMrvF3auF0M/z9bc45UIzI7RKV EgcXdczBls0/cOzgwHt4OaYSASpaqCYzHQqEsQwacNt3pPXAnhe4AtSx5Zy+NPC+m5pWj97aJl4 vRti4VbjNrQTvCigt/3VHo22OOIx20pODTdvvkFyOyHREZM9OYawR3rnIQc8cyVL4lVRCk/6GqX r4uQ6qpg49Eg== X-Google-Smtp-Source: ABdhPJzZzcMt2vE8UwiATN63pUwEqx1dMdhdaVHBe6UgjFDDJ0w4RTYLk0xn8nRc9pRSjOlS9kBUMA== X-Received: by 2002:a17:90b:38d2:b0:1c6:fa94:96bb with SMTP id nn18-20020a17090b38d200b001c6fa9496bbmr4760680pjb.206.1647951724421; Tue, 22 Mar 2022 05:22:04 -0700 (PDT) Received: from dhcp-10-123-20-15.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id d11-20020a056a0010cb00b004e1b76b09c0sm23225259pfu.74.2022.03.22.05.22.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 05:22:03 -0700 (PDT) From: Sumit Saxena To: linux-scsi@vger.kernel.org Cc: martin.petersen@oracle.com, sathya.prakash@broadcom.com, kashyap.desai@broadcom.com, chandrakanth.patil@broadcom.com, sreekanth.reddy@broadcom.com, prayas.patel@broadcom.com, Sumit Saxena Subject: [PATCH 5/7] mpi3mr: expose adapter state to sysfs Date: Tue, 22 Mar 2022 08:21:05 -0400 Message-Id: <20220322122107.8482-6-sumit.saxena@broadcom.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220322122107.8482-1-sumit.saxena@broadcom.com> References: <20220322122107.8482-1-sumit.saxena@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Signed-off-by: Sumit Saxena --- drivers/scsi/mpi3mr/mpi3mr.h | 2 +- drivers/scsi/mpi3mr/mpi3mr_app.c | 46 ++++++++++++++++++++++++++++++++ drivers/scsi/mpi3mr/mpi3mr_os.c | 1 + 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h index 10c074c1eea6..5a1b2d9b64da 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -1022,5 +1022,5 @@ int mpi3mr_pel_get_seqnum_post(struct mpi3mr_ioc *mrioc, struct mpi3mr_drv_cmd *drv_cmd); void mpi3mr_app_save_logdata(struct mpi3mr_ioc *mrioc, char *event_data, u16 event_data_size); - +extern const struct attribute_group *mpi3mr_host_groups[]; #endif /*MPI3MR_H_INCLUDED*/ diff --git a/drivers/scsi/mpi3mr/mpi3mr_app.c b/drivers/scsi/mpi3mr/mpi3mr_app.c index aa95bff5412a..da3c7835ada4 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_app.c +++ b/drivers/scsi/mpi3mr/mpi3mr_app.c @@ -1220,3 +1220,49 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc) err_device_add: kfree(mrioc->bsg_dev); } + +/** + * adapter_state_show - SysFS callback for adapter state show + * @dev: class device + * @attr: Device attributes + * @buf: Buffer to copy + * + * Return: snprintf() return after copying adapter state + */ +static ssize_t +adp_state_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct Scsi_Host *shost = class_to_shost(dev); + struct mpi3mr_ioc *mrioc = shost_priv(shost); + enum mpi3mr_iocstate ioc_state; + uint8_t adp_state; + + ioc_state = mpi3mr_get_iocstate(mrioc); + if (ioc_state == MRIOC_STATE_UNRECOVERABLE) + adp_state = MPI3MR_BSG_ADPSTATE_UNRECOVERABLE; + else if ((mrioc->reset_in_progress) || (mrioc->stop_bsgs)) + adp_state = MPI3MR_BSG_ADPSTATE_IN_RESET; + else if (ioc_state == MRIOC_STATE_FAULT) + adp_state = MPI3MR_BSG_ADPSTATE_FAULT; + else + adp_state = MPI3MR_BSG_ADPSTATE_OPERATIONAL; + + return snprintf(buf, PAGE_SIZE, "%u\n", adp_state); +} + +static DEVICE_ATTR_RO(adp_state); + +static struct attribute *mpi3mr_host_attrs[] = { + &dev_attr_adp_state.attr, + NULL, +}; + +static const struct attribute_group mpi3mr_host_attr_group = { + .attrs = mpi3mr_host_attrs +}; + +const struct attribute_group *mpi3mr_host_groups[] = { + &mpi3mr_host_attr_group, + NULL, +}; diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index 19298136edb6..89a4918c4a9e 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -4134,6 +4134,7 @@ static struct scsi_host_template mpi3mr_driver_template = { .max_segment_size = 0xffffffff, .track_queue_depth = 1, .cmd_size = sizeof(struct scmd_priv), + .shost_groups = mpi3mr_host_groups, }; /**