Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Monday, October 29, 2018 3:09:25 AM CET Stephen Rothwell wrote:
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
> 
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got conflicts in:
> 
>   drivers/i2c/busses/i2c-designware-baytrail.c
>   drivers/i2c/busses/i2c-designware-core.h
> 
> between commit:
> 
>   9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C bus pm_disab=
> led workaround")
> 
> from the i2c tree and commit:
> 
>   8afb46804dfa ("i2c: designware: Cleanup bus lock handling")
> 
> from the pm 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.
> 
> --=20
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/i2c/busses/i2c-designware-baytrail.c
> index 9ca1feaba98f,971b5cde7a93..
> --- a/drivers/i2c/busses/i2c-designware-baytrail.c
> +++ b/drivers/i2c/busses/i2c-designware-baytrail.c
> @@@ -162,18 -36,9 +36,9 @@@ int i2c_dw_probe_lock_support(struct dw
>   return -EPROBE_DEFER;
>  =20
>   dev_info(dev->dev, "I2C bus managed by PUNIT\n");
> - dev->acquire_lock =3D baytrail_i2c_acquire;
> - dev->release_lock =3D baytrail_i2c_release;
> + dev->acquire_lock =3D iosf_mbi_block_punit_i2c_access;
> + dev->release_lock =3D iosf_mbi_unblock_punit_i2c_access;
>  -dev->pm_disabled =3D true;
>  +dev->shared_with_punit =3D true;
>  =20
> - pm_qos_add_request(>pm_qos, PM_QOS_CPU_DMA_LATENCY,
> -PM_QOS_DEFAULT_VALUE);
> -=20
>   return 0;
>   }
> -=20
> - void i2c_dw_remove_lock_support(struct dw_i2c_dev *dev)
> - {
> - if (dev->acquire_lock)
> - pm_qos_remove_request(>pm_qos);
> - }
> diff --cc drivers/i2c/busses/i2c-designware-core.h
> index 9ec8394f4787,152bf56d8404..
> --- a/drivers/i2c/busses/i2c-designware-core.h
> +++ b/drivers/i2c/busses/i2c-designware-core.h
> @@@ -209,10 -208,9 +208,9 @@@
>* @fp_lcnt: fast plus LCNT value
>* @hs_hcnt: high speed HCNT value
>* @hs_lcnt: high speed LCNT value
> -  * @pm_qos: pm_qos_request used while holding a hardware lock on the bus
>* @acquire_lock: function to acquire a hardware lock on the bus
>* @release_lock: function to release a hardware lock on the bus
>  - * @pm_disabled: true if power-management should be disabled for this i2c=
> -bus
>  + * @shared_with_punit: true if this bus is shared with the SoCs PUNIT
>* @disable: function to disable the controller
>* @disable_int: function to disable all interrupts
>* @init: function to initialize the I2C hardware
> @@@ -263,10 -260,9 +261,9 @@@ struct dw_i2c_dev=20
>   u16 fp_lcnt;
>   u16 hs_hcnt;
>   u16 hs_lcnt;
> - struct pm_qos_request   pm_qos;
> - int (*acquire_lock)(struct dw_i2c_dev *dev);
> - void(*release_lock)(struct dw_i2c_dev *dev);
> + int (*acquire_lock)(void);
> + void(*release_lock)(void);
>  -boolpm_disabled;
>  +boolshared_with_punit;
>   void(*disable)(struct dw_i2c_dev *dev);
>   void(*disable_int)(struct dw_i2c_dev *dev);
>   int (*init)(struct dw_i2c_dev *dev);
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk
> Content-Type: application/pgp-signature
> Content-Description: OpenPGP digital signature
> 
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk--
> 

The fix looks good to me, thanks!

Cheers,
Rafael

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Monday, October 29, 2018 3:09:25 AM CET Stephen Rothwell wrote:
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
> 
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got conflicts in:
> 
>   drivers/i2c/busses/i2c-designware-baytrail.c
>   drivers/i2c/busses/i2c-designware-core.h
> 
> between commit:
> 
>   9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C bus pm_disab=
> led workaround")
> 
> from the i2c tree and commit:
> 
>   8afb46804dfa ("i2c: designware: Cleanup bus lock handling")
> 
> from the pm 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.
> 
> --=20
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/i2c/busses/i2c-designware-baytrail.c
> index 9ca1feaba98f,971b5cde7a93..
> --- a/drivers/i2c/busses/i2c-designware-baytrail.c
> +++ b/drivers/i2c/busses/i2c-designware-baytrail.c
> @@@ -162,18 -36,9 +36,9 @@@ int i2c_dw_probe_lock_support(struct dw
>   return -EPROBE_DEFER;
>  =20
>   dev_info(dev->dev, "I2C bus managed by PUNIT\n");
> - dev->acquire_lock =3D baytrail_i2c_acquire;
> - dev->release_lock =3D baytrail_i2c_release;
> + dev->acquire_lock =3D iosf_mbi_block_punit_i2c_access;
> + dev->release_lock =3D iosf_mbi_unblock_punit_i2c_access;
>  -dev->pm_disabled =3D true;
>  +dev->shared_with_punit =3D true;
>  =20
> - pm_qos_add_request(>pm_qos, PM_QOS_CPU_DMA_LATENCY,
> -PM_QOS_DEFAULT_VALUE);
> -=20
>   return 0;
>   }
> -=20
> - void i2c_dw_remove_lock_support(struct dw_i2c_dev *dev)
> - {
> - if (dev->acquire_lock)
> - pm_qos_remove_request(>pm_qos);
> - }
> diff --cc drivers/i2c/busses/i2c-designware-core.h
> index 9ec8394f4787,152bf56d8404..
> --- a/drivers/i2c/busses/i2c-designware-core.h
> +++ b/drivers/i2c/busses/i2c-designware-core.h
> @@@ -209,10 -208,9 +208,9 @@@
>* @fp_lcnt: fast plus LCNT value
>* @hs_hcnt: high speed HCNT value
>* @hs_lcnt: high speed LCNT value
> -  * @pm_qos: pm_qos_request used while holding a hardware lock on the bus
>* @acquire_lock: function to acquire a hardware lock on the bus
>* @release_lock: function to release a hardware lock on the bus
>  - * @pm_disabled: true if power-management should be disabled for this i2c=
> -bus
>  + * @shared_with_punit: true if this bus is shared with the SoCs PUNIT
>* @disable: function to disable the controller
>* @disable_int: function to disable all interrupts
>* @init: function to initialize the I2C hardware
> @@@ -263,10 -260,9 +261,9 @@@ struct dw_i2c_dev=20
>   u16 fp_lcnt;
>   u16 hs_hcnt;
>   u16 hs_lcnt;
> - struct pm_qos_request   pm_qos;
> - int (*acquire_lock)(struct dw_i2c_dev *dev);
> - void(*release_lock)(struct dw_i2c_dev *dev);
> + int (*acquire_lock)(void);
> + void(*release_lock)(void);
>  -boolpm_disabled;
>  +boolshared_with_punit;
>   void(*disable)(struct dw_i2c_dev *dev);
>   void(*disable_int)(struct dw_i2c_dev *dev);
>   int (*init)(struct dw_i2c_dev *dev);
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk
> Content-Type: application/pgp-signature
> Content-Description: OpenPGP digital signature
> 
> 
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk--
> 

