Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <bb71721b-ba20-90d9-df35-aff3c175194e@intel.com>
Date:   Thu, 5 Jan 2023 15:27:03 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: linux-next: manual merge of the thermal tree with the pm tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Lezcano <daniel.lezcano@linaro.org>
CC:     Daniel Lezcano <daniel.lezcano@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Zhang Rui <rui.zhang@intel.com>,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>
References: <20230105101054.108ad186@canb.auug.org.au>
 <20230105103519.4e849420@canb.auug.org.au>
From:   "Wysocki, Rafael J" <rafael.j.wysocki@intel.com>
In-Reply-To: <20230105103519.4e849420@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WHRqMzU1RmtoM1Z6aElHVGwzYUlNVlN6MTB0S3Nmd092ZGpCbFk0dVV6SnBF?=
 =?utf-8?B?Y0t0Zy81MWVzdFltVXBiY0hoQXJpaUlzSmdIckdnb2hwYXY5c1A0d0ZzV2Uy?=
 =?utf-8?B?R1ZPRGV5YURnNW9aNWt1OC9qV1dGajVRY3FwWXNBTkdxUG1iODJRVWZTcE1t?=
 =?utf-8?B?a2VGUkpKeTJXN2NSUWhnaS80LzJ0OU9hR3E3cGFUMHpZSVVBWVFnZ1FkcHMr?=
 =?utf-8?B?dEdvWW1KRnhJRFRnLzFLR1ZTSFNHZUdDdzk2VVoyTVdHWnBoVU1OaDg4MmVu?=
 =?utf-8?B?eTM1K1FKMzMwRGU0QWdXM1EraStzWHRCei91bTc1ZVRBWDZsNkQveU51NFp3?=
 =?utf-8?B?WnNYV3JnOUhjZjZtVkZmM0FCUUt2MmYyV1ZBQ2x1eWhYNTdFWkpvRkI3Slpr?=
 =?utf-8?B?RU9mNVRxNzNFSFNBODExaHdTZFYyL2laT3N0UlFqWXg4NUNBZndhd3NKeFBu?=
 =?utf-8?B?MUVVT0V6WHc3UXdXZzZHR25ZaHBDU1pDZExpZnJKUGtpNEUzcWRrTTU3Z0NK?=
 =?utf-8?B?RlI5WktKWFhBVldMQnovRVkrYmtLS0QxcEI0T2xsdFQyV2xpdUkyajY0S01S?=
 =?utf-8?B?V0dlSm12RXJoUC95TGRieVY4akpTbHVneTdLbVJ3d1NMdTY3YzdLTG5iNVdo?=
 =?utf-8?B?VEJ5ZUxPOVBhaHFrVHZKTGplbzBnd3JWaW9QdkJob2YxOEJpOUl4OEZNMmZm?=
 =?utf-8?B?djlMSHI2Qks2ZGtQSmZIdFNPUy9jczFtWis2bjNCaVUrb0JzWlJ3VFlVbHRD?=
 =?utf-8?B?TjZiSjVwK2pQSkFYUHZNYXB0eDNUbFBqdVJwTUFvUXF1NFNsbWpvRERRQTVj?=
 =?utf-8?B?WERwNWZFODdyOWxKc0N3Q3dvR29nN2tmdU5Hd2ZWejNwelFkT012S25XMWJR?=
 =?utf-8?B?K0JaQXBLb0VUWEVmL0tJR3ZKbDNnMm11ZklpeXJhUk5Ud3labjJ1cDdzSG9v?=
 =?utf-8?B?dzRSSVRSbk45blljR085eDd3QnhUSjUvZXJ6NnFpWUt3a0J5TllITmpIUWtn?=
 =?utf-8?B?YTVOVkdFSldYc2o5ams4QTFBYzVhTnNoNHV3SVpKZ294MWhUeThmNHE0SS9F?=
 =?utf-8?B?ejVEU3FITGJ6SGZldmFJV3FYWHQ2enRyTE1mQWpZZHlRTm82UkRsRGpUNS9y?=
 =?utf-8?B?ajl2YUJZdURFMEJVdVF1YXlTOVN1cXEzVnFEVWhxc3ltMGxHT3k2bjhOTjdX?=
 =?utf-8?B?bWtoQVl4YUc1TFh1R0xiUGROVDV5Q3NDOWdjbDdkNkM0K3c2Q0lVUzhnSkQ1?=
 =?utf-8?B?YXA0WDRYcGI1T1pYTXNDdG9LNTgzK1NvZkYwVkpJS3pQczhFUm5CN2tHZTV0?=
 =?utf-8?B?cTA5UnpuSTB1d0paQUdyVDNQWDdBTTkwUU1jbVZwcTFwdDQzWXdsS1RQVmhY?=
 =?utf-8?B?WnIyZWEwNTQwUnM1MnpCdFp4ZXlWMnEwZEpkRkZEVG81dU8wZ1ljVmpWYUlL?=
 =?utf-8?B?MXU1SmkyM1BIZkJRdzR1R05RVFR4bmlPSTRGbGFQYkxDYlhjVFpNa3NiRXk0?=
 =?utf-8?B?UlF1R0JYS0ZraWp1NE50ZFRjdHZ6MFkwa2k0WS9Fd0sxUHFuQnJYZ1JWKy9Z?=
 =?utf-8?B?SmZrdWV6RDFCODJ4RjZib1NUb0E2UkljNi9QWG1JUnp6TWYzdjh3d3VGU1Jt?=
 =?utf-8?B?SUxmWkllbGdYZUdnNVE4Qks3bHlHK2J4akc2K0E4dFkrZnd0dVZVUVhBRzA4?=
 =?utf-8?B?L0dNU1JSbTV3MjNlbWxoK1VrMjVXbWtKUjJMU1doelhaQmxqVGdBbEVTSFRX?=
 =?utf-8?B?ZXNZWk1GUm0xMFVkTGlMTG9qb2VNbGlvT08wTnAxUlFUYTJYM1lnYW5zN0E0?=
 =?utf-8?B?bW1LZk5WNHVOMWJEKzcwTENaM3VRdjlNaEhzRG9VWW9YTTlheCtsb0tuT2xU?=
 =?utf-8?B?b2dvWnRvcnpCRTVmNTdTWmNXYS9LRTRQcGwxOEJqZ1VZTmpQVTBhUUpzdWFi?=
 =?utf-8?B?S2R3TU9GRkpiZURaT2x0eTlNdFNEdVhmYkRKUzFGZm9nNm01UG9ESzdydXYy?=
 =?utf-8?B?RDVsbnlteENkUVpydG5jbWhEdkt2dStQaGRETnlrbzB0Nlp6aUZMSGRJSVVt?=
 =?utf-8?B?WDhrM2lRY0tMNGk2SkFkOTl2QVlONGx1VzFNc2p4Zkp2Tlc1NUhGM2RBWmhN?=
 =?utf-8?B?NnllamE0bFV3Y3pJRHF1eGpmSkkwWkdrRVlwZ0JNa2RISFd2SDdHOFJUanVw?=
 =?utf-8?B?aEE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 598ca375-e095-40b7-1ba7-08daef28ee4e
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5810.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2023 14:27:10.5467
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eHqLB6lNGqtMwmL6/T6JkGRZryY+/K9hre3BKQq2PVUFsVKFwI5vRJiHWrGDw7B/JHQknthM7bWesnHMYHJsUwmvGk/YIHoDVEQYm8hoVq4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5498
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 1/5/2023 12:35 AM, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 5 Jan 2023 10:10:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the thermal tree got a conflict in:
>>
>>    drivers/thermal/intel/x86_pkg_temp_thermal.c
>>
>> between commit:
>>
>>    58374a3970a0 ("thermal/x86_pkg_temp_thermal: Add support for handling dynamic tjmax")
>>
>> from the pm tree and commit:
>>
>>    03b2e86a24aa ("thermal/drivers/intel: Use generic thermal_zone_get_trip() function")
>>
>> from the thermal tree.

