projects
/
seabios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grml...
[seabios.git]
/
src
/
virtio-blk.c
diff --git
a/src/virtio-blk.c
b/src/virtio-blk.c
index ad80c24af01dabd151c1c2649955aec39bec2c05..b869189ee15b2ddb6e9657af860fc00f1c3ae924 100644
(file)
--- a/
src/virtio-blk.c
+++ b/
src/virtio-blk.c
@@
-8,7
+8,7
@@
// This file may be distributed under the terms of the GNU LGPLv3 license.
#include "util.h" // dprintf
// This file may be distributed under the terms of the GNU LGPLv3 license.
#include "util.h" // dprintf
-#include "pci.h" // foreach
bdf
+#include "pci.h" // foreach
pci
#include "config.h" // CONFIG_*
#include "biosvar.h" // GET_GLOBAL
#include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK
#include "config.h" // CONFIG_*
#include "biosvar.h" // GET_GLOBAL
#include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK
@@
-75,7
+75,7
@@
virtio_blk_op(struct disk_op_s *op, int write)
}
int
}
int
-process_virtio_op(struct disk_op_s *op)
+process_virtio_
blk_
op(struct disk_op_s *op)
{
if (! CONFIG_VIRTIO_BLK || CONFIG_COREBOOT)
return 0;
{
if (! CONFIG_VIRTIO_BLK || CONFIG_COREBOOT)
return 0;
@@
-97,32
+97,23
@@
process_virtio_op(struct disk_op_s *op)
}
static void
}
static void
-init_virtio_blk(
u16 bdf
)
+init_virtio_blk(
struct pci_device *pci
)
{
{
+ u16 bdf = pci->bdf;
dprintf(1, "found virtio-blk at %x:%x\n", pci_bdf_to_bus(bdf),
pci_bdf_to_dev(bdf));
struct virtiodrive_s *vdrive_g = malloc_fseg(sizeof(*vdrive_g));
dprintf(1, "found virtio-blk at %x:%x\n", pci_bdf_to_bus(bdf),
pci_bdf_to_dev(bdf));
struct virtiodrive_s *vdrive_g = malloc_fseg(sizeof(*vdrive_g));
- struct vring_virtqueue *vq = memalign_low(PAGE_SIZE, sizeof(*vq));
- if (!vdrive_g || !vq) {
+ if (!vdrive_g) {
warn_noalloc();
warn_noalloc();
-
goto fail
;
+
return
;
}
memset(vdrive_g, 0, sizeof(*vdrive_g));
}
memset(vdrive_g, 0, sizeof(*vdrive_g));
- memset(vq, 0, sizeof(*vq));
- vdrive_g->drive.type = DTYPE_VIRTIO;
+ vdrive_g->drive.type = DTYPE_VIRTIO_BLK;
vdrive_g->drive.cntl_id = bdf;
vdrive_g->drive.cntl_id = bdf;
- vdrive_g->vq = vq;
-
- u16 ioaddr = pci_config_readl(bdf, PCI_BASE_ADDRESS_0) &
- PCI_BASE_ADDRESS_IO_MASK;
+ u16 ioaddr = vp_init_simple(bdf);
vdrive_g->ioaddr = ioaddr;
vdrive_g->ioaddr = ioaddr;
-
- vp_reset(ioaddr);
- vp_set_status(ioaddr, VIRTIO_CONFIG_S_ACKNOWLEDGE |
- VIRTIO_CONFIG_S_DRIVER );
-
- if (vp_find_vq(ioaddr, 0, vdrive_g->vq) < 0 ) {
+ if (vp_find_vq(ioaddr, 0, &vdrive_g->vq) < 0 ) {
dprintf(1, "fail to find vq for virtio-blk %x:%x\n",
pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf));
goto fail;
dprintf(1, "fail to find vq for virtio-blk %x:%x\n",
pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf));
goto fail;
@@
-153,15
+144,15
@@
init_virtio_blk(u16 bdf)
char *desc = znprintf(MAXDESCSIZE, "Virtio disk PCI:%x:%x",
pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf));
char *desc = znprintf(MAXDESCSIZE, "Virtio disk PCI:%x:%x",
pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf));
- boot_add_hd(&vdrive_g->drive, desc, bootprio_find_pci_device(
bdf
));
+ boot_add_hd(&vdrive_g->drive, desc, bootprio_find_pci_device(
pci
));
vp_set_status(ioaddr, VIRTIO_CONFIG_S_ACKNOWLEDGE |
VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_DRIVER_OK);
return;
fail:
vp_set_status(ioaddr, VIRTIO_CONFIG_S_ACKNOWLEDGE |
VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_DRIVER_OK);
return;
fail:
+ free(vdrive_g->vq);
free(vdrive_g);
free(vdrive_g);
- free(vq);
}
void
}
void
@@
-173,12
+164,11
@@
virtio_blk_setup(void)
dprintf(3, "init virtio-blk\n");
dprintf(3, "init virtio-blk\n");
- int bdf, max;
- u32 id = PCI_VENDOR_ID_REDHAT_QUMRANET | (PCI_DEVICE_ID_VIRTIO_BLK << 16);
- foreachbdf(bdf, max) {
- u32 v = pci_config_readl(bdf, PCI_VENDOR_ID);
- if (v != id)
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (pci->vendor != PCI_VENDOR_ID_REDHAT_QUMRANET
+ || pci->device != PCI_DEVICE_ID_VIRTIO_BLK)
continue;
continue;
- init_virtio_blk(
bdf
);
+ init_virtio_blk(
pci
);
}
}
}
}