sb_edac: fix TAD presence check for sbridge_mci_bind_devs()
Subsystems (2)
PATCH 1/1 sb_edac: fix TAD presence check for sbridge_mci_bind_devs()
In 7d375bff, NUM_CHANNELS was changed to 8 and the channel space was renumerated to handle EN, EP, and EX configurations.
The *_mci_bind_devs functions, except for sbridge_mci_bind_devs(), got a new device presence check in the form of saw_chan_mask. However, sbridge_mci_bind_devs() still uses the NUM_CHANNELS for loop.
With the increase in NUM_CHANNELS, this loop fails at index 4 since SB only has 4 TADs. This results in the following error on SB machines:
EDAC sbridge: Some needed devices are missing
EDAC sbridge: Couldn't find mci handler
EDAC sbridge: Couldn't find mci handle
This patch adapts the saw_chan_mask logic for sbridge_mci_bind_devs() as well.
After this patch:
EDAC MC0: Giving out device to module sbridge_edac.c controller Sandy Bridge Socket#0: DEV 0000:3f:0e.0 (POLLED) EDAC MC1: Giving out device to module sbridge_edac.c controller Sandy Bridge Socket#1: DEV 0000:7f:0e.0 (POLLED)
--- drivers/edac/sb_edac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/edac/sb_edac.c +4 -4
@@ -1648,6 +1648,7 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, {struct sbridge_pvt *pvt = mci->pvt_info;struct pci_dev *pdev; +u8 saw_chan_mask =0 ;int i;for (i =0 ; i < sbridge_dev->n_devs; i++) {
@@ -1681,6 +1682,7 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, {int id = pdev->device -PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0 ; pvt->pci_tad[id] = pdev; + saw_chan_mask |=1 << id; }break ;case PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO :
@@ -1701,10 +1703,8 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, !pvt-> pci_tad || !pvt->pci_ras || !pvt->pci_ta) goto enodev; -for (i =0 ; i <NUM_CHANNELS ; i++) { -if (!pvt->pci_tad[i]) - goto enodev; - } +if (saw_chan_mask !=0x0f ) + goto enodev;return 0 ; enodev:
Signature · 1 line
2.4.3
Quoted 14 lines · Seth Jennings
In
7d375bff,NUM_CHANNELSwas changed to 8 and the channel space was renumerated to handle EN, EP, and EX configurations.The
*_mci_bind_devsfunctions, except forsbridge_mci_bind_devs(), got a new device presence check in the form ofsaw_chan_mask. However,sbridge_mci_bind_devs()still uses theNUM_CHANNELSfor loop.With the increase in
NUM_CHANNELS, this loop fails at index 4 since SB only has 4 TADs. This results in the following error on SB machines:EDAC sbridge: Some needed devices are missing
EDAC sbridge: Couldn't find mci handler
EDAC sbridge: Couldn't find mci handle
Quoted 7 lines
This patch adapts the
saw_chan_masklogic forsbridge_mci_bind_devs()as well.After this patch:
EDAC MC0: Giving out device to module
sbridge_edac.ccontroller Sandy Bridge Socket#0: DEV 0000:3f:0e.0 (POLLED) EDAC MC1: Giving out device to modulesbridge_edac.ccontroller Sandy Bridge Socket#1: DEV 0000:7f:0e.0 (POLLED)
Quoted 42 lines
Signed-off-by Seth Jennings <[email protected]>--- drivers/edac/sb_edac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/edac/sb_edac.c +4
-4@@ -1648,6 +1648,7 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, {struct sbridge_pvt *pvt = mci->pvt_info;struct pci_dev *pdev; +u8 saw_chan_mask =0 ;int i;for (i =0 ; i < sbridge_dev->n_devs; i++) {@@ -1681,6 +1682,7 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, {int id = pdev->device -PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0 ; pvt->pci_tad[id] = pdev; + saw_chan_mask |=1 << id; }break ;case PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO :@@ -1701,10 +1703,8 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, !pvt-> pci_tad || !pvt->pci_ras || !pvt->pci_ta) goto enodev; -for (i =0 ; i <NUM_CHANNELS ; i++) { -if (!pvt->pci_tad[i]) - goto enodev; - } +if (saw_chan_mask !=0x0f ) + goto enodev;return 0 ; enodev:Signature · 1 line
2.4.3
Signature · 1 line
Aristeu
Quoted 9 lines
In
7d375bff,NUM_CHANNELSwas changed to 8 and the channel space was renumerated to handle EN, EP, and EX configurations.The
*_mci_bind_devsfunctions, except forsbridge_mci_bind_devs(), got a new device presence check in the form ofsaw_chan_mask. However,sbridge_mci_bind_devs()still uses theNUM_CHANNELSfor loop.This patch adapts the
saw_chan_masklogic forsbridge_mci_bind_devs()as well.
Oops. Sorry I missed that. Looks good.
Quoted 19 lines · Seth Jennings
In
7d375bff,NUM_CHANNELSwas changed to 8 and the channel space was renumerated to handle EN, EP, and EX configurations.The
*_mci_bind_devsfunctions, except forsbridge_mci_bind_devs(), got a new device presence check in the form ofsaw_chan_mask. However,sbridge_mci_bind_devs()still uses theNUM_CHANNELSfor loop.With the increase in
NUM_CHANNELS, this loop fails at index 4 since SB only has 4 TADs. This results in the following error on SB machines:EDAC sbridge: Some needed devices are missing
EDAC sbridge: Couldn't find mci handler
EDAC sbridge: Couldn't find mci handleThis patch adapts the
saw_chan_masklogic forsbridge_mci_bind_devs()as well.After this patch:
Quoted 7 lines
EDAC MC0: Giving out device to module
sbridge_edac.ccontroller Sandy Bridge Socket#0: DEV 0000:3f:0e.0 (POLLED) EDAC MC1: Giving out device to modulesbridge_edac.ccontroller Sandy Bridge Socket#1: DEV 0000:7f:0e.0 (POLLED)Signed-off-by Seth Jennings <[email protected]>--- drivers/edac/sb_edac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Applied, thanks.
Signature · 4 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.