[RFC] parisc: Ignore AUX port of DIVA on rp34xx machines

Commit Message

Helge Deller May 21, 2017, 9:16 p.m. UTC

On rp34xx machines Linux detects the AUX port of the DIVA GSP card (PCI
subsystem id 0x1291) before the console port of DIVA GSP and as such the
AUX port becomes ttyS0 and the console port becomes ttyS1.  Since the
palo bootloader by default sets the console output to ttyS0 if no
keyboard & monitor is attached, all Linux kernel boot messages get lost.

Avoid this problem by ignoring the AUX port. There is no external serial
port connector for AUX, so we won't miss this serial port either.

(RFC, patch untested)

Signed-off-by: Helge Deller <[e-mail]>

--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 22d32d2..98261aa 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -174,6 +174,9 @@  static int pci_hp_diva_init(struct pci_dev *dev)
 	case PCI_DEVICE_ID_HP_DIVA_HURRICANE:
 		rc = 1;
 		break;
+	case PCI_DEVICE_ID_HP_DIVA_AUX2:
+		rc = -ENODEV; /* ignore on rp34xx */
+		break;
 	}
 
 	return rc;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3e5dbbe..633e738 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -760,6 +760,7 @@ 
 #define PCI_DEVICE_ID_HP_SX1000_IOC	0x127c
 #define PCI_DEVICE_ID_HP_DIVA_EVEREST	0x1282
 #define PCI_DEVICE_ID_HP_DIVA_AUX	0x1290
+#define PCI_DEVICE_ID_HP_DIVA_AUX2	0x1291
 #define PCI_DEVICE_ID_HP_DIVA_RMP3	0x1301
 #define PCI_DEVICE_ID_HP_DIVA_HURRICANE	0x132a
 #define PCI_DEVICE_ID_HP_CISSA		0x3220