From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cedric Le Goater Date: Tue, 07 Apr 2015 14:42:12 +0000 Subject: Re: [lm-sensors] [PATCH 4/4] hwmon: (ibmpowernv) pretty print labels Message-Id: <5523ECC4.9010609@fr.ibm.com> List-Id: References: <1426787085-9004-1-git-send-email-clg@fr.ibm.com> <1427883306-32528-5-git-send-email-clg@fr.ibm.com> <551EB692.3010309@roeck-us.net> In-Reply-To: <551EB692.3010309@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Guenter Roeck , lm-sensors@lm-sensors.org Cc: Stewart Smith , Neelesh Gupta , skiboot@lists.ozlabs.org, linuxppc-dev@lists.ozlabs.org, Jean Delvare T24gMDQvMDMvMjAxNSAwNTo0OSBQTSwgR3VlbnRlciBSb2VjayB3cm90ZToKPiBPbiAwNC8wMS8y MDE1IDAzOjE1IEFNLCBDw6lkcmljIExlIEdvYXRlciB3cm90ZToKPj4gVGhlIG5ldyBPUEFMIGRl dmljZSB0cmVlIGFkZHMgYSBmZXcgcHJvcGVydGllcyB3aGljaCBjYW4gYmUgdXNlZCB0byBhZGQK Pj4gZXh0cmEgaW5mb3JtYXRpb24gb24gdGhlIHNlbnNvciBsYWJlbC4KPj4KPj4gU2lnbmVkLW9m Zi1ieTogQ8OpZHJpYyBMZSBHb2F0ZXIgPGNsZ0Bmci5pYm0uY29tPgo+PiAtLS0KPj4gICBkcml2 ZXJzL2h3bW9uL2libXBvd2VybnYuYyB8ICAgMjIgKysrKysrKysrKysrKysrKysrKysrKwo+PiAg IDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspCj4+Cj4+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2h3bW9uL2libXBvd2VybnYuYyBiL2RyaXZlcnMvaHdtb24vaWJtcG93ZXJudi5jCj4+IGlu ZGV4IGJlNmZlNTU5YjUyYS4uM2U3NTNjMjE1YjQwIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2h3 bW9uL2libXBvd2VybnYuYwo+PiArKysgYi9kcml2ZXJzL2h3bW9uL2libXBvd2VybnYuYwo+PiBA QCAtMTEzLDkgKzExMywzMSBAQCBzdGF0aWMgc3NpemVfdCBzaG93X2xhYmVsKHN0cnVjdCBkZXZp Y2UgKmRldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmRldmF0dHIsCj4+ICAgc3RhdGljIHZv aWQgX19pbml0IG1ha2Vfc2Vuc29yX2xhYmVsKHN0cnVjdCBkZXZpY2Vfbm9kZSAqbnAsCj4+ICAg ICAgICAgICAgICAgc3RydWN0IHNlbnNvcl9kYXRhICpzZGF0YSwgY29uc3QgY2hhciAqbGFiZWwp Cj4+ICAgewo+PiArICAgIHUzMiBpZDsKPj4gICAgICAgc2l6ZV90IG47Cj4+Cj4+ICAgICAgIG4g PSBzbnByaW50ZihzZGF0YS0+bGFiZWwsIHNpemVvZihzZGF0YS0+bGFiZWwpLCAiJXMiLCBsYWJl bCk7Cj4+ICsKPj4gKyAgICAvKgo+PiArICAgICAqIENvcmUgdGVtcCBwcmV0dHkgcHJpbnQKPj4g KyAgICAgKi8KPj4gKyAgICBpZiAoIW9mX3Byb3BlcnR5X3JlYWRfdTMyKG5wLCAiaWJtLHBpciIs ICZpZCkpIHsKPj4gKyAgICAgICAgaW50IGk7Cj4+ICsKPj4gKyAgICAgICAgZm9yX2VhY2hfcG9z c2libGVfY3B1KGkpCj4+ICsgICAgICAgICAgICBpZiAocGFjYVtpXS5od19jcHVfaWQgPT0gaWQp Cj4+ICsgICAgICAgICAgICAgICAgYnJlYWs7Cj4+ICsKPj4gKyAgICAgICAgbiArPSBzbnByaW50 ZihzZGF0YS0+bGFiZWwgKyBuLCBzaXplb2Yoc2RhdGEtPmxhYmVsKSAtIG4sCj4+ICsgICAgICAg ICAgICAgICAgICAiICVkLSVkIiwgaSwgaSs3KTsKPiAKPiBJZiBpYm0scGlyIHBvaW50cyB0byBh IGJhZC9pbnZhbGlkIENQVSBpZCB5b3UganVzdCBwcmludCBhbiBpbnZhbGlkIHZhbHVlLgo+IElz IHRoYXQgd2hhdCB5b3Ugd2FudCA/IAoKQ2VydGFpbmx5IG5vdCA6KSBJIGFtIGJlaW5nIG92ZXIg b3B0aW1pc3RpYyBvbiB0aGUgdW5kZXJseWluZyBsYXllci4gCgo+IEFsc28sIHdoYXQgcmVsZXZh bmNlIGRvZXMgJ2knIGhhdmUgZm9yIHRoZSB1c2VyID8KPiBJdCBpcyB0aGUgaW5kZXggaW50byB0 aGUgcGFjYSBhcnJheSwgc3VyZSwgYnV0IHdoYXQgaXMgaXRzIHJlbGV2YW5jZQo+IG91dHNpZGUg dGhpcyBjb2RlLCBlc3BlY2lhbGx5IGluIHRoZSBjb250ZXh0IG9mIHlvdSBwcmludGluZyBib3Ro IGkgYW5kIGkrNyA/CgpJdCBnaXZlcyBhIGhpbnQgb24gdGhlIGxvY2FsaXphdGlvbiBvZiB0aGUg Y29yZSBpbiB0aGUgc3lzdGVtLCB3aGljaApjYW4gYmUgdXNlZnVsIHdoZW4gZGV2ZWxvcGluZyBj dXN0b20gaGVhdCBzaW5rcy4gVGhlIHRyYW5zbGF0aW9uIApmcm9tIHBoeXNpY2FsIHRvIGxpbnV4 IGNwdSBpZCBpcyBoZXJlIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCB0aGUgdXNlcgpsYXllci4gVGhl IHBoeXNpY2FsIGlkIGlzIHJhcmVseSB1c2VkIGF0IHRoYXQgbGV2ZWwuICAKCkkgd2lsbCBzZW5k IGEgdjIgZm9yIHRoaXMgcGF0Y2guCgpUaGFua3MsCgpDLgogCgo+IAo+IEd1ZW50ZXIKPiAKPj4g KyAgICB9Cj4+ICsKPj4gKyAgICAvKgo+PiArICAgICAqIE1lbWJ1ZmZlciBwcmV0dHkgcHJpbnQK Pj4gKyAgICAgKi8KPj4gKyAgICBpZiAoIW9mX3Byb3BlcnR5X3JlYWRfdTMyKG5wLCAiaWJtLGNo aXAtaWQiLCAmaWQpKQo+PiArICAgICAgICBuICs9IHNucHJpbnRmKHNkYXRhLT5sYWJlbCArIG4s IHNpemVvZihzZGF0YS0+bGFiZWwpIC0gbiwKPj4gKyAgICAgICAgICAgICAgICAgICIgJWQiLCBp ZCAmIDB4ZmZmZik7Cj4+ICAgfQo+Pgo+PiAgIHN0YXRpYyBpbnQgZ2V0X3NlbnNvcl9pbmRleF9h dHRyKGNvbnN0IGNoYXIgKm5hbWUsIHUzMiAqaW5kZXgsCj4+Cj4gCgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbG0tc2Vuc29ycyBtYWlsaW5nIGxpc3QK bG0tc2Vuc29yc0BsbS1zZW5zb3JzLm9yZwpodHRwOi8vbGlzdHMubG0tc2Vuc29ycy5vcmcvbWFp bG1hbi9saXN0aW5mby9sbS1zZW5zb3Jz From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e06smtp17.uk.ibm.com (e06smtp17.uk.ibm.com [195.75.94.113]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id F0EF51A084E for ; Wed, 8 Apr 2015 00:42:23 +1000 (AEST) Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Apr 2015 15:42:19 +0100 Message-ID: <5523ECC4.9010609@fr.ibm.com> Date: Tue, 07 Apr 2015 16:42:12 +0200 From: Cedric Le Goater MIME-Version: 1.0 To: Guenter Roeck , lm-sensors@lm-sensors.org Subject: Re: [PATCH 4/4] hwmon: (ibmpowernv) pretty print labels References: <1426787085-9004-1-git-send-email-clg@fr.ibm.com> <1427883306-32528-5-git-send-email-clg@fr.ibm.com> <551EB692.3010309@roeck-us.net> In-Reply-To: <551EB692.3010309@roeck-us.net> Content-Type: text/plain; charset=utf-8 Cc: Stewart Smith , Neelesh Gupta , skiboot@lists.ozlabs.org, linuxppc-dev@lists.ozlabs.org, Jean Delvare List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 04/03/2015 05:49 PM, Guenter Roeck wrote: > On 04/01/2015 03:15 AM, Cédric Le Goater wrote: >> The new OPAL device tree adds a few properties which can be used to add >> extra information on the sensor label. >> >> Signed-off-by: Cédric Le Goater >> --- >> drivers/hwmon/ibmpowernv.c | 22 ++++++++++++++++++++++ >> 1 file changed, 22 insertions(+) >> >> diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c >> index be6fe559b52a..3e753c215b40 100644 >> --- a/drivers/hwmon/ibmpowernv.c >> +++ b/drivers/hwmon/ibmpowernv.c >> @@ -113,9 +113,31 @@ static ssize_t show_label(struct device *dev, struct device_attribute *devattr, >> static void __init make_sensor_label(struct device_node *np, >> struct sensor_data *sdata, const char *label) >> { >> + u32 id; >> size_t n; >> >> n = snprintf(sdata->label, sizeof(sdata->label), "%s", label); >> + >> + /* >> + * Core temp pretty print >> + */ >> + if (!of_property_read_u32(np, "ibm,pir", &id)) { >> + int i; >> + >> + for_each_possible_cpu(i) >> + if (paca[i].hw_cpu_id == id) >> + break; >> + >> + n += snprintf(sdata->label + n, sizeof(sdata->label) - n, >> + " %d-%d", i, i+7); > > If ibm,pir points to a bad/invalid CPU id you just print an invalid value. > Is that what you want ? Certainly not :) I am being over optimistic on the underlying layer. > Also, what relevance does 'i' have for the user ? > It is the index into the paca array, sure, but what is its relevance > outside this code, especially in the context of you printing both i and i+7 ? It gives a hint on the localization of the core in the system, which can be useful when developing custom heat sinks. The translation from physical to linux cpu id is here to be consistent with the user layer. The physical id is rarely used at that level. I will send a v2 for this patch. Thanks, C. > > Guenter > >> + } >> + >> + /* >> + * Membuffer pretty print >> + */ >> + if (!of_property_read_u32(np, "ibm,chip-id", &id)) >> + n += snprintf(sdata->label + n, sizeof(sdata->label) - n, >> + " %d", id & 0xffff); >> } >> >> static int get_sensor_index_attr(const char *name, u32 *index, >> >