Merge pull request #24 from loicpoulain/rb1

rmtfs.service: Fix start/stop ordering between rmtfs and NetworkManager

Makefile

@@ -6,6 +6,8 @@ prefix = /usr/local
 bindir := $(prefix)/bin
 servicedir := $(prefix)/lib/systemd/system
 
+RMTFS_EFS_PATH ?= /var/lib/rmtfs
+
 SRCS := qmi_rmtfs.c rmtfs.c rproc.c sharedmem.c storage.c util.c
 OBJS := $(SRCS:.c=.o)
 
@@ -15,13 +17,15 @@ $(OUT): $(OBJS)
 %.c: %.qmi
 	qmic -k < $<
 
-rmtfs.service: rmtfs.service.in
-	@sed 's+RMTFS_PATH+$(bindir)+g' $< > $@
+%.service: %.service.in
+	@sed -e 's+RMTFS_PATH+$(bindir)+g' -e 's+RMTFS_EFS_PATH+$(RMTFS_EFS_PATH)+g' $< > $@
 
-install: $(OUT) rmtfs.service
+install: $(OUT) rmtfs.service rmtfs-dir.service
 	@install -D -m 755 $(OUT) $(DESTDIR)$(prefix)/bin/$(OUT)
 	@install -D -m 644 rmtfs.service $(DESTDIR)$(servicedir)/rmtfs.service
+	@install -D -m 644 rmtfs-dir.service $(DESTDIR)$(servicedir)/rmtfs-dir.service
 
 clean:
 	rm -f $(OUT) $(OBJS) rmtfs.service
+	rm -f $(OUT) $(OBJS) rmtfs-dir.service
 

rmtfs-dir.service.in

@@ -0,0 +1,11 @@
+[Unit]
+Description=Qualcomm remotefs service
+Before=NetworkManager.service
+
+[Service]
+ExecStart=RMTFS_PATH/rmtfs -s -o RMTFS_EFS_PATH
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target

rmtfs.c

@@ -151,11 +151,11 @@ static void rmtfs_iovec(int sock, struct qrtr_packet *pkt)
 	struct rmtfs_iovec_resp resp = {};
 	struct rmtfs_iovec_req req = {};
 	DEFINE_QRTR_PACKET(resp_buf, 256);
-	struct rmtfd *rmtfd;
+	struct rmtfd *rmtfd = NULL;
 	uint32_t caller_id = 0;
 	size_t num_entries = 0;
 	off_t sector_base;
-	uint8_t is_write;
+	uint8_t is_write = 0;
 	off_t phys_base;
 	uint8_t force = 0;
 	unsigned txn;

rmtfs.service.in

@@ -1,7 +1,6 @@
 [Unit]
 Description=Qualcomm remotefs service
-Requires=qrtr-ns.service
-After=qrtr-ns.service
+Before=NetworkManager.service
 
 [Service]
 ExecStart=RMTFS_PATH/rmtfs -r -P -s

sharedmem.c

@@ -418,7 +418,7 @@ static int rmtfs_mem_enumerate(struct rmtfs_mem *rmem)
 	if (!dir) {
 		fprintf(stderr,
 			"Unable to open reserved-memory device tree node: %s\n",
-			strerror(-errno));
+			strerror(errno));
 		close(basefd);
 		return -1;
 	}
@@ -430,7 +430,7 @@ static int rmtfs_mem_enumerate(struct rmtfs_mem *rmem)
 		dirfd = openat(basefd, de->d_name, O_DIRECTORY);
 		if (dirfd < 0) {
 			fprintf(stderr, "failed to open %s: %s\n",
-				de->d_name, strerror(-errno));
+				de->d_name, strerror(errno));
 			ret = -1;
 			goto out;
 		}
@@ -438,7 +438,7 @@ static int rmtfs_mem_enumerate(struct rmtfs_mem *rmem)
 		regfd = openat(dirfd, "reg", O_RDONLY);
 		if (regfd < 0) {
 			fprintf(stderr, "failed to open reg of %s: %s\n",
-				de->d_name, strerror(-errno));
+				de->d_name, strerror(errno));
 			ret = -1;
 			goto out;
 		}
@@ -452,7 +452,7 @@ static int rmtfs_mem_enumerate(struct rmtfs_mem *rmem)
 			rmem->size = be64toh(reg.qw[1]);
 		} else {
 			fprintf(stderr, "failed to read reg of %s: %s\n",
-				de->d_name, strerror(-errno));
+				de->d_name, strerror(errno));
 			ret = -1;
 		}
 

storage.c

@@ -42,6 +42,7 @@ static const struct partition partition_table[] = {
 	{ "/boot/modem_fsc", "modem_fsc", "fsc" },
 	{ "/boot/modem_fsg", "modem_fsg", "fsg" },
 	{ "/boot/modem_tunning", "modem_tunning", "tunning" },
+	{ "/boot/modem_tng", "modem_tng", "tunning" },
 	{}
 };