diff for duplicates of <1502420276.2598.5.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 40801b0..b4995f1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,13 +19,13 @@ rui > - don't allocate space for disabled zones > - allow compilation with COMPILE_TEST > -> drivers/thermal/Makefile | 2 +- -> drivers/thermal/tegra/Kconfig | 7 + -> drivers/thermal/tegra/Makefile | 3 +- -> drivers/thermal/tegra/bpmp-thermal.c | 263 +> ?drivers/thermal/Makefile?????????????|???2 +- +> ?drivers/thermal/tegra/Kconfig????????|???7 + +> ?drivers/thermal/tegra/Makefile???????|???3 +- +> ?drivers/thermal/tegra/bpmp-thermal.c | 263 > +++++++++++++++++++++++++++++++++++ -> 4 files changed, 273 insertions(+), 2 deletions(-) -> create mode 100644 drivers/thermal/tegra/bpmp-thermal.c +> ?4 files changed, 273 insertions(+), 2 deletions(-) +> ?create mode 100644 drivers/thermal/tegra/bpmp-thermal.c > > diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile > index 094d7039981c..c03dccdba7b8 100644 @@ -33,33 +33,33 @@ rui > +++ b/drivers/thermal/Makefile > @@ -54,7 +54,7 @@ obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += > intel_bxt_pmic_thermal.o -> obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o -> obj-$(CONFIG_ST_THERMAL) += st/ -> obj-$(CONFIG_QCOM_TSENS) += qcom/ +> ?obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o +> ?obj-$(CONFIG_ST_THERMAL) += st/ +> ?obj-$(CONFIG_QCOM_TSENS) += qcom/ > -obj-$(CONFIG_TEGRA_SOCTHERM) += tegra/ > +obj-y += tegra/ -> obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o -> obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o -> obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o +> ?obj-$(CONFIG_HISI_THERMAL)?????+= hisi_thermal.o +> ?obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o +> ?obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o > diff --git a/drivers/thermal/tegra/Kconfig > b/drivers/thermal/tegra/Kconfig > index cec586ec7e4b..f8740f7852e3 100644 > --- a/drivers/thermal/tegra/Kconfig > +++ b/drivers/thermal/tegra/Kconfig > @@ -10,4 +10,11 @@ config TEGRA_SOCTHERM -> zones to manage temperatures. This option is also required +> ? ??zones to manage temperatures. This option is also required > for the -> emergency thermal reset (thermtrip) feature to function. -> +> ? ??emergency thermal reset (thermtrip) feature to function. +> ? > +config TEGRA_BPMP_THERMAL > + tristate "Tegra BPMP thermal sensing" > + depends on TEGRA_BPMP || COMPILE_TEST > + help -> + Enable this option for support for sensing system +> + ?Enable this option for support for sensing system > temperature of NVIDIA -> + Tegra systems-on-chip with the BPMP coprocessor (Tegra186). +> + ?Tegra systems-on-chip with the BPMP coprocessor (Tegra186). > + -> endmenu +> ?endmenu > diff --git a/drivers/thermal/tegra/Makefile > b/drivers/thermal/tegra/Makefile > index 1ce1af2cf0f5..757abcd1feaf 100644 @@ -69,10 +69,10 @@ rui > -obj-$(CONFIG_TEGRA_SOCTHERM) += tegra-soctherm.o > +obj-$(CONFIG_TEGRA_SOCTHERM) += tegra-soctherm.o > +obj-$(CONFIG_TEGRA_BPMP_THERMAL) += bpmp-thermal.o -> -> tegra-soctherm-y := soctherm.o +> ? +> ?tegra-soctherm-y := soctherm.o > soctherm-fuse.o -> tegra-soctherm-$(CONFIG_ARCH_TEGRA_124_SOC) += tegra124- +> ?tegra-soctherm-$(CONFIG_ARCH_TEGRA_124_SOC) += tegra124- > soctherm.o > diff --git a/drivers/thermal/tegra/bpmp-thermal.c > b/drivers/thermal/tegra/bpmp-thermal.c @@ -82,7 +82,7 @@ rui > +++ b/drivers/thermal/tegra/bpmp-thermal.c > @@ -0,0 +1,263 @@ > +/* -> + * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights +> + * Copyright (c) 2015-2017, NVIDIA CORPORATION.??All rights > reserved. > + * > + * Author: @@ -97,7 +97,7 @@ rui > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of -> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the > + * GNU General Public License for more details. > + * > + */ @@ -180,7 +180,7 @@ rui > + struct tegra_bpmp_thermal_zone *zone; > + > + zone = container_of(work, struct tegra_bpmp_thermal_zone, -> + tz_device_update_work); +> + ????tz_device_update_work); > + > + thermal_zone_device_update(zone->tzd, > THERMAL_TRIP_VIOLATED); @@ -188,7 +188,7 @@ rui > + > +static void bpmp_mrq_thermal(unsigned int mrq, struct > tegra_bpmp_channel *ch, -> + void *data) +> + ?????void *data) > +{ > + struct mrq_thermal_bpmp_to_host_request *req; > + struct tegra_bpmp_thermal *tegra = data; @@ -223,7 +223,7 @@ rui > +} > + > +static int tegra_bpmp_thermal_get_num_zones(struct tegra_bpmp *bpmp, -> + int *num_zones) +> + ????int *num_zones) > +{ > + struct mrq_thermal_host_to_bpmp_request req; > + union mrq_thermal_bpmp_to_host_response reply; @@ -281,7 +281,7 @@ rui > + } > + > + tegra->zones = devm_kcalloc(&pdev->dev, max_num_zones, -> + sizeof(*tegra->zones), +> + ????sizeof(*tegra->zones), > GFP_KERNEL); > + if (!tegra->zones) > + return -ENOMEM; @@ -316,14 +316,14 @@ rui > + > + zone->tzd = tzd; > + INIT_WORK(&zone->tz_device_update_work, -> + tz_device_update_work_fn); +> + ??tz_device_update_work_fn); > + > + tegra->zones[tegra->num_zones++] = zone; > + } > + > + err = tegra_bpmp_request_mrq(bpmp, MRQ_THERMAL, > bpmp_mrq_thermal, -> + tegra); +> + ?????tegra); > + if (err) { > + dev_err(&pdev->dev, "failed to register mrq handler: > %d\n", diff --git a/a/content_digest b/N1/content_digest index 075f98c..e27e618 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,9 @@ "ref\020170724162918.21050-1-mperttunen@nvidia.com\0" "ref\020170724162918.21050-5-mperttunen@nvidia.com\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH v2 5/5] thermal: Add Tegra BPMP thermal sensor driver\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH v2 5/5] thermal: Add Tegra BPMP thermal sensor driver\0" "Date\0Fri, 11 Aug 2017 10:57:56 +0800\0" - "To\0Mikko Perttunen <mperttunen@nvidia.com>" - edubezval@gmail.com - thierry.reding@gmail.com - jonathanh@nvidia.com - " wni@nvidia.com\0" - "Cc\0linux-pm@vger.kernel.org" - linux-tegra@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 2017-07-24 at 19:29 +0300, Mikko Perttunen wrote:\n" @@ -35,13 +27,13 @@ "> - don't allocate space for disabled zones\n" "> - allow compilation with COMPILE_TEST\n" "> \n" - "> \302\240drivers/thermal/Makefile\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\240\302\2402 +-\n" - "> \302\240drivers/thermal/tegra/Kconfig\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\240\302\2407 +\n" - "> \302\240drivers/thermal/tegra/Makefile\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\240\302\2403 +-\n" - "> \302\240drivers/thermal/tegra/bpmp-thermal.c | 263\n" + "> ?drivers/thermal/Makefile?????????????|???2 +-\n" + "> ?drivers/thermal/tegra/Kconfig????????|???7 +\n" + "> ?drivers/thermal/tegra/Makefile???????|???3 +-\n" + "> ?drivers/thermal/tegra/bpmp-thermal.c | 263\n" "> +++++++++++++++++++++++++++++++++++\n" - "> \302\2404 files changed, 273 insertions(+), 2 deletions(-)\n" - "> \302\240create mode 100644 drivers/thermal/tegra/bpmp-thermal.c\n" + "> ?4 files changed, 273 insertions(+), 2 deletions(-)\n" + "> ?create mode 100644 drivers/thermal/tegra/bpmp-thermal.c\n" "> \n" "> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile\n" "> index 094d7039981c..c03dccdba7b8 100644\n" @@ -49,33 +41,33 @@ "> +++ b/drivers/thermal/Makefile\n" "> @@ -54,7 +54,7 @@ obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) +=\n" "> intel_bxt_pmic_thermal.o\n" - "> \302\240obj-$(CONFIG_INTEL_PCH_THERMAL)\t+= intel_pch_thermal.o\n" - "> \302\240obj-$(CONFIG_ST_THERMAL)\t+= st/\n" - "> \302\240obj-$(CONFIG_QCOM_TSENS)\t+= qcom/\n" + "> ?obj-$(CONFIG_INTEL_PCH_THERMAL)\t+= intel_pch_thermal.o\n" + "> ?obj-$(CONFIG_ST_THERMAL)\t+= st/\n" + "> ?obj-$(CONFIG_QCOM_TSENS)\t+= qcom/\n" "> -obj-$(CONFIG_TEGRA_SOCTHERM)\t+= tegra/\n" "> +obj-y\t\t\t\t+= tegra/\n" - "> \302\240obj-$(CONFIG_HISI_THERMAL)\302\240\302\240\302\240\302\240\302\240+= hisi_thermal.o\n" - "> \302\240obj-$(CONFIG_MTK_THERMAL)\t+= mtk_thermal.o\n" - "> \302\240obj-$(CONFIG_GENERIC_ADC_THERMAL)\t+= thermal-generic-adc.o\n" + "> ?obj-$(CONFIG_HISI_THERMAL)?????+= hisi_thermal.o\n" + "> ?obj-$(CONFIG_MTK_THERMAL)\t+= mtk_thermal.o\n" + "> ?obj-$(CONFIG_GENERIC_ADC_THERMAL)\t+= thermal-generic-adc.o\n" "> diff --git a/drivers/thermal/tegra/Kconfig\n" "> b/drivers/thermal/tegra/Kconfig\n" "> index cec586ec7e4b..f8740f7852e3 100644\n" "> --- a/drivers/thermal/tegra/Kconfig\n" "> +++ b/drivers/thermal/tegra/Kconfig\n" "> @@ -10,4 +10,11 @@ config TEGRA_SOCTHERM\n" - "> \302\240\t\302\240\302\240zones to manage temperatures. This option is also required\n" + "> ?\t??zones to manage temperatures. This option is also required\n" "> for the\n" - "> \302\240\t\302\240\302\240emergency thermal reset (thermtrip) feature to function.\n" - "> \302\240\n" + "> ?\t??emergency thermal reset (thermtrip) feature to function.\n" + "> ?\n" "> +config TEGRA_BPMP_THERMAL\n" "> +\ttristate \"Tegra BPMP thermal sensing\"\n" "> +\tdepends on TEGRA_BPMP || COMPILE_TEST\n" "> +\thelp\n" - "> +\t\302\240Enable this option for support for sensing system\n" + "> +\t?Enable this option for support for sensing system\n" "> temperature of NVIDIA\n" - "> +\t\302\240Tegra systems-on-chip with the BPMP coprocessor (Tegra186).\n" + "> +\t?Tegra systems-on-chip with the BPMP coprocessor (Tegra186).\n" "> +\n" - "> \302\240endmenu\n" + "> ?endmenu\n" "> diff --git a/drivers/thermal/tegra/Makefile\n" "> b/drivers/thermal/tegra/Makefile\n" "> index 1ce1af2cf0f5..757abcd1feaf 100644\n" @@ -85,10 +77,10 @@ "> -obj-$(CONFIG_TEGRA_SOCTHERM)\t+= tegra-soctherm.o\n" "> +obj-$(CONFIG_TEGRA_SOCTHERM)\t\t+= tegra-soctherm.o\n" "> +obj-$(CONFIG_TEGRA_BPMP_THERMAL)\t+= bpmp-thermal.o\n" - "> \302\240\n" - "> \302\240tegra-soctherm-y\t\t\t\t:= soctherm.o\n" + "> ?\n" + "> ?tegra-soctherm-y\t\t\t\t:= soctherm.o\n" "> soctherm-fuse.o\n" - "> \302\240tegra-soctherm-$(CONFIG_ARCH_TEGRA_124_SOC)\t+= tegra124-\n" + "> ?tegra-soctherm-$(CONFIG_ARCH_TEGRA_124_SOC)\t+= tegra124-\n" "> soctherm.o\n" "> diff --git a/drivers/thermal/tegra/bpmp-thermal.c\n" "> b/drivers/thermal/tegra/bpmp-thermal.c\n" @@ -98,7 +90,7 @@ "> +++ b/drivers/thermal/tegra/bpmp-thermal.c\n" "> @@ -0,0 +1,263 @@\n" "> +/*\n" - "> + * Copyright (c) 2015-2017, NVIDIA CORPORATION.\302\240\302\240All rights\n" + "> + * Copyright (c) 2015-2017, NVIDIA CORPORATION.??All rights\n" "> reserved.\n" "> + *\n" "> + * Author:\n" @@ -113,7 +105,7 @@ "> + *\n" "> + * This program is distributed in the hope that it will be useful,\n" "> + * but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\302\240\302\240See the\n" + "> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See the\n" "> + * GNU General Public License for more details.\n" "> + *\n" "> + */\n" @@ -196,7 +188,7 @@ "> +\tstruct tegra_bpmp_thermal_zone *zone;\n" "> +\n" "> +\tzone = container_of(work, struct tegra_bpmp_thermal_zone,\n" - "> +\t\t\t\302\240\302\240\302\240\302\240tz_device_update_work);\n" + "> +\t\t\t????tz_device_update_work);\n" "> +\n" "> +\tthermal_zone_device_update(zone->tzd,\n" "> THERMAL_TRIP_VIOLATED);\n" @@ -204,7 +196,7 @@ "> +\n" "> +static void bpmp_mrq_thermal(unsigned int mrq, struct\n" "> tegra_bpmp_channel *ch,\n" - "> +\t\t\t\302\240\302\240\302\240\302\240\302\240void *data)\n" + "> +\t\t\t?????void *data)\n" "> +{\n" "> +\tstruct mrq_thermal_bpmp_to_host_request *req;\n" "> +\tstruct tegra_bpmp_thermal *tegra = data;\n" @@ -239,7 +231,7 @@ "> +}\n" "> +\n" "> +static int tegra_bpmp_thermal_get_num_zones(struct tegra_bpmp *bpmp,\n" - "> +\t\t\t\t\t\302\240\302\240\302\240\302\240int *num_zones)\n" + "> +\t\t\t\t\t????int *num_zones)\n" "> +{\n" "> +\tstruct mrq_thermal_host_to_bpmp_request req;\n" "> +\tunion mrq_thermal_bpmp_to_host_response reply;\n" @@ -297,7 +289,7 @@ "> +\t}\n" "> +\n" "> +\ttegra->zones = devm_kcalloc(&pdev->dev, max_num_zones,\n" - "> +\t\t\t\t\302\240\302\240\302\240\302\240sizeof(*tegra->zones),\n" + "> +\t\t\t\t????sizeof(*tegra->zones),\n" "> GFP_KERNEL);\n" "> +\tif (!tegra->zones)\n" "> +\t\treturn -ENOMEM;\n" @@ -332,14 +324,14 @@ "> +\n" "> +\t\tzone->tzd = tzd;\n" "> +\t\tINIT_WORK(&zone->tz_device_update_work,\n" - "> +\t\t\t\302\240\302\240tz_device_update_work_fn);\n" + "> +\t\t\t??tz_device_update_work_fn);\n" "> +\n" "> +\t\ttegra->zones[tegra->num_zones++] = zone;\n" "> +\t}\n" "> +\n" "> +\terr = tegra_bpmp_request_mrq(bpmp, MRQ_THERMAL,\n" "> bpmp_mrq_thermal,\n" - "> +\t\t\t\t\302\240\302\240\302\240\302\240\302\240tegra);\n" + "> +\t\t\t\t?????tegra);\n" "> +\tif (err) {\n" "> +\t\tdev_err(&pdev->dev, \"failed to register mrq handler:\n" "> %d\\n\",\n" @@ -382,4 +374,4 @@ "> +MODULE_DESCRIPTION(\"NVIDIA Tegra BPMP thermal sensor driver\");\n" "> +MODULE_LICENSE(\"GPL v2\");" -d9b4bbe8064adab1e3dbc309574ddb3bda5e8d44b6db6433ec73492b11c3d397 +0473633334cded363c993219eb3ee09897d83c4a1437f80e779a8234e66249d4
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.