diff for duplicates of <551EB692.3010309@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index d811474..8c2882f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,33 +1,54 @@ -T24gMDQvMDEvMjAxNSAwMzoxNSBBTSwgQ8OpZHJpYyBMZSBHb2F0ZXIgd3JvdGU6Cj4gVGhlIG5l -dyBPUEFMIGRldmljZSB0cmVlIGFkZHMgYSBmZXcgcHJvcGVydGllcyB3aGljaCBjYW4gYmUgdXNl -ZCB0byBhZGQKPiBleHRyYSBpbmZvcm1hdGlvbiBvbiB0aGUgc2Vuc29yIGxhYmVsLgo+Cj4gU2ln -bmVkLW9mZi1ieTogQ8OpZHJpYyBMZSBHb2F0ZXIgPGNsZ0Bmci5pYm0uY29tPgo+IC0tLQo+ICAg -ZHJpdmVycy9od21vbi9pYm1wb3dlcm52LmMgfCAgIDIyICsrKysrKysrKysrKysrKysrKysrKysK -PiAgIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspCj4KPiBkaWZmIC0tZ2l0IGEvZHJp -dmVycy9od21vbi9pYm1wb3dlcm52LmMgYi9kcml2ZXJzL2h3bW9uL2libXBvd2VybnYuYwo+IGlu -ZGV4IGJlNmZlNTU5YjUyYS4uM2U3NTNjMjE1YjQwIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvaHdt -b24vaWJtcG93ZXJudi5jCj4gKysrIGIvZHJpdmVycy9od21vbi9pYm1wb3dlcm52LmMKPiBAQCAt -MTEzLDkgKzExMywzMSBAQCBzdGF0aWMgc3NpemVfdCBzaG93X2xhYmVsKHN0cnVjdCBkZXZpY2Ug -KmRldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmRldmF0dHIsCj4gICBzdGF0aWMgdm9pZCBf -X2luaXQgbWFrZV9zZW5zb3JfbGFiZWwoc3RydWN0IGRldmljZV9ub2RlICpucCwKPiAgIAkJICAg -IHN0cnVjdCBzZW5zb3JfZGF0YSAqc2RhdGEsIGNvbnN0IGNoYXIgKmxhYmVsKQo+ICAgewo+ICsJ -dTMyIGlkOwo+ICAgCXNpemVfdCBuOwo+Cj4gICAJbiA9IHNucHJpbnRmKHNkYXRhLT5sYWJlbCwg -c2l6ZW9mKHNkYXRhLT5sYWJlbCksICIlcyIsIGxhYmVsKTsKPiArCj4gKwkvKgo+ICsJICogQ29y -ZSB0ZW1wIHByZXR0eSBwcmludAo+ICsJICovCj4gKwlpZiAoIW9mX3Byb3BlcnR5X3JlYWRfdTMy -KG5wLCAiaWJtLHBpciIsICZpZCkpIHsKPiArCQlpbnQgaTsKPiArCj4gKwkJZm9yX2VhY2hfcG9z -c2libGVfY3B1KGkpCj4gKwkJCWlmIChwYWNhW2ldLmh3X2NwdV9pZCA9PSBpZCkKPiArCQkJCWJy -ZWFrOwo+ICsKPiArCQluICs9IHNucHJpbnRmKHNkYXRhLT5sYWJlbCArIG4sIHNpemVvZihzZGF0 -YS0+bGFiZWwpIC0gbiwKPiArCQkJICAgICAgIiAlZC0lZCIsIGksIGkrNyk7CgpJZiBpYm0scGly -IHBvaW50cyB0byBhIGJhZC9pbnZhbGlkIENQVSBpZCB5b3UganVzdCBwcmludCBhbiBpbnZhbGlk -IHZhbHVlLgpJcyB0aGF0IHdoYXQgeW91IHdhbnQgPyBBbHNvLCB3aGF0IHJlbGV2YW5jZSBkb2Vz -ICdpJyBoYXZlIGZvciB0aGUgdXNlciA/Ckl0IGlzIHRoZSBpbmRleCBpbnRvIHRoZSBwYWNhIGFy -cmF5LCBzdXJlLCBidXQgd2hhdCBpcyBpdHMgcmVsZXZhbmNlCm91dHNpZGUgdGhpcyBjb2RlLCBl -c3BlY2lhbGx5IGluIHRoZSBjb250ZXh0IG9mIHlvdSBwcmludGluZyBib3RoIGkgYW5kIGkrNyA/ -CgpHdWVudGVyCgo+ICsJfQo+ICsKPiArCS8qCj4gKwkgKiBNZW1idWZmZXIgcHJldHR5IHByaW50 -Cj4gKwkgKi8KPiArCWlmICghb2ZfcHJvcGVydHlfcmVhZF91MzIobnAsICJpYm0sY2hpcC1pZCIs -ICZpZCkpCj4gKwkJbiArPSBzbnByaW50ZihzZGF0YS0+bGFiZWwgKyBuLCBzaXplb2Yoc2RhdGEt -PmxhYmVsKSAtIG4sCj4gKwkJCSAgICAgICIgJWQiLCBpZCAmIDB4ZmZmZik7Cj4gICB9Cj4KPiAg -IHN0YXRpYyBpbnQgZ2V0X3NlbnNvcl9pbmRleF9hdHRyKGNvbnN0IGNoYXIgKm5hbWUsIHUzMiAq -aW5kZXgsCj4KCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f -XwpsbS1zZW5zb3JzIG1haWxpbmcgbGlzdApsbS1zZW5zb3JzQGxtLXNlbnNvcnMub3JnCmh0dHA6 -Ly9saXN0cy5sbS1zZW5zb3JzLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xtLXNlbnNvcnM +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 ? 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 ? + +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 ba3300a..55d9e29 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01426787085-9004-1-git-send-email-clg@fr.ibm.com\0" "ref\01427883306-32528-5-git-send-email-clg@fr.ibm.com\0" "From\0Guenter Roeck <linux@roeck-us.net>\0" - "Subject\0Re: [lm-sensors] [PATCH 4/4] hwmon: (ibmpowernv) pretty print labels\0" - "Date\0Fri, 03 Apr 2015 15:49:38 +0000\0" + "Subject\0Re: [PATCH 4/4] hwmon: (ibmpowernv) pretty print labels\0" + "Date\0Fri, 03 Apr 2015 08:49:38 -0700\0" "To\0C\303\251dric Le Goater <clg@fr.ibm.com>" " lm-sensors@lm-sensors.org\0" "Cc\0Stewart Smith <stewart@linux.vnet.ibm.com>" @@ -12,38 +12,59 @@ " Jean Delvare <jdelvare@suse.de>\0" "\00:1\0" "b\0" - "T24gMDQvMDEvMjAxNSAwMzoxNSBBTSwgQ8OpZHJpYyBMZSBHb2F0ZXIgd3JvdGU6Cj4gVGhlIG5l\n" - "dyBPUEFMIGRldmljZSB0cmVlIGFkZHMgYSBmZXcgcHJvcGVydGllcyB3aGljaCBjYW4gYmUgdXNl\n" - "ZCB0byBhZGQKPiBleHRyYSBpbmZvcm1hdGlvbiBvbiB0aGUgc2Vuc29yIGxhYmVsLgo+Cj4gU2ln\n" - "bmVkLW9mZi1ieTogQ8OpZHJpYyBMZSBHb2F0ZXIgPGNsZ0Bmci5pYm0uY29tPgo+IC0tLQo+ICAg\n" - "ZHJpdmVycy9od21vbi9pYm1wb3dlcm52LmMgfCAgIDIyICsrKysrKysrKysrKysrKysrKysrKysK\n" - "PiAgIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspCj4KPiBkaWZmIC0tZ2l0IGEvZHJp\n" - "dmVycy9od21vbi9pYm1wb3dlcm52LmMgYi9kcml2ZXJzL2h3bW9uL2libXBvd2VybnYuYwo+IGlu\n" - "ZGV4IGJlNmZlNTU5YjUyYS4uM2U3NTNjMjE1YjQwIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvaHdt\n" - "b24vaWJtcG93ZXJudi5jCj4gKysrIGIvZHJpdmVycy9od21vbi9pYm1wb3dlcm52LmMKPiBAQCAt\n" - "MTEzLDkgKzExMywzMSBAQCBzdGF0aWMgc3NpemVfdCBzaG93X2xhYmVsKHN0cnVjdCBkZXZpY2Ug\n" - "KmRldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUgKmRldmF0dHIsCj4gICBzdGF0aWMgdm9pZCBf\n" - "X2luaXQgbWFrZV9zZW5zb3JfbGFiZWwoc3RydWN0IGRldmljZV9ub2RlICpucCwKPiAgIAkJICAg\n" - "IHN0cnVjdCBzZW5zb3JfZGF0YSAqc2RhdGEsIGNvbnN0IGNoYXIgKmxhYmVsKQo+ICAgewo+ICsJ\n" - "dTMyIGlkOwo+ICAgCXNpemVfdCBuOwo+Cj4gICAJbiA9IHNucHJpbnRmKHNkYXRhLT5sYWJlbCwg\n" - "c2l6ZW9mKHNkYXRhLT5sYWJlbCksICIlcyIsIGxhYmVsKTsKPiArCj4gKwkvKgo+ICsJICogQ29y\n" - "ZSB0ZW1wIHByZXR0eSBwcmludAo+ICsJICovCj4gKwlpZiAoIW9mX3Byb3BlcnR5X3JlYWRfdTMy\n" - "KG5wLCAiaWJtLHBpciIsICZpZCkpIHsKPiArCQlpbnQgaTsKPiArCj4gKwkJZm9yX2VhY2hfcG9z\n" - "c2libGVfY3B1KGkpCj4gKwkJCWlmIChwYWNhW2ldLmh3X2NwdV9pZCA9PSBpZCkKPiArCQkJCWJy\n" - "ZWFrOwo+ICsKPiArCQluICs9IHNucHJpbnRmKHNkYXRhLT5sYWJlbCArIG4sIHNpemVvZihzZGF0\n" - "YS0+bGFiZWwpIC0gbiwKPiArCQkJICAgICAgIiAlZC0lZCIsIGksIGkrNyk7CgpJZiBpYm0scGly\n" - "IHBvaW50cyB0byBhIGJhZC9pbnZhbGlkIENQVSBpZCB5b3UganVzdCBwcmludCBhbiBpbnZhbGlk\n" - "IHZhbHVlLgpJcyB0aGF0IHdoYXQgeW91IHdhbnQgPyBBbHNvLCB3aGF0IHJlbGV2YW5jZSBkb2Vz\n" - "ICdpJyBoYXZlIGZvciB0aGUgdXNlciA/Ckl0IGlzIHRoZSBpbmRleCBpbnRvIHRoZSBwYWNhIGFy\n" - "cmF5LCBzdXJlLCBidXQgd2hhdCBpcyBpdHMgcmVsZXZhbmNlCm91dHNpZGUgdGhpcyBjb2RlLCBl\n" - "c3BlY2lhbGx5IGluIHRoZSBjb250ZXh0IG9mIHlvdSBwcmludGluZyBib3RoIGkgYW5kIGkrNyA/\n" - "CgpHdWVudGVyCgo+ICsJfQo+ICsKPiArCS8qCj4gKwkgKiBNZW1idWZmZXIgcHJldHR5IHByaW50\n" - "Cj4gKwkgKi8KPiArCWlmICghb2ZfcHJvcGVydHlfcmVhZF91MzIobnAsICJpYm0sY2hpcC1pZCIs\n" - "ICZpZCkpCj4gKwkJbiArPSBzbnByaW50ZihzZGF0YS0+bGFiZWwgKyBuLCBzaXplb2Yoc2RhdGEt\n" - "PmxhYmVsKSAtIG4sCj4gKwkJCSAgICAgICIgJWQiLCBpZCAmIDB4ZmZmZik7Cj4gICB9Cj4KPiAg\n" - "IHN0YXRpYyBpbnQgZ2V0X3NlbnNvcl9pbmRleF9hdHRyKGNvbnN0IGNoYXIgKm5hbWUsIHUzMiAq\n" - "aW5kZXgsCj4KCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f\n" - "XwpsbS1zZW5zb3JzIG1haWxpbmcgbGlzdApsbS1zZW5zb3JzQGxtLXNlbnNvcnMub3JnCmh0dHA6\n" - Ly9saXN0cy5sbS1zZW5zb3JzLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xtLXNlbnNvcnM + "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" + "> \t\t struct sensor_data *sdata, const char *label)\n" + "> {\n" + "> +\tu32 id;\n" + "> \tsize_t n;\n" + ">\n" + "> \tn = snprintf(sdata->label, sizeof(sdata->label), \"%s\", label);\n" + "> +\n" + "> +\t/*\n" + "> +\t * Core temp pretty print\n" + "> +\t */\n" + "> +\tif (!of_property_read_u32(np, \"ibm,pir\", &id)) {\n" + "> +\t\tint i;\n" + "> +\n" + "> +\t\tfor_each_possible_cpu(i)\n" + "> +\t\t\tif (paca[i].hw_cpu_id == id)\n" + "> +\t\t\t\tbreak;\n" + "> +\n" + "> +\t\tn += snprintf(sdata->label + n, sizeof(sdata->label) - n,\n" + "> +\t\t\t \" %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 ? 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" + "Guenter\n" + "\n" + "> +\t}\n" + "> +\n" + "> +\t/*\n" + "> +\t * Membuffer pretty print\n" + "> +\t */\n" + "> +\tif (!of_property_read_u32(np, \"ibm,chip-id\", &id))\n" + "> +\t\tn += snprintf(sdata->label + n, sizeof(sdata->label) - n,\n" + "> +\t\t\t \" %d\", id & 0xffff);\n" + "> }\n" + ">\n" + "> static int get_sensor_index_attr(const char *name, u32 *index,\n" + > -52356115b3b9924a55fc5d76b12bd2cb22611cae6f7745ceb456f9154df57d57 +c2d7565f5a22f9fc3438f642db57873a468bb2913f34c6e56a18ea324e4ae671
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.