13dc976a52
Find all the (ramstage) implementations of enter()/exit() functions
for the configuration state, register and call them through the new
struct pnp_mode_ops. As our standard PnP functions are aware of the
pnp_mode_ops, it's not necessary to call enter()/exit() around them
anymore.
Patch generated with the cocci below. It's not perfect. The movement
of the enter()/exit() calls is somehow fragile. So I checked the
remaining calls for sense, and changed some empty lines. Also a
duplicate insertion of pnp_conf_mode_ops had to be removed.
/* Try to find enter and exit functions by their outb() structure and
their usage around calls to our standard pnp functions: */
@ enter_match @
identifier enter;
identifier dev;
type device_t;
@@
void enter(device_t dev)
{
<...
outb(..., dev->path.pnp.port);
...>
}
@ exit_match @
identifier exit;
identifier dev;
type device_t;
@@
void exit(device_t dev)
{
<...
outb(..., dev->path.pnp.port);
...>
}
@ pnp_match @
identifier op;
identifier pnp_op =~ "^pnp_((alt_|)enable|(set|enable)_resources)$";
identifier enter_match.enter, exit_match.exit;
type device_t;
identifier dev;
@@
void op(device_t dev)
{
...
enter(dev);
...
pnp_op(dev);
...
exit(dev);
...
}
/* Now add enter/exit to a pnp_mode_ops structure: */
@ depends on pnp_match @
identifier enter_match.enter;
identifier exit_match.exit;
identifier ops;
@@
+static const struct pnp_mode_ops pnp_conf_mode_ops = {
+ .enter_conf_mode = enter,
+ .exit_conf_mode = exit,
+};
+
struct device_operations ops = {
...,
+ .ops_pnp_mode = &pnp_conf_mode_ops,
};
/* Match against the new structure as we change the code and the above
matches might not work anymore: */
@ mode_match @
identifier enter, exit, ops;
@@
struct pnp_mode_ops ops = {
.enter_conf_mode = enter,
.exit_conf_mode = exit,
};
/* Replace enter()/enter() calls with new standard calls (e.g.
pnp_enter_conf_mode()): */
@@
identifier mode_match.enter;
expression e;
@@
-enter(e)
+pnp_enter_conf_mode(e)
@@
identifier mode_match.exit;
expression e;
@@
-exit(e)
+pnp_exit_conf_mode(e)
/* If there are calls to standard PnP functions, (re)move the
enter()/exit() calls around them: */
@@
identifier pnp_op =~ "^pnp_((alt_|)enable|(set|enable)_resources)$";
expression e;
@@
-pnp_enter_conf_mode(e);
pnp_op(e);
+pnp_enter_conf_mode(e);
...
pnp_exit_conf_mode(e);
@@
identifier pnp_op =~ "^pnp_((alt_|)enable|(set|enable)_resources)$";
expression e;
@@
pnp_enter_conf_mode(e);
...
+pnp_exit_conf_mode(e);
pnp_op(e);
-pnp_exit_conf_mode(e);
@@
expression e;
@@
-pnp_enter_conf_mode(e);
-pnp_exit_conf_mode(e);
Change-Id: I5c04b0c6a8f01a30bc25fe195797c02e75b6c276
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: http://review.coreboot.org/3482
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
89 lines
2.4 KiB
C
Executable File
89 lines
2.4 KiB
C
Executable File
/*
|
|
* This file is part of the coreboot project.
|
|
*
|
|
* Copyright (C) 2011 Advanced Micro Devices, Inc.
|
|
*
|
|
* 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <arch/io.h>
|
|
#include <device/pnp.h>
|
|
#include <stdlib.h>
|
|
#include "nct5104d.h"
|
|
|
|
static void pnp_enter_exteded_mode(device_t dev)
|
|
{
|
|
outb(0x87,dev->path.pnp.port);
|
|
outb(0x87,dev->path.pnp.port);
|
|
}
|
|
|
|
static void pnp_exit_extended_mode(device_t dev)
|
|
{
|
|
outb(0xaa,dev->path.pnp.port);
|
|
}
|
|
|
|
static void nct5104d_init(device_t dev)
|
|
{
|
|
}
|
|
|
|
static void nct5104d_pnp_set_resources(device_t dev)
|
|
{
|
|
pnp_set_resources(dev);
|
|
}
|
|
|
|
static void nct5104d_pnp_enable_resources(device_t dev)
|
|
{
|
|
pnp_enable_resources(dev);
|
|
}
|
|
|
|
static void nct5104d_pnp_enable(device_t dev)
|
|
{
|
|
pnp_alt_enable(dev);
|
|
}
|
|
|
|
static const struct pnp_mode_ops pnp_conf_mode_ops = {
|
|
.enter_conf_mode = pnp_enter_exteded_mode,
|
|
.exit_conf_mode = pnp_exit_extended_mode,
|
|
};
|
|
|
|
static struct device_operations ops = {
|
|
.read_resources = pnp_read_resources,
|
|
.set_resources = nct5104d_pnp_set_resources,
|
|
.enable_resources = nct5104d_pnp_enable_resources,
|
|
.enable = nct5104d_pnp_enable,
|
|
.init = nct5104d_init,
|
|
.ops_pnp_mode = &pnp_conf_mode_ops,
|
|
};
|
|
|
|
static struct pnp_info pnp_dev_info[] = {
|
|
{ &ops, NCT5104D_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
|
|
{ &ops, NCT5104D_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
|
|
{ &ops, NCT5104D_GPIO_WDT},
|
|
{ &ops, NCT5104D_GPIO_PP_OD},
|
|
{ &ops, NCT5104D_GPIO0},
|
|
{ &ops, NCT5104D_GPIO1},
|
|
{ &ops, NCT5104D_GPIO6},
|
|
};
|
|
|
|
static void enable_dev(struct device *dev)
|
|
{
|
|
pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
|
|
}
|
|
|
|
struct chip_operations superio_nuvoton_nct5104d_ops = {
|
|
CHIP_NAME("NUVOTON NCT5104D Super I/O")
|
|
.enable_dev = enable_dev,
|
|
};
|