summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--INSTALL370
-rw-r--r--configure.ac2
-rw-r--r--io-module/Makefile2
-rw-r--r--io-module/adc.c1
-rw-r--r--io-module/machine/mtcap.c2
-rw-r--r--io-module/machine/mtcap3.c19
-rw-r--r--io-module/machine/mths.c2
-rw-r--r--io-module/machine/mtr.c369
-rw-r--r--io-module/mts-io.c72
-rw-r--r--io-module/mts_io_module.h4
-rw-r--r--io-module/radio_udev_discovery.c308
-rw-r--r--io-module/radio_udev_discovery.h24
-rwxr-xr-xtest/resettest.sh46
14 files changed, 800 insertions, 423 deletions
diff --git a/AUTHORS b/AUTHORS
index c654a0d..89f02fb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-James Maki <jmaki@multitech.com>
+Multi-Tech
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 007e939..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
-
- Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved. This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package. Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below. The lack of an optional feature in a given package is not
-necessarily a bug. More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package, generally using the just-built uninstalled binaries.
-
- 4. Type `make install' to install the programs and any data files and
- documentation. When installing into a prefix owned by root, it is
- recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
- privileges.
-
- 5. Optionally, type `make installcheck' to repeat any self-tests, but
- this time using the binaries in their final installed location.
- This target does not install anything. Running this target as a
- regular user, particularly if the prior `make install' required
- root privileges, verifies that the installation completed
- correctly.
-
- 6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 7. Often, you can also type `make uninstall' to remove the installed
- files again. In practice, not all packages have tested that
- uninstallation works correctly, even though it is required by the
- GNU Coding Standards.
-
- 8. Some packages, particularly those that use Automake, provide `make
- distcheck', which can by used by developers to test that all other
- targets like `make install' and `make uninstall' work correctly.
- This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'. This
-is known as a "VPATH" build.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
-this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
- This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them. In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
- The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
- The first method involves providing an override variable for each
-affected directory. For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'. Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated. The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
- The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names. The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters. On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
- Some packages offer the ability to configure how verbose the
-execution of `make' will be. For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
- HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved. Use GNU `make'
-instead.
-
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
-
- ./configure CC="cc"
-
-and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
- On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS
- KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation. Until the limitation is lifted, you can use
-this workaround:
-
- CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
- Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--prefix=DIR'
- Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
-`--no-create'
-`-n'
- Run the configure checks, but stop before creating any output
- files.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
diff --git a/configure.ac b/configure.ac
index fc176d5..99f7a9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mts-io], [4.6.0])
+AC_INIT([mts-io], [4.7.0])
AC_CONFIG_SRCDIR([util/mts_util_lora2_reset.c])
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER([config.h])
diff --git a/io-module/Makefile b/io-module/Makefile
index 0c05414..e45e789 100644
--- a/io-module/Makefile
+++ b/io-module/Makefile
@@ -1,6 +1,6 @@
obj-m := mts_io.o
-mts_io-objs := buttons.o mts-io.o mts_supercap.o
+mts_io-objs := buttons.o mts-io.o mts_supercap.o radio_udev_discovery.o
clean:
rm -f *.ko *.o
diff --git a/io-module/adc.c b/io-module/adc.c
index 3d5f3d0..541dc95 100644
--- a/io-module/adc.c
+++ b/io-module/adc.c
@@ -118,7 +118,6 @@ static int mts_io_board_adc_probe(struct platform_device *pdev)
static int mts_io_board_adc_remove(struct platform_device *pdev)
{
if (adc_clk) {
- int ret;
clk_disable_unprepare(adc_clk);
}
return 0;
diff --git a/io-module/machine/mtcap.c b/io-module/machine/mtcap.c
index 0d4af0f..e013f14 100644
--- a/io-module/machine/mtcap.c
+++ b/io-module/machine/mtcap.c
@@ -349,7 +349,7 @@ static int radio_reset_mtcap(int radio_model)
if (!rst_pin || !onoff_pin) {
return -ENODEV;
}
-
+ reset_radio_udev_discovery();
//
// Unconditional shutdown
//
diff --git a/io-module/machine/mtcap3.c b/io-module/machine/mtcap3.c
index 2304a28..8d2f3c4 100644
--- a/io-module/machine/mtcap3.c
+++ b/io-module/machine/mtcap3.c
@@ -373,7 +373,8 @@ static ssize_t mts_attr_store_radio_reset_mtcap3(struct device *dev,
if (value != 0 && value != -1) {
return -EINVAL;
}
-
+
+ reset_radio_udev_discovery();
mutex_lock(&mts_io_mutex);
radio_off_mtcap3();
@@ -453,6 +454,11 @@ static DEVICE_ATTR_MTS(dev_attr_led_lora_gpio_mtcap3, "led-lora",
static DEVICE_ATTR_MTS(dev_attr_led_extra_gpio_mtcap3, "led-extra",
mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
+// here to maintain compatiblility
+static DEVICE_ATTR_MTS(dev_attr_radio_enable_mtcap3, "radio-enable",
+ mts_attr_show_radio_enable_mtcap3, mts_attr_store_radio_enable_mtcap3);
+
+
static struct attribute *mtcap3_0_0_platform_attributes[] = {
&dev_attr_vendor_id.attr,
&dev_attr_product_id.attr,
@@ -481,6 +487,8 @@ static struct attribute *mtcap3_0_0_platform_attributes[] = {
&dev_attr_radio_reset_backoff_index.attr,
&dev_attr_radio_reset_backoff_seconds.attr,
+ &dev_attr_radio_enable_mtcap3.attr,
+
NULL,
};
@@ -529,12 +537,3 @@ static struct attribute *mtcap3_0_0_lora_attributes[] = {
static struct attribute_group mtcap3_0_0_lora_attribute_group = {
.attrs = mtcap3_0_0_lora_attributes
};
-
-// here to maintain compatiblility
-static DEVICE_ATTR_MTS(dev_attr_radio_enable_mtcap3, "radio-enable",
- mts_attr_show_radio_enable_mtcap3, mts_attr_store_radio_enable_mtcap3);
-
-static struct attribute *mtcap3_0_0_enable_radio_attribute[] = {
- &dev_attr_radio_enable_mtcap3.attr,
-};
-
diff --git a/io-module/machine/mths.c b/io-module/machine/mths.c
index 1922d88..b74e69f 100644
--- a/io-module/machine/mths.c
+++ b/io-module/machine/mths.c
@@ -658,7 +658,7 @@ static int radio_reset_mths(void)
if (!rst_pin || !onoff_pin) {
return -ENODEV;
}
-
+ reset_radio_udev_discovery();
// drive reset pin low for 500ms
gpio_set_value(rst_pin->pin.gpio, 0);
diff --git a/io-module/machine/mtr.c b/io-module/machine/mtr.c
index 9f00be8..3838fd2 100644
--- a/io-module/machine/mtr.c
+++ b/io-module/machine/mtr.c
@@ -1460,6 +1460,270 @@ static struct gpio_pin gpio_pins_mtrv1_0_3[] = {
{ },
};
+static struct gpio_pin gpio_pins_mtrv1_0_4[] = {
+ {
+ .name = "ETH_RESET",
+ .pin = {
+ .gpio = AT91_PIN_PC6,
+ .flags = GPIOF_OUT_INIT_HIGH | GPIOF_OPEN_DRAIN, /* without GPIOF_OPEN_DRAIN causes issues with the Micrel KSZ8091RNBCA (RMII) PHY */
+ .label = "eth-reset",
+ },
+ .active_low = 0,
+ },
+ {
+ .name = "DEVICE_RESET",
+ .pin = {
+ .gpio = AT91_PIN_PC4,
+ .flags = GPIOF_IN,
+ .label = "reset",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LS_LED",
+ .pin = {
+ .gpio = AT91_PIN_PC4,
+#if LED_LS_CONTROLLABLE
+ .flags = GPIOF_OUT_INIT_HIGH,
+#else
+ .flags = GPIOF_IN,
+#endif
+ .label = "led-ls",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "STATUS_LED",
+ .pin = {
+ .gpio = AT91_PIN_PC21,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "led-status",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED3",
+ .pin = {
+ .gpio = AT91_PIN_PC15,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-wifi",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED3",
+ .pin = {
+ .gpio = AT91_PIN_PC15,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-b",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED4",
+ .pin = {
+ .gpio = AT91_PIN_PC20,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-cd",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED4",
+ .pin = {
+ .gpio = AT91_PIN_PC20,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-c",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED6",
+ .pin = {
+ .gpio = AT91_PIN_PC19,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-sig1",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED6",
+ .pin = {
+ .gpio = AT91_PIN_PC19,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-d",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED7",
+ .pin = {
+ .gpio = AT91_PIN_PC18,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-sig2",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED7",
+ .pin = {
+ .gpio = AT91_PIN_PC18,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-e",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED8",
+ .pin = {
+ .gpio = AT91_PIN_PC17,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-sig3",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "LED8",
+ .pin = {
+ .gpio = AT91_PIN_PC17,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "led-f",
+ },
+ .active_low = 1,
+ },
+ { // Moved in MTRV1-0.4
+ .name = "RI_B",
+ .pin = {
+ .gpio = AT91_PIN_PC14,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "extserial-ri",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "DTR_B",
+ .pin = {
+ .gpio = AT91_PIN_PC26,
+ .flags = GPIOF_IN,
+ .label = "extserial-dtr",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "DSR_B",
+ .pin = {
+ .gpio = AT91_PIN_PC27,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "extserial-dsr",
+ },
+ .active_low = 1,
+ },
+ {
+ .name = "DCD_B",
+ .pin = {
+ .gpio = AT91_PIN_PC28,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "extserial-dcd",
+ },
+ .active_low = 1,
+ },
+
+ // The difference between MTRv1_0_0 and MTRv1_0_1 starts here
+ {
+ .name = "WIFI_BT_ULPWKUP",
+ .pin = {
+ .gpio = AT91_PIN_PA0,
+ .flags = GPIOF_IN,
+ .label = "wifi-bt-ulpwkup",
+ }
+ },
+ {
+ .name = "WIFI_BT_LPWKUP",
+ .pin = {
+ .gpio = AT91_PIN_PA6,
+ .flags = GPIOF_IN,
+ .label = "wifi-bt-lpwkup",
+ }
+ },
+ {
+ .name = "WIFI_BT_INT",
+ .pin = {
+ .gpio = AT91_PIN_PB11,
+ .flags = GPIOF_IN,
+ .label = "wifi-bt-int",
+ }
+ },
+ {
+ .name = "WIFI_BT_RESET",
+ .pin = {
+ .gpio = AT91_PIN_PD14,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "wifi-bt-reset",
+ }
+ },
+ {
+ .name = "WIFI_BT_LPMODE",
+ .pin = {
+ .gpio = AT91_PIN_PD20,
+ .flags = GPIOF_IN,
+ .label = "wifi-bt-lpmode",
+ }
+ },
+ {
+ .name = "GNSS_RESET",
+ .pin = {
+ .gpio = AT91_PIN_PD15,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "gnss-reset",
+ }
+ },
+ {
+ .name = "SECURE_RESET",
+ .pin = {
+ .gpio = AT91_PIN_PD16,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "secure-reset",
+ }
+ },
+ {
+ .name = "MTQ_RESET",
+ .pin = {
+ .gpio = AT91_PIN_PD17,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "radio-reset",
+ }
+ },
+ {
+ .name = "GNSS_INT",
+ .pin = {
+ .gpio = AT91_PIN_PD19,
+ .flags = GPIOF_OUT_INIT_HIGH,
+ .label = "gnss-int",
+ }
+ },
+ // Difference with mtrv1_0_1 starts here
+ {
+ .name = "RADIO_WM_LK_M", // WM LINK Monitor for CAT M
+ .pin = {
+ .gpio = AT91_PIN_PA14,
+ .flags = GPIOF_IN,
+ .label = "radio-wm-lk-m",
+ }
+ },
+ // RADIO_STATUS must be at the end, because it might be removed
+ // if we ever support a Telit module which has no radio status.
+ {
+ .name = "RADIO_STATUS",
+ .pin = {
+ .gpio = AT91_PIN_PA28,
+ .flags = GPIOF_IN,
+ .label = "radio-status",
+ }
+ },
+
+ { },
+};
+
/* radio control (power/reset) for mtr */
static int radio_off_mtr(void)
{
@@ -1561,7 +1825,7 @@ static int radio_reset_mtr(void)
if (!rst_pin || !onoff_pin) {
return -ENODEV;
}
-
+ reset_radio_udev_discovery();
// drive reset pin low for 500ms
gpio_set_value(rst_pin->pin.gpio, 0);
@@ -1590,7 +1854,7 @@ static int radio_reset_mtr_mtq(void)
if (!rst_pin) {
return -ENODEV;
}
-
+ reset_radio_udev_discovery();
// drive reset pin low for 500ms
gpio_set_value(rst_pin->pin.gpio, 0);
@@ -1670,7 +1934,7 @@ static ssize_t mts_attr_store_radio_reset_mtr(struct device *dev,
mutex_lock(&mts_io_mutex);
- if (mts_hw_version == MTRV1_0_3)
+ if (mts_hw_version == MTRV1_0_3 || mts_hw_version == MTRV1_0_4)
{
err = radio_reset_mtr_mtq();
}
@@ -1766,6 +2030,9 @@ static DEVICE_ATTR_MTS(dev_attr_usbhub_reset_mtr, "usbhub-reset",
static DEVICE_ATTR_RO_MTS(dev_attr_gnss_int_mtr, "gnss-int",
mts_attr_show_gpio_pin);
+static DEVICE_ATTR_RO_MTS(dev_attr_radio_status_mtr, "radio-status",
+ mts_attr_show_gpio_pin);
+
static DEVICE_ATTR_RO_MTS(dev_attr_radio_wm_lk_m, "radio-wm-lk-m",
mts_attr_show_gpio_pin);
@@ -1816,6 +2083,9 @@ static struct attribute *mtr_platform_attributes[] = {
&dev_attr_radio_reset_backoff_index.attr,
&dev_attr_radio_reset_backoff_seconds.attr,
+ // UDEV notification of radio discovery
+ &dev_attr_radio_udev_discovery.attr,
+ &dev_attr_radio_reset_monitor.attr,
NULL,
};
@@ -1873,7 +2143,8 @@ static struct attribute *mtrv1_0_1_platform_attributes[] = {
&dev_attr_led_d_gpio.attr,
&dev_attr_led_e_gpio.attr,
&dev_attr_led_f_gpio_mtr.attr,
-
+ &dev_attr_radio_udev_discovery.attr,
+ &dev_attr_radio_reset_monitor.attr,
NULL,
};
@@ -1931,8 +2202,9 @@ static struct attribute *mtrv1_0_2_platform_attributes[] = {
&dev_attr_led_e_gpio.attr,
&dev_attr_led_f_gpio_mtr.attr,
- &dev_attr_radio_wm_lk_m.attr, // CAT M feature
-
+ &dev_attr_radio_wm_lk_m.attr, // CAT M feature
+ &dev_attr_radio_udev_discovery.attr,
+ &dev_attr_radio_reset_monitor.attr,
NULL,
};
@@ -1990,11 +2262,92 @@ static struct attribute *mtrv1_0_3_platform_attributes[] = {
&dev_attr_led_e_gpio.attr,
&dev_attr_led_f_gpio_mtr.attr,
- &dev_attr_radio_wm_lk_m.attr, // CAT M feature? Is this still there on the MTQ with Quectel?
-
+ &dev_attr_radio_wm_lk_m.attr, // CAT M feature? Is this still there on the MTQ with Quectel?
+ &dev_attr_radio_udev_discovery.attr,
+ &dev_attr_radio_reset_monitor.attr,
NULL,
};
static struct attribute_group mtrv1_0_3_platform_attribute_group = {
.attrs = mtrv1_0_3_platform_attributes
};
+
+static struct attribute *mtrv1_0_4_platform_attributes[] = {
+ &dev_attr_vendor_id.attr,
+ &dev_attr_product_id.attr,
+ &dev_attr_device_id.attr,
+ &dev_attr_uuid.attr,
+ &dev_attr_hw_version.attr,
+ &dev_attr_imei.attr,
+ &dev_attr_eth_mac.attr,
+ &dev_attr_has_radio.attr,
+ &dev_attr_wifi_mac_mtr.attr,
+ &dev_attr_bluetooth_mac_mtr.attr,
+
+ &dev_attr_reset.attr,
+ &dev_attr_reset_monitor.attr,
+ &dev_attr_reset_monitor_intervals.attr,
+ &dev_attr_radio_reset_mtr.attr,
+
+ &dev_attr_radio_reset_backoffs.attr,
+ &dev_attr_radio_reset_backoff_index.attr,
+ &dev_attr_radio_reset_backoff_seconds.attr,
+
+ &dev_attr_extserial_ri_gpio_mtr.attr,
+ &dev_attr_extserial_dtr_mtr.attr,
+ &dev_attr_extserial_dsr_gpio_mtr.attr,
+ &dev_attr_extserial_dcd_gpio_mtr.attr,
+
+ &dev_attr_eth_reset_mtr.attr,
+ &dev_attr_wifi_bt_lpwkup_mtr.attr,
+ &dev_attr_wifi_bt_ulpwkup_mtr.attr,
+ &dev_attr_wifi_bt_reset_mtr.attr,
+ &dev_attr_wifi_bt_lpmode_mtr.attr,
+ &dev_attr_wifi_bt_int_mtr.attr,
+ &dev_attr_gnss_reset_mtr.attr,
+ &dev_attr_gnss_int_mtr.attr,
+ &dev_attr_radio_status_mtr.attr,
+
+ &dev_attr_led_status.attr,
+ &dev_attr_led_cd_gpio.attr,
+ &dev_attr_led_sig1_gpio.attr,
+ &dev_attr_led_sig2_gpio.attr,
+ &dev_attr_led_sig3_gpio.attr,
+ &dev_attr_led_wifi_gpio_mtr.attr,
+
+ &dev_attr_led_b_gpio.attr,
+ &dev_attr_led_c_gpio.attr,
+ &dev_attr_led_d_gpio.attr,
+ &dev_attr_led_e_gpio.attr,
+ &dev_attr_led_f_gpio_mtr.attr,
+
+ &dev_attr_radio_wm_lk_m.attr, // CAT M feature? Is this still there on the MTQ with Quectel?
+ &dev_attr_radio_udev_discovery.attr,
+ &dev_attr_radio_reset_monitor.attr,
+ NULL,
+};
+
+static struct attribute_group mtrv1_0_4_platform_attribute_group = {
+ .attrs = mtrv1_0_4_platform_attributes
+};
+
+// L4G1 is active low, but other modules are active-high.
+int
+mtr_setup_radio_status(const char *product_id)
+{
+ struct gpio_pin *pin;
+ int l4g1;
+
+ l4g1 = (strstr(product_id,"L4G1") != NULL);
+ if (l4g1) {
+ pin = gpio_pin_by_attr_name("radio-status");
+ if (pin == NULL) {
+ printk(KERN_ERR "mts-io mtr_setup_radio_status() cannot find radio-status gpio");
+ return -ENODEV;
+ }
+ pin->active_low = 1;
+ return 0;
+ }
+ return 0;
+}
+
diff --git a/io-module/mts-io.c b/io-module/mts-io.c
index e4290a6..ed0cb49 100644
--- a/io-module/mts-io.c
+++ b/io-module/mts-io.c
@@ -49,6 +49,7 @@
#include "mts_io.h"
#include "buttons.h"
#include "mts_supercap.h"
+#include "radio_udev_discovery.h"
#define PLATFORM_NAME "mts-io"
@@ -257,6 +258,7 @@ static ssize_t mts_attr_store_radio_reset(struct device *dev,
radio_reset_timer_is_start = 1;
}
+ reset_radio_udev_discovery();
log_info("radio is reset\n");
pin = gpio_pin_by_attr_name("radio-reset");
@@ -509,6 +511,13 @@ static DEVICE_ATTR_MTS(dev_attr_radio_reset_backoff_index, "radio-reset-backoff-
static DEVICE_ATTR_RO_MTS(dev_attr_radio_reset_backoff_seconds, "radio-reset-backoff-seconds",
mts_attr_show_radio_reset_backoff_seconds);
+static DEVICE_ATTR_MTS(dev_attr_radio_udev_discovery, "radio-udev-discovery",
+ mts_attr_show_radio_udev_discovery, mts_attr_store_radio_udev_discovery);
+
+static DEVICE_ATTR_MTS(dev_attr_radio_reset_monitor, "radio-reset-monitor",
+ mts_attr_show_radio_reset_monitor, mts_attr_store_radio_reset_monitor);
+
+
/* shared gpio-based LEDs */
static DEVICE_ATTR_MTS(dev_attr_led_status, "led-status",
mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
@@ -878,6 +887,13 @@ mts_id_eeprom_load(void)
set_buttons(default_buttons);
mts_hw_version = MTRV1_0_3;
log_info("detected board %s", HW_VERSION_MTRV1_0_3);
+ } else if (strncmp(id_eeprom.hw_version, HW_VERSION_MTRV1_0_4, strlen(HW_VERSION_MTRV1_0_4)) == 0) {
+ attr_group = &mtrv1_0_4_platform_attribute_group;
+ gpio_pins = gpio_pins_mtrv1_0_4;
+ set_buttons(default_buttons);
+ mts_hw_version = MTRV1_0_4;
+ mtr_setup_radio_status(id_eeprom.product_id);
+ log_info("detected board %s", HW_VERSION_MTRV1_0_4);
} else if (strncmp(id_eeprom.hw_version, HW_VERSION_MTHS_0_0, strlen(HW_VERSION_MTHS_0_0)) == 0) {
attr_group = &mths_0_0_platform_attribute_group;
gpio_pins = gpio_pins_mths_0_0;
@@ -1307,41 +1323,41 @@ static int __init mts_io_init(void)
static void __exit mts_io_exit(void)
{
- if (DEVICE_CAPA(id_eeprom.capa, CAPA_DOUT)) {
- spi_unregister_driver(&mts_spi_dout_driver);
- }
- if (DEVICE_CAPA(id_eeprom.capa, CAPA_DIN)) {
- spi_unregister_driver(&mts_spi_din_driver);
- }
- spi_unregister_driver(&mts_spi_board_temp_driver);
+ struct gpio_pin *pin;
+ if (DEVICE_CAPA(id_eeprom.capa, CAPA_DOUT)) {
+ spi_unregister_driver(&mts_spi_dout_driver);
+ }
+ if (DEVICE_CAPA(id_eeprom.capa, CAPA_DIN)) {
+ spi_unregister_driver(&mts_spi_din_driver);
+ }
+ spi_unregister_driver(&mts_spi_board_temp_driver);
- struct gpio_pin *pin;
- /* delete radio_reset_timer */
- del_timer(&radio_reset_timer);
- /* delete radio_reset_available_timer */
- del_timer(&radio_reset_available_timer);
+ /* delete radio_reset_timer */
+ del_timer(&radio_reset_timer);
+ /* delete radio_reset_available_timer */
+ del_timer(&radio_reset_available_timer);
- for (pin = gpio_pins; *pin->name; pin++)
- if (pin->capability == 0 || DEVICE_CAPA(id_eeprom.capa,pin->capability))
- gpio_free(pin->pin.gpio);
+ for (pin = gpio_pins; *pin->name; pin++)
+ if (pin->capability == 0 || DEVICE_CAPA(id_eeprom.capa,pin->capability))
+ gpio_free(pin->pin.gpio);
- cleanup_buttons();
+ cleanup_buttons();
- //cleanup supercap monitor worker if SUPERCAP CAPA is true
- if(DEVICE_CAPA(id_eeprom.capa, CAPA_SUPERCAP)) {
- cleanup_supercap_worker();
- }
+ //cleanup supercap monitor worker if SUPERCAP CAPA is true
+ if(DEVICE_CAPA(id_eeprom.capa, CAPA_SUPERCAP)) {
+ cleanup_supercap_worker();
+ }
- cleanup();
+ cleanup();
- if (mts_leds) {
- mts_leds_unregister();
- }
+ if (mts_leds) {
+ mts_leds_unregister();
+ }
- if (DEVICE_CAPA(id_eeprom.capa, CAPA_LORA) && attr_group_lora) {
- mts_teardown_lora_port();
- }
- log_info("exiting");
+ if (DEVICE_CAPA(id_eeprom.capa, CAPA_LORA) && attr_group_lora) {
+ mts_teardown_lora_port();
+ }
+ log_info("exiting");
}
module_init(mts_io_init);
diff --git a/io-module/mts_io_module.h b/io-module/mts_io_module.h
index 5655f29..3219753 100644
--- a/io-module/mts_io_module.h
+++ b/io-module/mts_io_module.h
@@ -5,7 +5,7 @@
* MTAC cards.
*/
-#define DRIVER_VERSION "v4.6.0"
+#define DRIVER_VERSION "v4.7.0"
#define DRIVER_AUTHOR "Multitech Systems"
#define DRIVER_DESC "MTS-IO Controller"
#define DRIVER_NAME "mts-io"
@@ -32,6 +32,7 @@
#define HW_VERSION_MTRV1_0_1 "MTRV1-0.1"
#define HW_VERSION_MTRV1_0_2 "MTRV1-0.2" // Cat M
#define HW_VERSION_MTRV1_0_3 "MTRV1-0.3" // MTR-MTQ
+#define HW_VERSION_MTRV1_0_4 "MTRV1-0.4" // MTR No USB hub
#define HW_VERSION_MTRE "MTRE-0.0"
#define HW_VERSION_MTCDT_0_0 "MTCDT-0.0" // No GPS or WiFi Capability
#define HW_VERSION_MTCDT_0_1 "MTCDT-0.1" // Conduit refresh with GPS and WiFi possible
@@ -65,6 +66,7 @@ enum {
MTRV1_0_1,
MTRV1_0_2,
MTRV1_0_3,
+ MTRV1_0_4,
MTRE_0_0,
MTCDT_0_0,
MTCDT_0_1,
diff --git a/io-module/radio_udev_discovery.c b/io-module/radio_udev_discovery.c
new file mode 100644
index 0000000..eb6c1aa
--- /dev/null
+++ b/io-module/radio_udev_discovery.c
@@ -0,0 +1,308 @@
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/platform_device.h>
+#include "mts_io_module.h"
+#include "radio_udev_discovery.h"
+
+/*
+ * radio-reset in the mts-io driver sets radio_udev_discovery to 0.
+ * Then it returns early if radio_udev_discovery is set to 1. The
+ * UDEV daemon is used to set radio_udev_discovery. Notifications
+ * are sent if radio_udev_discovery goes from 0 to 1.
+ */
+
+int radio_udev_discovery = 1;
+
+
+struct sig_pid_radio_reset_monitor_s {
+ pid_t pid;
+ int signal;
+ struct pid *vpid;
+};
+
+#define PID_MAX_COUNT 20
+static struct sig_pid_radio_reset_monitor_s sig_pid_radio_reset_monitor[PID_MAX_COUNT];
+
+
+/* Clear an entry in the table that no longer exists.
+ * unlocks the mts_io_lock, toggles the rcu_read_lock,
+ * then puts back the mts_io_lock.
+ */
+static int
+verify_vpid(struct sig_pid_radio_reset_monitor_s *p)
+{
+ pid_t pid0 = p->pid;
+ struct pid *vpid1;
+ struct pid *vpid0 = p->vpid;
+ unsigned int vcount;
+
+ // Check to see if vpid and pid still match
+ if (p->pid == 0)
+ return 0;
+ if (vpid0 == NULL) {
+ p->pid = 0;
+ return 0;
+ }
+
+ mutex_unlock(&mts_io_mutex);
+ rcu_read_lock();
+ vpid1 = find_vpid((pid_t)pid0);
+ if(vpid1 != NULL)
+ vcount = atomic_read(&vpid1->count);
+ else
+ vcount = 0;
+ rcu_read_unlock();
+ mutex_lock(&mts_io_mutex);
+ if ((vpid1 != vpid0) || (vpid1 == NULL))
+ p->pid = 0;
+ pr_debug("%s: verify_vpid: vpid0 0x%x vpid1 0x%x vcount %d for pid %d\n",
+ __FUNCTION__,
+ (unsigned int)vpid0, (unsigned int)vpid1, vcount, (int)pid0);
+ return p->pid;
+}
+
+// Need to find existing entries and allow updates. Signal 0 removes a value.
+ssize_t mts_attr_store_radio_reset_monitor(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+ long pid0;
+ int sig;
+ int i;
+ int found;
+ struct pid *vpid1, *vpid0;
+ int retval;
+
+ retval = sscanf(buf, "%ld %d", &pid0, &sig);
+ if (retval != 2)
+ return -EINVAL;
+
+ if (pid0 < 0)
+ return -EINVAL;
+
+ rcu_read_lock();
+ vpid0 = find_vpid((pid_t)pid0);
+ rcu_read_unlock();
+ pr_debug("%s: Try to store %ld %d 0x%x\n",
+ __FUNCTION__,
+ pid0,sig,(unsigned int)vpid0);
+ if (vpid0) {
+ /* Note that since we no longer hold the rcu lock, vpid
+ * could become invalid, unless it is ours.
+ */
+ mutex_lock(&mts_io_mutex);
+ /* First see if we are already in the table -- search whole table */
+ found = -1;
+ for (i=0; i < PID_MAX_COUNT; i++) {
+ if ((sig_pid_radio_reset_monitor[i].pid == (pid_t)pid0) &&
+ (sig_pid_radio_reset_monitor[i].vpid == vpid0)) {
+ if (sig == 0) {
+ sig_pid_radio_reset_monitor[i].pid = 0;
+ sig_pid_radio_reset_monitor[i].vpid = NULL;
+ } else {
+ sig_pid_radio_reset_monitor[i].signal = sig;
+ mutex_unlock(&mts_io_mutex);
+ rcu_read_lock();
+ vpid0 = find_vpid((pid_t)pid0);
+ rcu_read_unlock();
+ pr_debug("%s: slot %d: pid %d, vpid 0x%x/vpid 0x%x\n",
+ __FUNCTION__,
+ i,pid0,vpid0,sig_pid_radio_reset_monitor[i].vpid);
+ mutex_lock(&mts_io_mutex);
+ if (vpid0 != sig_pid_radio_reset_monitor[i].vpid) {
+ sig_pid_radio_reset_monitor[i].pid = 0; /* Maybe exited? */
+ sig_pid_radio_reset_monitor[i].vpid = NULL;
+ pr_debug("%s: mts-io: vpid mismatch pid %d, vpid 0x%x/0x%x, sig %d, cleared %d\n",
+ __FUNCTION__,
+ (int)sig_pid_radio_reset_monitor[i].pid,
+ (unsigned int)sig_pid_radio_reset_monitor[i].vpid,(unsigned int)vpid0,
+ (unsigned int)sig_pid_radio_reset_monitor[i].signal,i);
+ } else {
+ found = i;
+ pr_debug("%s: mts-io: found pid %d, vpid 0x%x, sig %d\n",
+ __FUNCTION__,
+ (int)sig_pid_radio_reset_monitor[i].pid,
+ (unsigned int)sig_pid_radio_reset_monitor[i].vpid,
+ (unsigned int)sig_pid_radio_reset_monitor[i].signal);
+ sig = 0; // Clear any more that we find.
+ }
+
+ }
+ } // Location matches our pid
+ } // Loop through table
+
+ pr_debug("%s: found=%d, sig=%d\n",__FUNCTION__,sig);
+ if (found > -1) {
+ mutex_unlock(&mts_io_mutex);
+ return count;
+ }
+
+ if (sig == 0) {
+ // Nothing to clear out.
+ mutex_unlock(&mts_io_mutex);
+ return count;
+ }
+
+ /* Need to find an unused slot and save our signal and PID.
+ * Still holding mutex_lock(&mts_io_mutex)
+ * Find first open slot
+ */
+ found = -1;
+ for (i=0; i < PID_MAX_COUNT; i++) {
+ if (sig_pid_radio_reset_monitor[i].pid == 0) {
+ sig_pid_radio_reset_monitor[i].pid = (pid_t)pid0;
+ sig_pid_radio_reset_monitor[i].signal = sig;
+ sig_pid_radio_reset_monitor[i].vpid = vpid0;
+ pr_debug("%s: mts-io: open slot: pid %d, vpid 0x%x, sig %d, slot %d\n",
+ __FUNCTION__,
+ (int)pid0,
+ (unsigned int)vpid0,
+ (unsigned int)sig, i);
+ found = i;
+ break;
+ } else {
+ // See if this slot may be used.
+ pid_t pid1 = sig_pid_radio_reset_monitor[i].pid;
+ if (pid1 > 0) {
+ mutex_unlock(&mts_io_mutex);
+ rcu_read_lock();
+ vpid1 = find_vpid((pid_t)pid1);
+ rcu_read_unlock();
+ mutex_lock(&mts_io_mutex);
+ // See if pid and vpid still exists
+ if (!vpid1 || (vpid1 != sig_pid_radio_reset_monitor[i].vpid)) {
+ // Make sure no one else has claimed this slot
+ if (pid1 == sig_pid_radio_reset_monitor[i].pid) {
+ sig_pid_radio_reset_monitor[i].pid = 0;
+ sig_pid_radio_reset_monitor[i].vpid = NULL;
+ i--; // Should be able to use this slot.
+ continue;
+ } // Has not been re-claimed.
+ } // Slot has no user or exited user
+ } // Verify that slot in use is still in use
+ } // Found an empty slot
+ } // Loop through all the slots.
+ mutex_unlock(&mts_io_mutex);
+ } // pid is in pid table
+ return count;
+}
+
+// Examples say buf is PAGE_SIZE long
+ssize_t mts_attr_show_radio_reset_monitor(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ int count;
+ int max = PAGE_SIZE;
+ int ret;
+ int i;
+ pid_t pid1;
+
+ mutex_lock(&mts_io_mutex);
+
+ count = 0;
+ for (i=0; i < PID_MAX_COUNT; i++) {
+ pid1 = verify_vpid(sig_pid_radio_reset_monitor + i);
+ if (pid1 == 0) {
+ sig_pid_radio_reset_monitor[i].pid = 0;
+ sig_pid_radio_reset_monitor[i].vpid = NULL;
+ continue;
+ }
+ pr_debug("%s: found a pid in slot %d\n",__FUNCTION__,i);
+ ret = snprintf(buf+count, max, "%lu %d\n",
+ (unsigned long)pid1,
+ sig_pid_radio_reset_monitor[i].signal);
+ if (ret > 0) {
+ max -= ret;
+ count += ret;
+ }
+ if (max == 0)
+ break;
+ if(ret == 0)
+ break;
+ } // Loop through all the slots until we are full.
+
+ mutex_unlock(&mts_io_mutex);
+
+ return count;
+}
+
+
+/*
+ * After a radio reset, prime the flag, so if it is set to one
+ * after this, then we wake the processes waiting on the flag.
+ * Caller holds the mts_io_mutex lock.
+ */
+void
+reset_radio_udev_discovery(void)
+{
+ radio_udev_discovery = 0;
+}
+
+int
+udev_discovered_radio(void)
+{
+ return radio_udev_discovery;
+}
+
+ssize_t mts_attr_show_radio_udev_discovery(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "%d\n", radio_udev_discovery);
+}
+
+
+ssize_t mts_attr_store_radio_udev_discovery(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ int value = -1;
+ pid_t pid1;
+ struct pid *vpid0, *vpid1;
+ int sig, i;
+ int retval;
+
+ retval = sscanf(buf, "%i", &value);
+ if (retval != 1)
+ return -EINVAL;
+
+ if (radio_udev_discovery == -1) {
+ // Not ready
+ return -EPROTO;
+ }
+
+ // Only driver can set this to zero.
+ if (value == 0)
+ return -EINVAL;
+
+ mutex_lock(&mts_io_mutex);
+ if((value == 1) && (radio_udev_discovery == 0)) {
+ radio_udev_discovery = 1;
+ pr_debug("%s: mts-io: UDEV discovered cellular modem after radio-reset so signal registered processes",
+ __FUNCTION__);
+ // kill all processes that are queued
+ for (i=0; i < PID_MAX_COUNT; i++) {
+ pid1 = verify_vpid(sig_pid_radio_reset_monitor + i);
+ if (pid1 == 0) continue;
+ sig = sig_pid_radio_reset_monitor[i].signal;
+ vpid0 = sig_pid_radio_reset_monitor[i].vpid;
+ mutex_unlock(&mts_io_mutex);
+ rcu_read_lock();
+ vpid1 = find_vpid(pid1);
+ if (vpid1 == vpid0) {
+ printk(KERN_ALERT
+ "mts-io: %s: Sending signal %d to pid %d due to UDEV radio discovery\n",
+ __FUNCTION__,
+ sig,pid1);
+ kill_pid(vpid1,sig,1);
+ } // vpid is valid, same as registered
+ else {
+ printk(KERN_ALERT
+ "mts-io: %s: mismatched vpid %x/%x\n", __FUNCTION__, (unsigned int)vpid1, (unsigned int) vpid0);
+ }
+
+ rcu_read_unlock();
+ mutex_lock(&mts_io_mutex);
+ } // Find empty slot
+ } // udev wants us to wake everybody up after reset
+ mutex_unlock(&mts_io_mutex);
+ return count;
+}
diff --git a/io-module/radio_udev_discovery.h b/io-module/radio_udev_discovery.h
new file mode 100644
index 0000000..d735dc1
--- /dev/null
+++ b/io-module/radio_udev_discovery.h
@@ -0,0 +1,24 @@
+#ifndef IO_MODULE_RADIO_UDEV_DISCOVERY_H_
+#define IO_MODULE_RADIO_UDEV_DISCOVERY_H_
+
+
+void reset_radio_udev_discovery(void);
+
+int udev_discovered_radio(void);
+
+ssize_t mts_attr_show_radio_udev_discovery(struct device *dev,
+ struct device_attribute *attr,
+ char *buf);
+
+ssize_t mts_attr_store_radio_udev_discovery(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count);
+
+ssize_t mts_attr_show_radio_reset_monitor(struct device *dev,
+ struct device_attribute *attr, char *buf);
+
+ssize_t mts_attr_store_radio_reset_monitor(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count);
+
+#endif /* IO_MODULE_RADIO_UDEV_DISCOVERY_H_ */
+
diff --git a/test/resettest.sh b/test/resettest.sh
new file mode 100755
index 0000000..b0cb9e1
--- /dev/null
+++ b/test/resettest.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Register for with radio-reset-monitor to
+# get a signal when radio-reset occurs.
+# Child process exists so the parent
+# does not need to worry about resets
+# starting before it can get through
+# checks, and possibly sleeping forever.
+# pgrep was needed to kill the sleep.
+# wait is called to wait for the SIGUSR1 signal.
+# The child never terminates.
+# The hope is that the parent will fall into wait
+# before the child registers for the radio-reset.
+# checking for do_wait is risky if the kernel ever
+# changes. The child will exit if the reset is not
+# in process.
+#
+
+USR1=10
+TERM=15
+function sleep_reset
+{
+ # Wait for parent to enter wait.
+ trap "kill $!;kill $BASHPID" $TERM
+ while [[ $(ps -h -o wchan -p $PPID) != do_wait ]] ; do usleep 100 ; done
+ echo Register parent for SIGUSR1
+ echo "$$" "$USR1" >/sys/devices/platform/mts-io/radio-reset-monitor
+ discovered=$(cat /sys/devices/platform/mts-io/radio-udev-discovery)
+ if ((discovered == 1)) ; then
+ # reset is not in progress.
+ exit 0
+ fi
+ sleep 4294967295 # Hopefully forever
+ exit 0
+}
+
+date
+trap ":" $USR1
+in_reset=$(cat /sys/devices/platform/mts-io/radio-udev-discovery)
+if ((in_reset == 0)) ; then
+ sleep_reset &
+ wait $!
+ # pgrep is needed to find the sleep process
+ pgrep -P $! | xargs kill
+fi
+echo Radio Reset is done.
+date