ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-01 23:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gpio_drv: use platform session for i.MX

Browse Source 
This makes the driver work for all i.MX boards. A platform driver with
the board specific configuration is required.

issue #3900
This commit is contained in:
Sebastian Sumpf 2020-09-24 14:42:56 +02:00 committed by Christian Helmuth
parent 664b861f9d
commit 89972b11b7
5 changed files with 100 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
repos/os/src/drivers/gpio/imx/driver.h
View File

@ -14,30 +14,28 @@
* under the terms of the GNU Affero General Public License version 3. * under the terms of the GNU Affero General Public License version 3.
*/ */
#ifndef _DRIVERS__GPIO__SPEC__IMX__DRIVER_H_ #ifndef _DRIVERS__GPIO__IMX__DRIVER_H_
#define _DRIVERS__GPIO__SPEC__IMX__DRIVER_H_ #define _DRIVERS__GPIO__IMX__DRIVER_H_
/* Genode includes */ /* Genode includes */
#include <gpio/driver.h> #include <gpio/driver.h>
#include <irq_session/connection.h> #include <irq_session/client.h>
#include <platform_session/connection.h>
#include <timer_session/connection.h> #include <timer_session/connection.h>
/* local includes */ /* local includes */
#include <board.h>
#include <gpio.h> #include <gpio.h>
class Imx_driver : public Gpio::Driver class Imx_driver : public Gpio::Driver
{ {
private: private:
enum { enum {
PIN_SHIFT = 5, PIN_SHIFT = 5,
MAX_BANKS = 7, MAX_BANKS = 8,
MAX_PINS = 32 MAX_PINS = 32
}; };
class Gpio_bank class Gpio_bank
{ {
public: public:
@ -67,7 +65,7 @@ class Imx_driver : public Gpio::Driver
Irq_handler(Irq_handler const &); Irq_handler(Irq_handler const &);
Irq_handler &operator = (Irq_handler const &); Irq_handler &operator = (Irq_handler const &);
Genode::Irq_connection _irq; Genode::Irq_session_client _irq;
Genode::Io_signal_handler<Irq_handler> _dispatcher; Genode::Io_signal_handler<Irq_handler> _dispatcher;
Gpio_bank *_bank; Gpio_bank *_bank;
@ -80,8 +78,8 @@ class Imx_driver : public Gpio::Driver
public: public:
Irq_handler(Genode::Env &env, Irq_handler(Genode::Env &env,
unsigned irq, Gpio_bank *bank) Genode::Irq_session_capability cap, Gpio_bank *bank)
: _irq(env, irq), _dispatcher(env.ep(), *this, &Irq_handler::_handle), : _irq(cap), _dispatcher(env.ep(), *this, &Irq_handler::_handle),
_bank(bank) _bank(bank)
{ {
_irq.sigh(_dispatcher); _irq.sigh(_dispatcher);
@ -97,9 +95,10 @@ class Imx_driver : public Gpio::Driver
public: public:
Gpio_bank(Genode::Env &env, Genode::addr_t base, Gpio_bank(Genode::Env &env, Genode::Dataspace_capability io_mem,
Genode::size_t size, unsigned irq_low, unsigned irq_high) Genode::Irq_session_capability irq_low,
: _reg(env, base, size), Genode::Irq_session_capability irq_high)
: _reg(env, io_mem),
_irqh_low(env, irq_low, this), _irqh_low(env, irq_low, this),
_irqh_high(env, irq_high, this) { } _irqh_high(env, irq_high, this) { }
@ -121,70 +120,72 @@ class Imx_driver : public Gpio::Driver
_sig_cap[pin] = cap; } _sig_cap[pin] = cap; }
}; };
Gpio_bank _gpio_bank_0; Platform::Connection _platform_connection;
Gpio_bank _gpio_bank_1; Genode::Constructible<Gpio_bank> _gpio_banks[MAX_BANKS];
Gpio_bank _gpio_bank_2;
Gpio_bank _gpio_bank_3;
Gpio_bank _gpio_bank_4;
Gpio_bank _gpio_bank_5;
Gpio_bank _gpio_bank_6;
Gpio_bank *_gpio_bank(int gpio) Gpio_bank &_gpio_bank(int gpio)
{ {
switch (gpio >> PIN_SHIFT) { int bank = gpio >> PIN_SHIFT;
case 0:
return &_gpio_bank_0; if (bank >= MAX_BANKS) {
case 1: Genode::error("no Gpio_bank for pin ", gpio, " available");
return &_gpio_bank_1; throw -1;
case 2:
return &_gpio_bank_2;
case 3:
return &_gpio_bank_3;
case 4:
return &_gpio_bank_4;
case 5:
return &_gpio_bank_5;
case 6:
return &_gpio_bank_6;
} }
Genode::error("no Gpio_bank for pin ", gpio, " available"); return *_gpio_banks[bank];
return 0;
}
int _gpio_index(int gpio) { return gpio & 0x1f; }
Imx_driver(Genode::Env &env)
:
_gpio_bank_0(env, Board::GPIO1_MMIO_BASE, Board::GPIO1_MMIO_SIZE,
Board::GPIO1_IRQL, Board::GPIO1_IRQH),
_gpio_bank_1(env, Board::GPIO2_MMIO_BASE, Board::GPIO2_MMIO_SIZE,
Board::GPIO2_IRQL, Board::GPIO2_IRQH),
_gpio_bank_2(env, Board::GPIO3_MMIO_BASE, Board::GPIO3_MMIO_SIZE,
Board::GPIO3_IRQL, Board::GPIO3_IRQH),
_gpio_bank_3(env, Board::GPIO4_MMIO_BASE, Board::GPIO4_MMIO_SIZE,
Board::GPIO4_IRQL, Board::GPIO4_IRQH),
_gpio_bank_4(env, Board::GPIO5_MMIO_BASE, Board::GPIO5_MMIO_SIZE,
Board::GPIO5_IRQL, Board::GPIO5_IRQH),
_gpio_bank_5(env, Board::GPIO6_MMIO_BASE, Board::GPIO6_MMIO_SIZE,
Board::GPIO6_IRQL, Board::GPIO6_IRQH),
_gpio_bank_6(env, Board::GPIO7_MMIO_BASE, Board::GPIO7_MMIO_SIZE,
Board::GPIO7_IRQL, Board::GPIO7_IRQH)
{
for (unsigned i = 0; i < MAX_BANKS; ++i) {
Gpio_reg *regs = _gpio_bank(i << PIN_SHIFT)->regs();
for (unsigned j = 0; j < MAX_PINS; j++) {
regs->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::LOW_LEVEL, j);
regs->write<Gpio_reg::Int_mask>(0, j);
}
regs->write<Gpio_reg::Int_stat>(0xffffffff);
}
} }
int _gpio_index(int gpio) { return gpio & 0x1f; }
public: public:
static Imx_driver &factory(Genode::Env &env); Imx_driver(Genode::Env &env)
: _platform_connection(env)
{
using namespace Platform;
unsigned i = 0;
_platform_connection.with_xml([&] (Xml_node &xml) {
xml.for_each_sub_node("device", [&] (Xml_node node) {
if (i >= MAX_BANKS) return;
Device::Name name = node.attribute_value("name", Device::Name());
if (name == Device::Name()) return;
Device_client device { _platform_connection.acquire_device(name.string()) };
Genode::Dataspace_capability io_mem = device.io_mem_dataspace();
if (io_mem.valid() == false) {
Genode::warning("No 'io_mem' node present for device '", name, "' skipping");
return;
}
Genode::Irq_session_capability irq_low = device.irq(0);
if (irq_low.valid() == false) {
Genode::warning("No 'irq' node for low present for device '", name, "' skipping");
return;
}
Genode::Irq_session_capability irq_high = device.irq(1);
if (irq_high.valid() == false) {
Genode::warning("No 'irq' node for high present for device '", name, "' skipping");
return;
}
_gpio_banks[i].construct(env, io_mem, irq_low, irq_high);
Gpio_reg *regs = _gpio_banks[i]->regs();
for (unsigned j = 0; j < MAX_PINS; j++) {
regs->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::LOW_LEVEL, j);
regs->write<Gpio_reg::Int_mask>(0, j);
}
regs->write<Gpio_reg::Int_stat>(0xffffffff);
i++;
});
});
}
/****************************** /******************************
** Gpio::Driver interface ** ** Gpio::Driver interface **
@ -192,14 +193,14 @@ class Imx_driver : public Gpio::Driver
void direction(unsigned gpio, bool input) override void direction(unsigned gpio, bool input) override
{ {
Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); Gpio_reg *gpio_reg = _gpio_bank(gpio).regs();
gpio_reg->write<Gpio_reg::Dir>(input ? 0 : 1, gpio_reg->write<Gpio_reg::Dir>(input ? 0 : 1,
_gpio_index(gpio)); _gpio_index(gpio));
} }
void write(unsigned gpio, bool level) override void write(unsigned gpio, bool level) override
{ {
Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); Gpio_reg *gpio_reg = _gpio_bank(gpio).regs();
gpio_reg->write<Gpio_reg::Data>(level ? 1 : 0, gpio_reg->write<Gpio_reg::Data>(level ? 1 : 0,
_gpio_index(gpio)); _gpio_index(gpio));
@ -207,7 +208,7 @@ class Imx_driver : public Gpio::Driver
bool read(unsigned gpio) override bool read(unsigned gpio) override
{ {
Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); Gpio_reg *gpio_reg = _gpio_bank(gpio).regs();
return gpio_reg->read<Gpio_reg::Pad_stat>(_gpio_index(gpio)); return gpio_reg->read<Gpio_reg::Pad_stat>(_gpio_index(gpio));
} }
@ -223,54 +224,54 @@ class Imx_driver : public Gpio::Driver
void falling_detect(unsigned gpio) override void falling_detect(unsigned gpio) override
{ {
Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); Gpio_reg *gpio_reg = _gpio_bank(gpio).regs();
gpio_reg->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::FAL_EDGE, gpio_reg->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::FAL_EDGE,
_gpio_index(gpio)); _gpio_index(gpio));
} }
void rising_detect(unsigned gpio) override void rising_detect(unsigned gpio) override
{ {
Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); Gpio_reg *gpio_reg = _gpio_bank(gpio).regs();
gpio_reg->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::RIS_EDGE, gpio_reg->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::RIS_EDGE,
_gpio_index(gpio)); _gpio_index(gpio));
} }
void high_detect(unsigned gpio) override void high_detect(unsigned gpio) override
{ {
Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); Gpio_reg *gpio_reg = _gpio_bank(gpio).regs();
gpio_reg->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::HIGH_LEVEL, gpio_reg->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::HIGH_LEVEL,
_gpio_index(gpio)); _gpio_index(gpio));
} }
void low_detect(unsigned gpio) override void low_detect(unsigned gpio) override
{ {
Gpio_reg *gpio_reg = _gpio_bank(gpio)->regs(); Gpio_reg *gpio_reg = _gpio_bank(gpio).regs();
gpio_reg->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::LOW_LEVEL, gpio_reg->write<Gpio_reg::Int_conf>(Gpio_reg::Int_conf::LOW_LEVEL,
_gpio_index(gpio)); _gpio_index(gpio));
} }
void irq_enable(unsigned gpio, bool enable) override void irq_enable(unsigned gpio, bool enable) override
{ {
_gpio_bank(gpio)->irq(_gpio_index(gpio), enable); _gpio_bank(gpio).irq(_gpio_index(gpio), enable);
} }
void ack_irq(unsigned gpio) override void ack_irq(unsigned gpio) override
{ {
_gpio_bank(gpio)->ack_irq(_gpio_index(gpio)); _gpio_bank(gpio).ack_irq(_gpio_index(gpio));
} }
void register_signal(unsigned gpio, void register_signal(unsigned gpio,
Genode::Signal_context_capability cap) override Genode::Signal_context_capability cap) override
{ {
_gpio_bank(gpio)->sigh(_gpio_index(gpio), cap); } _gpio_bank(gpio).sigh(_gpio_index(gpio), cap); }
void unregister_signal(unsigned gpio) override void unregister_signal(unsigned gpio) override
{ {
Genode::Signal_context_capability cap; Genode::Signal_context_capability cap;
_gpio_bank(gpio)->sigh(_gpio_index(gpio), cap); _gpio_bank(gpio).sigh(_gpio_index(gpio), cap);
} }
bool gpio_valid(unsigned gpio) override { return gpio < (MAX_PINS*MAX_BANKS); } bool gpio_valid(unsigned gpio) override { return gpio < (MAX_PINS*MAX_BANKS); }
}; };
#endif /* _DRIVERS__GPIO__SPEC__IMX53__DRIVER_H_ */ #endif /* _DRIVERS__GPIO__IMX__DRIVER_H_ */

