d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ig4] Add ACPI platform support for ig4 driver

Browse Source 
Add ACPI part for ig4 driver to make it work on Intel BayTrail SoC where
ig4 device is available only through ACPI

Reviewed by:	avg
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D8742
This commit is contained in:
Oleksandr Tymoshenko 2016-12-26 22:13:43 +00:00
parent fd30dd7c26
commit 5c5bcb1d70
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=310621
6 changed files with 192 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/conf/files
View File

@ -1730,6 +1730,7 @@ dev/hptiop/hptiop.c optional hptiop scbus
dev/hwpmc/hwpmc_logging.c optional hwpmc
dev/hwpmc/hwpmc_mod.c optional hwpmc
dev/hwpmc/hwpmc_soft.c optional hwpmc
dev/ichiic/ig4_acpi.c optional ig4 acpi iicbus
dev/ichiic/ig4_iic.c optional ig4 iicbus
dev/ichiic/ig4_pci.c optional ig4 pci iicbus
dev/ichsmb/ichsmb.c optional ichsmb

166
sys/dev/ichiic/ig4_acpi.c Normal file
View File

@ -0,0 +1,166 @@
/*-
* Copyright (c) 2016 Oleksandr Tymoshenko <gonzo@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include "opt_acpi.h"
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/module.h>
#include <sys/proc.h>
#include <sys/rman.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <contrib/dev/acpica/include/acpi.h>
#include <contrib/dev/acpica/include/accommon.h>
#include <dev/acpica/acpivar.h>
#include <dev/iicbus/iiconf.h>
#include <dev/ichiic/ig4_reg.h>
#include <dev/ichiic/ig4_var.h>
static int ig4iic_acpi_probe(device_t dev);
static int ig4iic_acpi_attach(device_t dev);
static int ig4iic_acpi_detach(device_t dev);
static char *ig4iic_ids[] = {
"INT33C2",
"INT33C3",
"INT3432",
"INT3433",
"80860F41",
"808622C1",
"AMDI0510",
"APMC0D0F",
NULL
};
static int
ig4iic_acpi_probe(device_t dev)
{
if (acpi_disabled("ig4iic") ||
ACPI_ID_PROBE(device_get_parent(dev), dev, ig4iic_ids) == NULL)
return (ENXIO);
device_set_desc(dev, "Designware I2C Controller");
return (0);
}
static int
ig4iic_acpi_attach(device_t dev)
{
ig4iic_softc_t *sc;
int error;
sc = device_get_softc(dev);
sc->dev = dev;
sc->regs_rid = 0;
sc->regs_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
&sc->regs_rid, RF_ACTIVE);
if (sc->regs_res == NULL) {
device_printf(dev, "unable to map registers\n");
ig4iic_acpi_detach(dev);
return (ENXIO);
}
sc->intr_rid = 0;
sc->intr_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
&sc->intr_rid, RF_SHAREABLE | RF_ACTIVE);
if (sc->intr_res == NULL) {
device_printf(dev, "unable to map interrupt\n");
ig4iic_acpi_detach(dev);
return (ENXIO);
}
sc->platform_attached = 1;
error = ig4iic_attach(sc);
if (error)
ig4iic_acpi_detach(dev);
return (error);
}
static int
ig4iic_acpi_detach(device_t dev)
{
ig4iic_softc_t *sc = device_get_softc(dev);
int error;
if (sc->platform_attached) {
error = ig4iic_detach(sc);
if (error)
return (error);
sc->platform_attached = 0;
}
if (sc->intr_res) {
bus_release_resource(dev, SYS_RES_IRQ,
sc->intr_rid, sc->intr_res);
sc->intr_res = NULL;
}
if (sc->regs_res) {
bus_release_resource(dev, SYS_RES_MEMORY,
sc->regs_rid, sc->regs_res);
sc->regs_res = NULL;
}
return (0);
}
static device_method_t ig4iic_acpi_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, ig4iic_acpi_probe),
DEVMETHOD(device_attach, ig4iic_acpi_attach),
DEVMETHOD(device_detach, ig4iic_acpi_detach),
/* iicbus interface */
DEVMETHOD(iicbus_transfer, ig4iic_transfer),
DEVMETHOD(iicbus_reset, ig4iic_reset),
DEVMETHOD(iicbus_callback, iicbus_null_callback),
DEVMETHOD_END
};
static driver_t ig4iic_acpi_driver = {
"ig4iic_acpi",
ig4iic_acpi_methods,
sizeof(struct ig4iic_softc),
};
static devclass_t ig4iic_acpi_devclass;
DRIVER_MODULE(ig4iic_acpi, acpi, ig4iic_acpi_driver, ig4iic_acpi_devclass, 0, 0);
MODULE_DEPEND(ig4iic_acpi, acpi, 1, 1, 1);
MODULE_DEPEND(ig4iic_acpi, pci, 1, 1, 1);
MODULE_DEPEND(ig4iic_acpi, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(ig4iic_acpi, 1);

10
sys/dev/ichiic/ig4_iic.c
View File

@ -522,6 +522,9 @@ ig4iic_attach(ig4iic_softc_t *sc)
int error;
uint32_t v;
mtx_init(&sc->io_lock, "IG4 I/O lock", NULL, MTX_DEF);
sx_init(&sc->call_lock, "IG4 call lock");
v = reg_read(sc, IG4_REG_COMP_TYPE);
v = reg_read(sc, IG4_REG_COMP_PARAM1);
v = reg_read(sc, IG4_REG_GENERAL);
@ -664,6 +667,10 @@ ig4iic_detach(ig4iic_softc_t *sc)
mtx_unlock(&sc->io_lock);
sx_xunlock(&sc->call_lock);
mtx_destroy(&sc->io_lock);
sx_destroy(&sc->call_lock);
return (0);
}
@ -731,4 +738,5 @@ ig4iic_dump(ig4iic_softc_t *sc)
}
#undef REGDUMP
DRIVER_MODULE(iicbus, ig4iic, iicbus_driver, iicbus_devclass, NULL, NULL);
DRIVER_MODULE(iicbus, ig4iic_acpi, iicbus_driver, iicbus_devclass, NULL, NULL);
DRIVER_MODULE(iicbus, ig4iic_pci, iicbus_driver, iicbus_devclass, NULL, NULL);

