Re: pchb0 problems after upgrade to 5.1

[Mark Kettenis]

> Date: Mon, 12 Nov 2012 17:01:16 +0200
> From: =?UTF-8?Q?K=C4=81rlis_Mi=C4=B7elsons?= <karlis.mikels...@lf.lv>
> 
> Hello,
> 
> After upgrading one computer to OpenBSD 5.1, it stops booting. Booting 
> can only be completed if I enter ddb command "continue". Updating this 
> box to 5.2 didn't solve the problem. It seems to be same bug reported 
> here: http://marc.info/?t=132741811100003&r=1&w=2

Can you try the following diff?

Index: agp_intel.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/agp_intel.c,v
retrieving revision 1.19
diff -u -p -r1.19 agp_intel.c
--- agp_intel.c 24 Oct 2011 15:42:33 -0000      1.19
+++ agp_intel.c 13 Nov 2012 13:13:14 -0000
@@ -262,7 +262,6 @@ agp_intel_attach(struct device *parent, 
        default:
                reg = pci_conf_read(isc->isc_pc, isc->isc_tag,
                    AGP_INTEL_ERRCMD);
-               reg |= 0x7000; /* Ack ERRSTS bits 8-10*/
                pci_conf_write(isc->isc_pc, isc->isc_tag,
                    AGP_INTEL_ERRCMD, reg);
        }
@@ -381,7 +380,6 @@ agp_intel_restore(struct agp_intel_softc
        default:
                tmp = pci_conf_read(isc->isc_pc, isc->isc_tag,
                    AGP_INTEL_ERRCMD);
-               tmp |= 0x7000; /* Ack ERRSTS bits 8-10*/
                pci_conf_write(isc->isc_pc, isc->isc_tag,
                    AGP_INTEL_ERRCMD, tmp);
                break;