Skip to content

Commit 1dc78f1

Browse files
qzhuo2aegl
authored andcommitted
EDAC, skx, i10nm: Fix source ID register offset
The source ID register offset for Skylake server is 0xf0, while for Icelake server is 0xf8. Pass the correct offset to get the source ID. Signed-off-by: Qiuxu Zhuo <[email protected]> Signed-off-by: Tony Luck <[email protected]>
1 parent c4a1dd9 commit 1dc78f1

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

drivers/edac/i10nm_base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static int __init i10nm_init(void)
267267
goto fail;
268268

269269
list_for_each_entry(d, i10nm_edac_list, list) {
270-
rc = skx_get_src_id(d, &src_id);
270+
rc = skx_get_src_id(d, 0xf8, &src_id);
271271
if (rc < 0)
272272
goto fail;
273273

drivers/edac/skx_base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ static int __init skx_init(void)
639639
}
640640

641641
list_for_each_entry(d, skx_edac_list, list) {
642-
rc = skx_get_src_id(d, &src_id);
642+
rc = skx_get_src_id(d, 0xf0, &src_id);
643643
if (rc < 0)
644644
goto fail;
645645
rc = skx_get_node_id(d, &node_id);

drivers/edac/skx_common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ void skx_set_decode(skx_decode_f decode)
136136
skx_decode = decode;
137137
}
138138

139-
int skx_get_src_id(struct skx_dev *d, u8 *id)
139+
int skx_get_src_id(struct skx_dev *d, int off, u8 *id)
140140
{
141141
u32 reg;
142142

143-
if (pci_read_config_dword(d->util_all, 0xf0, &reg)) {
143+
if (pci_read_config_dword(d->util_all, off, &reg)) {
144144
skx_printk(KERN_ERR, "Failed to read src id\n");
145145
return -ENODEV;
146146
}

drivers/edac/skx_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ int __init skx_adxl_get(void);
118118
void __exit skx_adxl_put(void);
119119
void skx_set_decode(skx_decode_f decode);
120120

121-
int skx_get_src_id(struct skx_dev *d, u8 *id);
121+
int skx_get_src_id(struct skx_dev *d, int off, u8 *id);
122122
int skx_get_node_id(struct skx_dev *d, u8 *id);
123123

124124
int skx_get_all_bus_mappings(unsigned int did, int off, enum type,

0 commit comments

Comments
 (0)