Skip to content

Commit

Permalink
pc-ata: set IO port addresses based on pci BARs
Browse files Browse the repository at this point in the history
Some hardware (tested on ThinkPad E540) use uncommon ATA IO port
addresses instead of typical 0x1f0, 0x3f6, 0x1e8, 0x3ee. In such case,
these addresses are often located in pci BAR0-BAR3 of the storage
device. This change utilizes BARs via platformctl/pctl_get if nothing is
found on common addresses

JIRA: RTOS-922
  • Loading branch information
adamgreloch committed Oct 4, 2024
1 parent 10cca0a commit 0cc89b2
Showing 1 changed file with 72 additions and 4 deletions.
76 changes: 72 additions & 4 deletions storage/pc-ata/ata.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*
* Generic ATA controller driver
*
* Copyright 2012-2015, 2019, 2020 Phoenix Systems
* Author: Marcin Stragowski, Kamil Amanowicz, Lukasz Kosinski
* Copyright 2012-2015, 2019, 2020, 2024 Phoenix Systems
* Author: Marcin Stragowski, Kamil Amanowicz, Lukasz Kosinski, Adam Greloch
*
* This file is part of Phoenix-RTOS.
*
Expand All @@ -17,11 +17,15 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdbool.h>

#include <sys/io.h>
#include <sys/list.h>
#include <sys/threads.h>

#include <sys/platform.h>
#include <phoenix/arch/ia32/ia32.h>

#include "ata.h"

#define ATA_SECTORSZ_MAX 4096 /* Max supported sector size */
Expand All @@ -33,6 +37,12 @@ ata_common_t ata_common;
static ata_bus_t *buses;


static const int pci_devClasses[2] = {
0x0101, /* IDE interface */
0x0105, /* ATA controller */
};


static uint32_t ata_readreg(void *base, uint8_t reg, uint8_t size)
{
uintptr_t addr = (uintptr_t)base;
Expand Down Expand Up @@ -610,7 +620,11 @@ static int ata_initbus(void *base, void *ctrl, ata_bus_t *bus)

int ata_init(void)
{
int i, err;
ata_bus_t *bus1, *bus2;
addr_t ata1Base, ata1Ctrl, ata2Base, ata2Ctrl;
bool bus1Found = false, bus2Found = false;
platformctl_t pctl = { .action = pctl_get, .type = pctl_pci };

ata_common.ndevs = 0;
ata_common.devs = NULL;
Expand All @@ -624,11 +638,65 @@ int ata_init(void)
return -ENOMEM;
}

if (ata_initbus((void *)(ATA1_BASE | 0x1), (void *)(ATA1_CTRL | 0x1), bus1) < 0)
if (buses == NULL) {
for (i = 0; i < sizeof(pci_devClasses) + 1; i++) {
if (i == 0) {
/* try most common addresses first */
ata1Base = ATA1_BASE;
ata1Ctrl = ATA1_CTRL;
ata2Base = ATA2_BASE;
ata2Ctrl = ATA2_CTRL;
}
else {
/* no buses found on common addresses. look through pci config BARs */
pctl.pci.id.vendor = PCI_ANY;
pctl.pci.id.device = PCI_ANY;
pctl.pci.id.subvendor = PCI_ANY;
pctl.pci.id.subdevice = PCI_ANY;
pctl.pci.dev.bus = 0;
pctl.pci.dev.dev = 0;
pctl.pci.dev.func = 0;
pctl.pci.caps = NULL;

pctl.pci.id.cl = pci_devClasses[i - 1];
err = platformctl(&pctl);
if (err < 0) {
/* try next device class */
continue;
}

ata1Base = pctl.pci.dev.resources[0].base;
ata1Ctrl = pctl.pci.dev.resources[1].base;
ata2Base = pctl.pci.dev.resources[2].base;
ata2Ctrl = pctl.pci.dev.resources[3].base;
}

if (ata_initbus((void *)(ata1Base | 0x1), (void *)(ata1Ctrl | 0x1), bus1) == EOK) {
bus1Found = true;
}

if (ata_initbus((void *)(ata2Base | 0x1), (void *)(ata2Ctrl | 0x1), bus2) == EOK) {
bus2Found = true;
}

if (buses != NULL) {
/* at least one bus found via pci config, success */
break;
}
}
}

if (!bus1Found) {
free(bus1);
}

if (ata_initbus((void *)(ATA2_BASE | 0x1), (void *)(ATA2_CTRL | 0x1), bus2) < 0)
if (!bus2Found) {
free(bus2);
}

if (buses == NULL) {
return -ENODEV;
}

return EOK;
}

0 comments on commit 0cc89b2

Please sign in to comment.