arch/io.h: Separate MMIO and PNP ops

Change-Id: Ie32f1d43168c277be46cdbd7fbfa2445d9899689
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31699
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki
2019-03-03 00:35:15 +02:00
parent 3855c01e0a
commit 3ee8b750f4
11 changed files with 163 additions and 141 deletions

View File

@@ -14,7 +14,6 @@
#include <device/resource.h>
#include <device/path.h>
#include <device/pci_type.h>
#include <arch/io.h>
struct device;
struct pci_operations;

View File

@@ -15,7 +15,7 @@
#ifndef __DEVICE_MMIO_H__
#define __DEVICE_MMIO_H__
/* FIXME: We only want the volatile MMIO ops. */
#include <arch/io.h>
#include <arch/mmio.h>
#include <endian.h>
#endif

View File

@@ -15,7 +15,73 @@
#ifndef __DEVICE_PNP_OPS_H__
#define __DEVICE_PNP_OPS_H__
/* FIXME: We only want the PNP ops. */
#include <stdint.h>
#include <arch/io.h>
#include <device/pnp_type.h>
#ifdef __SIMPLE_DEVICE__
static __always_inline void pnp_write_config(
pnp_devfn_t dev, uint8_t reg, uint8_t value)
{
unsigned int port = dev >> 8;
outb(reg, port);
outb(value, port + 1);
}
static __always_inline uint8_t pnp_read_config(
pnp_devfn_t dev, uint8_t reg)
{
unsigned int port = dev >> 8;
outb(reg, port);
return inb(port + 1);
}
static __always_inline
void pnp_set_logical_device(pnp_devfn_t dev)
{
unsigned int device = dev & 0xff;
pnp_write_config(dev, 0x07, device);
}
static __always_inline
void pnp_set_enable(pnp_devfn_t dev, int enable)
{
pnp_write_config(dev, 0x30, enable?0x1:0x0);
}
static __always_inline
int pnp_read_enable(pnp_devfn_t dev)
{
return !!pnp_read_config(dev, 0x30);
}
static __always_inline
void pnp_set_iobase(pnp_devfn_t dev, unsigned int index, unsigned int iobase)
{
pnp_write_config(dev, index + 0, (iobase >> 8) & 0xff);
pnp_write_config(dev, index + 1, iobase & 0xff);
}
static __always_inline
uint16_t pnp_read_iobase(pnp_devfn_t dev, unsigned int index)
{
return ((uint16_t)(pnp_read_config(dev, index)) << 8)
| pnp_read_config(dev, index + 1);
}
static __always_inline
void pnp_set_irq(pnp_devfn_t dev, unsigned int index, unsigned int irq)
{
pnp_write_config(dev, index, irq);
}
static __always_inline
void pnp_set_drq(pnp_devfn_t dev, unsigned int index, unsigned int drq)
{
pnp_write_config(dev, index, drq & 0xff);
}
#endif /* __SIMPLE_DEVICE__ */
#endif