The fix looks good to me, thanks!

Cheers,
Rafael

linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi Rafael,

Today's linux-next merge of the pm tree got conflicts in:

  drivers/i2c/busses/i2c-designware-baytrail.c
  drivers/i2c/busses/i2c-designware-core.h

between commit:

  9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C bus pm_disabled 
workaround")

from the i2c tree and commit:

  8afb46804dfa ("i2c: designware: Cleanup bus lock handling")

from the pm 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/i2c/busses/i2c-designware-baytrail.c
index 9ca1feaba98f,971b5cde7a93..
--- a/drivers/i2c/busses/i2c-designware-baytrail.c
+++ b/drivers/i2c/busses/i2c-designware-baytrail.c
@@@ -162,18 -36,9 +36,9 @@@ int i2c_dw_probe_lock_support(struct dw
return -EPROBE_DEFER;
  
dev_info(dev->dev, "I2C bus managed by PUNIT\n");
-   dev->acquire_lock = baytrail_i2c_acquire;
-   dev->release_lock = baytrail_i2c_release;
+   dev->acquire_lock = iosf_mbi_block_punit_i2c_access;
+   dev->release_lock = iosf_mbi_unblock_punit_i2c_access;
 -  dev->pm_disabled = true;
 +  dev->shared_with_punit = true;
  
-   pm_qos_add_request(>pm_qos, PM_QOS_CPU_DMA_LATENCY,
-  PM_QOS_DEFAULT_VALUE);
- 
return 0;
  }
- 
- void i2c_dw_remove_lock_support(struct dw_i2c_dev *dev)
- {
-   if (dev->acquire_lock)
-   pm_qos_remove_request(>pm_qos);
- }
diff --cc drivers/i2c/busses/i2c-designware-core.h
index 9ec8394f4787,152bf56d8404..
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@@ -209,10 -208,9 +208,9 @@@
   * @fp_lcnt: fast plus LCNT value
   * @hs_hcnt: high speed HCNT value
   * @hs_lcnt: high speed LCNT value
-  * @pm_qos: pm_qos_request used while holding a hardware lock on the bus
   * @acquire_lock: function to acquire a hardware lock on the bus
   * @release_lock: function to release a hardware lock on the bus
 - * @pm_disabled: true if power-management should be disabled for this i2c-bus
 + * @shared_with_punit: true if this bus is shared with the SoCs PUNIT
   * @disable: function to disable the controller
   * @disable_int: function to disable all interrupts
   * @init: function to initialize the I2C hardware
@@@ -263,10 -260,9 +261,9 @@@ struct dw_i2c_dev 
u16 fp_lcnt;
u16 hs_hcnt;
u16 hs_lcnt;
-   struct pm_qos_request   pm_qos;
-   int (*acquire_lock)(struct dw_i2c_dev *dev);
-   void(*release_lock)(struct dw_i2c_dev *dev);
+   int (*acquire_lock)(void);
+   void(*release_lock)(void);
 -  boolpm_disabled;
 +  boolshared_with_punit;
void(*disable)(struct dw_i2c_dev *dev);
void(*disable_int)(struct dw_i2c_dev *dev);
int (*init)(struct dw_i2c_dev *dev);


pgpjXaNv1E_pY.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi Rafael,

Today's linux-next merge of the pm tree got conflicts in:

  drivers/i2c/busses/i2c-designware-baytrail.c
  drivers/i2c/busses/i2c-designware-core.h

between commit:

  9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C bus pm_disabled 
workaround")

from the i2c tree and commit:

  8afb46804dfa ("i2c: designware: Cleanup bus lock handling")

