From dd4715b6a5beca80ce9655f8711327a83d05b416 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Mon, 10 Jun 2013 22:08:35 +0200 Subject: pnp: Implement common handling for PnP config modes Many super i/o chips only answer to PnP requests if they are in a configuration state (sometimes also called ext func mode). To cope with that, the code of many chips implements its own version of our default PnP functions like pnp_set_resource(), pnp_enable_resource() etc. To avoid this code duplication, this patch extends our PnP device interface with optional functions to enter and exit configuration mode. Change-Id: I9b7662a0db70ede93276764fa15020f251eb46bd Signed-off-by: Nico Huber Reviewed-on: http://review.coreboot.org/3481 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Stefan Reinauer --- src/device/pnp_device.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/device') diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c index f39f8f9893..987a253932 100644 --- a/src/device/pnp_device.c +++ b/src/device/pnp_device.c @@ -6,6 +6,7 @@ * Copyright (C) 2004 Li-Ta Lo * Copyright (C) 2005 Tyan * (Written by Yinghai Lu for Tyan) + * Copyright (C) 2013 Nico Huber * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +30,20 @@ #include #include +/* PNP config mode wrappers */ + +void pnp_enter_conf_mode(device_t dev) +{ + if (dev->ops->ops_pnp_mode) + dev->ops->ops_pnp_mode->enter_conf_mode(dev); +} + +void pnp_exit_conf_mode(device_t dev) +{ + if (dev->ops->ops_pnp_mode) + dev->ops->ops_pnp_mode->exit_conf_mode(dev); +} + /* PNP fundamental operations */ void pnp_write_config(device_t dev, u8 reg, u8 value) @@ -133,32 +148,42 @@ void pnp_set_resources(device_t dev) { struct resource *res; + pnp_enter_conf_mode(dev); + /* Select the logical device (LDN). */ pnp_set_logical_device(dev); /* Paranoia says I should disable the device here... */ for (res = dev->resource_list; res; res = res->next) pnp_set_resource(dev, res); + + pnp_exit_conf_mode(dev); } void pnp_enable_resources(device_t dev) { + pnp_enter_conf_mode(dev); pnp_set_logical_device(dev); pnp_set_enable(dev, 1); + pnp_exit_conf_mode(dev); } void pnp_enable(device_t dev) { if (!dev->enabled) { + pnp_enter_conf_mode(dev); pnp_set_logical_device(dev); pnp_set_enable(dev, 0); + pnp_exit_conf_mode(dev); } } void pnp_alt_enable(device_t dev) { + pnp_enter_conf_mode(dev); pnp_set_logical_device(dev); pnp_set_enable(dev, !!dev->enabled); + pnp_exit_conf_mode(dev); } struct device_operations pnp_ops = { -- cgit v1.2.3