Re: Problems with EDAC coexisting with BIOS

mark gross
2006-04-26T19:40:40Z

On Wed, Apr 26, 2006 at 11:38:35AM -0700, Randy.Dunlap wrote:
> On Wed, 26 Apr 2006 11:26:38 -0700 mark gross wrote:
>
> > Signed-off-by: Mark Gross <mark.gross@intel.com>
> >
> >
> > Trying mutt.
>
> Yes, much better. Almost there.
>
>
> > diff -urN -X linux-2.6.16/Documentation/dontdiff linux-2.6.16/drivers/edac/e752x_edac.c linux-2.6.16_edac/drivers/edac/e752x_edac.c
> > --- linux-2.6.16/drivers/edac/e752x_edac.c 2006-03-19 21:53:29.000000000 -0800
> > +++ linux-2.6.16_edac/drivers/edac/e752x_edac.c 2006-04-26 08:36:25.000000000 -0700
> > @@ -755,8 +756,16 @@
> > debugf0("MC: " __FILE__ ": %s(): mci\n", __func__);
> > debugf0("Starting Probe1\n");
> >
> > - /* enable device 0 function 1 */
> > + /* check to see if device 0 function 1 is enbaled; if it isn't, we
>
> "enabled"
>
> > + * assume the BIOS has reserved it for a reason and is expecting
> > + * exclusive access, we take care not to violate that assumption and
> > + * fail the probe. */
> > pci_read_config_byte(pdev, E752X_DEVPRES1, &stat8);
> > + if (!force_function_unhide && !(stat8 & (1 << 5))) {
> > + printk(KERN_INFO "Contact your BIOS vendor to see if the "
> > + "E752x error registers can be safely un-hidden\n");
> > + goto fail;
>
> The goto is indented too much...
>
> > + }
>

Sorry about that. trying again.

Signed-off-by: Mark Gross <mark.gross@intel.com>

diff -urN -X linux-2.6.16/Documentation/dontdiff linux-2.6.16/drivers/edac/e752x_edac.c linux-2.6.16_edac/drivers/edac/e752x_edac.c
--- linux-2.6.16/drivers/edac/e752x_edac.c 2006-03-19 21:53:29.000000000 -0800
+++ linux-2.6.16_edac/drivers/edac/e752x_edac.c 2006-04-26 12:31:51.000000000 -0700
@@ -29,6 +29,7 @@

#include "edac_mc.h"

+static int force_function_unhide;

#ifndef PCI_DEVICE_ID_INTEL_7520_0
#define PCI_DEVICE_ID_INTEL_7520_0 0x3590
@@ -755,8 +756,16 @@
debugf0("MC: " __FILE__ ": %s(): mci\n", __func__);
debugf0("Starting Probe1\n");

- /* enable device 0 function 1 */
+ /* check to see if device 0 function 1 is enabled; if it isn't, we
+ * assume the BIOS has reserved it for a reason and is expecting
+ * exclusive access, we take care not to violate that assumption and
+ * fail the probe. */
pci_read_config_byte(pdev, E752X_DEVPRES1, &stat8);
+ if (!force_function_unhide && !(stat8 & (1 << 5))) {
+ printk(KERN_INFO "Contact your BIOS vendor to see if the "
+ "E752x error registers can be safely un-hidden\n");
+ goto fail;
+ }
stat8 |= (1 << 5);
pci_write_config_byte(pdev, E752X_DEVPRES1, stat8);

@@ -1069,3 +1078,8 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Linux Networx (http://lnxi.com) Tom Zimmerman\n");
MODULE_DESCRIPTION("MC support for Intel e752x memory controllers");
+
+module_param(force_function_unhide, int, 0444);
+MODULE_PARM_DESC(force_function_unhide, "if BIOS sets Dev0:Fun1 up as hidden:"
+" 1=force unhide and hope BIOS doesn't fight driver for Dev0:Fun1 access");
+