Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp5676691yba; Thu, 11 Apr 2019 03:25:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqziTLoIW7jT8M9Vea8P1WQNuCAZjI3KQm9lt855dvEwFfC7j9sHOBI17SaiJ8s7hyG9SIpZ X-Received: by 2002:a62:174c:: with SMTP id 73mr49135636pfx.33.1554978331302; Thu, 11 Apr 2019 03:25:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554978331; cv=none; d=google.com; s=arc-20160816; b=CwkuEXXz94dIZbGtDr4wEwRMd9MmZLtk7nQ9VTxhh+luCyNVpilVEGueEmAD5KGaSr ljH/AwJM+OxxHVK3Sc2eAdqTFQJ8jMQS0w6OpEYAI0XfEpcxRfq1m+qvlsl8b4iNYGVh rY8iuzgOs5xslk8S3cV7OzJFjdJ3XE8+whlMGTVLGMX1WRDsJJBLp3dL3BRcS5oONMko +jATtCLfMIPyf5ZChHsd2Gcy7Z4t5jyFn/VSLQ1QFhCI6Da3PRbgnSXtlJPyB4JDg5vZ VEoy83uVD7Mix8rYJhEhL10WgkpJd9qrGYs9alg6ZurDxc82ciME0xOg/ue4NPoZktHJ fUdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=D5COnaEMj1dSrN3bUntCS2/3FFeeDpM05/t1O4kXNR0=; b=RV/Y7aBBE9Euf31BIN/1tGMTM3kw64JhKuusIfzxk4NoyMOeMnKckMyzqLZ6oGvRWR aHvY4eeTzmm22+EoqFHgmW+e8rSSeMi+goKMB61mEvDxEPqQy75X4FA7/4Q81Ya9hVGx Om4BAYOCMmn1zHOblPQSkKorhoesqhy0ObiJL3uUh7szxb+UlHpPd0H3F1PgyXx0BCiR qdeOPYLAxuciGLTgpJsNm3sxT8ZZms/G15rFF1P9tKhtVe5m/2kJ8inbGtx+WSt9cjJ9 sL3LaHUDT6Yy6bX8wDWC9MemPOyUx1rKetN36W6WI1y0mKlgJ77mLJinl+VLI0ej6kdd 0CWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=YUWrSk8u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 129si37631676pfz.159.2019.04.11.03.25.15; Thu, 11 Apr 2019 03:25:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=YUWrSk8u; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726847AbfDKKXX (ORCPT + 99 others); Thu, 11 Apr 2019 06:23:23 -0400 Received: from smtp-fw-6001.amazon.com ([52.95.48.154]:14779 "EHLO smtp-fw-6001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726517AbfDKKXW (ORCPT ); Thu, 11 Apr 2019 06:23:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1554978200; x=1586514200; h=from:to:subject:date:message-id:in-reply-to:references: mime-version; bh=D5COnaEMj1dSrN3bUntCS2/3FFeeDpM05/t1O4kXNR0=; b=YUWrSk8uKLIQ/kKYkrKGX7l48Njw7mojAPtKrwZGoRVw3ZW9YQbp7jhu RF7pBUO2s3AJ8ix3VzcJJG4n8XMj8qb2ouZ4CZUvc35op8OLEPVq04g20 pUh9QFya0dlBH1z18N+cqshAeY6XyQtmWHLvE8bjaBbQL8BqBba7Ebjje k=; X-IronPort-AV: E=Sophos;i="5.60,337,1549929600"; d="scan'208";a="390542863" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1a-af6a10df.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 11 Apr 2019 10:23:19 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-af6a10df.us-east-1.amazon.com (8.14.7/8.14.7) with ESMTP id x3BANGc1055273 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL); Thu, 11 Apr 2019 10:23:17 GMT Received: from EX13D01EUB001.ant.amazon.com (10.43.166.194) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 11 Apr 2019 10:23:16 +0000 Received: from udc4a3e82dbc15a031435.hfa14.amazon.com (10.43.160.69) by EX13D01EUB001.ant.amazon.com (10.43.166.194) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 11 Apr 2019 10:23:10 +0000 From: Talel Shenhar To: , , , , , , , , , , , , Subject: [PATCH v3 2/2] thermal: Introduce Amazon's Annapurna Labs Thermal Driver Date: Thu, 11 Apr 2019 13:22:48 +0300 Message-ID: <1554978168-17369-3-git-send-email-talel@amazon.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554978168-17369-1-git-send-email-talel@amazon.com> References: <1554978168-17369-1-git-send-email-talel@amazon.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.43.160.69] X-ClientProxiedBy: EX13D15UWB001.ant.amazon.com (10.43.161.254) To EX13D01EUB001.ant.amazon.com (10.43.166.194) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a generic thermal driver for simple MMIO sensors, of which amazon,al-thermal is one. This device uses a single MMIO transaction to read the temperature and report it to the thermal subsystem. Signed-off-by: Talel Shenhar Reviewed-by: David Woodhouse --- MAINTAINERS | 6 ++ drivers/thermal/Kconfig | 10 ++++ drivers/thermal/Makefile | 1 + drivers/thermal/thermal_mmio.c | 129 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 146 insertions(+) create mode 100644 drivers/thermal/thermal_mmio.c diff --git a/MAINTAINERS b/MAINTAINERS index 955463f..262cb2c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -727,6 +727,12 @@ S: Supported F: Documentation/networking/ena.txt F: drivers/net/ethernet/amazon/ +AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER +M: Talel Shenhar +S: Maintained +F: Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt +F: drivers/thermal/thermal_mmio.c + AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER M: Tom Lendacky M: Gary Hook diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 1775d44..96d9236 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -199,6 +199,16 @@ config THERMAL_EMULATION because userland can easily disable the thermal policy by simply flooding this sysfs node with low temperature values. +config THERMAL_MMIO + tristate "Generic Thermal MMIO driver" + depends on OF || COMPILE_TEST + help + This option enables the generic thermal MMIO driver that will use + memory-mapped reads to get the temperature. Any HW/System that + allows temperature reading by a single memory-mapped reading, be it + register or shared memory, is a potential candidate to work with this + driver. + config HISI_THERMAL tristate "Hisilicon thermal driver" depends on ARCH_HISI || COMPILE_TEST diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 82bb50d..d4c9ae7 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -29,6 +29,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o # platform thermal drivers obj-y += broadcom/ +obj-$(CONFIG_THERMAL_MMIO) += thermal_mmio.o obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM) += qcom-spmi-temp-alarm.o obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o obj-$(CONFIG_ROCKCHIP_THERMAL) += rockchip_thermal.o diff --git a/drivers/thermal/thermal_mmio.c b/drivers/thermal/thermal_mmio.c new file mode 100644 index 0000000..de3ccee --- /dev/null +++ b/drivers/thermal/thermal_mmio.c @@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + */ + +#include +#include +#include +#include + +struct thermal_mmio { + void __iomem *mmio_base; + u32 (*read_mmio)(void __iomem *mmio_base); + u32 mask; + int factor; +}; + +static u32 thermal_mmio_readb(void __iomem *mmio_base) +{ + return readb(mmio_base); +} + +static int thermal_mmio_get_temperature(void *private, int *temp) +{ + int t; + struct thermal_mmio *sensor = + (struct thermal_mmio *)private; + + t = sensor->read_mmio(sensor->mmio_base) & sensor->mask; + t *= sensor->factor; + + *temp = t; + + return 0; +} + +static struct thermal_zone_of_device_ops thermal_mmio_ops = { + .get_temp = thermal_mmio_get_temperature, +}; + +static int thermal_mmio_probe(struct platform_device *pdev) +{ + struct resource *resource; + struct thermal_mmio *sensor; + int (*sensor_init_func)(struct platform_device *pdev, + struct thermal_mmio *sensor); + struct thermal_zone_device *thermal_zone; + int ret; + int temperature; + + sensor = devm_kzalloc(&pdev->dev, sizeof(*sensor), GFP_KERNEL); + if (!sensor) + return -ENOMEM; + + resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (IS_ERR(resource)) { + dev_err(&pdev->dev, + "fail to get platform memory resource (%ld)\n", + PTR_ERR(resource)); + return PTR_ERR(resource); + } + + sensor->mmio_base = devm_ioremap_resource(&pdev->dev, resource); + if (IS_ERR(sensor->mmio_base)) { + dev_err(&pdev->dev, "failed to ioremap memory (%ld)\n", + PTR_ERR(sensor->mmio_base)); + return PTR_ERR(sensor->mmio_base); + } + + sensor_init_func = device_get_match_data(&pdev->dev); + if (sensor_init_func) { + ret = sensor_init_func(pdev, sensor); + if (ret) { + dev_err(&pdev->dev, + "failed to initialize sensor (%d)\n", + ret); + return ret; + } + } + + thermal_zone = devm_thermal_zone_of_sensor_register(&pdev->dev, + 0, + sensor, + &thermal_mmio_ops); + if (IS_ERR(thermal_zone)) { + dev_err(&pdev->dev, + "failed to register sensor (%ld)\n", + PTR_ERR(thermal_zone)); + return PTR_ERR(thermal_zone); + } + + thermal_mmio_get_temperature(sensor, &temperature); + dev_info(&pdev->dev, + "thermal mmio sensor %s registered, current temperature: %d\n", + pdev->name, temperature); + + return 0; +} + +static int al_thermal_init(struct platform_device *pdev, + struct thermal_mmio *sensor) +{ + sensor->read_mmio = thermal_mmio_readb; + sensor->mask = 0xff; + sensor->factor = 1000; + + return 0; +} + +static const struct of_device_id thermal_mmio_id_table[] = { + { .compatible = "amazon,al-thermal", .data = al_thermal_init}, + {} +}; +MODULE_DEVICE_TABLE(of, thermal_mmio_id_table); + +static struct platform_driver thermal_mmio_driver = { + .probe = thermal_mmio_probe, + .driver = { + .name = "thermal-mmio", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(thermal_mmio_id_table), + }, +}; + +module_platform_driver(thermal_mmio_driver); + +MODULE_AUTHOR("Talel Shenhar "); +MODULE_DESCRIPTION("Thermal MMIO Driver"); +MODULE_LICENSE("GPL v2"); -- 2.7.4