from the pm 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/i2c/busses/i2c-designware-baytrail.c
index 9ca1feaba98f,971b5cde7a93..
--- a/drivers/i2c/busses/i2c-designware-baytrail.c
+++ b/drivers/i2c/busses/i2c-designware-baytrail.c
@@@ -162,18 -36,9 +36,9 @@@ int i2c_dw_probe_lock_support(struct dw
return -EPROBE_DEFER;
  
dev_info(dev->dev, "I2C bus managed by PUNIT\n");
-   dev->acquire_lock = baytrail_i2c_acquire;
-   dev->release_lock = baytrail_i2c_release;
+   dev->acquire_lock = iosf_mbi_block_punit_i2c_access;
+   dev->release_lock = iosf_mbi_unblock_punit_i2c_access;
 -  dev->pm_disabled = true;
 +  dev->shared_with_punit = true;
  
-   pm_qos_add_request(>pm_qos, PM_QOS_CPU_DMA_LATENCY,
-  PM_QOS_DEFAULT_VALUE);
- 
return 0;
  }
- 
- void i2c_dw_remove_lock_support(struct dw_i2c_dev *dev)
- {
-   if (dev->acquire_lock)
-   pm_qos_remove_request(>pm_qos);
- }
diff --cc drivers/i2c/busses/i2c-designware-core.h
index 9ec8394f4787,152bf56d8404..
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@@ -209,10 -208,9 +208,9 @@@
   * @fp_lcnt: fast plus LCNT value
   * @hs_hcnt: high speed HCNT value
   * @hs_lcnt: high speed LCNT value
-  * @pm_qos: pm_qos_request used while holding a hardware lock on the bus
   * @acquire_lock: function to acquire a hardware lock on the bus
   * @release_lock: function to release a hardware lock on the bus
 - * @pm_disabled: true if power-management should be disabled for this i2c-bus
 + * @shared_with_punit: true if this bus is shared with the SoCs PUNIT
   * @disable: function to disable the controller
   * @disable_int: function to disable all interrupts
   * @init: function to initialize the I2C hardware
@@@ -263,10 -260,9 +261,9 @@@ struct dw_i2c_dev 
u16 fp_lcnt;
u16 hs_hcnt;
u16 hs_lcnt;
-   struct pm_qos_request   pm_qos;
-   int (*acquire_lock)(struct dw_i2c_dev *dev);
-   void(*release_lock)(struct dw_i2c_dev *dev);
+   int (*acquire_lock)(void);
+   void(*release_lock)(void);
 -  boolpm_disabled;
 +  boolshared_with_punit;
void(*disable)(struct dw_i2c_dev *dev);
void(*disable_int)(struct dw_i2c_dev *dev);
int (*init)(struct dw_i2c_dev *dev);


pgpjXaNv1E_pY.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Friday, January 12, 2018 12:27:29 AM CET Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/i2c/busses/i2c-designware-platdrv.c
> 
> between commit:
> 
>   0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to 
> i2c_dw_prepare_clk")
> 
> from the i2c tree and commit:
> 
>   02e45646d53b ("PM: i2c-designware-platdrv: Optimize power management")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks good to me.

Thanks!

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Friday, January 12, 2018 12:27:29 AM CET Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/i2c/busses/i2c-designware-platdrv.c
> 
> between commit:
> 
>   0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to 
> i2c_dw_prepare_clk")
> 
> from the i2c tree and commit:
> 
>   02e45646d53b ("PM: i2c-designware-platdrv: Optimize power management")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks good to me.

Thanks!

linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi Rafael,

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

  drivers/i2c/busses/i2c-designware-platdrv.c

between commit:

  0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to 
i2c_dw_prepare_clk")

from the i2c tree and commit:

  02e45646d53b ("PM: i2c-designware-platdrv: Optimize power management")

