Changeset 443695e in mainline for uspace/drv

Timestamp:

2024-05-21T11:33:56Z (17 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

3526f4f3

Parents:

1801005

git-author:

Jiri Svoboda <jiri@…> (2024-05-20 17:33:43)

git-committer:

Jiri Svoboda <jiri@…> (2024-05-21 11:33:56)

Message:

Basic PCI-IDE driver (no DMA support)

Also, make sure we avoid attaching ISA IDE and PCI IDE
at the same time. For simplicity, use ISA IDE on ISA systems
and PCI IDE on PCI-based systems.

Location:

uspace/drv

Files:

• block/isa-ide/isa-ide.c (modified) (1 diff)
• block/isa-ide/main.c (modified) (5 diffs)
• block/pci-ide/doc/doxygroups.h (added)
• block/pci-ide/main.c (added)
• block/pci-ide/main.h (added)
• block/pci-ide/meson.build (added)
• block/pci-ide/pci-ide.c (added)
• block/pci-ide/pci-ide.h (added)
• block/pci-ide/pci-ide.ma (added)
• block/pci-ide/pci-ide_hw.h (added)
• bus/isa/isa.c (modified) (6 diffs)
• meson.build (modified) (1 diff)

uspace/drv/block/isa-ide/isa-ide.c

@@ -34 +34 @@
  * @file
  * @brief ISA IDE driver
- *
- * The driver services a single IDE channel.
  */
 

uspace/drv/block/isa-ide/main.c

@@ -66 +66 @@
 };
 
-static errno_t ata_get_res(ddf_dev_t *dev, isa_ide_hwres_t *ata_res)
+static errno_t isa_ide_get_res(ddf_dev_t *dev, isa_ide_hwres_t *res)
 {
         async_sess_t *parent_sess;
         hw_res_list_parsed_t hw_res;
+        hw_res_flags_t flags;
         errno_t rc;
 
@@ -75 +76 @@
         if (parent_sess == NULL)
                 return ENOMEM;
+
+        rc = hw_res_get_flags(parent_sess, &flags);
+        if (rc != EOK)
+                return rc;
+
+        /*
+         * Prevent attaching to the legacy ISA IDE register block
+         * on a system with PCI not to conflict with PCI IDE.
+         *
+         * XXX This is a simplification. If we had a PCI-based system without
+         * PCI-IDE or with PCI-IDE disabled and would still like to use
+         * an ISA IDE controller, this would prevent us from doing so.
+         */
+        if (flags & hwf_isa_bridge) {
+                ddf_msg(LVL_NOTE, "Will not attach to PCI/ISA bridge.");
+                return EIO;
+        }
 
         hw_res_list_parsed_init(&hw_res);
@@ -92 +110 @@
         addr_range_t *cmd2_rng = &hw_res.io_ranges.ranges[2];
         addr_range_t *ctl2_rng = &hw_res.io_ranges.ranges[3];
-        ata_res->cmd1 = RNGABS(*cmd1_rng);
-        ata_res->ctl1 = RNGABS(*ctl1_rng);
-        ata_res->cmd2 = RNGABS(*cmd2_rng);
-        ata_res->ctl2 = RNGABS(*ctl2_rng);
+        res->cmd1 = RNGABS(*cmd1_rng);
+        res->ctl1 = RNGABS(*ctl1_rng);
+        res->cmd2 = RNGABS(*cmd2_rng);
+        res->ctl2 = RNGABS(*ctl2_rng);
 
         if (RNGSZ(*ctl1_rng) < sizeof(ata_ctl_t)) {
@@ -119 +137 @@
         /* IRQ */
         if (hw_res.irqs.count > 0) {
-                ata_res->irq1 = hw_res.irqs.irqs[0];
+                res->irq1 = hw_res.irqs.irqs[0];
         } else {
-                ata_res->irq1 = -1;
+                res->irq1 = -1;
         }
 
         if (hw_res.irqs.count > 1) {
-                ata_res->irq2 = hw_res.irqs.irqs[1];
+                res->irq2 = hw_res.irqs.irqs[1];
         } else {
-                ata_res->irq2 = -1;
+                res->irq2 = -1;
         }
 
@@ -147 +165 @@
         errno_t rc;
 
-        rc = ata_get_res(dev, &res);
+        rc = isa_ide_get_res(dev, &res);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");

uspace/drv/bus/isa/isa.c

@@ -76 +76 @@
 typedef struct {
         fibril_mutex_t mutex;
+        bool pci_isa_bridge;
         uint16_t pci_vendor_id;
         uint16_t pci_device_id;
@@ -92 +93 @@
         hw_resource_list_t hw_resources;
         link_t bus_link;
+        isa_bus_t *bus;
 } isa_fun_t;
 
@@ -204 +206 @@
 }
 
+static errno_t isa_fun_get_flags(ddf_fun_t *fnode, hw_res_flags_t *rflags)
+{
+        isa_fun_t *fun = isa_fun(fnode);
+        hw_res_flags_t flags;
+
+        flags = 0;
+        if (fun->bus->pci_isa_bridge)
+                flags |= hwf_isa_bridge;
+
+        ddf_msg(LVL_NOTE, "isa_fun_get_flags: returning 0x%x", flags);
+        *rflags = flags;
+        return EOK;
+}
+
 static hw_res_ops_t isa_fun_hw_res_ops = {
         .get_resource_list = isa_fun_get_resources,
@@ -211 +227 @@
         .dma_channel_setup = isa_fun_setup_dma,
         .dma_channel_remain = isa_fun_remain_dma,
+        .get_flags = isa_fun_get_flags
 };
 
@@ -264 +281 @@
         fibril_mutex_initialize(&fun->mutex);
         fun->hw_resources.resources = fun->resources;
+        fun->bus = isa;
 
         fun->fnode = fnode;
@@ -743 +761 @@
         if (rc != EOK) {
                 ddf_msg(LVL_NOTE, "Cannot read PCI config. Assuming ISA classic.");
+                isa->pci_isa_bridge = false;
                 isa->pci_vendor_id = 0;
                 isa->pci_device_id = 0;
                 isa->pci_class = BASE_CLASS_BRIDGE;
                 isa->pci_subclass = SUB_CLASS_BRIDGE_ISA;
+        } else {
+                ddf_msg(LVL_NOTE, "ISA Bridge");
+                isa->pci_isa_bridge = true;
         }
 

uspace/drv/meson.build

@@ -35 +35 @@
         'block/ddisk',
         'block/isa-ide',
+        'block/pci-ide',
         'block/usbmast',
         'block/virtio-blk',