From 2d3964ec29ecc5df5783f8c7366fb1416f83f68c Mon Sep 17 00:00:00 2001 From: Dave Frodin Date: Tue, 12 May 2015 06:53:11 -0600 Subject: [PATCH] superio: Replace the indexed I/O functions Replace the multiple indexed I/O read and write functions with common functions. Change-Id: Idfe7a8784c28d51b3fbcb2f4e26beaa0b91741a8 Signed-off-by: Dave Frodin Reviewed-on: http://review.coreboot.org/10145 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/include/device/pnp.h | 39 ++++++++++++++++++++++ src/superio/fintek/f71869ad/f71869ad_hwm.c | 6 ---- src/superio/ite/it8716f/superio.c | 11 ------ src/superio/ite/it8728f/it8728f_hwm.c | 6 ---- src/superio/smsc/lpc47b397/superio.c | 12 ------- src/superio/winbond/w83627ehg/superio.c | 12 ------- src/superio/winbond/w83627hf/superio.c | 12 ------- 7 files changed, 39 insertions(+), 59 deletions(-) diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h index d0d6fa36a9..29df77de20 100644 --- a/src/include/device/pnp.h +++ b/src/include/device/pnp.h @@ -5,6 +5,7 @@ #include #include #include +#include #ifndef __SIMPLE_DEVICE__ @@ -63,5 +64,43 @@ struct pnp_mode_ops { void pnp_enter_conf_mode(device_t dev); void pnp_exit_conf_mode(device_t dev); +/* PNP indexed I/O operations */ + +/* + * u8 pnp_read_index(u16 port, u8 reg) + * Description: + * This routine reads indexed I/O registers. The reg byte is written + * to the index register at I/O address = port. The result is then + * read from the data register at I/O address = port + 1. + * + * Parameters: + * @param[in] u16 port = The I/O address of the port index register. + * @param[in] u8 reg = The offset within the indexed space. + * @param[out] u8 result = The value read back from the data register. + */ +static inline u8 pnp_read_index(u16 port, u8 reg) +{ + outb(reg, port); + return inb(port + 1); +} + +/* + * void pnp_write_index(u16 port, u8 reg, u8 value) + * Description: + * This routine writes indexed I/O registers. The reg byte is written + * to the index register at I/O address = port. The value byte is then + * written to the data register at I/O address = port + 1. + * + * Parameters: + * @param[in] u16 port = The address of the port index register. + * @param[in] u8 reg = The offset within the indexed space. + * @param[in] u8 value = The value to be written to the data register. + */ +static inline void pnp_write_index(u16 port, u8 reg, u8 value) +{ + outb(reg, port); + outb(value, port + 1); +} + #endif /* ! __SIMPLE_DEVICE__ */ #endif /* DEVICE_PNP_H */ diff --git a/src/superio/fintek/f71869ad/f71869ad_hwm.c b/src/superio/fintek/f71869ad/f71869ad_hwm.c index 25bc1ffaed..d4897c9790 100644 --- a/src/superio/fintek/f71869ad/f71869ad_hwm.c +++ b/src/superio/fintek/f71869ad/f71869ad_hwm.c @@ -55,12 +55,6 @@ #define HWM_FAN1_SEG3_SPEED_COUNT 0xAC #define HWM_FAN1_TEMP_MAP_SEL 0xAF -static void pnp_write_index(u16 port, u8 reg, u8 value) -{ - outb(reg, port); - outb(value, port + 1); -} - /* note: multifunc registers need to be tweaked before here */ void f71869ad_hwm_init(struct device *dev) { diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c index 56747ba762..01736eeabb 100644 --- a/src/superio/ite/it8716f/superio.c +++ b/src/superio/ite/it8716f/superio.c @@ -32,17 +32,6 @@ #include "it8716f.h" #if !CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL -static void pnp_write_index(u16 port_base, u8 reg, u8 value) -{ - outb(reg, port_base); - outb(value, port_base + 1); -} - -static u8 pnp_read_index(u16 port_base, u8 reg) -{ - outb(reg, port_base); - return inb(port_base + 1); -} static void init_ec(u16 base) { diff --git a/src/superio/ite/it8728f/it8728f_hwm.c b/src/superio/ite/it8728f/it8728f_hwm.c index 23fa9e8830..47dd274689 100644 --- a/src/superio/ite/it8728f/it8728f_hwm.c +++ b/src/superio/ite/it8728f/it8728f_hwm.c @@ -35,12 +35,6 @@ #define HWM_FAN3_CTL_PWM 0x17 /* default 0x00 */ #define HWM_ADC_TEMP_CHAN_EN_REG 0x51 /* default 0x00 */ -static void pnp_write_index(u16 port, u8 reg, u8 value) -{ - outb(reg, port); - outb(value, port + 1); -} - void it8728f_hwm_ec_init(struct device *dev) { struct superio_ite_it8728f_config *conf = dev->chip_info; diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c index 9c4a3b6dc6..c3d0aeebad 100644 --- a/src/superio/smsc/lpc47b397/superio.c +++ b/src/superio/smsc/lpc47b397/superio.c @@ -31,18 +31,6 @@ #include #include "lpc47b397.h" -static void pnp_write_index(u16 port, u8 reg, u8 value) -{ - outb(reg, port); - outb(value, port + 1); -} - -static u8 pnp_read_index(u16 port, u8 reg) -{ - outb(reg, port); - return inb(port + 1); -} - static void enable_hwm_smbus(struct device *dev) { /* Enable SensorBus register access. */ diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index 73ab022859..7c91a4214f 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -32,18 +32,6 @@ #include #include "w83627ehg.h" -static void pnp_write_index(u16 port, u8 reg, u8 value) -{ - outb(reg, port); - outb(value, port + 1); -} - -static u8 pnp_read_index(u16 port, u8 reg) -{ - outb(reg, port); - return inb(port + 1); -} - static void enable_hwm_smbus(struct device *dev) { u8 reg8; diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index 2d69fad201..9ac2683f0e 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -32,18 +32,6 @@ #include #include "w83627hf.h" -static void pnp_write_index(u16 port, u8 reg, u8 value) -{ - outb(reg, port); - outb(value, port + 1); -} - -static u8 pnp_read_index(u16 port, u8 reg) -{ - outb(reg, port); - return inb(port + 1); -} - static void enable_hwm_smbus(struct device *dev) { u8 reg8;