from the pm 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/i2c/busses/i2c-designware-platdrv.c
index 6e0fd94faba1,153b947702c5..
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -430,16 -471,9 +448,9 @@@ static int dw_i2c_plat_suspend(struct d
  {
struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
  
-   if (i_dev->suspended) {
-   i_dev->skip_resume = true;
-   return 0;
-   }
- 
i_dev->disable(i_dev);
 -  i2c_dw_plat_prepare_clk(i_dev, false);
 +  i2c_dw_prepare_clk(i_dev, false);
  
-   i_dev->suspended = true;
- 
return 0;
  }
  
@@@ -447,19 -481,9 +458,9 @@@ static int dw_i2c_plat_resume(struct de
  {
struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
  
-   if (!i_dev->suspended)
-   return 0;
- 
-   if (i_dev->skip_resume) {
-   i_dev->skip_resume = false;
-   return 0;
-   }
- 
 -  i2c_dw_plat_prepare_clk(i_dev, true);
 +  i2c_dw_prepare_clk(i_dev, true);
i_dev->init(i_dev);
  
-   i_dev->suspended = false;
- 
return 0;
  }
  

linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi Rafael,

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

  drivers/i2c/busses/i2c-designware-platdrv.c

between commit:

  0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to 
i2c_dw_prepare_clk")

from the i2c tree and commit:

  02e45646d53b ("PM: i2c-designware-platdrv: Optimize power management")

from the pm 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/i2c/busses/i2c-designware-platdrv.c
index 6e0fd94faba1,153b947702c5..
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -430,16 -471,9 +448,9 @@@ static int dw_i2c_plat_suspend(struct d
  {
struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
  
-   if (i_dev->suspended) {
-   i_dev->skip_resume = true;
-   return 0;
-   }
- 
i_dev->disable(i_dev);
 -  i2c_dw_plat_prepare_clk(i_dev, false);
 +  i2c_dw_prepare_clk(i_dev, false);
  
-   i_dev->suspended = true;
- 
return 0;
  }
  
@@@ -447,19 -481,9 +458,9 @@@ static int dw_i2c_plat_resume(struct de
  {
struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
  
-   if (!i_dev->suspended)
-   return 0;
- 
-   if (i_dev->skip_resume) {
-   i_dev->skip_resume = false;
-   return 0;
-   }
- 
 -  i2c_dw_plat_prepare_clk(i_dev, true);
 +  i2c_dw_prepare_clk(i_dev, true);
i_dev->init(i_dev);
  
-   i_dev->suspended = false;
- 
return 0;
  }
  

Re: linux-next: manual merge of the pm tree with the i2c tree

[Andy Shevchenko]

On Tue, Jul 19, 2016 at 6:48 AM, Wolfram Sang  wrote:
>
>> > Well, not knowing much about ACPI, I just need the conflict resolution
>> > for my latest i2c/for-next and your above branch. If you want to do it,
>> > fine with me. But maybe Jarkko will be back to office on Monday, too.
>>
>> Unfortunately, I don't see how these branches can be merged in a sensible
>> way without adding too much new code into the merge itself.
>>
>> Something needs to be dropped and then rebased and applied again.
>
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.

Jarkko and Mika are on holidays, I recently noticed this thread,
sorry. For now your solution seems okay, since we can't push broken
parts into v4.8-rc1.

-- 
With Best Regards,
Andy Shevchenko

Re: linux-next: manual merge of the pm tree with the i2c tree

[Andy Shevchenko]

On Tue, Jul 19, 2016 at 6:48 AM, Wolfram Sang  wrote:
>
>> > Well, not knowing much about ACPI, I just need the conflict resolution
>> > for my latest i2c/for-next and your above branch. If you want to do it,
>> > fine with me. But maybe Jarkko will be back to office on Monday, too.
>>
>> Unfortunately, I don't see how these branches can be merged in a sensible
>> way without adding too much new code into the merge itself.
>>
>> Something needs to be dropped and then rebased and applied again.
>
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.

Jarkko and Mika are on holidays, I recently noticed this thread,
sorry. For now your solution seems okay, since we can't push broken
parts into v4.8-rc1.

-- 
With Best Regards,
Andy Shevchenko

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Tuesday, July 19, 2016 05:48:07 AM Wolfram Sang wrote:
> 
> > > Well, not knowing much about ACPI, I just need the conflict resolution
> > > for my latest i2c/for-next and your above branch. If you want to do it,
> > > fine with me. But maybe Jarkko will be back to office on Monday, too.
> > 
> > Unfortunately, I don't see how these branches can be merged in a sensible
> > way without adding too much new code into the merge itself.
> > 
> > Something needs to be dropped and then rebased and applied again.
> 
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.

Thanks a lot!

> Thanks for looking into it!

No problem.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Tuesday, July 19, 2016 05:48:07 AM Wolfram Sang wrote:
> 
> > > Well, not knowing much about ACPI, I just need the conflict resolution
> > > for my latest i2c/for-next and your above branch. If you want to do it,
> > > fine with me. But maybe Jarkko will be back to office on Monday, too.
> > 
> > Unfortunately, I don't see how these branches can be merged in a sensible
> > way without adding too much new code into the merge itself.
> > 
> > Something needs to be dropped and then rebased and applied again.
> 
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.

Thanks a lot!

> Thanks for looking into it!

No problem.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

Re: linux-next: manual merge of the pm tree with the i2c tree

[Wolfram Sang]

> > Well, not knowing much about ACPI, I just need the conflict resolution
> > for my latest i2c/for-next and your above branch. If you want to do it,
> > fine with me. But maybe Jarkko will be back to office on Monday, too.
> 
> Unfortunately, I don't see how these branches can be merged in a sensible
> way without adding too much new code into the merge itself.
> 
> Something needs to be dropped and then rebased and applied again.

Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
there was also a driver patch making use of the core changes for which I
requested some updates. Since those did not happen yet (Jarkko on
holiday?), the core patches alone are not important anyhow.

Thanks for looking into it!

   Wolfram



signature.asc
Description: PGP signature

Re: linux-next: manual merge of the pm tree with the i2c tree

[Wolfram Sang]

> > Well, not knowing much about ACPI, I just need the conflict resolution
> > for my latest i2c/for-next and your above branch. If you want to do it,
> > fine with me. But maybe Jarkko will be back to office on Monday, too.
> 
> Unfortunately, I don't see how these branches can be merged in a sensible
> way without adding too much new code into the merge itself.
> 
> Something needs to be dropped and then rebased and applied again.

Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
there was also a driver patch making use of the core changes for which I
requested some updates. Since those did not happen yet (Jarkko on
holiday?), the core patches alone are not important anyhow.

Thanks for looking into it!

   Wolfram



signature.asc
Description: PGP signature

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Sunday, July 17, 2016 08:14:48 PM Wolfram Sang wrote:
> 
> > > > > > I fixed it up (I think, but it needs more work - see below) and can
> > > > > 
> > > > > For a start, it generates this warning, now:
> > > > > 
> > > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined 
> > > > > but not used [-Wunused-function]
> > > > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > > > >^
> > > > 
> > > > OK, thanks for the heads-up.
> > > 
> > > Yes, thanks!
> > > 
> > > > 
> > > > Wolfram, what about if I exposed my "acpi-tables" branch for you to 
> > > > pull?
> > > > 
> > > > You could resolve this in your tree then.
> > > 
> > > I can pull it in, sure. For the fixup, I'd like a commitment from one of
> > > the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> > > revert given that we are quite late in the cycle already.
> > 
> > The branch is here:
> > 
> >  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git 
> > acpi-tables
> > 
> > The top-most commit is:
> > 
> > fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link 
> > error
> > 
> > I won't rebase this branch going forward, so it is safe to pull.
> > 
> > Please let me know how I can help with the conflict resolution.
> 
> Well, not knowing much about ACPI, I just need the conflict resolution
> for my latest i2c/for-next and your above branch. If you want to do it,
> fine with me. But maybe Jarkko will be back to office on Monday, too.

Unfortunately, I don't see how these branches can be merged in a sensible
way without adding too much new code into the merge itself.

Something needs to be dropped and then rebased and applied again.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Sunday, July 17, 2016 08:14:48 PM Wolfram Sang wrote:
> 
> > > > > > I fixed it up (I think, but it needs more work - see below) and can
> > > > > 
> > > > > For a start, it generates this warning, now:
> > > > > 
> > > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined 
> > > > > but not used [-Wunused-function]
> > > > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > > > >^
> > > > 
> > > > OK, thanks for the heads-up.
> > > 
> > > Yes, thanks!
> > > 
> > > > 
> > > > Wolfram, what about if I exposed my "acpi-tables" branch for you to 
> > > > pull?
> > > > 
> > > > You could resolve this in your tree then.
> > > 
> > > I can pull it in, sure. For the fixup, I'd like a commitment from one of
> > > the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> > > revert given that we are quite late in the cycle already.
> > 
> > The branch is here:
> > 
> >  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git 
> > acpi-tables
> > 
> > The top-most commit is:
> > 
> > fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link 
> > error
> > 
> > I won't rebase this branch going forward, so it is safe to pull.
> > 
> > Please let me know how I can help with the conflict resolution.
> 
> Well, not knowing much about ACPI, I just need the conflict resolution
> for my latest i2c/for-next and your above branch. If you want to do it,
> fine with me. But maybe Jarkko will be back to office on Monday, too.

Unfortunately, I don't see how these branches can be merged in a sensible
way without adding too much new code into the merge itself.

Something needs to be dropped and then rebased and applied again.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

Re: linux-next: manual merge of the pm tree with the i2c tree

[Wolfram Sang]

> > > > > I fixed it up (I think, but it needs more work - see below) and can
> > > > 
> > > > For a start, it generates this warning, now:
> > > > 
> > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined 
> > > > but not used [-Wunused-function]
> > > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > > >^
> > > 
> > > OK, thanks for the heads-up.
> > 
> > Yes, thanks!
> > 
> > > 
> > > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > > 
> > > You could resolve this in your tree then.
> > 
> > I can pull it in, sure. For the fixup, I'd like a commitment from one of
> > the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> > revert given that we are quite late in the cycle already.
> 
> The branch is here:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-tables
> 
> The top-most commit is:
> 
> fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link error
> 
> I won't rebase this branch going forward, so it is safe to pull.
> 
> Please let me know how I can help with the conflict resolution.

Well, not knowing much about ACPI, I just need the conflict resolution
for my latest i2c/for-next and your above branch. If you want to do it,
fine with me. But maybe Jarkko will be back to office on Monday, too.



signature.asc
Description: PGP signature

Re: linux-next: manual merge of the pm tree with the i2c tree

[Wolfram Sang]

> > > > > I fixed it up (I think, but it needs more work - see below) and can
> > > > 
> > > > For a start, it generates this warning, now:
> > > > 
> > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined 
> > > > but not used [-Wunused-function]
> > > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > > >^
> > > 
> > > OK, thanks for the heads-up.
> > 
> > Yes, thanks!
> > 
> > > 
> > > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > > 
> > > You could resolve this in your tree then.
> > 
> > I can pull it in, sure. For the fixup, I'd like a commitment from one of
> > the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> > revert given that we are quite late in the cycle already.
> 
> The branch is here:
> 
>  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-tables
> 
> The top-most commit is:
> 
> fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link error
> 
> I won't rebase this branch going forward, so it is safe to pull.
> 
> Please let me know how I can help with the conflict resolution.

Well, not knowing much about ACPI, I just need the conflict resolution
for my latest i2c/for-next and your above branch. If you want to do it,
fine with me. But maybe Jarkko will be back to office on Monday, too.



signature.asc
Description: PGP signature

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote:
> On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote:
> > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell 
> > >  wrote:
> > > >
> > > > I fixed it up (I think, but it needs more work - see below) and can
> > > 
> > > For a start, it generates this warning, now:
> > > 
> > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but 
> > > not used [-Wunused-function]
> > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > >^
> > 
> > OK, thanks for the heads-up.
> 
> Yes, thanks!
> 
> > 
> > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > 
> > You could resolve this in your tree then.
> 
> I can pull it in, sure. For the fixup, I'd like a commitment from one of
> the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> revert given that we are quite late in the cycle already.

The branch is here:

 git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-tables

The top-most commit is:

fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link error

I won't rebase this branch going forward, so it is safe to pull.

Please let me know how I can help with the conflict resolution.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote:
> On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote:
> > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell 
> > >  wrote:
> > > >
> > > > I fixed it up (I think, but it needs more work - see below) and can
> > > 
> > > For a start, it generates this warning, now:
> > > 
> > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but 
> > > not used [-Wunused-function]
> > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > >^
> > 
> > OK, thanks for the heads-up.
> 
> Yes, thanks!
> 
> > 
> > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > 
> > You could resolve this in your tree then.
> 
> I can pull it in, sure. For the fixup, I'd like a commitment from one of
> the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> revert given that we are quite late in the cycle already.

The branch is here:

 git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-tables

The top-most commit is:

fafe5306f201 ACPI: Rename configfs.c to acpi_configfs.c to prevent link error

I won't rebase this branch going forward, so it is safe to pull.

Please let me know how I can help with the conflict resolution.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote:
> On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote:
> > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell 
> > >  wrote:
> > > >
> > > > I fixed it up (I think, but it needs more work - see below) and can
> > > 
> > > For a start, it generates this warning, now:
> > > 
> > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but 
> > > not used [-Wunused-function]
> > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > >^
> > 
> > OK, thanks for the heads-up.
> 
> Yes, thanks!
> 
> > 
> > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > 
> > You could resolve this in your tree then.
> 
> I can pull it in, sure. For the fixup, I'd like a commitment from one of
> the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> revert given that we are quite late in the cycle already.

Well, I can help with that too, I suppose.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote:
> On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote:
> > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell 
> > >  wrote:
> > > >
> > > > I fixed it up (I think, but it needs more work - see below) and can
> > > 
> > > For a start, it generates this warning, now:
> > > 
> > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but 
> > > not used [-Wunused-function]
> > > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> > >^
> > 
> > OK, thanks for the heads-up.
> 
> Yes, thanks!
> 
> > 
> > Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> > 
> > You could resolve this in your tree then.
> 
> I can pull it in, sure. For the fixup, I'd like a commitment from one of
> the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
> revert given that we are quite late in the cycle already.

Well, I can help with that too, I suppose.

Thanks,
Rafael


signature.asc
Description: This is a digitally signed message part.

Re: linux-next: manual merge of the pm tree with the i2c tree

[Wolfram Sang]

On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote:
> On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> > Hi all,
> > 
> > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell  
> > wrote:
> > >
> > > I fixed it up (I think, but it needs more work - see below) and can
> > 
> > For a start, it generates this warning, now:
> > 
> > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but 
> > not used [-Wunused-function]
> > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> >^
> 
> OK, thanks for the heads-up.

Yes, thanks!

> 
> Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> 
> You could resolve this in your tree then.

I can pull it in, sure. For the fixup, I'd like a commitment from one of
the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
revert given that we are quite late in the cycle already.



signature.asc
Description: PGP signature

Re: linux-next: manual merge of the pm tree with the i2c tree

[Wolfram Sang]

On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote:
> On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> > Hi all,
> > 
> > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell  
> > wrote:
> > >
> > > I fixed it up (I think, but it needs more work - see below) and can
> > 
> > For a start, it generates this warning, now:
> > 
> > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but 
> > not used [-Wunused-function]
> > static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
> >^
> 
> OK, thanks for the heads-up.

Yes, thanks!

> 
> Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?
> 
> You could resolve this in your tree then.

I can pull it in, sure. For the fixup, I'd like a commitment from one of
the ACPI experts (Jarkko, Mika, Andy), though. Otherwise I'd need to
revert given that we are quite late in the cycle already.



signature.asc
Description: PGP signature

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> Hi all,
> 
> On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell  
> wrote:
> >
> > I fixed it up (I think, but it needs more work - see below) and can
> 
> For a start, it generates this warning, now:
> 
> drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not 
> used [-Wunused-function]
> static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
>^

OK, thanks for the heads-up.

Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?

You could resolve this in your tree then.

Thanks,
Rafael

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> Hi all,
> 
> On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell  
> wrote:
> >
> > I fixed it up (I think, but it needs more work - see below) and can
> 
> For a start, it generates this warning, now:
> 
> drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not 
> used [-Wunused-function]
> static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
>^

OK, thanks for the heads-up.

Wolfram, what about if I exposed my "acpi-tables" branch for you to pull?

You could resolve this in your tree then.

Thanks,
Rafael

Re: linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi all,

On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell  
wrote:
>
> I fixed it up (I think, but it needs more work - see below) and can

For a start, it generates this warning, now:

drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not 
used [-Wunused-function]
static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
   ^

-- 
Cheers,
Stephen Rothwell

Re: linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi all,

On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell  
wrote:
>
> I fixed it up (I think, but it needs more work - see below) and can

For a start, it generates this warning, now:

drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not 
used [-Wunused-function]
static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,
   ^

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi Rafael,

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

  drivers/i2c/i2c-core.c

between commit:

  a7003b65801e ("i2c: core: Cleanup I2C ACPI namespace")
  55d38d060e99 ("i2c: core: Add function for finding the bus speed from ACPI")

from the i2c tree and commit:

  525e6fabeae2 ("i2c / ACPI: add support for ACPI reconfigure notifications")

from the pm tree.

I fixed it up (I think, but it needs more work - 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/i2c/i2c-core.c
index 77ce28f2dd4c,74e5aeaf84f9..
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@@ -103,20 -101,17 +103,19 @@@ struct gsb_buffer 
};
  } __packed;
  
 -struct acpi_i2c_lookup {
 +struct i2c_acpi_lookup {
struct i2c_board_info *info;
 +  struct i2c_adapter *adapter; /* set only when registering slaves */
acpi_handle adapter_handle;
acpi_handle device_handle;
 +  u32 min_speed;
  };
  
 -static int acpi_i2c_fill_info(struct acpi_resource *ares, void *data)
 +static int i2c_acpi_find_resource(struct acpi_resource *ares, void *data)
  {
 -  struct acpi_i2c_lookup *lookup = data;
 +  struct i2c_acpi_lookup *lookup = data;
struct i2c_board_info *info = lookup->info;
struct acpi_resource_i2c_serialbus *sb;
-   acpi_handle adapter_handle;
acpi_status status;
  
if (info->addr || ares->type != ACPI_RESOURCE_TYPE_SERIAL_BUS)
@@@ -126,97 -121,110 +125,181 @@@
if (sb->type != ACPI_RESOURCE_SERIAL_TYPE_I2C)
return 1;
  
-   /*
-* Extract the ResourceSource and make sure that the handle matches
-* with the I2C adapter handle.
-*/
status = acpi_get_handle(lookup->device_handle,
 sb->resource_source.string_ptr,
-_handle);
-   if (ACPI_SUCCESS(status) && adapter_handle == lookup->adapter_handle) {
-   info->addr = sb->slave_address;
-   if (sb->access_mode == ACPI_I2C_10BIT_MODE)
-   info->flags |= I2C_CLIENT_TEN;
-   /* Save speed of the slowest device */
-   if (sb->connection_speed < lookup->min_speed)
-   lookup->min_speed = sb->connection_speed;
-   }
+>adapter_handle);
+   if (!ACPI_SUCCESS(status))
+   return 1;
+ 
+   info->addr = sb->slave_address;
+   if (sb->access_mode == ACPI_I2C_10BIT_MODE)
+   info->flags |= I2C_CLIENT_TEN;
++  /* Save speed of the slowest device */
++  if (sb->connection_speed < lookup->min_speed)
++  lookup->min_speed = sb->connection_speed;
  
return 1;
  }
  
 -static int acpi_i2c_get_info(struct acpi_device *adev,
 +static acpi_status i2c_acpi_slave_lookup(acpi_handle handle, u32 level,
 +   void *data, void **return_value)
 +{
 +  struct i2c_acpi_lookup *lookup = data;
 +  struct i2c_adapter *adapter = lookup->adapter;
 +  struct list_head resource_list;
 +  struct resource_entry *entry;
 +  struct i2c_board_info info;
 +  struct acpi_device *adev;
 +  int ret;
 +
 +  if (acpi_bus_get_device(handle, ))
 +  return AE_OK;
 +  if (acpi_bus_get_status(adev) || !adev->status.present)
 +  return AE_OK;
 +
 +  memset(, 0, sizeof(info));
 +  info.fwnode = acpi_fwnode_handle(adev);
 +
 +  lookup->device_handle = handle;
 +  lookup->info = 
 +
 +  /*
 +   * Look up for I2cSerialBus resource with ResourceSource that
 +   * matches with this adapter.
 +   */
 +  INIT_LIST_HEAD(_list);
 +  ret = acpi_dev_get_resources(adev, _list,
 +   i2c_acpi_find_resource, lookup);
 +  acpi_dev_free_resource_list(_list);
 +
 +  if (ret < 0 || !info.addr || !lookup->adapter)
 +  return AE_OK;
 +
 +  /* Then fill IRQ number if any */
 +  ret = acpi_dev_get_resources(adev, _list, NULL, NULL);
 +  if (ret < 0)
 +  return AE_OK;
 +
 +  resource_list_for_each_entry(entry, _list) {
 +  if (resource_type(entry->res) == IORESOURCE_IRQ) {
 +  info.irq = entry->res->start;
 +  break;
 +  }
 +  }
 +
 +  acpi_dev_free_resource_list(_list);
 +
 +  adev->power.flags.ignore_parent = true;
 +  strlcpy(info.type, dev_name(>dev), sizeof(info.type));
 +  if (!i2c_new_device(adapter, )) {
 +  adev->power.flags.ignore_parent = false;
 +  dev_err(>dev,
 +  

linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi Rafael,

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

  drivers/i2c/i2c-core.c

between commit:

  a7003b65801e ("i2c: core: Cleanup I2C ACPI namespace")
  55d38d060e99 ("i2c: core: Add function for finding the bus speed from ACPI")

from the i2c tree and commit:

  525e6fabeae2 ("i2c / ACPI: add support for ACPI reconfigure notifications")

from the pm tree.

I fixed it up (I think, but it needs more work - 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/i2c/i2c-core.c
index 77ce28f2dd4c,74e5aeaf84f9..
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@@ -103,20 -101,17 +103,19 @@@ struct gsb_buffer 
};
  } __packed;
  
 -struct acpi_i2c_lookup {
 +struct i2c_acpi_lookup {
struct i2c_board_info *info;
 +  struct i2c_adapter *adapter; /* set only when registering slaves */
acpi_handle adapter_handle;
acpi_handle device_handle;
 +  u32 min_speed;
  };
  
 -static int acpi_i2c_fill_info(struct acpi_resource *ares, void *data)
 +static int i2c_acpi_find_resource(struct acpi_resource *ares, void *data)
  {
 -  struct acpi_i2c_lookup *lookup = data;
 +  struct i2c_acpi_lookup *lookup = data;
struct i2c_board_info *info = lookup->info;
struct acpi_resource_i2c_serialbus *sb;
-   acpi_handle adapter_handle;
acpi_status status;
  
if (info->addr || ares->type != ACPI_RESOURCE_TYPE_SERIAL_BUS)
@@@ -126,97 -121,110 +125,181 @@@
if (sb->type != ACPI_RESOURCE_SERIAL_TYPE_I2C)
return 1;
  
-   /*
-* Extract the ResourceSource and make sure that the handle matches
-* with the I2C adapter handle.
-*/
status = acpi_get_handle(lookup->device_handle,
 sb->resource_source.string_ptr,
-_handle);
-   if (ACPI_SUCCESS(status) && adapter_handle == lookup->adapter_handle) {
-   info->addr = sb->slave_address;
-   if (sb->access_mode == ACPI_I2C_10BIT_MODE)
-   info->flags |= I2C_CLIENT_TEN;
-   /* Save speed of the slowest device */
-   if (sb->connection_speed < lookup->min_speed)
-   lookup->min_speed = sb->connection_speed;
-   }
+>adapter_handle);
+   if (!ACPI_SUCCESS(status))
+   return 1;
+ 
+   info->addr = sb->slave_address;
+   if (sb->access_mode == ACPI_I2C_10BIT_MODE)
+   info->flags |= I2C_CLIENT_TEN;
++  /* Save speed of the slowest device */
++  if (sb->connection_speed < lookup->min_speed)
++  lookup->min_speed = sb->connection_speed;
  
return 1;
  }
  
 -static int acpi_i2c_get_info(struct acpi_device *adev,
 +static acpi_status i2c_acpi_slave_lookup(acpi_handle handle, u32 level,
 +   void *data, void **return_value)
 +{
 +  struct i2c_acpi_lookup *lookup = data;
 +  struct i2c_adapter *adapter = lookup->adapter;
 +  struct list_head resource_list;
 +  struct resource_entry *entry;
 +  struct i2c_board_info info;
 +  struct acpi_device *adev;
 +  int ret;
 +
 +  if (acpi_bus_get_device(handle, ))
 +  return AE_OK;
 +  if (acpi_bus_get_status(adev) || !adev->status.present)
 +  return AE_OK;
 +
 +  memset(, 0, sizeof(info));
 +  info.fwnode = acpi_fwnode_handle(adev);
 +
 +  lookup->device_handle = handle;
 +  lookup->info = 
 +
 +  /*
 +   * Look up for I2cSerialBus resource with ResourceSource that
 +   * matches with this adapter.
 +   */
 +  INIT_LIST_HEAD(_list);
 +  ret = acpi_dev_get_resources(adev, _list,
 +   i2c_acpi_find_resource, lookup);
 +  acpi_dev_free_resource_list(_list);
 +
 +  if (ret < 0 || !info.addr || !lookup->adapter)
 +  return AE_OK;
 +
 +  /* Then fill IRQ number if any */
 +  ret = acpi_dev_get_resources(adev, _list, NULL, NULL);
 +  if (ret < 0)
 +  return AE_OK;
 +
 +  resource_list_for_each_entry(entry, _list) {
 +  if (resource_type(entry->res) == IORESOURCE_IRQ) {
 +  info.irq = entry->res->start;
 +  break;
 +  }
 +  }
 +
 +  acpi_dev_free_resource_list(_list);
 +
 +  adev->power.flags.ignore_parent = true;
 +  strlcpy(info.type, dev_name(>dev), sizeof(info.type));
 +  if (!i2c_new_device(adapter, )) {
 +  adev->power.flags.ignore_parent = false;
 +  dev_err(>dev,
 +  

Re: linux-next: manual merge of the pm tree with the i2c tree

[Wolfram Sang]

> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> Looks good to me and thanks for taking care of this!

Ditto. Thanks!



signature.asc
Description: Digital signature

Re: linux-next: manual merge of the pm tree with the i2c tree

[Wolfram Sang]

> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> Looks good to me and thanks for taking care of this!

Ditto. Thanks!



signature.asc
Description: Digital signature

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Wednesday, January 06, 2016 12:39:11 PM Stephen Rothwell wrote:
> Hi Rafael,

Hi,

> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/i2c/busses/i2c-designware-platdrv.c
> 
> between commit:
> 
>   90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
> 
> from the i2c tree and commit:
> 
>   a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me and thanks for taking care of this!

Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi Rafael,

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

  drivers/i2c/busses/i2c-designware-platdrv.c

between commit:

  90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")

from the i2c tree and commit:

  a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")

from the pm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
index 4f86d0795f7f,bf72ae740fc1..
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -122,7 -123,7 +123,8 @@@ static const struct acpi_device_id dw_i
{ "80860F41", 0 },
{ "808622C1", 0 },
{ "AMD0010", ACCESS_INTR_MASK },
 +  { "AMDI0510", 0 },
+   { "APMC0D0F", 0 },
{ }
  };
  MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the pm tree with the i2c tree

[Stephen Rothwell]

Hi Rafael,

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

  drivers/i2c/busses/i2c-designware-platdrv.c

between commit:

  90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")

from the i2c tree and commit:

  a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")

from the pm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
index 4f86d0795f7f,bf72ae740fc1..
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -122,7 -123,7 +123,8 @@@ static const struct acpi_device_id dw_i
{ "80860F41", 0 },
{ "808622C1", 0 },
{ "AMD0010", ACCESS_INTR_MASK },
 +  { "AMDI0510", 0 },
+   { "APMC0D0F", 0 },
{ }
  };
  MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the pm tree with the i2c tree

[Rafael J. Wysocki]

On Wednesday, January 06, 2016 12:39:11 PM Stephen Rothwell wrote:
> Hi Rafael,

Hi,

> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/i2c/busses/i2c-designware-platdrv.c
> 
> between commit:
> 
>   90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
> 
> from the i2c tree and commit:
> 
>   a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me and thanks for taking care of this!

Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/