linux-next: manual merge of the thermal-soc tree with Linus' tree

linux-next: manual merge of the thermal-soc tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]

Hi all,

Today's linux-next merge of the thermal-soc tree got a conflict in:

  MAINTAINERS

between commit:

  f23afd75fc99 ("RDMA/efa: Add driver to Kconfig/Makefile")

from Linus' tree and commit:

  7e34eb7dd067 ("thermal: Introduce Amazon's Annapurna Labs Thermal Driver")

from the thermal-soc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 2ff031b5e620,7defe065470d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -745,15 -744,12 +745,21 @@@ S:	Supporte
  F:	Documentation/networking/device_drivers/amazon/ena.txt
  F:	drivers/net/ethernet/amazon/
  
+ AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
+ M:	Talel Shenhar <talel@amazon.com>
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
+ F:	drivers/thermal/thermal_mmio.c
+ 
 +AMAZON RDMA EFA DRIVER
 +M:	Gal Pressman <galpress@amazon.com>
 +R:	Yossi Leybovich <sleybo@amazon.com>
 +L:	linux-rdma@vger.kernel.org
 +Q:	https://patchwork.kernel.org/project/linux-rdma/list/
 +S:	Supported
 +F:	drivers/infiniband/hw/efa/
 +F:	include/uapi/rdma/efa-abi.h
 +
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
  M:	Tom Lendacky <thomas.lendacky@amd.com>
  M:	Gary Hook <gary.hook@amd.com>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the thermal-soc tree with Linus' tree

[Eduardo Valentin]

Stephen,

On Mon, May 13, 2019 at 10:49:28AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the thermal-soc tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   f23afd75fc99 ("RDMA/efa: Add driver to Kconfig/Makefile")
> 
> from Linus' tree and commit:
> 
>   7e34eb7dd067 ("thermal: Introduce Amazon's Annapurna Labs Thermal Driver")
> 
> from the thermal-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
where the last conflict went in with my current queue.

> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc MAINTAINERS
> index 2ff031b5e620,7defe065470d..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -745,15 -744,12 +745,21 @@@ S:	Supporte
>   F:	Documentation/networking/device_drivers/amazon/ena.txt
>   F:	drivers/net/ethernet/amazon/
>   
> + AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
> + M:	Talel Shenhar <talel@amazon.com>
> + S:	Maintained
> + F:	Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
> + F:	drivers/thermal/thermal_mmio.c
> + 
>  +AMAZON RDMA EFA DRIVER
>  +M:	Gal Pressman <galpress@amazon.com>
>  +R:	Yossi Leybovich <sleybo@amazon.com>
>  +L:	linux-rdma@vger.kernel.org
>  +Q:	https://patchwork.kernel.org/project/linux-rdma/list/
>  +S:	Supported
>  +F:	drivers/infiniband/hw/efa/
>  +F:	include/uapi/rdma/efa-abi.h
>  +
>   AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
>   M:	Tom Lendacky <thomas.lendacky@amd.com>
>   M:	Gary Hook <gary.hook@amd.com>

Re: linux-next: manual merge of the thermal-soc tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

Hi Eduardo,

On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin <edubezval@gmail.com> wrote:
>
> Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
> where the last conflict went in with my current queue.

Its really not worth the rebase.  Just fix the build problem and send it
all to Linus.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the thermal-soc tree with Linus' tree

[Eduardo Valentin]

Hey Stephen,

On Tue, May 14, 2019 at 02:40:06PM +1000, Stephen Rothwell wrote:
> Hi Eduardo,
> 
> On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin <edubezval@gmail.com> wrote:
> >
> > Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
> > where the last conflict went in with my current queue.
> 
> Its really not worth the rebase.  Just fix the build problem and send it
> all to Linus.

Yeah, I think I was not super clear in my first email. I am about to
send the content of my branch to Linus.  This specific conflict was
because a change in MAINTAINERS went in before the change I have in it,
causing a conflict there. The rebase is simply to make it easier for him
to pull when I send the git pull.

> 
> -- 
> Cheers,
> Stephen Rothwell

Re: linux-next: manual merge of the thermal-soc tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]

Hi Eduardo,

On Tue, 14 May 2019 07:15:33 -0700 Eduardo Valentin <edubezval@gmail.com> wrote:
>
> On Tue, May 14, 2019 at 02:40:06PM +1000, Stephen Rothwell wrote:
> > Hi Eduardo,
> > 
> > On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin <edubezval@gmail.com> wrote:  
> > >
> > > Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
> > > where the last conflict went in with my current queue.  
> > 
> > Its really not worth the rebase.  Just fix the build problem and send it
> > all to Linus.  
> 
> Yeah, I think I was not super clear in my first email. I am about to
> send the content of my branch to Linus.  This specific conflict was
> because a change in MAINTAINERS went in before the change I have in it,
> causing a conflict there. The rebase is simply to make it easier for him
> to pull when I send the git pull.

