Changeset 832cbe7 in mainline for uspace/drv


Ignore:
Timestamp:
2025-02-05T12:30:20Z (8 months ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
accdf882
Parents:
0dab4850
git-author:
Jiri Svoboda <jiri@…> (2025-02-04 21:30:06)
git-committer:
Jiri Svoboda <jiri@…> (2025-02-05 12:30:20)
Message:

Add proper IDE PCI to ISA fallback mechanism.

To determine if legacy IDE I/O ports are free, isa-ide asks isa,
who asks pciintel. pciintel waits for bus enumeration to complete,
then waits for all functions except the one who is asking
(which is ISA bus) to stabilize. During attach pci-ide will claim
the legacy IDE ports. Thus, if at this point legacy IDE ports
are unclaimed, pciintel tells ISA they are free, which tells isa-ide,
which continues to attach. If they are not free, isa-ide will not
attach.

This works for all use cases, including system without PCI bus,
system with PCI bus, but no (or disabled) PCI IDE, system with PCI
IDE with unrecognized VID/PID (which we will handle in legacy ISA mode).

Location:
uspace/drv
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

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

    r0dab4850 r832cbe7  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    4343
    4444#include "isa-ide.h"
     45#include "isa-ide_hw.h"
    4546#include "main.h"
    4647
    … …  
    7071        async_sess_t *parent_sess;
    7172        hw_res_list_parsed_t hw_res;
    72         hw_res_flags_t flags;
     73        hw_res_claims_t claims;
    7374        errno_t rc;
    7475
    … …  
    7778                return ENOMEM;
    7879
    79         rc = hw_res_get_flags(parent_sess, &flags);
    80         if (rc != EOK)
    81                 return rc;
    82 
    83         /*
    84          * Prevent attaching to the legacy ISA IDE register block
    85          * on a system with PCI not to conflict with PCI IDE.
    86          *
    87          * XXX This is a simplification. If we had a PCI-based system without
    88          * PCI-IDE or with PCI-IDE disabled and would still like to use
    89          * an ISA IDE controller, this would prevent us from doing so.
    90          */
    91         if (flags & hwf_isa_bridge) {
    92                 ddf_msg(LVL_NOTE, "Will not attach to PCI/ISA bridge.");
    93                 return EIO;
     80        rc = hw_res_query_legacy_io(parent_sess, &claims);
     81        if (rc != EOK) {
     82                ddf_msg(LVL_NOTE, "Error getting HW resource flags.");
     83                return rc;
    9484        }
    9585
    9686        hw_res_list_parsed_init(&hw_res);
    9787        rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
    98         if (rc != EOK)
    99                 return rc;
     88        if (rc != EOK) {
     89                ddf_msg(LVL_NOTE, "Error getting HW resource list.");
     90                return rc;
     91        }
    10092
    10193        if (hw_res.io_ranges.count != 4) {
    … …  
    148140        }
    149141
     142        /*
     143         * Only attach to legacy ISA IDE register block if it
     144         * is not claimed by PCI IDE driver.
     145         */
     146        if (res->cmd1 == leg_ide_ata_cmd_p &&
     147            res->cmd2 == leg_ide_ata_cmd_s &&
     148            (claims & hwc_isa_ide) != 0) {
     149                ddf_msg(LVL_NOTE, "Will not attach to ISA legacy ports "
     150                    "since they are already handled by PCI.");
     151                return EBUSY;
     152        }
     153
    150154        return EOK;
    151155error:
    … …  
    167171        rc = isa_ide_get_res(dev, &res);
    168172        if (rc != EOK) {
    169                 ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");
     173                if (rc == EINVAL)
     174                        ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");
    170175                return EINVAL;
    171176        }

  • uspace/drv/block/pc-floppy/main.c

    r0dab4850 r832cbe7  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    7373        async_sess_t *parent_sess;
    7474        hw_res_list_parsed_t hw_res;
    75         hw_res_flags_t flags;
    7675        errno_t rc;
    7776
    … …  
    7978        if (parent_sess == NULL)
    8079                return ENOMEM;
    81 
    82         rc = hw_res_get_flags(parent_sess, &flags);
    83         if (rc != EOK)
    84                 return rc;
    8580
    8681        hw_res_list_parsed_init(&hw_res);

  • uspace/drv/block/pci-ide/main.c

    r0dab4850 r832cbe7  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    133133        pci_ide_ctrl_t *ctrl;
    134134        pci_ide_hwres_t res;
     135        async_sess_t *parent_sess;
    135136        errno_t rc;
    136137
    … …  
    164165        if (rc != EOK) {
    165166                ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");
     167                rc = EIO;
     168                goto error;
     169        }
     170
     171        parent_sess = ddf_dev_parent_sess_get(dev);
     172        if (parent_sess == NULL) {
     173                rc = ENOMEM;
     174                goto error;
     175        }
     176
     177        /* Claim legacy I/O range to prevent ISA IDE from attaching there. */
     178        rc = hw_res_claim_legacy_io(parent_sess, hwc_isa_ide);
     179        if (rc != EOK) {
     180                ddf_msg(LVL_ERROR, "Failed claiming legacy I/O range.");
    166181                rc = EIO;
    167182                goto error;

  • uspace/drv/block/pci-ide/pci-ide.c

    r0dab4850 r832cbe7  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    189189
    190190        ddf_msg(LVL_DEBUG, "pci_ide_channel_init()");
     191
     192        memset(&params, 0, sizeof(params));
    191193
    192194        chan->ctrl = ctrl;

  • uspace/drv/bus/isa/isa.c

    r0dab4850 r832cbe7  
    11/*
    2  * Copyright (c) 2024 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * Copyright (c) 2010 Lenka Trochtova
    44 * Copyright (c) 2011 Jan Vesely
    … …  
    206206}
    207207
    208 static errno_t isa_fun_get_flags(ddf_fun_t *fnode, hw_res_flags_t *rflags)
     208/** Handle legacy IO availability query from function.
     209 *
     210 * @param fnode Function performing the query
     211 * @param rclaims Place to store the legacy IO claims bitmask
     212 * @return EOK on success or an error code
     213 */
     214static errno_t isa_fun_query_legacy_io(ddf_fun_t *fnode,
     215    hw_res_claims_t *rclaims)
    209216{
    210217        isa_fun_t *fun = isa_fun(fnode);
    211         hw_res_flags_t flags;
    212 
    213         flags = 0;
    214         if (fun->bus->pci_isa_bridge)
    215                 flags |= hwf_isa_bridge;
    216 
    217         ddf_msg(LVL_NOTE, "isa_fun_get_flags: returning 0x%x", flags);
    218         *rflags = flags;
     218        hw_res_claims_t claims;
     219        async_sess_t *sess;
     220        errno_t rc;
     221
     222        ddf_msg(LVL_DEBUG, "isa_fun_query_legacy_io()");
     223
     224        sess = ddf_dev_parent_sess_get(fun->bus->dev);
     225        if (sess == NULL) {
     226                ddf_msg(LVL_ERROR, "isa_dev_add failed to connect to the "
     227                    "parent driver.");
     228                return ENOENT;
     229        }
     230
     231        if (!fun->bus->pci_isa_bridge) {
     232                ddf_msg(LVL_NOTE, "isa_fun_query_legacy_io: classic ISA - "
     233                    "legacy IDE range is available");
     234                /* Classic ISA, we can be sure IDE is unclaimed by PCI */
     235                claims = 0;
     236        } else {
     237                ddf_msg(LVL_NOTE, "isa_fun_query_legacy_io: ISA bridge - "
     238                    "determine legacy IDE availability from PCI bus driver");
     239                rc = hw_res_query_legacy_io(sess, &claims);
     240                if (rc != EOK) {
     241                        ddf_msg(LVL_NOTE, "Error querying legacy IO claims.");
     242                        return rc;
     243                }
     244        }
     245
     246        ddf_msg(LVL_DEBUG, "isa_fun_query_legacy_io: returning 0x%x", claims);
     247        *rclaims = claims;
    219248        return EOK;
    220249}
    … …  
    227256        .dma_channel_setup = isa_fun_setup_dma,
    228257        .dma_channel_remain = isa_fun_remain_dma,
    229         .get_flags = isa_fun_get_flags
     258        .query_legacy_io = isa_fun_query_legacy_io
    230259};
    231260

  • uspace/drv/bus/pci/pciintel/pci.c

    r0dab4850 r832cbe7  
    11/*
    2  * Copyright (c) 2019 Jiri Svoboda
     2 * Copyright (c) 2025 Jiri Svoboda
    33 * Copyright (c) 2010 Lenka Trochtova
    44 * All rights reserved.
    … …  
    143143}
    144144
     145/** Handle legacy IO availability query from function.
     146 *
     147 * @param fnode Function performing the query
     148 * @param rclaims Place to store the legacy IO claims bitmask
     149 * @return EOK on success or an error code
     150 */
     151static errno_t pciintel_query_legacy_io(ddf_fun_t *fnode,
     152    hw_res_claims_t *rclaims)
     153{
     154        pci_fun_t *fun = pci_fun(fnode);
     155        pci_bus_t *bus = fun->busptr;
     156        pci_fun_t *f;
     157        hw_res_claims_t claims;
     158
     159        /*
     160         * We need to wait for enumeration to complete so that we give
     161         * the PCI IDE driver a chance to claim the legacy ISA IDE
     162         * ranges.
     163         */
     164        ddf_msg(LVL_DEBUG, "pciintel_query_legacy_io");
     165
     166        fun->querying = true;
     167
     168        fibril_mutex_lock(&bus->enum_done_lock);
     169        while (!bus->enum_done)
     170                fibril_condvar_wait(&bus->enum_done_cv, &bus->enum_done_lock);
     171        fibril_mutex_unlock(&bus->enum_done_lock);
     172
     173        ddf_msg(LVL_DEBUG, "Wait for PCI devices to stabilize");
     174
     175        f = pci_fun_first(bus);
     176        while (f != NULL) {
     177                if (!f->querying)
     178                        ddf_fun_wait_stable(f->fnode);
     179                f = pci_fun_next(f);
     180        }
     181
     182        /* Devices are stable. Now we can determine if ISA IDE was claimed. */
     183
     184        claims = 0;
     185
     186        ddf_msg(LVL_DEBUG, "PCI devices stabilized, leg_ide_claimed=%d\n",
     187            (int)bus->leg_ide_claimed);
     188        if (bus->leg_ide_claimed != false) {
     189                ddf_msg(LVL_NOTE, "Legacy IDE I/O ports claimed by PCI driver.");
     190                claims |= hwc_isa_ide;
     191        }
     192
     193        fun->querying = false;
     194        *rclaims = claims;
     195        return EOK;
     196}
     197
     198/** Handle legacy IO claim from function.
     199 *
     200 * @param fnode Function claiming the legacy I/O ports
     201 * @param claims Bitmask of claimed I/O
     202 * @return EOK on success or an error code
     203 */
     204static errno_t pciintel_claim_legacy_io(ddf_fun_t *fnode,
     205    hw_res_claims_t claims)
     206{
     207        pci_fun_t *fun = pci_fun(fnode);
     208        pci_bus_t *bus = fun->busptr;
     209
     210        ddf_msg(LVL_DEBUG, "pciintel_claim_legacy_io() claims=%x", claims);
     211        if ((claims & hwc_isa_ide) != 0)
     212                bus->leg_ide_claimed = true;
     213
     214        return EOK;
     215}
     216
    145217static pio_window_t *pciintel_get_pio_window(ddf_fun_t *fnode)
    146218{
    … …  
    211283        .disable_interrupt = &pciintel_disable_interrupt,
    212284        .clear_interrupt = &pciintel_clear_interrupt,
     285        .query_legacy_io = &pciintel_query_legacy_io,
     286        .claim_legacy_io = &pciintel_claim_legacy_io
    213287};
    214288
    … …  
    755829        list_initialize(&bus->funs);
    756830        fibril_mutex_initialize(&bus->conf_mutex);
     831        fibril_mutex_initialize(&bus->enum_done_lock);
     832        fibril_condvar_initialize(&bus->enum_done_cv);
    757833
    758834        bus->dnode = dnode;
    … …  
    863939        hw_res_clean_resource_list(&hw_resources);
    864940
     941        ddf_msg(LVL_DEBUG, "Bus enumeration done.");
     942
     943        fibril_mutex_lock(&bus->enum_done_lock);
     944        bus->enum_done = true;
     945        fibril_mutex_unlock(&bus->enum_done_lock);
     946        fibril_condvar_broadcast(&bus->enum_done_cv);
     947
    865948        return EOK;
    866 
    867949fail:
    868950        if (got_res)

  • uspace/drv/bus/pci/pciintel/pci.h

    r0dab4850 r832cbe7  
    11/*
     2 * Copyright (c) 2025 Jiri Svoboda
    23 * Copyright (c) 2010 Lenka Trochtova
    3  * Copyright (c) 2011 Jiri Svoboda
    44 * All rights reserved.
    55 *
    … …  
    4141#include <ddf/driver.h>
    4242#include <fibril_synch.h>
     43#include <stdbool.h>
    4344
    4445#define PCI_MAX_HW_RES 10
    … …  
    5455        /** List of functions (of pci_fun_t) */
    5556        list_t funs;
     57        /** Enumeration is done */
     58        bool enum_done;
     59        /** Synchronize enum_done */
     60        fibril_mutex_t enum_done_lock;
     61        /** Signal change to enum_done */
     62        fibril_condvar_t enum_done_cv;
     63        /** @c true iff legacy IDE range is claimed by PCI IDE driver */
     64        bool leg_ide_claimed;
    5665} pci_bus_t;
    5766
    … …  
    7281        uint8_t prog_if;
    7382        uint8_t revision;
     83        bool querying;
    7484        hw_resource_list_t hw_resources;
    7585        hw_resource_t resources[PCI_MAX_HW_RES];
Note: See TracChangeset for help on using the changeset viewer.