From patchwork Wed Apr 13 14:56:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Saxena X-Patchwork-Id: 561156 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 EF000C433F5 for ; Wed, 13 Apr 2022 14:59:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232540AbiDMPCF (ORCPT ); Wed, 13 Apr 2022 11:02:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236353AbiDMPBy (ORCPT ); Wed, 13 Apr 2022 11:01:54 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 466BDE0DD for ; Wed, 13 Apr 2022 07:59:29 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id j8so2171568pll.11 for ; Wed, 13 Apr 2022 07:59:29 -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=iyfJ9Rxc7QNzB6qTGHH21XN9wO3QSu2ReJbAAbqefL8=; b=haWiL6IYleKXf0yOtL+LiZQQd1A/Wjhu3GA9IG29oBbHsnRGIj68LD22I9NG6arlaa prQhx6u+cv3vUVz98Y2KBnmK29tjpHdZuKloB7C5iGv4d2pP+8j73yi/R7eTBP4zXTzu 8/lM8jPAe0qC15GApRkPs5WhWqCdS6p3GImgc= 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=iyfJ9Rxc7QNzB6qTGHH21XN9wO3QSu2ReJbAAbqefL8=; b=YkQUqLNfHquLjm2jEh+qFDvBEvn6yu0pLfAU7BqcFmpQ+/yAjnsWzPXqi66kCzx+S8 K/pt+K8lB1W2a/9e71XLRlT693abOZPxxika7iZaE1RrQ682Fc6ZwLc02b/bEDYbJDQv /Hu3Fweohkt1wN7lQ2WVpi22Zdg53Q3dVU82lBR6Le88LCo/ODrcQnDumfAp333xELRh oMhdLnOBVx3GatUsBSC4Ch/jmFwV9R0yIPdp2vNs5QAjx3rkrEqhtsOIMJS68KPlpgB9 Q3afog15E3MDzEDEADPXAdBRdqPgGKsFeelEv2XB61GuNN35IQshyJ8dbf6sqbPUzFWl AnFw== X-Gm-Message-State: AOAM5339SANNtDb8KE0hf9HW9W7K16vbiq0SA1cS5pPxy9WYbQA5t2zE t3qYe1Awsq/hb7uvXuo+uU9Hz8MdGzDifrGjOTR1HECpMxQCN3Ng753ViSAUPI9fsiP8YlZTV+h XVdqK/4NOTq89AeWPXeI1uFhmzxSkzTvOPd+ouONZPpT0Nz4VRy4pnQpWpdizcWr9DHPT98pCLL bfxVsgKm8= X-Google-Smtp-Source: ABdhPJye+bL0FwxGUcv5j6mphnYym/P+tfF+2xPfD/DPkG9ezhyzXB/NI89Fi5dZPmA9J1KW/MGn4g== X-Received: by 2002:a17:902:bcc4:b0:157:333:e512 with SMTP id o4-20020a170902bcc400b001570333e512mr32101604pls.9.1649861968568; Wed, 13 Apr 2022 07:59:28 -0700 (PDT) Received: from dhcp-10-123-20-15.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id e14-20020aa78c4e000000b00506475da4cesm2488379pfd.49.2022.04.13.07.59.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 07:59:27 -0700 (PDT) From: Sumit Saxena To: linux-scsi@vger.kernel.org Cc: martin.petersen@oracle.com, bvanassche@acm.org, hch@lst.de, hare@suse.de, himanshu.madhani@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 v4 6/8] mpi3mr: expose adapter state to sysfs Date: Wed, 13 Apr 2022 10:56:50 -0400 Message-Id: <20220413145652.112271-7-sumit.saxena@broadcom.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220413145652.112271-1-sumit.saxena@broadcom.com> References: <20220413145652.112271-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 Reviewed-by: Himanshu Madhani --- 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 cc54231da658..1de3b006f444 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -1056,5 +1056,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 c5c447defef3..dada12216b97 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_app.c +++ b/drivers/scsi/mpi3mr/mpi3mr_app.c @@ -1217,3 +1217,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, }; /**