[parisc-linux-cvs] pci changes

[Helge Deller]

--------------Boundary-00=_VNPFMMCMQKTX3RBTW1WX
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
Subject: 

Log message:
- EXTRAVERSION -pa39
- iosapic.c: Nice bug: if isi==NULL we can't access isi->isi_hpa in the 
printk()
- lba_pci.c: Some devices don't seem to have an IRT which leads to 
tmp_obj==NULL.
I temporarily disabled the NULL-check (as suggested by ggg) and that way those
PCI devices will be visible on the PCI bus.

The above changes will let my PCI graphic card (id: 103c:1005) appear on the
PCI bus (via lspci) and hopefully I'll now be able in the next step to get the
sticon working on my c3k and other machines :-)
--------------Boundary-00=_VNPFMMCMQKTX3RBTW1WX
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename="diff"

Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/parisc/linux/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- Makefile=092001/06/23 17:29:06=091.70
+++ Makefile=092001/06/24 12:13:13
@@ -1,7 +1,7 @@
 VERSION =3D 2
 PATCHLEVEL =3D 4
 SUBLEVEL =3D 0
-EXTRAVERSION =3D -pa38
+EXTRAVERSION =3D -pa39
=20
 KERNELRELEASE=3D$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
=20
Index: iosapic.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/iosapic.c,v
retrieving revision 1.24
diff -u -r1.24 iosapic.c
--- iosapic.c=092001/04/06 05:10:54=091.24
+++ iosapic.c=092001/06/24 12:12:08
@@ -636,7 +636,8 @@
 #endif
=20
 =09if (NULL =3D=3D isi) {
-=09=09printk(KERN_WARNING MODULE_NAME ": 0x%p hpa not registered\n", isi=
->isi_hpa);
+=09=09printk(KERN_WARNING MODULE_NAME ": hpa not registered for %s\n",
+=09=09=09pcidev->name);
 =09=09return(-1);
 =09}
=20
Index: lba_pci.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/lba_pci.c,v
retrieving revision 1.26
diff -u -r1.26 lba_pci.c
--- lba_pci.c=092001/05/16 21:00:13=091.26
+++ lba_pci.c=092001/06/24 12:12:09
@@ -1356,6 +1356,7 @@
 =09** Tell I/O SAPIC driver we have a IRQ handler/region.
 =09*/
 =09tmp_obj =3D iosapic_register(d->hpa+LBA_IOSAPIC_BASE);
+#if 0=09/* FIXME: some graphic cards (e.g. 103c:1005) don't have an IRT.=
 */
 =09if (NULL =3D=3D tmp_obj) {
 =09=09/* iosapic may have failed. But more likely the
 =09=09** slot isn't occupied and thus has no IRT entries.
@@ -1366,7 +1367,8 @@
 =09=09DBG(KERN_WARNING MODULE_NAME ": iosapic_register found no IRT entr=
ies for this HBA\n");
 =09=09return (1);
 =09}
-
+#endif
+=09
 =09lba_dev =3D kmalloc(sizeof(struct lba_device), GFP_KERNEL);
 =09if (NULL =3D=3D lba_dev)
 =09{

--------------Boundary-00=_VNPFMMCMQKTX3RBTW1WX--