Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp743052pxb; Tue, 14 Sep 2021 07:50:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMWZaZDiyY4wk17N2bQI1Zyq+8rqwxKqStx28jzHqMLZO5K7eChngzoLVXtXwzqY4SiXFS X-Received: by 2002:a05:6602:1503:: with SMTP id g3mr13848801iow.25.1631631022555; Tue, 14 Sep 2021 07:50:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631631022; cv=none; d=google.com; s=arc-20160816; b=h6gcq/iZwAAtUoHR8Z+mqueRcU5ZRGm2dE8/n8EnmRUL3MwPVtSoEb/FerETXDEeIY SDzmMUu9RKCP7FRuWZ3/sD33zfD+8jYoY3CfXXhOF/qoYrwAkrSLDJXqxsqUGkqTUr6L 7HscWMdE/lrjKQjU5P+wJga+RVaUmPOAIvch4pwouNcBIl0HkU5GYl400hw/YGi6tuXc q7GISCWikqOMFLux4zeB+b78UC05nFCwQCCZ94fCc4+6cdK3IOuAZR/x22OFkKs3NFlI 2tHDdazMd04zYLZD1nq189UM1/E6DJrmaDW9c4vY+SMOVm+1/frK+hZVi6xy6gEsYr1h QJ8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:sender:dkim-signature; bh=GhQGU3ekRm4j7CzPEpJtVJmuDRBmMMIkLT2CMwHpL+Q=; b=QOJTVvcGOETjP68elB7r2K/X/vIHMghezXtub8lmlOfl9bSBIP1rjvQmN0pXedSNIq wyjAo8aG4UirT6jmNbd75/x8ibzkkX7J3i1WMgDcgWeIGnaxmBA2KDah86aYfLDoJ7rQ 7WlweY/0CQ+OpNyoQ6Cuw3OgJT0Sp816xLw0AxFXVnwwVsGZ+yTL0CgAji2xFi6rqjSK ZTAGeLY3vj1ONXS/evOYn1DRKkHIhp/bMQlnRSLUD3HmrOyaRo908aK8jtXUJtsjsekx 7WRLMfd9me0GUF/cAjx21RThKbCwySYWgxQ89ajF5ILq5r0rStrCOhMNt67zxnfU5rfU 45EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qP4kZ8P4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i37si9404439jaf.126.2021.09.14.07.50.10; Tue, 14 Sep 2021 07:50:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qP4kZ8P4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235185AbhINOuE (ORCPT + 99 others); Tue, 14 Sep 2021 10:50:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234870AbhINOt7 (ORCPT ); Tue, 14 Sep 2021 10:49:59 -0400 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09115C061767; Tue, 14 Sep 2021 07:47:09 -0700 (PDT) Received: by mail-ot1-x331.google.com with SMTP id c8-20020a9d6c88000000b00517cd06302dso18727061otr.13; Tue, 14 Sep 2021 07:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=GhQGU3ekRm4j7CzPEpJtVJmuDRBmMMIkLT2CMwHpL+Q=; b=qP4kZ8P4+qGuepBGKSjbeRLpKH6fe98cWK12AjvziKwHSq5J2xVzQXzHU2utb8qvhc m2LQOdhiZVe85mJbswmSgR8nd5VBFRiQnFJEq7+9gKucEiBnAVat0/E572zShnUg5/IR RyQ2XTCYS4/8WDRvmr7b96HdUtSrDpNruLPbAOrL8apNRshGbKyZ6VMZ2lZAxMqmVCHC gFOxj27BKjqlCbw7gvDQ0Ontzzq/0uT82vFr4kjT6ui9Xt7SkVvmLFLD5fzkyj+nn4v5 1nzOaWRLl8i+iQMwIAIgQul0lSk5ZWrWh57+P0MYB+zIGitN7Ni9hjlQ9IifFDcf4Kzc ci4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=GhQGU3ekRm4j7CzPEpJtVJmuDRBmMMIkLT2CMwHpL+Q=; b=RblYoubJSSpkYXF5YtWVNtK9EJ84JIGwLG0hIiFVqnYtKKaPMMWBheRZOXZXcgxoDE z8KsQUJvdiN7QLTQ1LXqSAu1aFX/SmKhS3FNS9HOM4ASP6a2hNChsLpTUhx0xm+zI0EZ yhjCOEV0vG6hW/cRKHh+7UgfrFY+DKgrqlGMEYzDoONOSeOUrUX3HuP2HTKMOqdfLYw5 s3MWsL851hmGeqPooXUGspnHU5AFvjx702r5odkSaUrNX6MdlAXkQnm3GCiz8/AtS0u8 J/YXz6p97Z1LK4rbM60FWpJ/5E7KQdQLMMwuGzgYpyZknqJ1QUclC6u0qle8qlC4hQWj V5hg== X-Gm-Message-State: AOAM532lTs2ZXcBK3RqlRMEU1DN+jpRWyYPJvXurAvy3QOPm6wN+HTzQ rmG7mQVP+ukKo1s3yBFORcA= X-Received: by 2002:a05:6830:278b:: with SMTP id x11mr14862596otu.326.1631630828332; Tue, 14 Sep 2021 07:47:08 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id c37sm2615183otu.60.2021.09.14.07.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 07:47:07 -0700 (PDT) Sender: Guenter Roeck Date: Tue, 14 Sep 2021 07:47:06 -0700 From: Guenter Roeck To: Avri Altman Cc: "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bart Van Assche , Adrian Hunter , Bean Huo Subject: Re: [PATCH v5 1/2] scsi: ufs: Probe for temperature notification support Message-ID: <20210914144706.GA3457579@roeck-us.net> References: <20210914065320.8554-1-avri.altman@wdc.com> <20210914065320.8554-2-avri.altman@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210914065320.8554-2-avri.altman@wdc.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 14, 2021 at 09:53:19AM +0300, Avri Altman wrote: > Probe the dExtendedUFSFeaturesSupport register for the device's > temperature notification support, and if supported, add a hw monitor > device. > > Signed-off-by: Avri Altman > --- > drivers/scsi/ufs/Kconfig | 9 ++ > drivers/scsi/ufs/Makefile | 1 + > drivers/scsi/ufs/ufs-hwmon.c | 201 +++++++++++++++++++++++++++++++++++ > drivers/scsi/ufs/ufs.h | 7 ++ > drivers/scsi/ufs/ufshcd.c | 26 +++++ > drivers/scsi/ufs/ufshcd.h | 18 ++++ > 6 files changed, 262 insertions(+) > create mode 100644 drivers/scsi/ufs/ufs-hwmon.c > > diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig > index 432df76e6318..565e8aa6319d 100644 > --- a/drivers/scsi/ufs/Kconfig > +++ b/drivers/scsi/ufs/Kconfig > @@ -199,3 +199,12 @@ config SCSI_UFS_FAULT_INJECTION > help > Enable fault injection support in the UFS driver. This makes it easier > to test the UFS error handler and abort handler. > + > +config SCSI_UFS_HWMON > + bool "UFS Temperature Notification" > + depends on SCSI_UFSHCD && HWMON > + help > + This provides support for UFS hardware monitoring. If enabled, > + a hardware monitoring device will be created for the UFS device. > + > + If unsure, say N. > diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile > index c407da9b5171..966048875b50 100644 > --- a/drivers/scsi/ufs/Makefile > +++ b/drivers/scsi/ufs/Makefile > @@ -10,6 +10,7 @@ ufshcd-core-$(CONFIG_SCSI_UFS_BSG) += ufs_bsg.o > ufshcd-core-$(CONFIG_SCSI_UFS_CRYPTO) += ufshcd-crypto.o > ufshcd-core-$(CONFIG_SCSI_UFS_HPB) += ufshpb.o > ufshcd-core-$(CONFIG_SCSI_UFS_FAULT_INJECTION) += ufs-fault-injection.o > +ufshcd-core-$(CONFIG_SCSI_UFS_HWMON) += ufs-hwmon.o > > obj-$(CONFIG_SCSI_UFS_DWC_TC_PCI) += tc-dwc-g210-pci.o ufshcd-dwc.o tc-dwc-g210.o > obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-dwc-g210.o > diff --git a/drivers/scsi/ufs/ufs-hwmon.c b/drivers/scsi/ufs/ufs-hwmon.c > new file mode 100644 > index 000000000000..be7e60fb1a98 > --- /dev/null > +++ b/drivers/scsi/ufs/ufs-hwmon.c > @@ -0,0 +1,201 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * UFS hardware monitoring support > + * Copyright (c) 2021, Western Digital Corporation > + */ > + > +#include > +#include > + > +#include "ufshcd.h" > + > +struct ufs_hwmon_data { > + struct ufs_hba *hba; > + u8 mask; > +}; > + > +static int ufs_read_temp_enable(struct ufs_hba *hba, u8 mask, long *val) > +{ > + u32 ee_mask; > + int err = 0; Unnecessary initialization > + > + err = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR, QUERY_ATTR_IDN_EE_CONTROL, 0, 0, > + &ee_mask); > + if (err) > + return err; > + > + *val = (mask & ee_mask & MASK_EE_TOO_HIGH_TEMP) || (mask & ee_mask & MASK_EE_TOO_LOW_TEMP); > + > + return 0; > +} > + > +static int ufs_get_temp(struct ufs_hba *hba, enum attr_idn idn, long *val) > +{ > + u32 value; > + int err = 0; > + > + err = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR, idn, 0, 0, &value); > + if (err) > + return err; > + > + if (value == 0) > + return -ENODATA; > + > + *val = ((long)value - 80) * MILLIDEGREE_PER_DEGREE; > + > + return 0; > +} > + > +static int ufs_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, > + long *val) > +{ > + struct ufs_hwmon_data *data = dev_get_drvdata(dev); > + struct ufs_hba *hba = data->hba; > + int err = 0; Unnecesaary initialization > + > + if (type != hwmon_temp) > + return 0; > + > + down(&hba->host_sem); > + > + if (!ufshcd_is_user_access_allowed(hba)) { > + up(&hba->host_sem); > + return -EBUSY; > + } > + > + ufshcd_rpm_get_sync(hba); > + > + switch (attr) { > + case hwmon_temp_enable: > + err = ufs_read_temp_enable(hba, data->mask, val); extra space before 'err =' > + > + break; > + case hwmon_temp_crit: > + err = ufs_get_temp(hba, QUERY_ATTR_IDN_HIGH_TEMP_BOUND, val); > + > + break; > + case hwmon_temp_lcrit: > + err = ufs_get_temp(hba, QUERY_ATTR_IDN_LOW_TEMP_BOUND, val); > + > + break; > + case hwmon_temp_input: > + err = ufs_get_temp(hba, QUERY_ATTR_IDN_CASE_ROUGH_TEMP, val); > + > + break; > + default: > + err = -EOPNOTSUPP; > + > + break; > + } > + > + ufshcd_rpm_put_sync(hba); > + > + up(&hba->host_sem); > + > + return err; > +} > + > +static int ufs_hwmon_write(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, > + long val) > +{ > + struct ufs_hwmon_data *data = dev_get_drvdata(dev); > + struct ufs_hba *hba = data->hba; > + int err = 0; > + > + if (attr != hwmon_temp_enable) > + return -EINVAL; > + > + if (val != 0 && val != 1) > + return -EINVAL; > + > + down(&hba->host_sem); > + > + if (!ufshcd_is_user_access_allowed(hba)) { > + up(&hba->host_sem); > + return -EBUSY; > + } > + > + ufshcd_rpm_get_sync(hba); > + > + if (val == 1) > + err = ufshcd_update_ee_usr_mask(hba, MASK_EE_URGENT_TEMP, 0); > + else > + err = ufshcd_update_ee_usr_mask(hba, 0, MASK_EE_URGENT_TEMP); > + > + ufshcd_rpm_put_sync(hba); > + > + up(&hba->host_sem); > + > + return err; > +} > + > +static umode_t ufs_hwmon_is_visible(const void *_data, enum hwmon_sensor_types type, u32 attr, > + int channel) > +{ > + if (type != hwmon_temp) > + return 0; > + > + switch (attr) { > + case hwmon_temp_enable: > + return 0644; > + case hwmon_temp_crit: > + case hwmon_temp_lcrit: > + case hwmon_temp_input: > + return 0444; > + default: > + break; > + } > + return 0; > +} > + > +static const struct hwmon_channel_info *ufs_hwmon_info[] = { > + HWMON_CHANNEL_INFO(temp, HWMON_T_ENABLE | HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LCRIT), > + NULL > +}; > + > +static const struct hwmon_ops ufs_hwmon_ops = { > + .is_visible = ufs_hwmon_is_visible, > + .read = ufs_hwmon_read, > + .write = ufs_hwmon_write, > +}; > + > +static const struct hwmon_chip_info ufs_hwmon_hba_info = { > + .ops = &ufs_hwmon_ops, > + .info = ufs_hwmon_info, > +}; > + > +void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) > +{ > + struct device *dev = hba->dev; > + struct ufs_hwmon_data *data; > + struct device *hwmon; > + > + data = kzalloc(sizeof(*data), GFP_KERNEL); > + if (!data) > + return; > + > + data->hba = hba; > + data->mask = mask; > + > + hwmon = hwmon_device_register_with_info(dev, "ufs", data, &ufs_hwmon_hba_info, NULL); > + if (IS_ERR(hwmon)) { > + dev_warn(dev, "Failed to instantiate hwmon device\n"); > + kfree(data); > + return; > + } > + > + hba->hwmon_device = hwmon; > +} > + > +void ufs_hwmon_remove(struct ufs_hba *hba) > +{ > + struct ufs_hwmon_data *data; > + > + if (!hba->hwmon_device) > + return; > + > + data = dev_get_drvdata(hba->hwmon_device); > + hwmon_device_unregister(hba->hwmon_device); > + hba->hwmon_device = NULL; > + kfree(data); > +} > diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h > index 8c6b38b1b142..0bfdca3e648e 100644 > --- a/drivers/scsi/ufs/ufs.h > +++ b/drivers/scsi/ufs/ufs.h > @@ -152,6 +152,9 @@ enum attr_idn { > QUERY_ATTR_IDN_PSA_STATE = 0x15, > QUERY_ATTR_IDN_PSA_DATA_SIZE = 0x16, > QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME = 0x17, > + QUERY_ATTR_IDN_CASE_ROUGH_TEMP = 0x18, > + QUERY_ATTR_IDN_HIGH_TEMP_BOUND = 0x19, > + QUERY_ATTR_IDN_LOW_TEMP_BOUND = 0x1A, > QUERY_ATTR_IDN_WB_FLUSH_STATUS = 0x1C, > QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE = 0x1D, > QUERY_ATTR_IDN_WB_BUFF_LIFE_TIME_EST = 0x1E, > @@ -338,6 +341,9 @@ enum { > > /* Possible values for dExtendedUFSFeaturesSupport */ > enum { > + UFS_DEV_LOW_TEMP_NOTIF = BIT(4), > + UFS_DEV_HIGH_TEMP_NOTIF = BIT(5), > + UFS_DEV_EXT_TEMP_NOTIF = BIT(6), > UFS_DEV_HPB_SUPPORT = BIT(7), > UFS_DEV_WRITE_BOOSTER_SUP = BIT(8), > }; > @@ -370,6 +376,7 @@ enum { > MASK_EE_WRITEBOOSTER_EVENT = BIT(5), > MASK_EE_PERFORMANCE_THROTTLING = BIT(6), > }; > +#define MASK_EE_URGENT_TEMP (MASK_EE_TOO_HIGH_TEMP | MASK_EE_TOO_LOW_TEMP) > > /* Background operation status */ > enum bkops_status { > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 3841ab49f556..ce22340024ce 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -7469,6 +7469,29 @@ static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf) > hba->caps &= ~UFSHCD_CAP_WB_EN; > } > > +static void ufshcd_temp_notif_probe(struct ufs_hba *hba, u8 *desc_buf) > +{ > + struct ufs_dev_info *dev_info = &hba->dev_info; > + u32 ext_ufs_feature; > + u8 mask = 0; > + > + if (!(hba->caps & UFSHCD_CAP_TEMP_NOTIF) || dev_info->wspecversion < 0x300) > + return; > + > + ext_ufs_feature = get_unaligned_be32(desc_buf + DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP); > + > + if (ext_ufs_feature & UFS_DEV_LOW_TEMP_NOTIF) > + mask |= MASK_EE_TOO_LOW_TEMP; > + > + if (ext_ufs_feature & UFS_DEV_HIGH_TEMP_NOTIF) > + mask |= MASK_EE_TOO_HIGH_TEMP; > + > + if (mask) { > + ufshcd_enable_ee(hba, mask); > + ufs_hwmon_probe(hba, mask); > + } > +} > + > void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_fix *fixups) > { > struct ufs_dev_fix *f; > @@ -7564,6 +7587,8 @@ static int ufs_get_device_desc(struct ufs_hba *hba) > > ufshcd_wb_probe(hba, desc_buf); > > + ufshcd_temp_notif_probe(hba, desc_buf); > + > /* > * ufshcd_read_string_desc returns size of the string > * reset the error value > @@ -9408,6 +9433,7 @@ void ufshcd_remove(struct ufs_hba *hba) > { > if (hba->sdev_ufs_device) > ufshcd_rpm_get_sync(hba); > + ufs_hwmon_remove(hba); > ufs_bsg_remove(hba); > ufshpb_remove(hba); > ufs_sysfs_remove_nodes(hba->dev); > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h > index 52ea6f350b18..021c858955af 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -653,6 +653,12 @@ enum ufshcd_caps { > * in order to exit DeepSleep state. > */ > UFSHCD_CAP_DEEPSLEEP = 1 << 10, > + > + /* > + * This capability allows the host controller driver to use temperature > + * notification if it is supported by the UFS device. > + */ > + UFSHCD_CAP_TEMP_NOTIF = 1 << 11, > }; > > struct ufs_hba_variant_params { > @@ -789,6 +795,10 @@ struct ufs_hba { > struct scsi_device *sdev_ufs_device; > struct scsi_device *sdev_rpmb; > > +#ifdef CONFIG_SCSI_UFS_HWMON > + struct device *hwmon_device; > +#endif > + > enum ufs_dev_pwr_mode curr_dev_pwr_mode; > enum uic_link_state uic_link_state; > /* Desired UFS power management level during runtime PM */ > @@ -1049,6 +1059,14 @@ static inline u8 ufshcd_wb_get_query_index(struct ufs_hba *hba) > return 0; > } > > +#ifdef CONFIG_SCSI_UFS_HWMON > +void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask); > +void ufs_hwmon_remove(struct ufs_hba *hba); > +#else > +static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) {} > +static inline void ufs_hwmon_remove(struct ufs_hba *hba) {} > +#endif > + > #ifdef CONFIG_PM > extern int ufshcd_runtime_suspend(struct device *dev); > extern int ufshcd_runtime_resume(struct device *dev); > -- > 2.17.1 >