From patchwork Mon Apr 25 12:23:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Saxena X-Patchwork-Id: 565965 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 4877AC433EF for ; Mon, 25 Apr 2022 12:27:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241804AbiDYMa6 (ORCPT ); Mon, 25 Apr 2022 08:30:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242144AbiDYMaC (ORCPT ); Mon, 25 Apr 2022 08:30:02 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F8AE6FA29 for ; Mon, 25 Apr 2022 05:24:48 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id q12so13254939pgj.13 for ; Mon, 25 Apr 2022 05:24:48 -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=iFVDLDuCAkTWcoZQHfQoaXDrVMvKjC0JrhhBn3zj7Ow=; b=A6gxdwRo4Cuep7DzNi65VbVCkt5rI3JIq3uNyGrQ1YDf/yZSSxzxjctta4VXyFrgDC sEjiHg3Y/ElZMOFEcCeYr8Rco6xnq2ckpK0300Vjt1qnbCO8dUZFK4dEzVzV+KEfNDx4 tSTR7y1tYWJDZwHYewnqI99lHkrvBfLuifM5M= 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=iFVDLDuCAkTWcoZQHfQoaXDrVMvKjC0JrhhBn3zj7Ow=; b=xI3f19RDuh1dq099ncYBNRy9OP+LCvsHiznj0J8Uq5pVKpgVnJhIsYv9FbYEmxYgR8 oGNxHfWOcL6vZhQ8oXSO1HUKfZma7ZMNsdBPcYTUfOXzrTS0nRiLvnQo44QJgt1vwudq jx/kv0rA24g6rj64JoZUDrpKhDsVScJco0M472gkPe755U/Y6eQPl1rdgp/5BiWs7jH7 AQqfKA4FhzNLcrA0IcT6z0kJLCtQ4k4TjWZd+3vOFzxkXvAJilLQc/luivrmCijHzJX0 /TkP7xoHMJKG8WZ4KBLaII6irPP+swPzi2NVvVp/yFvdepFvXARcCuYEW5mkT5xu0oWX 7fhQ== X-Gm-Message-State: AOAM530rAfwI+t8bvnLCxoKvUv6xzYbNFBmFm054wAKL1YYHz6g98uIL NrXEdW/ZO+o5i65ldosJ9n5WMHyylSPGBRs42Lpl5jQuksu2ufapmCyv7Akk5mTMsBzH8Zi0mwf 4p19CwgrXAg6XgU9O3aiF/2EQ3eNZaU7ANWDHXAFCBRX6wMmZ/3HBTvfrdS0HNpe/JAO4+oqDHz Qk6exbC04= X-Google-Smtp-Source: ABdhPJyhwt6wEDZ4v54sty4pCOXPD8zLpiMt6BBtg9LAC+rkdWojhnsQl91ReYP8fSSlSd/2HBkB3Q== X-Received: by 2002:a05:6a00:2310:b0:4fa:7eb1:e855 with SMTP id h16-20020a056a00231000b004fa7eb1e855mr18869851pfh.14.1650889487715; Mon, 25 Apr 2022 05:24:47 -0700 (PDT) Received: from dhcp-10-123-20-15.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id y16-20020a63b510000000b00398d8b19bbfsm9757722pge.23.2022.04.25.05.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 05:24:47 -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 v6 6/8] mpi3mr: expose adapter state to sysfs Date: Mon, 25 Apr 2022 08:23:32 -0400 Message-Id: <20220425122334.368142-7-sumit.saxena@broadcom.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220425122334.368142-1-sumit.saxena@broadcom.com> References: <20220425122334.368142-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 06a1e950bec4..5221058e3d6b 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, }; /**