[PATCH] ACPI: battery: add sysfs serial number

[PATCH] ACPI: battery: add sysfs serial number

[maximilian attems]

egrep serial /proc/acpi/battery/BAT0/info
serial number:           32090

serial number can tell you from the imminent danger
of beeing set on fire.

Signed-off-by: maximilian attems <max@stro.at>
---
 drivers/acpi/battery.c             |    5 +++++
 drivers/power/power_supply_sysfs.c |    1 +
 include/linux/power_supply.h       |    1 +
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index c4a769d..f6215e8 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -194,6 +194,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
 	case POWER_SUPPLY_PROP_MANUFACTURER:
 		val->strval = battery->oem_info;
 		break;
+	case POWER_SUPPLY_PROP_SERIAL_NUMBER:
+		val->strval = battery->serial_number;
+		break;
 	default:
 		return -EINVAL;
 	}
@@ -212,6 +215,7 @@ static enum power_supply_property charge_battery_props[] = {
 	POWER_SUPPLY_PROP_CHARGE_NOW,
 	POWER_SUPPLY_PROP_MODEL_NAME,
 	POWER_SUPPLY_PROP_MANUFACTURER,
+	POWER_SUPPLY_PROP_SERIAL_NUMBER,
 };
 
 static enum power_supply_property energy_battery_props[] = {
@@ -226,6 +230,7 @@ static enum power_supply_property energy_battery_props[] = {
 	POWER_SUPPLY_PROP_ENERGY_NOW,
 	POWER_SUPPLY_PROP_MODEL_NAME,
 	POWER_SUPPLY_PROP_MANUFACTURER,
+	POWER_SUPPLY_PROP_SERIAL_NUMBER,
 };
 #endif
 
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 249f61b..8feaa48 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -117,6 +117,7 @@ static struct device_attribute power_supply_attrs[] = {
 	/* Properties of type `const char *' */
 	POWER_SUPPLY_ATTR(model_name),
 	POWER_SUPPLY_ATTR(manufacturer),
+	POWER_SUPPLY_ATTR(serial_number),
 };
 
 static ssize_t power_supply_show_static_attrs(struct device *dev,
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 606c095..300159b 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -101,6 +101,7 @@ enum power_supply_property {
 	/* Properties of type `const char *' */
 	POWER_SUPPLY_PROP_MODEL_NAME,
 	POWER_SUPPLY_PROP_MANUFACTURER,
+	POWER_SUPPLY_PROP_SERIAL_NUMBER,
 };
 
 enum power_supply_type {
-- 
1.5.4.rc2-dirty

Re: [PATCH] ACPI: battery: add sysfs serial number

[Alexey Starikovskiy]

ACK
maximilian attems wrote:
> egrep serial /proc/acpi/battery/BAT0/info
> serial number:           32090
> 
> serial number can tell you from the imminent danger
> of beeing set on fire.
> 
> Signed-off-by: maximilian attems <max@stro.at>
> ---
>  drivers/acpi/battery.c             |    5 +++++
>  drivers/power/power_supply_sysfs.c |    1 +
>  include/linux/power_supply.h       |    1 +
>  3 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> index c4a769d..f6215e8 100644
> --- a/drivers/acpi/battery.c
> +++ b/drivers/acpi/battery.c
> @@ -194,6 +194,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
>  	case POWER_SUPPLY_PROP_MANUFACTURER:
>  		val->strval = battery->oem_info;
>  		break;
> +	case POWER_SUPPLY_PROP_SERIAL_NUMBER:
> +		val->strval = battery->serial_number;
> +		break;
>  	default:
>  		return -EINVAL;
>  	}
> @@ -212,6 +215,7 @@ static enum power_supply_property charge_battery_props[] = {
>  	POWER_SUPPLY_PROP_CHARGE_NOW,
>  	POWER_SUPPLY_PROP_MODEL_NAME,
>  	POWER_SUPPLY_PROP_MANUFACTURER,
> +	POWER_SUPPLY_PROP_SERIAL_NUMBER,
>  };
>  
>  static enum power_supply_property energy_battery_props[] = {
> @@ -226,6 +230,7 @@ static enum power_supply_property energy_battery_props[] = {
>  	POWER_SUPPLY_PROP_ENERGY_NOW,
>  	POWER_SUPPLY_PROP_MODEL_NAME,
>  	POWER_SUPPLY_PROP_MANUFACTURER,
> +	POWER_SUPPLY_PROP_SERIAL_NUMBER,
>  };
>  #endif
>  
> diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
> index 249f61b..8feaa48 100644
> --- a/drivers/power/power_supply_sysfs.c
> +++ b/drivers/power/power_supply_sysfs.c
> @@ -117,6 +117,7 @@ static struct device_attribute power_supply_attrs[] = {
>  	/* Properties of type `const char *' */
>  	POWER_SUPPLY_ATTR(model_name),
>  	POWER_SUPPLY_ATTR(manufacturer),
> +	POWER_SUPPLY_ATTR(serial_number),
>  };
>  
>  static ssize_t power_supply_show_static_attrs(struct device *dev,
> diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
> index 606c095..300159b 100644
> --- a/include/linux/power_supply.h
> +++ b/include/linux/power_supply.h
> @@ -101,6 +101,7 @@ enum power_supply_property {
>  	/* Properties of type `const char *' */
>  	POWER_SUPPLY_PROP_MODEL_NAME,
>  	POWER_SUPPLY_PROP_MANUFACTURER,
> +	POWER_SUPPLY_PROP_SERIAL_NUMBER,
>  };
>  
>  enum power_supply_type {

Re: [PATCH] ACPI: battery: add sysfs serial number

[maximilian attems]

On Tue, Jan 22, 2008 at 09:00:09PM +0300, Alexey Starikovskiy wrote:
> ACK

thanks for your quick response!

while checking the missing bits of ACPI_SYSFS_POWER versus
ACPI_PROCFS_POWER i also noticed capacity granularity.
is that used by anyone?

if yes i can send another patch for that too.
want to switch debian to ACPI_SYSFS_POWER.

-- 
maks

Re: [PATCH] ACPI: battery: add sysfs serial number

[Alexey Starikovskiy]

maximilian attems wrote:
> On Tue, Jan 22, 2008 at 09:00:09PM +0300, Alexey Starikovskiy wrote:
>> ACK
> 
> thanks for your quick response!
> 
> while checking the missing bits of ACPI_SYSFS_POWER versus
> ACPI_PROCFS_POWER i also noticed capacity granularity.
> is that used by anyone?
IMHO, nobody cares about it.
> 
> if yes i can send another patch for that too.
SBS (sbs.c) has cycle_count field, which might be useful too, 
so you might want to show it as well.

> want to switch debian to ACPI_SYSFS_POWER.
Good luck!

Re: [PATCH] ACPI: battery: add sysfs serial number

[maximilian attems]

[ added debian hal maintainer on cc ]

On Tue, 22 Jan 2008, Alexey Starikovskiy wrote:

> maximilian attems wrote:
>> while checking the missing bits of ACPI_SYSFS_POWER versus
>> ACPI_PROCFS_POWER i also noticed capacity granularity.
>> is that used by anyone?
> IMHO, nobody cares about it.

ack, will add if someone cries.

>> if yes i can send another patch for that too.
> SBS (sbs.c) has cycle_count field, which might be useful too, so you might 
> want to show it as well.

i see, need to testboot to see if my first try went right.

>> want to switch debian to ACPI_SYSFS_POWER.
> Good luck!

done on the linux side.
thanks. :)

got the following question:
~/src/hal$ egrep 'voltage_(max|min)_design' -r .
./hald/linux/device.c:  if (hal_util_get_int_from_file (path, "voltage_max_design", &voltage_design, 10)) {

any particular reason the kernel is calling it
cat /sys/class/power_supply/BAT0/voltage_min_design 
14400000

shall i send in a patch along the line:
-       case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
+       case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
                val->intval = battery->design_voltage * 1000;

or is it hal beeing silly?

-- 
maks

Re: [PATCH] ACPI: battery: add sysfs serial number

[Alexey Starikovskiy]

maximilian attems wrote:
> got the following question:
> ~/src/hal$ egrep 'voltage_(max|min)_design' -r .
> ./hald/linux/device.c:  if (hal_util_get_int_from_file (path, "voltage_max_design", &voltage_design, 10)) {
> 
> any particular reason the kernel is calling it
> cat /sys/class/power_supply/BAT0/voltage_min_design 
> 14400000
> 
> shall i send in a patch along the line:
> -       case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
> +       case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
>                 val->intval = battery->design_voltage * 1000;
> 
> or is it hal beeing silly?
> 
On most new batteries design voltage is less than current voltage, thus I've chosen VOLTAGE_MIN_DESIGN.
On older batteries, current voltage may become lower than design, so I think hal should not be very 
strict about how they relate to each other. 

Alex.

Re: [PATCH] ACPI: battery: add sysfs serial number

[Sjoerd Simons]

On Wed, Jan 23, 2008 at 02:01:34PM +0300, Alexey Starikovskiy wrote:
> maximilian attems wrote:
>> got the following question:
>> ~/src/hal$ egrep 'voltage_(max|min)_design' -r .
>> ./hald/linux/device.c:  if (hal_util_get_int_from_file (path, "voltage_max_design", &voltage_design, 10)) {
>>
>> any particular reason the kernel is calling it
>> cat /sys/class/power_supply/BAT0/voltage_min_design 14400000
>>
>> shall i send in a patch along the line:
>> -       case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
>> +       case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
>>                 val->intval = battery->design_voltage * 1000;
>>
>> or is it hal beeing silly?
>>
> On most new batteries design voltage is less than current voltage, thus I've chosen VOLTAGE_MIN_DESIGN.
> On older batteries, current voltage may become lower than design, so I 
> think hal should not be very strict about how they relate to each other. 

I'll patch up hal to use voltage_min_design if there is no voltage_max_design
available. Which should be fine as we already picked up the same value from
procfs for this property.

What it does make me wonder about, is why there is a difference between MIN and
MAX in the power_supply class. As this doesn't seem to have a strict meaning
(or at least not for ACPI). So why not just voltage_design instead ?

  Sjoerd
-- 
The solution to a problem changes the nature of the problem.
		-- Peer

Re: [PATCH] ACPI: battery: add sysfs serial number

[Alexey Starikovskiy]

Sjoerd Simons wrote:
> On Wed, Jan 23, 2008 at 02:01:34PM +0300, Alexey Starikovskiy wrote:
>> maximilian attems wrote:
>>> got the following question:
>>> ~/src/hal$ egrep 'voltage_(max|min)_design' -r .
>>> ./hald/linux/device.c:  if (hal_util_get_int_from_file (path, "voltage_max_design", &voltage_design, 10)) {
>>>
>>> any particular reason the kernel is calling it
>>> cat /sys/class/power_supply/BAT0/voltage_min_design 14400000
>>>
>>> shall i send in a patch along the line:
>>> -       case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
>>> +       case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
>>>                 val->intval = battery->design_voltage * 1000;
>>>
>>> or is it hal beeing silly?
>>>
>> On most new batteries design voltage is less than current voltage, thus I've chosen VOLTAGE_MIN_DESIGN.
>> On older batteries, current voltage may become lower than design, so I 
>> think hal should not be very strict about how they relate to each other. 
> 
> I'll patch up hal to use voltage_min_design if there is no voltage_max_design
> available. Which should be fine as we already picked up the same value from
> procfs for this property.
> 
> What it does make me wonder about, is why there is a difference between MIN and
> MAX in the power_supply class. As this doesn't seem to have a strict meaning
> (or at least not for ACPI). So why not just voltage_design instead ?
Don't know, may be they had battery for which both min and max voltages are known and 
crossing each needs to be guarded...

Regards,
Alex. 

Re: [PATCH] ACPI: battery: add sysfs serial number

[maximilian attems]

Dear Len Brown,

could you please merged acked patch,
don't feel like merging sysfs file patches in Debian
on my own.

thanks for feedback

-- 
maks

On Tue, 22 Jan 2008, Alexey Starikovskiy wrote:

> ACK
> maximilian attems wrote:
>> egrep serial /proc/acpi/battery/BAT0/info
>> serial number:           32090
>>
>> serial number can tell you from the imminent danger
>> of beeing set on fire.
>>
>> Signed-off-by: maximilian attems <max@stro.at>
>> ---
>>  drivers/acpi/battery.c             |    5 +++++
>>  drivers/power/power_supply_sysfs.c |    1 +
>>  include/linux/power_supply.h       |    1 +
>>  3 files changed, 7 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
>> index c4a769d..f6215e8 100644
>> --- a/drivers/acpi/battery.c
>> +++ b/drivers/acpi/battery.c
>> @@ -194,6 +194,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
>>  	case POWER_SUPPLY_PROP_MANUFACTURER:
>>  		val->strval = battery->oem_info;
>>  		break;
>> +	case POWER_SUPPLY_PROP_SERIAL_NUMBER:
>> +		val->strval = battery->serial_number;
>> +		break;
>>  	default:
>>  		return -EINVAL;
>>  	}
>> @@ -212,6 +215,7 @@ static enum power_supply_property charge_battery_props[] = {
>>  	POWER_SUPPLY_PROP_CHARGE_NOW,
>>  	POWER_SUPPLY_PROP_MODEL_NAME,
>>  	POWER_SUPPLY_PROP_MANUFACTURER,
>> +	POWER_SUPPLY_PROP_SERIAL_NUMBER,
>>  };
>>   static enum power_supply_property energy_battery_props[] = {
>> @@ -226,6 +230,7 @@ static enum power_supply_property energy_battery_props[] = {
>>  	POWER_SUPPLY_PROP_ENERGY_NOW,
>>  	POWER_SUPPLY_PROP_MODEL_NAME,
>>  	POWER_SUPPLY_PROP_MANUFACTURER,
>> +	POWER_SUPPLY_PROP_SERIAL_NUMBER,
>>  };
>>  #endif
>>  diff --git a/drivers/power/power_supply_sysfs.c 
>> b/drivers/power/power_supply_sysfs.c
>> index 249f61b..8feaa48 100644
>> --- a/drivers/power/power_supply_sysfs.c
>> +++ b/drivers/power/power_supply_sysfs.c
>> @@ -117,6 +117,7 @@ static struct device_attribute power_supply_attrs[] = {
>>  	/* Properties of type `const char *' */
>>  	POWER_SUPPLY_ATTR(model_name),
>>  	POWER_SUPPLY_ATTR(manufacturer),
>> +	POWER_SUPPLY_ATTR(serial_number),
>>  };
>>   static ssize_t power_supply_show_static_attrs(struct device *dev,
>> diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
>> index 606c095..300159b 100644
>> --- a/include/linux/power_supply.h
>> +++ b/include/linux/power_supply.h
>> @@ -101,6 +101,7 @@ enum power_supply_property {
>>  	/* Properties of type `const char *' */
>>  	POWER_SUPPLY_PROP_MODEL_NAME,
>>  	POWER_SUPPLY_PROP_MANUFACTURER,
>> +	POWER_SUPPLY_PROP_SERIAL_NUMBER,
>>  };
>>   enum power_supply_type {

Re: [PATCH] ACPI: battery: add sysfs serial number

[Len Brown]

Applied.

thanks,
-Len

On Tuesday 22 January 2008 13:00, Alexey Starikovskiy wrote:
> ACK
> maximilian attems wrote:
> > egrep serial /proc/acpi/battery/BAT0/info
> > serial number:           32090
> > 
> > serial number can tell you from the imminent danger
> > of beeing set on fire.
> > 
> > Signed-off-by: maximilian attems <max@stro.at>
> > ---
> >  drivers/acpi/battery.c             |    5 +++++
> >  drivers/power/power_supply_sysfs.c |    1 +
> >  include/linux/power_supply.h       |    1 +
> >  3 files changed, 7 insertions(+), 0 deletions(-)
> > 
> > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> > index c4a769d..f6215e8 100644
> > --- a/drivers/acpi/battery.c
> > +++ b/drivers/acpi/battery.c
> > @@ -194,6 +194,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
> >  	case POWER_SUPPLY_PROP_MANUFACTURER:
> >  		val->strval = battery->oem_info;
> >  		break;
> > +	case POWER_SUPPLY_PROP_SERIAL_NUMBER:
> > +		val->strval = battery->serial_number;
> > +		break;
> >  	default:
> >  		return -EINVAL;
> >  	}
> > @@ -212,6 +215,7 @@ static enum power_supply_property charge_battery_props[] = {
> >  	POWER_SUPPLY_PROP_CHARGE_NOW,
> >  	POWER_SUPPLY_PROP_MODEL_NAME,
> >  	POWER_SUPPLY_PROP_MANUFACTURER,
> > +	POWER_SUPPLY_PROP_SERIAL_NUMBER,
> >  };
> >  
> >  static enum power_supply_property energy_battery_props[] = {
> > @@ -226,6 +230,7 @@ static enum power_supply_property energy_battery_props[] = {
> >  	POWER_SUPPLY_PROP_ENERGY_NOW,
> >  	POWER_SUPPLY_PROP_MODEL_NAME,
> >  	POWER_SUPPLY_PROP_MANUFACTURER,
> > +	POWER_SUPPLY_PROP_SERIAL_NUMBER,
> >  };
> >  #endif
> >  
> > diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
> > index 249f61b..8feaa48 100644
> > --- a/drivers/power/power_supply_sysfs.c
> > +++ b/drivers/power/power_supply_sysfs.c
> > @@ -117,6 +117,7 @@ static struct device_attribute power_supply_attrs[] = {
> >  	/* Properties of type `const char *' */
> >  	POWER_SUPPLY_ATTR(model_name),
> >  	POWER_SUPPLY_ATTR(manufacturer),
> > +	POWER_SUPPLY_ATTR(serial_number),
> >  };
> >  
> >  static ssize_t power_supply_show_static_attrs(struct device *dev,
> > diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
> > index 606c095..300159b 100644
> > --- a/include/linux/power_supply.h
> > +++ b/include/linux/power_supply.h
> > @@ -101,6 +101,7 @@ enum power_supply_property {
> >  	/* Properties of type `const char *' */
> >  	POWER_SUPPLY_PROP_MODEL_NAME,
> >  	POWER_SUPPLY_PROP_MANUFACTURER,
> > +	POWER_SUPPLY_PROP_SERIAL_NUMBER,
> >  };
> >  
> >  enum power_supply_type {
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>