Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1201038 > unrolled thread
| Started by | Seth Jennings <sjenning@redhat.com> |
|---|---|
| First post | 2015-08-05 20:20 +0200 |
| Last post | 2015-08-05 21:20 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] sb_edac: fix TAD presence check for sbridge_mci_bind_devs() Seth Jennings <sjenning@redhat.com> - 2015-08-05 20:20 +0200
Re: [PATCH] sb_edac: fix TAD presence check for sbridge_mci_bind_devs() Aristeu Rozanski <aris@redhat.com> - 2015-08-05 20:30 +0200
RE: [PATCH] sb_edac: fix TAD presence check for sbridge_mci_bind_devs() "Luck, Tony" <tony.luck@intel.com> - 2015-08-05 21:20 +0200
| From | Seth Jennings <sjenning@redhat.com> |
|---|---|
| Date | 2015-08-05 20:20 +0200 |
| Subject | [PATCH] sb_edac: fix TAD presence check for sbridge_mci_bind_devs() |
| Message-ID | <pUbsd-IU-1@gated-at.bofh.it> |
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)
Signed-off-by: Seth Jennings <sjenning@redhat.com>
---
drivers/edac/sb_edac.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index ca78311..91cf710 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -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:
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Aristeu Rozanski <aris@redhat.com> |
|---|---|
| Date | 2015-08-05 20:30 +0200 |
| Subject | Re: [PATCH] sb_edac: fix TAD presence check for sbridge_mci_bind_devs() |
| Message-ID | <pUbBU-Uj-1@gated-at.bofh.it> |
| In reply to | #1201038 |
On Wed, Aug 05, 2015 at 01:16:01PM -0500, Seth Jennings wrote:
> 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)
Acked-by: Aristeu Rozanski <aris@redhat.com>
>
> Signed-off-by: Seth Jennings <sjenning@redhat.com>
> ---
> drivers/edac/sb_edac.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
> index ca78311..91cf710 100644
> --- a/drivers/edac/sb_edac.c
> +++ b/drivers/edac/sb_edac.c
> @@ -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:
> --
> 2.4.3
>
--
Aristeu
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | "Luck, Tony" <tony.luck@intel.com> |
|---|---|
| Date | 2015-08-05 21:20 +0200 |
| Subject | RE: [PATCH] sb_edac: fix TAD presence check for sbridge_mci_bind_devs() |
| Message-ID | <pUcoh-24P-11@gated-at.bofh.it> |
| In reply to | #1201038 |
> 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. > This patch adapts the saw_chan_mask logic for sbridge_mci_bind_devs() as > well. Oops. Sorry I missed that. Looks good. Acked-by: Tony Luck <tony.luck@intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web