Page MenuHomeFreeBSD
Files F151132089

D15301.id44260.diff
No OneTemporary
Actions

D15301.id44260.diff
View Options

Index: sys/conf/NOTES
===================================================================
--- sys/conf/NOTES
+++ sys/conf/NOTES
@@ -3042,3 +3042,6 @@
# Encrypted kernel crash dumps.
options EKCD
+
+# Enable legacy alias names for spigen
+options SPIGEN_LEGACY_CDEVNAME # legacy alias names for spigen
Index: sys/conf/options
===================================================================
--- sys/conf/options
+++ sys/conf/options
@@ -992,6 +992,9 @@
# GPIO and child devices
GPIO_SPI_DEBUG opt_gpio.h
+# SPI devices
+SPIGEN_LEGACY_CDEVNAME opt_spi.h
+
# etherswitch(4) driver
RTL8366_SOFT_RESET opt_etherswitch.h
Index: sys/dev/spibus/spibus.c
===================================================================
--- sys/dev/spibus/spibus.c
+++ sys/dev/spibus/spibus.c
@@ -121,9 +121,16 @@
spibus_child_location_str(device_t bus, device_t child, char *buf,
size_t buflen)
{
+ int cs, bus_unit;
struct spibus_ivar *devi = SPIBUS_IVAR(child);
- snprintf(buf, buflen, "cs=%d", devi->cs);
+ cs = devi->cs & (~SPIBUS_CS_HIGH); /* trim 'cs high' bit */
+
+ bus_unit = device_get_unit(bus);
+
+ snprintf(buf, buflen, "bus=%d cs=%d",
+ bus_unit, cs);
+
return (0);
}
Index: sys/dev/spibus/spigen.c
===================================================================
--- sys/dev/spibus/spigen.c
+++ sys/dev/spibus/spigen.c
@@ -26,6 +26,7 @@
__FBSDID("$FreeBSD: head/sys/dev/spibus/spigen.c 332292 2018-04-08 17:06:30Z ian $");
#include "opt_platform.h"
+#include "opt_spi.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,6 +65,9 @@
struct spigen_softc {
device_t sc_dev;
struct cdev *sc_cdev;
+#ifdef SPIGEN_LEGACY_CDEVNAME
+ struct cdev *sc_adev; /* alias device */
+#endif
struct mtx sc_mtx;
uint32_t sc_command_length_max; /* cannot change while mmapped */
uint32_t sc_data_length_max; /* cannot change while mmapped */
@@ -186,15 +190,47 @@
{
struct spigen_softc *sc;
const int unit = device_get_unit(dev);
+ int cs, res;
+ struct make_dev_args mda;
+
+ spibus_get_cs(dev, &cs);
+ cs &= ~SPIBUS_CS_HIGH; /* trim 'cs high' bit */
sc = device_get_softc(dev);
sc->sc_dev = dev;
- sc->sc_cdev = make_dev(&spigen_cdevsw, unit,
- UID_ROOT, GID_OPERATOR, 0660, "spigen%d", unit);
- sc->sc_cdev->si_drv1 = dev;
+
+ make_dev_args_init(&mda);
+ mda.mda_flags = 0; /* see make_dev in kern_conf.c */
+ mda.mda_devsw = &spigen_cdevsw;
+ mda.mda_cr = NULL; /* see make_dev in kern_conf.c */
+ mda.mda_uid = UID_ROOT;
+ mda.mda_gid = GID_OPERATOR;
+ mda.mda_mode = 0660;
+ mda.mda_unit = unit;
+
+ mda.mda_si_drv1 = dev;
+
sc->sc_command_length_max = PAGE_SIZE;
sc->sc_data_length_max = PAGE_SIZE;
mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
+
+ res = make_dev_s(&mda, &(sc->sc_cdev), "spigen%d.%d",
+ device_get_unit(device_get_parent(dev)), cs);
+ if (res) {
+ return res;
+ }
+
+#ifdef SPIGEN_LEGACY_CDEVNAME
+ res = make_dev_alias_p(0, &(sc->sc_adev), sc->sc_cdev, "spigen%d", unit);
+ if (res) {
+ if (sc->sc_cdev) { /* TODO: should I just rely on 'detach' to do this? */
+ destroy_dev(sc->sc_cdev);
+ sc->sc_cdev = NULL;
+ }
+ return res;
+ }
+#endif
+
spigen_sysctl_init(sc);
return (0);
@@ -429,8 +465,13 @@
mtx_destroy(&sc->sc_mtx);
- if (sc->sc_cdev)
- destroy_dev(sc->sc_cdev);
+#ifdef SPIGEN_LEGACY_CDEVNAME
+ if (sc->sc_adev)
+ destroy_dev(sc->sc_adev);
+#endif
+
+ if (sc->sc_cdev)
+ destroy_dev(sc->sc_cdev);
return (0);
}

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 7:30 AM (19 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31018723
Default Alt Text
D15301.id44260.diff (3 KB)

Event Timeline