Linus has repeated told people not to do that.  He wants to see the
conflicts.  You should mention any conflicts you know about in your pull
request - just as a heads up to him.

However, if a conflict is particularly tricky, it may be worth while to
a test merge in another branch and tell him about that other branch in
your pull request.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the thermal-soc tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 5120 bytes --]

Hi all,

Today's linux-next merge of the thermal-soc tree got a conflict in:

  drivers/hwmon/pwm-fan.c

between commits:

  6b1ec4789fb1 ("hwmon: (pwm-fan) Add RPM support via external interrupt")
  841cf6767bf6 ("hwmon: (pwm-fan) Report probe errors consistently")

from Linus' tree and commit:

  37bcec5d9f71 ("hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register")

from the thermal-soc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/hwmon/pwm-fan.c
index eead8afe6447,0243ba70107e..000000000000
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@@ -280,9 -225,8 +291,9 @@@ static int pwm_fan_probe(struct platfor
  	struct device *hwmon;
  	int ret;
  	struct pwm_state state = { };
 +	u32 ppr = 2;
  
- 	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
+ 	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
  	if (!ctx)
  		return -ENOMEM;
  
@@@ -300,11 -244,7 +311,11 @@@
  
  	platform_set_drvdata(pdev, ctx);
  
 +	ctx->irq = platform_get_irq(pdev, 0);
 +	if (ctx->irq == -EPROBE_DEFER)
 +		return ctx->irq;
 +
- 	ctx->reg_en = devm_regulator_get_optional(&pdev->dev, "fan");
+ 	ctx->reg_en = devm_regulator_get_optional(dev, "fan");
  	if (IS_ERR(ctx->reg_en)) {
  		if (PTR_ERR(ctx->reg_en) != -ENODEV)
  			return PTR_ERR(ctx->reg_en);
@@@ -328,93 -269,38 +340,66 @@@
  
  	ret = pwm_apply_state(ctx->pwm, &state);
  	if (ret) {
- 		dev_err(&pdev->dev, "Failed to configure PWM: %d\n", ret);
- 		goto err_reg_disable;
 -		dev_err(dev, "Failed to configure PWM\n");
++		dev_err(dev, "Failed to configure PWM: %d\n", ret);
+ 		return ret;
  	}
+ 	devm_add_action_or_reset(dev, pwm_fan_pwm_disable, ctx->pwm);
  
 +	timer_setup(&ctx->rpm_timer, sample_timer, 0);
 +
- 	of_property_read_u32(pdev->dev.of_node, "pulses-per-revolution", &ppr);
++	of_property_read_u32(dev->of_node, "pulses-per-revolution", &ppr);
 +	ctx->pulses_per_revolution = ppr;
 +	if (!ctx->pulses_per_revolution) {
- 		dev_err(&pdev->dev, "pulses-per-revolution can't be zero.\n");
++		dev_err(dev, "pulses-per-revolution can't be zero.\n");
 +		ret = -EINVAL;
- 		goto err_pwm_disable;
++		return ret;
 +	}
 +
 +	if (ctx->irq > 0) {
- 		ret = devm_request_irq(&pdev->dev, ctx->irq, pulse_handler, 0,
++		ret = devm_request_irq(dev, ctx->irq, pulse_handler, 0,
 +				       pdev->name, ctx);
 +		if (ret) {
- 			dev_err(&pdev->dev,
- 				"Failed to request interrupt: %d\n", ret);
- 			goto err_pwm_disable;
++			dev_err(dev, "Failed to request interrupt: %d\n", ret);
++			return ret;
 +		}
 +		ctx->sample_start = ktime_get();
 +		mod_timer(&ctx->rpm_timer, jiffies + HZ);
 +	}
 +
- 	hwmon = devm_hwmon_device_register_with_groups(&pdev->dev, "pwmfan",
+ 	hwmon = devm_hwmon_device_register_with_groups(dev, "pwmfan",
  						       ctx, pwm_fan_groups);
  	if (IS_ERR(hwmon)) {
 -		dev_err(dev, "Failed to register hwmon device\n");
 -		return PTR_ERR(hwmon);
 +		ret = PTR_ERR(hwmon);
- 		dev_err(&pdev->dev,
- 			"Failed to register hwmon device: %d\n", ret);
++		dev_err(dev, "Failed to register hwmon device: %d\n", ret);
 +		goto err_del_timer;
  	}
  
- 	ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx);
+ 	ret = pwm_fan_of_get_cooling_data(dev, ctx);
  	if (ret)
 -		return ret;
 +		goto err_del_timer;
  
  	ctx->pwm_fan_state = ctx->pwm_fan_max_state;
  	if (IS_ENABLED(CONFIG_THERMAL)) {
- 		cdev = thermal_of_cooling_device_register(pdev->dev.of_node,
- 							  "pwm-fan", ctx,
- 							  &pwm_fan_cooling_ops);
+ 		cdev = devm_thermal_of_cooling_device_register(dev,
+ 			dev->of_node, "pwm-fan", ctx, &pwm_fan_cooling_ops);
  		if (IS_ERR(cdev)) {
 +			ret = PTR_ERR(cdev);
- 			dev_err(&pdev->dev,
+ 			dev_err(dev,
 -				"Failed to register pwm-fan as cooling device");
 -			return PTR_ERR(cdev);
 +				"Failed to register pwm-fan as cooling device: %d\n",
 +				ret);
 +			goto err_del_timer;
  		}
  		ctx->cdev = cdev;
  		thermal_cdev_update(cdev);
  	}
  
  	return 0;
 +
 +err_del_timer:
 +	del_timer_sync(&ctx->rpm_timer);
- 
- err_pwm_disable:
- 	state.enabled = false;
- 	pwm_apply_state(ctx->pwm, &state);
- 
- err_reg_disable:
- 	if (ctx->reg_en)
- 		regulator_disable(ctx->reg_en);
- 
 +	return ret;
  }
  
- static int pwm_fan_remove(struct platform_device *pdev)
- {
- 	struct pwm_fan_ctx *ctx = platform_get_drvdata(pdev);
- 
- 	thermal_cooling_device_unregister(ctx->cdev);
- 	del_timer_sync(&ctx->rpm_timer);
- 
- 	if (ctx->pwm_value)
- 		pwm_disable(ctx->pwm);
- 
- 	if (ctx->reg_en)
- 		regulator_disable(ctx->reg_en);
- 
- 	return 0;
- }
- 
  #ifdef CONFIG_PM_SLEEP
  static int pwm_fan_suspend(struct device *dev)
  {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the thermal-soc tree with Linus' tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2699 bytes --]

Hi Eduardo,

Today's linux-next merge of the thermal-soc tree got a conflict in:

  drivers/thermal/hisi_thermal.c

between commit:

  3fe156f1dd9909 ("thermal: hisilicon: constify thermal_zone_of_device_ops structures")

from Linus' tree and various commits from the thermal-soc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/thermal/hisi_thermal.c
index bd3572c41585,6a4e866a3596..000000000000
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@@ -206,20 -403,50 +403,50 @@@ static int hi6220_thermal_probe(struct 
  	return 0;
  }
  
- static const struct thermal_zone_of_device_ops hisi_of_thermal_ops = {
- 	.get_temp = hisi_thermal_get_temp,
- };
+ static int hi3660_thermal_probe(struct hisi_thermal_data *data)
+ {
+ 	struct platform_device *pdev = data->pdev;
+ 	struct device *dev = &pdev->dev;
+ 	struct resource *res;
+ 
+ 	data->get_temp = hi3660_thermal_get_temp;
+ 	data->enable_sensor = hi3660_thermal_enable_sensor;
+ 	data->disable_sensor = hi3660_thermal_disable_sensor;
+ 	data->irq_handler = hi3660_thermal_irq_handler;
+ 
+ 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ 	data->regs = devm_ioremap_resource(dev, res);
+ 	if (IS_ERR(data->regs)) {
+ 		dev_err(dev, "failed to get io address\n");
+ 		return PTR_ERR(data->regs);
+ 	}
  
- static irqreturn_t hisi_thermal_alarm_irq(int irq, void *dev)
+ 	data->irq = platform_get_irq(pdev, 0);
+ 	if (data->irq < 0)
+ 		return data->irq;
+ 
+ 	data->sensor.id = HI3660_DEFAULT_SENSOR;
+ 
+ 	return 0;
+ }
+ 
+ static int hisi_thermal_get_temp(void *__data, int *temp)
  {
- 	struct hisi_thermal_data *data = dev;
+ 	struct hisi_thermal_data *data = __data;
+ 	struct hisi_thermal_sensor *sensor = &data->sensor;
  
- 	disable_irq_nosync(irq);
- 	data->irq_enabled = false;
+ 	*temp = data->get_temp(data);
  
- 	return IRQ_WAKE_THREAD;
+ 	dev_dbg(&data->pdev->dev, "id=%d, temp=%d, thres=%d\n",
+ 		sensor->id, *temp, sensor->thres_temp);
+ 
+ 	return 0;
  }
  
 -static struct thermal_zone_of_device_ops hisi_of_thermal_ops = {
++static const struct thermal_zone_of_device_ops hisi_of_thermal_ops = {
+ 	.get_temp = hisi_thermal_get_temp,
+ };
+ 
  static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
  {
  	struct hisi_thermal_data *data = dev;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]