9
repos/os/src/drivers/gpio/imx/gpio.h
View File

@ -17,15 +17,14 @@
#define _DRIVERS__GPIO__SPEC__IMX__GPIO_H_ #define _DRIVERS__GPIO__SPEC__IMX__GPIO_H_
/* Genode includes */ /* Genode includes */
#include <base/attached_io_mem_dataspace.h> #include <base/attached_dataspace.h>
#include <util/mmio.h> #include <util/mmio.h>
struct Gpio_reg : Genode::Attached_io_mem_dataspace, Genode::Mmio struct Gpio_reg : Genode::Attached_dataspace, Genode::Mmio
{ {
Gpio_reg(Genode::Env &env, Gpio_reg(Genode::Env &env,
Genode::addr_t const mmio_base, Genode::Dataspace_capability cap)
Genode::size_t const mmio_size) : Genode::Attached_dataspace(env.rm(), cap),
: Genode::Attached_io_mem_dataspace(env, mmio_base, mmio_size),
Genode::Mmio((Genode::addr_t)local_addr<void>()) { } Genode::Mmio((Genode::addr_t)local_addr<void>()) { }
struct Data : Register_array<0x0, 32, 32, 1> {}; struct Data : Register_array<0x0, 32, 32, 1> {};

11
repos/os/src/drivers/gpio/imx/main.cc
View File

@ -25,19 +25,11 @@
/* local includes */ /* local includes */
#include <driver.h> #include <driver.h>
Imx_driver &Imx_driver::factory(Genode::Env &env)
{
static Imx_driver driver(env);
return driver;
}
struct Main struct Main
{ {
Genode::Env &env; Genode::Env &env;
Genode::Sliced_heap sliced_heap; Genode::Sliced_heap sliced_heap;
Imx_driver &driver; Imx_driver driver { env };
Gpio::Root root; Gpio::Root root;
Genode::Attached_rom_dataspace config_rom { env, "config" }; Genode::Attached_rom_dataspace config_rom { env, "config" };
@ -46,7 +38,6 @@ struct Main
: :
env(env), env(env),
sliced_heap(env.ram(), env.rm()), sliced_heap(env.ram(), env.rm()),
driver(Imx_driver::factory(env)),
root(&env.ep().rpc_ep(), &sliced_heap, driver) root(&env.ep().rpc_ep(), &sliced_heap, driver)
{ {
using namespace Genode; using namespace Genode;

7
repos/os/src/drivers/gpio/imx/spec/arm_v7/target.mk Normal file
View File

@ -0,0 +1,7 @@
TARGET = imx_gpio_drv
REQUIRES = arm_v7
SRC_CC = main.cc
LIBS = base
INC_DIR += $(REP_DIR)/src/drivers/gpio/imx
vpath main.cc $(REP_DIR)/src/drivers/gpio/imx

7
repos/os/src/drivers/gpio/imx/spec/arm_v8/target.mk Normal file
View File

@ -0,0 +1,7 @@
TARGET = imx_gpio_drv
REQUIRES = arm_v8
SRC_CC = main.cc
LIBS = base
INC_DIR += $(REP_DIR)/src/drivers/gpio/imx
vpath main.cc $(REP_DIR)/src/drivers/gpio/imx