diff for duplicates of <5523ECC4.9010609@fr.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 982de36..f78902c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,44 +1,73 @@ -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 +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 <clg@fr.ibm.com> +>> --- +>> 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, +>> +> diff --git a/a/content_digest b/N1/content_digest index 8442dc7..337b1f6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,8 @@ "ref\01427883306-32528-5-git-send-email-clg@fr.ibm.com\0" "ref\0551EB692.3010309@roeck-us.net\0" "From\0Cedric Le Goater <clg@fr.ibm.com>\0" - "Subject\0Re: [lm-sensors] [PATCH 4/4] hwmon: (ibmpowernv) pretty print labels\0" - "Date\0Tue, 07 Apr 2015 14:42:12 +0000\0" + "Subject\0Re: [PATCH 4/4] hwmon: (ibmpowernv) pretty print labels\0" + "Date\0Tue, 07 Apr 2015 16:42:12 +0200\0" "To\0Guenter Roeck <linux@roeck-us.net>" " lm-sensors@lm-sensors.org\0" "Cc\0Stewart Smith <stewart@linux.vnet.ibm.com>" @@ -13,49 +13,78 @@ " Jean Delvare <jdelvare@suse.de>\0" "\00:1\0" "b\0" - "T24gMDQvMDMvMjAxNSAwNTo0OSBQTSwgR3VlbnRlciBSb2VjayB3cm90ZToKPiBPbiAwNC8wMS8y\n" - "MDE1IDAzOjE1IEFNLCBDw6lkcmljIExlIEdvYXRlciB3cm90ZToKPj4gVGhlIG5ldyBPUEFMIGRl\n" - "dmljZSB0cmVlIGFkZHMgYSBmZXcgcHJvcGVydGllcyB3aGljaCBjYW4gYmUgdXNlZCB0byBhZGQK\n" - "Pj4gZXh0cmEgaW5mb3JtYXRpb24gb24gdGhlIHNlbnNvciBsYWJlbC4KPj4KPj4gU2lnbmVkLW9m\n" - "Zi1ieTogQ8OpZHJpYyBMZSBHb2F0ZXIgPGNsZ0Bmci5pYm0uY29tPgo+PiAtLS0KPj4gICBkcml2\n" - "ZXJzL2h3bW9uL2libXBvd2VybnYuYyB8ICAgMjIgKysrKysrKysrKysrKysrKysrKysrKwo+PiAg\n" - "IDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspCj4+Cj4+IGRpZmYgLS1naXQgYS9kcml2\n" - "ZXJzL2h3bW9uL2libXBvd2VybnYuYyBiL2RyaXZlcnMvaHdtb24vaWJtcG93ZXJudi5jCj4+IGlu\n" - "ZGV4IGJlNmZlNTU5YjUyYS4uM2U3NTNjMjE1YjQwIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2h3\n" - "bW9uL2libXBvd2VybnYuYwo+PiArKysgYi9kcml2ZXJzL2h3bW9uL2libXBvd2VybnYuYwo+PiBA\n" - "QCAtMTEzLDkgKzExMywzMSBAQCBzdGF0aWMgc3NpemVfdCBzaG93X2xhYmVsKHN0cnVjdCBkZXZp\n" - "Y2UgKmRldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmRldmF0dHIsCj4+ICAgc3RhdGljIHZv\n" - "aWQgX19pbml0IG1ha2Vfc2Vuc29yX2xhYmVsKHN0cnVjdCBkZXZpY2Vfbm9kZSAqbnAsCj4+ICAg\n" - "ICAgICAgICAgICAgc3RydWN0IHNlbnNvcl9kYXRhICpzZGF0YSwgY29uc3QgY2hhciAqbGFiZWwp\n" - "Cj4+ICAgewo+PiArICAgIHUzMiBpZDsKPj4gICAgICAgc2l6ZV90IG47Cj4+Cj4+ICAgICAgIG4g\n" - "PSBzbnByaW50ZihzZGF0YS0+bGFiZWwsIHNpemVvZihzZGF0YS0+bGFiZWwpLCAiJXMiLCBsYWJl\n" - "bCk7Cj4+ICsKPj4gKyAgICAvKgo+PiArICAgICAqIENvcmUgdGVtcCBwcmV0dHkgcHJpbnQKPj4g\n" - "KyAgICAgKi8KPj4gKyAgICBpZiAoIW9mX3Byb3BlcnR5X3JlYWRfdTMyKG5wLCAiaWJtLHBpciIs\n" - "ICZpZCkpIHsKPj4gKyAgICAgICAgaW50IGk7Cj4+ICsKPj4gKyAgICAgICAgZm9yX2VhY2hfcG9z\n" - "c2libGVfY3B1KGkpCj4+ICsgICAgICAgICAgICBpZiAocGFjYVtpXS5od19jcHVfaWQgPT0gaWQp\n" - "Cj4+ICsgICAgICAgICAgICAgICAgYnJlYWs7Cj4+ICsKPj4gKyAgICAgICAgbiArPSBzbnByaW50\n" - "ZihzZGF0YS0+bGFiZWwgKyBuLCBzaXplb2Yoc2RhdGEtPmxhYmVsKSAtIG4sCj4+ICsgICAgICAg\n" - "ICAgICAgICAgICAiICVkLSVkIiwgaSwgaSs3KTsKPiAKPiBJZiBpYm0scGlyIHBvaW50cyB0byBh\n" - "IGJhZC9pbnZhbGlkIENQVSBpZCB5b3UganVzdCBwcmludCBhbiBpbnZhbGlkIHZhbHVlLgo+IElz\n" - "IHRoYXQgd2hhdCB5b3Ugd2FudCA/IAoKQ2VydGFpbmx5IG5vdCA6KSBJIGFtIGJlaW5nIG92ZXIg\n" - "b3B0aW1pc3RpYyBvbiB0aGUgdW5kZXJseWluZyBsYXllci4gCgo+IEFsc28sIHdoYXQgcmVsZXZh\n" - "bmNlIGRvZXMgJ2knIGhhdmUgZm9yIHRoZSB1c2VyID8KPiBJdCBpcyB0aGUgaW5kZXggaW50byB0\n" - "aGUgcGFjYSBhcnJheSwgc3VyZSwgYnV0IHdoYXQgaXMgaXRzIHJlbGV2YW5jZQo+IG91dHNpZGUg\n" - "dGhpcyBjb2RlLCBlc3BlY2lhbGx5IGluIHRoZSBjb250ZXh0IG9mIHlvdSBwcmludGluZyBib3Ro\n" - "IGkgYW5kIGkrNyA/CgpJdCBnaXZlcyBhIGhpbnQgb24gdGhlIGxvY2FsaXphdGlvbiBvZiB0aGUg\n" - "Y29yZSBpbiB0aGUgc3lzdGVtLCB3aGljaApjYW4gYmUgdXNlZnVsIHdoZW4gZGV2ZWxvcGluZyBj\n" - "dXN0b20gaGVhdCBzaW5rcy4gVGhlIHRyYW5zbGF0aW9uIApmcm9tIHBoeXNpY2FsIHRvIGxpbnV4\n" - "IGNwdSBpZCBpcyBoZXJlIHRvIGJlIGNvbnNpc3RlbnQgd2l0aCB0aGUgdXNlcgpsYXllci4gVGhl\n" - "IHBoeXNpY2FsIGlkIGlzIHJhcmVseSB1c2VkIGF0IHRoYXQgbGV2ZWwuICAKCkkgd2lsbCBzZW5k\n" - "IGEgdjIgZm9yIHRoaXMgcGF0Y2guCgpUaGFua3MsCgpDLgogCgo+IAo+IEd1ZW50ZXIKPiAKPj4g\n" - "KyAgICB9Cj4+ICsKPj4gKyAgICAvKgo+PiArICAgICAqIE1lbWJ1ZmZlciBwcmV0dHkgcHJpbnQK\n" - "Pj4gKyAgICAgKi8KPj4gKyAgICBpZiAoIW9mX3Byb3BlcnR5X3JlYWRfdTMyKG5wLCAiaWJtLGNo\n" - "aXAtaWQiLCAmaWQpKQo+PiArICAgICAgICBuICs9IHNucHJpbnRmKHNkYXRhLT5sYWJlbCArIG4s\n" - "IHNpemVvZihzZGF0YS0+bGFiZWwpIC0gbiwKPj4gKyAgICAgICAgICAgICAgICAgICIgJWQiLCBp\n" - "ZCAmIDB4ZmZmZik7Cj4+ICAgfQo+Pgo+PiAgIHN0YXRpYyBpbnQgZ2V0X3NlbnNvcl9pbmRleF9h\n" - "dHRyKGNvbnN0IGNoYXIgKm5hbWUsIHUzMiAqaW5kZXgsCj4+Cj4gCgoKX19fX19fX19fX19fX19f\n" - "X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbG0tc2Vuc29ycyBtYWlsaW5nIGxpc3QK\n" - "bG0tc2Vuc29yc0BsbS1zZW5zb3JzLm9yZwpodHRwOi8vbGlzdHMubG0tc2Vuc29ycy5vcmcvbWFp\n" - bG1hbi9saXN0aW5mby9sbS1zZW5zb3Jz + "On 04/03/2015 05:49 PM, Guenter Roeck wrote:\n" + "> On 04/01/2015 03:15 AM, C\303\251dric Le Goater wrote:\n" + ">> The new OPAL device tree adds a few properties which can be used to add\n" + ">> extra information on the sensor label.\n" + ">>\n" + ">> Signed-off-by: C\303\251dric Le Goater <clg@fr.ibm.com>\n" + ">> ---\n" + ">> drivers/hwmon/ibmpowernv.c | 22 ++++++++++++++++++++++\n" + ">> 1 file changed, 22 insertions(+)\n" + ">>\n" + ">> diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c\n" + ">> index be6fe559b52a..3e753c215b40 100644\n" + ">> --- a/drivers/hwmon/ibmpowernv.c\n" + ">> +++ b/drivers/hwmon/ibmpowernv.c\n" + ">> @@ -113,9 +113,31 @@ static ssize_t show_label(struct device *dev, struct device_attribute *devattr,\n" + ">> static void __init make_sensor_label(struct device_node *np,\n" + ">> struct sensor_data *sdata, const char *label)\n" + ">> {\n" + ">> + u32 id;\n" + ">> size_t n;\n" + ">>\n" + ">> n = snprintf(sdata->label, sizeof(sdata->label), \"%s\", label);\n" + ">> +\n" + ">> + /*\n" + ">> + * Core temp pretty print\n" + ">> + */\n" + ">> + if (!of_property_read_u32(np, \"ibm,pir\", &id)) {\n" + ">> + int i;\n" + ">> +\n" + ">> + for_each_possible_cpu(i)\n" + ">> + if (paca[i].hw_cpu_id == id)\n" + ">> + break;\n" + ">> +\n" + ">> + n += snprintf(sdata->label + n, sizeof(sdata->label) - n,\n" + ">> + \" %d-%d\", i, i+7);\n" + "> \n" + "> If ibm,pir points to a bad/invalid CPU id you just print an invalid value.\n" + "> Is that what you want ? \n" + "\n" + "Certainly not :) I am being over optimistic on the underlying layer. \n" + "\n" + "> Also, what relevance does 'i' have for the user ?\n" + "> It is the index into the paca array, sure, but what is its relevance\n" + "> outside this code, especially in the context of you printing both i and i+7 ?\n" + "\n" + "It gives a hint on the localization of the core in the system, which\n" + "can be useful when developing custom heat sinks. The translation \n" + "from physical to linux cpu id is here to be consistent with the user\n" + "layer. The physical id is rarely used at that level. \n" + "\n" + "I will send a v2 for this patch.\n" + "\n" + "Thanks,\n" + "\n" + "C.\n" + " \n" + "\n" + "> \n" + "> Guenter\n" + "> \n" + ">> + }\n" + ">> +\n" + ">> + /*\n" + ">> + * Membuffer pretty print\n" + ">> + */\n" + ">> + if (!of_property_read_u32(np, \"ibm,chip-id\", &id))\n" + ">> + n += snprintf(sdata->label + n, sizeof(sdata->label) - n,\n" + ">> + \" %d\", id & 0xffff);\n" + ">> }\n" + ">>\n" + ">> static int get_sensor_index_attr(const char *name, u32 *index,\n" + ">>\n" + > -0da9472035d8682424afe061990483a7c042d28772053b312755c01f49aa4dd1 +cbe9b702a7db365be9edd93adf8cf3e3e827e7878575797a8886f5dd0dc4bd9a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.