I'm wondering why the above commit is in the linux-next branch of the 
thermal tree, though.

It is still under review AFAICS.

Daniel, can you possibly create a bleeding-edge branch for such things?  
I can merge it into my bleeding-edge branch on a daily basis.


>> 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.
> Actually, the resolution I needed was this:
>
> diff --cc drivers/thermal/intel/x86_pkg_temp_thermal.c
> index 9e08d8c8f5fb,494f25250c2d..24c7774cc4a9
> --- a/drivers/thermal/intel/x86_pkg_temp_thermal.c
> +++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
> @@@ -107,56 -108,37 +108,17 @@@ static struct zone_device *pkg_temp_the
>    static int sys_get_curr_temp(struct thermal_zone_device *tzd, int *temp)
>    {
>    	struct zone_device *zonedev = tzd->devdata;
>   -	u32 eax, edx;
>   +	int val;
>    
>   -	rdmsr_on_cpu(zonedev->cpu, MSR_IA32_PACKAGE_THERM_STATUS,
>   -			&eax, &edx);
>   -	if (eax & 0x80000000) {
>   -		*temp = zonedev->tj_max - ((eax >> 16) & 0x7f) * 1000;
>   -		pr_debug("sys_get_curr_temp %d\n", *temp);
>   -		return 0;
>   -	}
>   -	return -EINVAL;
>   +	val = intel_tcc_get_temp(zonedev->cpu, true);
>   +	if (val < 0)
>   +		return val;
>   +
>   +	*temp = val * 1000;
>   +	pr_debug("sys_get_curr_temp %d\n", *temp);
>   +	return 0;
>    }
>    
> - static int sys_get_trip_temp(struct thermal_zone_device *tzd,
> - 			     int trip, int *temp)
> - {
> - 	struct zone_device *zonedev = tzd->devdata;
> - 	unsigned long thres_reg_value;
> - 	u32 mask, shift, eax, edx;
> - 	int tj_max, ret;
> -
> - 	if (trip >= MAX_NUMBER_OF_TRIPS)
> - 		return -EINVAL;
> -
> - 	if (trip) {
> - 		mask = THERM_MASK_THRESHOLD1;
> - 		shift = THERM_SHIFT_THRESHOLD1;
> - 	} else {
> - 		mask = THERM_MASK_THRESHOLD0;
> - 		shift = THERM_SHIFT_THRESHOLD0;
> - 	}
> -
> - 	tj_max = intel_tcc_get_tjmax(zonedev->cpu);
> - 	if (tj_max < 0)
> - 		return tj_max;
> - 	tj_max *= 1000;
> -
> - 	ret = rdmsr_on_cpu(zonedev->cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT,
> - 			   &eax, &edx);
> - 	if (ret < 0)
> - 		return ret;
> -
> - 	thres_reg_value = (eax & mask) >> shift;
> - 	if (thres_reg_value)
> - 		*temp = tj_max - thres_reg_value * 1000;
> - 	else
> - 		*temp = THERMAL_TEMP_INVALID;
> - 	pr_debug("sys_get_trip_temp %d\n", *temp);
> -
> - 	return 0;
> - }
> -
>    static int
>    sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp)
>    {
> @@@ -330,18 -340,25 +325,25 @@@ static int pkg_temp_thermal_device_add(
>    
>    	thres_count = clamp_val(thres_count, 0, MAX_NUMBER_OF_TRIPS);
>    
> - 	err = intel_tcc_get_tjmax(cpu);
> - 	if (err < 0)
>   -	err = get_tj_max(cpu, &tj_max);
>   -	if (err)
> --		return err;
> ++	tj_max = intel_tcc_get_tjmax(cpu);
> ++	if (tj_max < 0)
> ++		return tj_max;
> ++	tj_max *= 1000;
>    
>    	zonedev = kzalloc(sizeof(*zonedev), GFP_KERNEL);
>    	if (!zonedev)
>    		return -ENOMEM;
>    
> + 	zonedev->trips = pkg_temp_thermal_trips_init(cpu, tj_max, thres_count);
> + 	if (IS_ERR(zonedev->trips)) {
> + 		err = PTR_ERR(zonedev->trips);
> + 		goto out_kfree_zonedev;
> + 	}
> +
>    	INIT_DELAYED_WORK(&zonedev->work, pkg_temp_thermal_threshold_work_fn);
>    	zonedev->cpu = cpu;
> - 	zonedev->tzone = thermal_zone_device_register("x86_pkg_temp",
> - 			thres_count,
>   -	zonedev->tj_max = tj_max;
> + 	zonedev->tzone = thermal_zone_device_register_with_trips("x86_pkg_temp",
> + 			zonedev->trips, thres_count,
>    			(thres_count == MAX_NUMBER_OF_TRIPS) ? 0x03 : 0x01,
>    			zonedev, &tzone_ops, &pkg_temp_tz_params, 0, 0);
>    	if (IS_ERR(zonedev->tzone)) {
>