[Maverick] SRU: Fixes for coretemp and pkgtemp

[Brad Figg]

On 10/20/2010 06:06 PM, Leann Ogasawara wrote:
> On Wed, 2010-10-20 at 11:17 +0800, Zhao, Yingying wrote:
>> AFAIK, these commits on coretmp are not submitted to stable.
>
> Now that I think about it, this was a slightly silly question for me to
> ask in the first place.  The pkgtemp driver was introduced in 2.6.36 and
> backported for Maverick.  Thus the patches wouldn't be acceptable for a
> 2.6.35.y stable update.
>
>> Yes, as you said the patch(89a3fd35) depends on those two patch
>> (0dca94b and 851b29c). Another commit 3771330 [1] which is a fix for
>> commit 851b29c is also necessary.
>> Most of the fixes on coretemp after v2.6.35 are about hotplug support,
>> I'd suggest to apply all the commits from 0dca94b to fff2017. What's
>> your opinion?
>
> The revised list of commits from 0dca94b to fff2017 for the coretemp and
> pkgtemp drivers is as follows:
>
> == coretemp ==
> fff2017354a3a9906862aabbf2a1cae5b4330e40 hwmon (coretemp): Fix build breakage if SMP is undefined
> e40cc4bdfd4b89813f072f72bd9c7055814d3f0f x86/hwmon: register alternate sibling upon CPU removal
> a46590533ad7b0f3f640732081d7e1658145c0ba x86/hwmon: fix initialization of coretemp
> 89a3fd35ba0318a7208e2c8d8ca6189f567d4a93 x86/hwmon: fix module init for hotplug-but-no-device-found case
> 45ff34d32a19e9008e7202ba2a7c0d0f40420228 hwmon: (coretemp) Fix harmless build warning
> 37713308d89f17c0f73e88b07138d6ca20bfe686 fix "hwmon: coretemp: update hotplug condition check"
> 6b8e8282611ea35845dcff0cb321a7d735fc3155 drivers/hwmon/coretemp.c: remove unneeded #ifdef CONFIG_HOTPLUG_CPU
> 851b29cb3b196cb66452ec964ab5f66c9c9cd1ed hwmon: coretemp: enable coretemp device add operation failure
> 0dca94baeab4a1a514841b0a4c8e3a51dfb4d5ae hwmon: coretemp: update hotplug condition check
>
> == pkgtemp ==
> 0eae7799000cdf0c2ed596c39bfb71030809fc71 x86/hwmon: pkgtemp has no dependency on PCI
> f6aeccdb96fc0555e939dd507702922f07dcbcbb x86/hwmon: fix initialization of pkgtemp
> d172132f358552eabd7a7410e478ffeead445243 x86/hwmon: don't leak device attribute file from pkgtemp_probe() and pkgtemp_remove()
> d9bca4358286584cc22f4261ee3a60cad01aa4d4 x86/hwmon: avoid deadlock on CPU removal in pkgtemp
>
> The above commits against the coretemp and pkgtemp drivers appear to be
> small reasonable changes and only touch the coretemp and pkgtemp
> drivers.  They can all be cleanly cherry-picked into Maverick with the
> exception of a4659053 which had a minor conflict to fix up.
>
> I've subsequently opened a new tracking bug for the above commits to be
> considered for Maverick SRU:
>
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/664181
>
> I've also pushed both the coretemp and pkgtemp patches to my
> ubuntu-maverick repo at branch lp664181 for easier review:
>
> The following changes since commit d1dfa2de39451a3041654714575d2ba817508cb3:
>
>    ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers
>
> are available in the git repository at:
>
>    git://kernel.ubuntu.com/ogasawara/ubuntu-maverick.git lp664181
>
> I've also built a test kernel with the above coretemp and pkgtemp
> patches applied.  Testing does not appear to exhibit any regressions.
>
> Acked-by: Leann Ogasawara<leann.ogasawara at canonical.com>
>
> Thanks,
> Leann
>
>> -----Original Message-----
>> From: Leann Ogasawara [mailto:leann.ogasawara at canonical.com]
>> Sent: Thursday, October 14, 2010 6:14 AM
>> To: Zhao, Yingying
>> Cc: Ubuntu Kernel Team
>> Subject: Re: [Maverick] SRU: Fixes for coretemp and pkgtemp
>>
>> Hi Yingying,
>>
>> Just curious if these have been submitted to upstream stable as well?
>> Additional comments inlined below...
>>
>> On Sat, 2010-10-09 at 16:28 +0800, Zhao, Yingying wrote:
>>> BugLink: http://bugs.launchpad.net/bugs/601073
>>>
>>> SRU Justification:
>>> The following commits fix some coretemp/pkgtemp bugs, please consider
>>> to apply them to Maverick.
>>>
>>> commit 89a3fd35ba0318a7208e2c8d8ca6189f567d4a93
>>> x86/hwmon: fix module init for hotplug-but-no-device-found case
>>
>> It seems the above fix is dependent on having applied the following
>> commit.  However, we don't have the following commit applied in
>> Maverick.  So I assume we want this patch as well?
>>
>> commit 0dca94baeab4a1a514841b0a4c8e3a51dfb4d5ae
>> Author: Chen Gong<gong.chen at linux.intel.com>
>> Date:   Mon Aug 9 17:21:09 2010 -0700
>>
>>      hwmon: coretemp: update hotplug condition check
>>
>> It also appears that it would be beneficial to add the following as
>> well.  Should this also be considered?
>>
>> commit 851b29cb3b196cb66452ec964ab5f66c9c9cd1ed
>> Author: Chen Gong<gong.chen at linux.intel.com>
>> Date:   Mon Aug 9 17:21:10 2010 -0700
>>
>>      hwmon: coretemp: enable coretemp device add operation failure
>>
>> By adding the additional two patches noted above, this allows for clean
>> cherry-picks of all the commits with the exception of a4659053 (which is
>> a simple manual fix up).
>>
>> Thanks,
>> Leann
>>
>>> commit d172132f358552eabd7a7410e478ffeead445243
>>> x86/hwmon: don't leak device attribute file from pkgtemp_probe() and
>>> pkgtemp_remove()
>>>
>>> commit d9bca4358286584cc22f4261ee3a60cad01aa4d4
>>> x86/hwmon: avoid deadlock on CPU removal in pkgtemp
>>>
>>> commit a46590533ad7b0f3f640732081d7e1658145c0ba
>>> x86/hwmon: fix initialization of coretemp
>>>
>>> commit f6aeccdb96fc0555e939dd507702922f07dcbcbb
>>> x86/hwmon: fix initialization of pkgtemp
>>>
>>> commit e40cc4bdfd4b89813f072f72bd9c7055814d3f0f
>>> x86/hwmon: register alternate sibling upon CPU removal
>>>
>>> commit 0eae7799000cdf0c2ed596c39bfb71030809fc71
>>> x86/hwmon: pkgtemp has no dependency on PCI
>>>
>>> Thanks,
>>> Yingying
>>>
>>
>>
>
>
>

Acked-by: Brad Figg <brad.figg at canonical.com>

-- 
Brad Figg brad.figg at canonical.com http://www.canonical.com