Skip to content

Commit 974205f

Browse files
hkallweitSasha Levin
authored andcommitted
eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
[ Upstream commit caba40e ] The DDR3 SPD data structure advertises the presence of a thermal sensor on a DDR3 module in byte 32, bit 7. Let's use this information to explicitly instantiate the thermal sensor I2C client instead of having to rely on class-based I2C probing. The temp sensor i2c address can be derived from the SPD i2c address, so we can directly instantiate the device and don't have to probe for it. If the temp sensor has been instantiated already by other means (e.g. class-based auto-detection), then the busy-check in i2c_new_client_device will detect this. Note: Thermal sensors on DDR4 DIMM's are instantiated from the ee1004 driver. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Link: https://lore.kernel.org/r/68113672-3724-44d5-9ff8-313dd6628f8c@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Stable-dep-of: f42c970 ("eeprom: at24: fix memory corruption race condition") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent e284e14 commit 974205f

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

drivers/misc/eeprom/at24.c

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,31 @@ static unsigned int at24_get_offset_adj(u8 flags, unsigned int byte_len)
581581
}
582582
}
583583

584+
static void at24_probe_temp_sensor(struct i2c_client *client)
585+
{
586+
struct at24_data *at24 = i2c_get_clientdata(client);
587+
struct i2c_board_info info = { .type = "jc42" };
588+
int ret;
589+
u8 val;
590+
591+
/*
592+
* Byte 2 has value 11 for DDR3, earlier versions don't
593+
* support the thermal sensor present flag
594+
*/
595+
ret = at24_read(at24, 2, &val, 1);
596+
if (ret || val != 11)
597+
return;
598+
599+
/* Byte 32, bit 7 is set if temp sensor is present */
600+
ret = at24_read(at24, 32, &val, 1);
601+
if (ret || !(val & BIT(7)))
602+
return;
603+
604+
info.addr = 0x18 | (client->addr & 7);
605+
606+
i2c_new_client_device(client->adapter, &info);
607+
}
608+
584609
static int at24_probe(struct i2c_client *client)
585610
{
586611
struct regmap_config regmap_config = { };
@@ -780,6 +805,10 @@ static int at24_probe(struct i2c_client *client)
780805
}
781806
}
782807

808+
/* If this a SPD EEPROM, probe for DDR3 thermal sensor */
809+
if (cdata == &at24_data_spd)
810+
at24_probe_temp_sensor(client);
811+
783812
pm_runtime_idle(dev);
784813

785814
if (writable)

0 commit comments

Comments
 (0)