30 Jun, 2012
1 commit
-
Pull x86 fixes from Ingo Molnar.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, cpufeature: Remove stray %s, add -w to mkcapflags.pl
x86, cpufeature: Catch duplicate CPU feature strings
x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM
x86: Fix kernel-doc warnings
x86, compat: Use test_thread_flag(TIF_IA32) in compat signal delivery
26 Jun, 2012
1 commit
-
It makes sense to label "Digital Thermal Sensor" as "DTS", but
unfortunately the string "dts" was already used for "Debug Store", and
/proc/cpuinfo is a user space ABI.Therefore, rename this to "dtherm".
This conflict went into mainline via the hwmon tree without any x86
maintainer ack, and without any kind of hint in the subject.a4659053 x86/hwmon: fix initialization of coretemp
Reported-by: Jean Delvare
Link: http://lkml.kernel.org/r/4FE34BCB.5050305@linux.intel.com
Cc: Jan Beulich
Cc: v2.6.36..v3.4
Signed-off-by: H. Peter Anvin
25 Jun, 2012
2 commits
-
My old e-mail address won't be valid for much longer. Time to update it.
Signed-off-by: Guenter Roeck
Acked-by: Jean Delvare -
I've not had a gmail address for years. This commit updates the
address to my actual working one.Signed-off-by: Jesper Juhl
Signed-off-by: Guenter Roeck
22 Jun, 2012
1 commit
-
Pull hwmon fixes from Guenter Roeck:
"Two minor fixes in emc2103 and applesmc drivers."* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (emc2103) Fix use of an uninitilized variable in error case
hwmon: (applesmc) Limit key length in warning messages
18 Jun, 2012
6 commits
-
Fix:
emc2103.c: In function set_pwm_enable:
emc2103.c:463:12: warning: conf_reg may be used uninitialized in this functionby checking the return value from read_u8_from_i2c(). This fixes a real problem,
as conf_reg is really uninitialized if read_u8_from_i2c returns an error.Signed-off-by: Guenter Roeck
Reviewed-by: Robert Coulson
Acked-by: Jean Delvare -
Key lookups may call read_smc() with a fixed-length key string,
and if the lookup fails, trailing stack content may appear in the
kernel log. Fixed with this patch.Signed-off-by: Henrik Rydberg
Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck -
The value is overridden a few lines later.
Signed-off-by: Jean Delvare
Acked-by: Guenter Roeck -
Atom CPUs don't have a register to retrieve TjMax. Detection so far was
incomplete. Use the X86 model ID to improve it.Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
Document the Atom series D2000 and N2000 (Cedar Trail) as being supported.
List and set TjMax for those series.Cc: Fenghua Yu
Cc: "R, Durgadoss"
Signed-off-by: Guenter Roeck
Signed-off-by: Jean Delvare -
Document the new Atom series (Tunnel Creek and Medfield) as being
supported, and list TjMax for the Atom E600 series.Also enable the Atom tjmax heuristic for these Atom CPU models.
Signed-off-by: Jean Delvare
Reviewed-by: Guenter Roeck
Cc: Alexander Stein
Cc: Fenghua Yu
Cc: "R, Durgadoss"
30 May, 2012
5 commits
-
Since the watchdog code in sch56xx-common now uses the watchdog core, the
Kconfig entires for the sch5627 and sch5636 should depend on WATCHDOG
being set. Also select the watchdog core when we select one of the drivers.Signed-off-by: Hans de Goede
Signed-off-by: Wim Van Sebroeck -
WDOG_NO_WAY_OUT (3) and WDOG_ACTIVE (0) are the bit numbers, not a mask.
So "data->wddev.status |= WDOG_ACTIVE;" was intended to set bit zero but
it is a no-op.Signed-off-by: Dan Carpenter
Acked-by: Hans de Goede
Signed-off-by: Wim Van Sebroeck -
This fixes referencing free-ed memory in the corner case where /dev/watchdog
is open when the platform driver gets unbound from the platform device.Signed-off-by: Hans de Goede
Signed-off-by: Wim Van Sebroeck -
Since the watchdog core keeps track of the watchdog's active state, start/stop
will never get called when no changes are necessary. So we can remove the
check for the output_enable register changing before writing it (which is
an expensive operation).Signed-off-by: Hans de Goede
Signed-off-by: Wim Van Sebroeck -
Convert sch56xx drivers to the generic watchdog core.
Note this patch depends on the "watchdog: Add multiple device support" patch
from Alan Cox.Signed-off-by: Hans de Goede
Signed-off-by: Wim Van Sebroeck
24 May, 2012
1 commit
-
Pull hwmon updates from Guenter Roeck:
"New driver for INA219 and INA226, added support for IT8782F and
IT8783E/F to it87 driver, plus cleanups in a couple of drivers."* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (it87) Make temp3 attribute conditional for IT8782F
hwmon: (it87) Convert to use devm_kzalloc and devm_request_region
hwmon: INA219 and INA226 support
hwmon: (it87) Create voltage attributes only if voltage is enabled
hwmon: (ntc_thermistor) Fix checkpatch warning
hwmon: (ntc_thermistor) Optimize and fix build warning
hwmon: (ntc_thermistor) Return error code from hwmon_device_register
hwmon: (ntc_thermistor) Convert to devm_kzalloc
hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFT
acpi_power_meter: clean up code around setup_attrs
acpi_power_meter: drop meter_rw_attrs, use common meter_attrs
acpi_power_meter: remove duplicate code between register_{ro,rw}_attrs
acpi_power_meter: use a {RW,RO}_SENSOR_TEMPLATE macro to clean things up
acpi_power_meter: use the same struct {rw,ro}_sensor_template for both
hwmon: use module_pci_driver
hwmon: (it87) Add support for IT8782F and IT8783E/F
23 May, 2012
1 commit
-
Pull trivial updates from Jiri Kosina:
"As usual, it's mostly typo fixes, redundant code elimination and some
documentation updates."* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
edac, mips: don't change code that has been removed in edac/mips tree
xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
lib: Change mail address of Oskar Schirmer
net: Change mail address of Oskar Schirmer
arm/m68k: Change mail address of Sebastian Hess
i2c: Change mail address of Oskar Schirmer
net: Fix tcp_build_and_update_options comment in struct tcp_sock
atomic64_32.h: fix parameter naming mismatch
Kconfig: replace "--- help ---" with "---help---"
c2port: fix bogus Kconfig "default no"
edac: Fix spelling errors.
qla1280: Remove redundant NULL check before release_firmware() call
remoteproc: remove redundant NULL check before release_firmware()
qla2xxx: Remove redundant NULL check before release_firmware() call.
aic94xx: Get rid of redundant NULL check before release_firmware() call
tehuti: delete redundant NULL check before release_firmware()
qlogic: get rid of a redundant test for NULL before call to release_firmware()
bna: remove redundant NULL test before release_firmware()
tg3: remove redundant NULL test before release_firmware() call
typhoon: get rid of redundant conditional before all to release_firmware()
...
22 May, 2012
3 commits
-
On IT8782F, temp3 is only supported if UART6 is disabled.
Signed-off-by: Guenter Roeck
Acked-by: Jean Delvare -
This makes the code a bit simpler and smaller.
Signed-off-by: Guenter Roeck
Acked-by: Jean Delvare -
Add support for the Texas Instruments INA219 and INA226 power monitors.
Signed-off-by: Lothar Felten
[guenter.roeck@ericsson.com: formatting cleanup; check for smbus word data;
select PGA=8 for INA219]
Signed-off-by: Guenter Roeck
21 May, 2012
13 commits
-
On IT8782F and IT8783F, some voltage input pins may be disabled. Don't create
sysfs attribute files if that is the case.Signed-off-by: Guenter Roeck
Acked-by: Jean Delvare -
Fix checkpatch WARNING: quoted string split across lines
Signed-off-by: Guenter Roeck
Reviewed-by: Robert Coulson -
The following build warning is seen in some configurations:
drivers/hwmon/ntc_thermistor.c: In function 'ntc_show_temp':
drivers/hwmon/ntc_thermistor.c:293: warning: 'temp' may be used uninitialized in this functionFix the problem by re-arranging the code to overload return values with error
codes, and by avoiding error returns whenever possible.Specifically,
Simplify lookup_comp() to not return an error. Instead, return i_low == i_high
if there is an exact match, or if the ohm value is outside the lookup table
range.Modify get_temp_mC() to not return an error. Since it only returns an error
after lookup_comp() returned an error, this is quite straightforward after above
change.Separate ntc_thermistor_read() into a function to read the resistor value (which
can return an error), and the call to get_temp_mC() which doesn't. Call the
functions directly from ntc_show_temp().Code was tested using a test program, comparing the result of the old and new
versions of get_temp_mC() for resistor values between 0 and 2,000,000 ohm.As a side effect, this patch reduces code size by approximately 400 bytes on
x86_64.Signed-off-by: Guenter Roeck
Cc: Donggeun Kim
Reviewed-by: Robert Coulson -
hwmon_device_register() never returns a NULL pointer in case of errors, but
an error value. Use it.Signed-off-by: Guenter Roeck
Reviewed-by: Robert Coulson -
This avoids memory leaks, and makes the code a bit simpler and smaller.
Signed-off-by: Guenter Roeck
Reviewed-by: Robert Coulson -
Remove unused defines AD7314_PD, AD7314_TEMP_SIGN, and ADT7301_TEMP_SIGN.
Rename AD7314_TEMP_OFFSET to the more appropriate AD7314_TEMP_SHIFT.Signed-off-by: Guenter Roeck
Cc: Jonathan Cameron
Acked-by: Jean Delvare -
We don't need to duplicate if (res) checks if we're always running
one or the other.Signed-off-by: Kyle McMartin
Signed-off-by: Guenter Roeck -
We always register these two together, so move meter_rw_attrs into
meter_ro_attrs and use the same for both since we no longer have two
register_attr paths.Signed-off-by: Kyle McMartin
Signed-off-by: Guenter Roeck -
Key off the attr->set method being present to set the sysfs attribute
as writable.Signed-off-by: Kyle McMartin
Signed-off-by: Guenter Roeck -
Similar to how we do PCI/USB device id structs.
Signed-off-by: Kyle McMartin
Signed-off-by: Guenter Roeck -
We don't need both, when we can just key the read/write off of the
presence of the .set member.Signed-off-by: Kyle McMartin
Signed-off-by: Guenter Roeck -
This patch converts the drivers in drivers/hwmon/* to use module_pci_driver()
macro which makes the code smaller and a bit simpler.Signed-off-by: Axel Lin
Cc: Andreas Herrmann
Cc: Clemens Ladisch
Cc: Rudolf Marek
Signed-off-by: Guenter Roeck -
Signed-off-by: Guenter Roeck
Acked-by: Jean Delvare
02 May, 2012
1 commit
-
CPU core ID is used to index the core_data[] array. The core ID is, however, not
sequential; 10-core CPUS can have a core ID as high as 25. Increase the limit to
32 to be able to deal with current CPUs.Signed-off-by: Guenter Roeck
Cc: stable@vger.kernel.org # 3.0+
Acked-by: Jean Delvare
Acked-by: Durgadoss R
01 May, 2012
1 commit
-
coretemp tries to access core_data array beyond bounds on cpu unplug if
core id of the cpu if more than NUM_REAL_CORES-1.BUG: unable to handle kernel NULL pointer dereference at 000000000000013c
IP: [] coretemp_cpu_callback+0x93/0x1ba [coretemp]
PGD 673e5a067 PUD 66e9b3067 PMD 0
Oops: 0000 [#1] SMP
CPU 79
Modules linked in: sunrpc cpufreq_ondemand acpi_cpufreq freq_table mperf bnep bluetooth rfkill ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter nf_conntrack_ipv4 nf_defrag_ipv4 ip6_tables xt_state nf_conntrack coretemp crc32c_intel asix tpm_tis pcspkr usbnet iTCO_wdt i2c_i801 microcode mii joydev tpm i2c_core iTCO_vendor_support tpm_bios i7core_edac igb ioatdma edac_core dca megaraid_sas [last unloaded: oprofile]Pid: 3315, comm: set-cpus Tainted: G W 3.4.0-rc5+ #2 QCI QSSC-S4R/QSSC-S4R
RIP: 0010:[] [] coretemp_cpu_callback+0x93/0x1ba [coretemp]
RSP: 0018:ffff880472fb3d48 EFLAGS: 00010246
RAX: 0000000000000124 RBX: 0000000000000034 RCX: 00000000ffffffff
RDX: 0000000000000000 RSI: 0000000000000046 RDI: 0000000000000246
RBP: ffff880472fb3d88 R08: ffff88077fcd36c0 R09: 0000000000000001
R10: ffffffff8184bc48 R11: 0000000000000000 R12: ffff880273095800
R13: 0000000000000013 R14: ffff8802730a1810 R15: 0000000000000000
FS: 00007f694a20f720(0000) GS:ffff88077fcc0000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 000000000000013c CR3: 000000067209b000 CR4: 00000000000007e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process set-cpus (pid: 3315, threadinfo ffff880472fb2000, task ffff880471fa0000)
Stack:
ffff880277b4c308 0000000000000003 ffff880472fb3d88 0000000000000005
0000000000000034 00000000ffffffd1 ffffffff81cadc70 ffff880472fb3e14
ffff880472fb3dc8 ffffffff8161f48d ffff880471fa0000 0000000000000034
Call Trace:
[] notifier_call_chain+0x4d/0x70
[] __raw_notifier_call_chain+0xe/0x10
[] __cpu_notify+0x20/0x40
[] _cpu_down+0x81/0x270
[] cpu_down+0x37/0x50
[] store_online+0x63/0xc0
[] dev_attr_store+0x18/0x30
[] sysfs_write_file+0xef/0x170
[] vfs_write+0xb3/0x180
[] sys_write+0x4a/0x90
[] system_call_fastpath+0x16/0x1b
Code: 48 c7 c7 94 60 01 a0 44 0f b7 ac 10 ac 00 00 00 31 c0 e8 41 b7 5f e1 41 83 c5 02 49 63 c5 49 8b 44 c4 10 48 85 c0 74 56 45 31 ff 58 18 75 4e eb 1f 49 63 d7 4c 89 f7 48 89 45 c8 48 6b d2 28
RIP [] coretemp_cpu_callback+0x93/0x1ba [coretemp]
RSP
CR2: 000000000000013cSigned-off-by: Kirill A. Shutemov
Cc: stable@vger.kernel.org # 3.0+
Signed-off-by: Guenter Roeck
26 Apr, 2012
1 commit
-
pci_match_id() takes an *array* of IDs which must be properly zero-
terminated.Reported-by: Ben Hutchings
Cc: stable@vger.kernel.org # 3.0+: 00250ec hwmon: fam15h_power: fix bogus values
Cc: stable@vger.kernel.org # 3.0+
Signed-off-by: Guenter Roeck
Acked-by: Jean Delvare
23 Apr, 2012
1 commit
-
The following build warning is seen in some configurations.
drivers/hwmon/ad7314.c: In function 'ad7314_show_temperature':
drivers/hwmon/ad7314.c:70: warning: 'data' may be used uninitialized in this functionFix by overloading the return value from ad7314_spi_read with both data and
error code (the returned data is really u16 and needs to be converted into a
signed value anyway).Signed-off-by: Guenter Roeck
Cc: Jonathan Cameron
Acked-by: Jean Delvare
19 Apr, 2012
2 commits
-
The following build warning is seen in some configurations.
drivers/hwmon/ads1015.c: In function 'show_in':
drivers/hwmon/ads1015.c:129: warning: 'in' may be used uninitialized in this functionFix by separating the register read function from the code converting the result
into mV.Signed-off-by: Guenter Roeck
Cc: Dirk Eibach
Reviewed-by: Robert Coulson -
Newer BKDG[1] versions recommend a different initialization value for
the running average range register in the northbridge. This improves
the power reading by avoiding counter saturations resulting in bogus
values for anything below about 80% of TDP power consumption.
Updated BIOSes will have this new value set up from the beginning,
but meanwhile we correct this value ourselves.
This needs to be done on all northbridges, even on those where the
driver itself does not register at.This fixes the driver on all current machines to provide proper
values for idle load.[1]
http://support.amd.com/us/Processor_TechDocs/42301_15h_Mod_00h-0Fh_BKDG.pdf
Chapter 3.8: D18F5xE0 Processor TDP Running Average (p. 452)Signed-off-by: Andre Przywara
Acked-by: Jean Delvare
[guenter.roeck@ericsson.com: Removed unnecessary return statement]
Signed-off-by: Guenter Roeck
Cc: stable@vger.kernel.org # 3.0+
