The patch titled
SGI IOC4: Detect IO card variant
has been added to the -mm tree. Its filename is
sgi-ioc4-detect-io-card-variant.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Brent Casavant <bcasavan@xxxxxxx>
There are three different IO cards which an SGI IOC4 controller may find
itself on. One of these variants does not bring out the IDE and serial
signals, so we need to disable attaching the corresponding IOC4 subdrivers
to such cards.
Signed-off-by: Brent Casavant <bcasavan@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ide/pci/sgiioc4.c | 10 +++++
drivers/serial/ioc4_serial.c | 13 +++++++
drivers/sn/ioc4.c | 61 +++++++++++++++++++++++++++++++++
include/linux/ioc4.h | 5 ++
4 files changed, 89 insertions(+)
diff -puN drivers/ide/pci/sgiioc4.c~sgi-ioc4-detect-io-card-variant drivers/ide/pci/sgiioc4.c
--- devel/drivers/ide/pci/sgiioc4.c~sgi-ioc4-detect-io-card-variant 2006-05-03 19:24:32.000000000 -0700
+++ devel-akpm/drivers/ide/pci/sgiioc4.c 2006-05-03 19:24:32.000000000 -0700
@@ -717,6 +717,16 @@ static ide_pci_device_t sgiioc4_chipsets
int
ioc4_ide_attach_one(struct ioc4_driver_data *idd)
{
+ /* IO9-RT does not bring out IDE connection.
+ * Do not attach to this particular IOC4.
+ */
+ if (idd->idd_variant == IOC4_VARIANT_IO9_RT) {
+ printk(KERN_INFO
+ "sgiioc4: Not needed for IO9-RT card at %s.\n",
+ pci_name(idd->idd_pdev));
+ return 0;
+ }
+
return pci_init_sgiioc4(idd->idd_pdev,
&sgiioc4_chipsets[idd->idd_pci_id->driver_data]);
}
diff -puN drivers/serial/ioc4_serial.c~sgi-ioc4-detect-io-card-variant drivers/serial/ioc4_serial.c
--- devel/drivers/serial/ioc4_serial.c~sgi-ioc4-detect-io-card-variant 2006-05-03 19:24:32.000000000 -0700
+++ devel-akpm/drivers/serial/ioc4_serial.c 2006-05-03 19:24:32.000000000 -0700
@@ -2646,7 +2646,10 @@ static int ioc4_serial_remove_one(struct
struct ioc4_port *port;
struct ioc4_soft *soft;
+ /* If serial driver did not attach, don't try to detach */
control = idd->idd_serial_data;
+ if (!control)
+ return 0;
for (port_num = 0; port_num < IOC4_NUM_SERIAL_PORTS; port_num++) {
for (port_type = UART_PORT_MIN;
@@ -2778,6 +2781,16 @@ ioc4_serial_attach_one(struct ioc4_drive
DPRINT_CONFIG(("%s (0x%p, 0x%p)\n", __FUNCTION__, idd->idd_pdev,
idd->idd_pci_id));
+ /* IO9-RT does not bring out serial connections.
+ * Do not attach to this particular IOC4.
+ */
+ if (idd->idd_variant == IOC4_VARIANT_IO9_RT) {
+ printk(KERN_INFO
+ "ioc4_serial: Not needed for IO9-RT card at %s.\n",
+ pci_name(idd->idd_pdev));
+ return 0;
+ }
+
/* request serial registers */
tmp_addr1 = idd->idd_bar0 + IOC4_SERIAL_OFFSET;
diff -puN drivers/sn/ioc4.c~sgi-ioc4-detect-io-card-variant drivers/sn/ioc4.c
--- devel/drivers/sn/ioc4.c~sgi-ioc4-detect-io-card-variant 2006-05-03 19:24:32.000000000 -0700
+++ devel-akpm/drivers/sn/ioc4.c 2006-05-03 19:24:32.000000000 -0700
@@ -222,6 +222,60 @@ ioc4_clock_calibrate(struct ioc4_driver_
idd->count_period = period;
}
+/* There are three variants of IOC4 cards: IO9, IO10, and IO9-RT.
+ * Each brings out different combinations of IOC4 signals, thus.
+ * the IOC4 subdrivers need to know to which we're attached.
+ *
+ * We look for the presence of a SCSI (IO9) or SATA (IO10) controller
+ * on the same PCI bus at slot number 3 to differentiate IO9 from IO10.
+ * If neither is present, it's an IO9-RT.
+ */
+#ifndef PCI_DEVICE_ID_QLOGIC_ISP12160
+#define PCI_DEVICE_ID_QLOGIC_ISP12160 0x1216
+#endif
+#ifndef PCI_VENDOR_ID_VITESSE
+#define PCI_VENDOR_ID_VITESSE 0x1725
+#endif
+#ifndef PCI_DEVICE_ID_VITESSE_7174
+#define PCI_DEVICE_ID_VITESSE_7174 0x7174
+#endif
+static unsigned int
+ioc4_variant(struct ioc4_driver_data *idd)
+{
+ struct pci_dev *pdev = NULL;
+ int found = 0;
+
+ /* IO9: Look for a QLogic ISP 12160 at the same bus and slot 3. */
+ do {
+ pdev = pci_get_device(PCI_VENDOR_ID_QLOGIC,
+ PCI_DEVICE_ID_QLOGIC_ISP12160, pdev);
+ if (pdev &&
+ idd->idd_pdev->bus->number == pdev->bus->number &&
+ 3 == PCI_SLOT(pdev->devfn))
+ found = 1;
+ pci_dev_put(pdev);
+ } while (pdev && !found);
+ if (NULL != pdev)
+ return IOC4_VARIANT_IO9;
+
+ /* IO10: Look for a Vitesse VSC 7174 at the same bus and slot 3. */
+ pdev = NULL;
+ do {
+ pdev = pci_get_device(PCI_VENDOR_ID_VITESSE,
+ PCI_DEVICE_ID_VITESSE_7174, pdev);
+ if (pdev &&
+ idd->idd_pdev->bus->number == pdev->bus->number &&
+ 3 == PCI_SLOT(pdev->devfn))
+ found = 1;
+ pci_dev_put(pdev);
+ } while (pdev && !found);
+ if (NULL != pdev)
+ return IOC4_VARIANT_IO10;
+
+ /* IO9-RT: No SCSI/SATA controller will be present */
+ return IOC4_VARIANT_IO9_RT;
+}
+
/* Adds a new instance of an IOC4 card */
static int
ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
@@ -286,6 +340,13 @@ ioc4_probe(struct pci_dev *pdev, const s
/* Failsafe portion of per-IOC4 initialization */
+ /* Detect card variant */
+ idd->idd_variant = ioc4_variant(idd);
+ printk(KERN_INFO "IOC4 at %s resides on %s card.\n", pci_name(pdev),
+ idd->idd_variant == IOC4_VARIANT_IO9 ? "IO9" :
+ idd->idd_variant == IOC4_VARIANT_IO9_RT ? "IO9-RT" :
+ idd->idd_variant == IOC4_VARIANT_IO10 ? "IO10" : "unknown");
+
/* Initialize IOC4 */
pci_read_config_dword(idd->idd_pdev, PCI_COMMAND, &pcmd);
pci_write_config_dword(idd->idd_pdev, PCI_COMMAND,
diff -puN include/linux/ioc4.h~sgi-ioc4-detect-io-card-variant include/linux/ioc4.h
--- devel/include/linux/ioc4.h~sgi-ioc4-detect-io-card-variant 2006-05-03 19:24:32.000000000 -0700
+++ devel-akpm/include/linux/ioc4.h 2006-05-03 19:24:32.000000000 -0700
@@ -147,6 +147,10 @@ struct ioc4_misc_regs {
#define IOC4_GPCR_EDGE_6 0x40
#define IOC4_GPCR_EDGE_7 0x80
+#define IOC4_VARIANT_IO9 0x0900
+#define IOC4_VARIANT_IO9_RT 0x0901
+#define IOC4_VARIANT_IO10 0x1000
+
/* One of these per IOC4 */
struct ioc4_driver_data {
struct list_head idd_list;
@@ -156,6 +160,7 @@ struct ioc4_driver_data {
struct __iomem ioc4_misc_regs *idd_misc_regs;
unsigned long count_period;
void *idd_serial_data;
+ unsigned int idd_variant;
};
/* One per submodule */
_
Patches currently in -mm which might be from bcasavan@xxxxxxx are
origin.patch
altix-correct-ioc4-port-order.patch
sgi-ioc4-detect-io-card-variant.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