25
sys/dev/ichiic/ig4_pci.c
View File

@ -115,11 +115,6 @@ ig4iic_pci_attach(device_t dev)
ig4iic_softc_t *sc = device_get_softc(dev);
int error;
bzero(sc, sizeof(*sc));
mtx_init(&sc->io_lock, "IG4 I/O lock", NULL, MTX_DEF);
sx_init(&sc->call_lock, "IG4 call lock");
sc->dev = dev;
sc->regs_rid = PCIR_BAR(0);
sc->regs_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
@ -140,7 +135,7 @@ ig4iic_pci_attach(device_t dev)
ig4iic_pci_detach(dev);
return (ENXIO);
}
sc->pci_attached = 1;
sc->platform_attached = 1;
error = ig4iic_attach(sc);
if (error)
@ -155,11 +150,11 @@ ig4iic_pci_detach(device_t dev)
ig4iic_softc_t *sc = device_get_softc(dev);
int error;
if (sc->pci_attached) {
if (sc->platform_attached) {
error = ig4iic_detach(sc);
if (error)
return (error);
sc->pci_attached = 0;
sc->platform_attached = 0;
}
if (sc->intr_res) {
@ -174,10 +169,6 @@ ig4iic_pci_detach(device_t dev)
sc->regs_rid, sc->regs_res);
sc->regs_res = NULL;
}
if (mtx_initialized(&sc->io_lock)) {
mtx_destroy(&sc->io_lock);
sx_destroy(&sc->call_lock);
}
return (0);
}
@ -196,15 +187,15 @@ static device_method_t ig4iic_pci_methods[] = {
};
static driver_t ig4iic_pci_driver = {
"ig4iic",
"ig4iic_pci",
ig4iic_pci_methods,
sizeof(struct ig4iic_softc)
};
static devclass_t ig4iic_pci_devclass;
DRIVER_MODULE_ORDERED(ig4iic, pci, ig4iic_pci_driver, ig4iic_pci_devclass, 0, 0,
DRIVER_MODULE_ORDERED(ig4iic_pci, pci, ig4iic_pci_driver, ig4iic_pci_devclass, 0, 0,
SI_ORDER_ANY);
MODULE_DEPEND(ig4iic, pci, 1, 1, 1);
MODULE_DEPEND(ig4iic, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(ig4iic, 1);
MODULE_DEPEND(ig4iic_pci, pci, 1, 1, 1);
MODULE_DEPEND(ig4iic_pci, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
MODULE_VERSION(ig4iic_pci, 1);

2
sys/dev/ichiic/ig4_var.h
View File

@ -65,7 +65,7 @@ struct ig4iic_softc {
char rbuf[IG4_RBUFSIZE];
int error;
uint8_t last_slave;
int pci_attached : 1;
int platform_attached : 1;
int use_10bit : 1;
int slave_valid : 1;
int read_started : 1;

9
sys/modules/i2c/controllers/ichiic/Makefile
View File

@ -2,7 +2,12 @@
.PATH: ${.CURDIR}/../../../../dev/ichiic
KMOD = ig4
SRCS = device_if.h bus_if.h iicbus_if.h pci_if.h smbus_if.h \
ig4_iic.c ig4_pci.c ig4_reg.h ig4_var.h
SRCS = acpi_if.h device_if.h bus_if.h iicbus_if.h pci_if.h \
smbus_if.h ${ig4_acpi} ig4_iic.c ig4_pci.c ig4_reg.h \
ig4_var.h opt_acpi.h
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
ig4_acpi= ig4_acpi.c
.endif
.include <bsd.kmod.mk>