From patchwork Fri Apr 22 11:54:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Saxena X-Patchwork-Id: 565583 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 D5246C433F5 for ; Fri, 22 Apr 2022 11:55:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1447213AbiDVL6Y (ORCPT ); Fri, 22 Apr 2022 07:58:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1447217AbiDVL6P (ORCPT ); Fri, 22 Apr 2022 07:58:15 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFC5F3ED01 for ; Fri, 22 Apr 2022 04:55:21 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id j8so10315553pll.11 for ; Fri, 22 Apr 2022 04:55:21 -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=YTwzzyGktuM5g0mmcPuj3Zv804/aNINZ4fPza1mJSEw=; b=PhPCTDDH9iw1bDfaMjbWLmp1ZbRh17ACsblLCzgH5u8/EqT4JT48c+/1xGzAUZw0nm pQvmuoayrf6QVNFIOUx1ShmqwqqTxDQG7OHl2KFVddqLRvv/YCzJzv1KNCiI3lBA9yJ6 gfe4q9IViGstrZ6Nr/xJcdwg1XfcQowNV4fZs= 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=YTwzzyGktuM5g0mmcPuj3Zv804/aNINZ4fPza1mJSEw=; b=lqNbv5gykcpU+4oZ1EpbtQ6O17UHzKqOJ5QLxWe0YvHhFUrSQSxt6jlkwlnY6PJGUV oNCK1eAoOMQwxGFyGlG30Atev+bmxU/nYIsgh5i0H06HaPr3S6Hg2NCJejNankFMq+kx ANSRtmfGrQnuPY3uvAFiEk0ND0Ryb8ryZf3q11XJsjKBUPA658YQB328UqgKq02OxiVZ MD0kAbcx1b80JOHyKvURzrxRBbPCycGUgJA8NnmDx4XO1gQwL066IDyxuWDJHEfSnw5M KNZ+6qPo0JwmsrRbup/p3PQchggavcQ5r3jcb+abGu+bOfrpxIUScGfYtg6s4owcdcIs o4TA== X-Gm-Message-State: AOAM531msceCPOU5Marsz2QXAsIC93rk51ntZhoq9YFUvtj0sIbQ2jQj JcS6v19CgvVnud6RuT2qgwa89hJW1Y2Iyg85KuqZvs2bx0bPo7Pkc1LvkBm21Yxsnn3dDdJwITA 0NuzTHwaYAD4rC2256MJxr6CtMLHu9U4kmzZ6MW4jw53RWBcPpyVQEu1toEL8bK0ceb2wPOygBM 0JYkzs9xs= X-Google-Smtp-Source: ABdhPJx8X16MZ7KNvgeepSMe0fcARl3rbU1BMOKwdeCZozvLFH1DFz14X8J5E/3Zm4yQZZK+EwQCzA== X-Received: by 2002:a17:90b:1e0b:b0:1d2:dabc:9929 with SMTP id pg11-20020a17090b1e0b00b001d2dabc9929mr4973014pjb.39.1650628521130; Fri, 22 Apr 2022 04:55:21 -0700 (PDT) Received: from dhcp-10-123-20-15.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id g6-20020a17090a714600b001d7f3bb11d7sm2367981pjs.53.2022.04.22.04.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 04:55:20 -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 v5 6/8] mpi3mr: expose adapter state to sysfs Date: Fri, 22 Apr 2022 07:54:21 -0400 Message-Id: <20220422115423.279805-7-sumit.saxena@broadcom.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220422115423.279805-1-sumit.saxena@broadcom.com> References: <20220422115423.279805-1-sumit.saxena@broadcom.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Reviewed-by: Himanshu Madhani 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 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 075dcc34f0e8..953891df4753 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_app.c +++ b/drivers/scsi/mpi3mr/mpi3mr_app.c @@ -1215,3 +1215,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, }; /**