Merge branch 'release/v1.4.2'

CHANGELOG → CHANGELOG.rst

@@ -2,6 +2,12 @@
 Changelog
 =========
 
+[1.4.2] - 2019-10-15
+====================
+Fixed
+-----
+- [sw] fix SPEC driver dependency with I2C OCores
+
 [1.4.1] - 2019-09-23
 ====================
 Changed

software/Makefile

@@ -7,17 +7,16 @@ REPO_PARENT ?= $(shell /bin/pwd)/..
 
 DIRS = kernel
 
-.PHONY: all clean modules install modules_install $(DIRS)
+.PHONY: all clean modules install modules_install coccicheck $(DIRS)
 
-all clean modules install modules_install: $(DIRS)
+all clean : $(DIRS)
+install modules_install coccicheck modules: kernel
 
 clean: TARGET = clean
 modules: TARGET = modules
+coccicheck: TARGET = coccicheck
 install: TARGET = install
 modules_install: TARGET = modules_install
 
-ENV_VAR := CONFIG_FPGA_MGR_BACKPORT_PATH=$(CONFIG_FPGA_MGR_BACKPORT_PATH)
-ENV_VAR += CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT)
-
 $(DIRS):
 	$(MAKE) -C $@ $(ENV_VAR) $(TARGET)

software/kernel/Makefile

@@ -43,20 +43,26 @@ CHEBY ?= /usr/bin/cheby
 
 all: modules
 
-.PHONY: all modules clean help install modules_install spec-core-fpga.h
+.PHONY: all modules clean help install modules_install coccicheck spec-core-fpga.h
 
 spec-core-fpga.h:
 ifeq ($(DKMS), 0)
 	$(CHEBY) --gen-c -i $(HDL_DIR)/rtl/spec_base_regs.cheby > $@
 endif
 
-modules help install modules_install: spec-core-fpga.h
-	$(MAKE) -C $(LINUX) M=$(shell pwd) VERSION=$(VERSION) CONFIG_FPGA_MGR_BACKPORT_PATH_ABS=$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS) CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT) FMC_ABS=$(FMC_ABS) I2C_ABS=$(I2C_ABS) SPI_ABS=$(SPI_ABS) $@
-
-# be able to run the "clean" rule even if $(LINUX) is not valid
-clean:
-	rm -rf *.o *~  .*.cmd *.ko *.mod.c .tmp_versions Module.symvers \
-                         Module.markers modules.order
+clean-spec-core-fpga.h:
 ifeq ($(DKMS), 0)
 	rm -f spec-core-fpga.h
 endif
+
+install: modules_install
+clean: clean-spec-core-fpga.h
+modules help coccicheck modules_install clean: spec-core-fpga.h
+	$(MAKE) -C $(LINUX) M=$(shell pwd) \
+		VERSION=$(VERSION) \
+		CONFIG_FPGA_MGR_BACKPORT_PATH_ABS=$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS) \
+		CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT) \
+		FMC_ABS=$(FMC_ABS) \
+		I2C_ABS=$(I2C_ABS) \
+		SPI_ABS=$(SPI_ABS) \
+		$@

software/kernel/spec-core.c

@@ -82,16 +82,9 @@ static ssize_t spec_dbg_fw_write(struct file *file,
 	return count;
 }
 
-static int spec_dbg_fw_open(struct inode *inode, struct file *file)
-{
-	file->private_data = inode->i_private;
-
-	return 0;
-}
-
 static const struct file_operations spec_dbg_fw_ops = {
 	.owner = THIS_MODULE,
-	.open  = spec_dbg_fw_open,
+	.open  = simple_open,
 	.write = spec_dbg_fw_write,
 };
 
@@ -279,12 +272,10 @@ static int spec_gpio_init_table(struct spec_gn412x *spec_gn412x)
 	struct gpiod_lookup_table *lookup;
 	int err = 0;
 
-	lookup = kzalloc(spec_gpiod_table_size(), GFP_KERNEL);
+	lookup = kmemdup(&spec_gpiod_table, spec_gpiod_table_size(), GFP_KERNEL);
 	if (!lookup)
 		return -ENOMEM;
 
-	memcpy(lookup, &spec_gpiod_table, spec_gpiod_table_size());
-
 	lookup->dev_id = kstrdup(dev_name(&spec_gn412x->pdev->dev), GFP_KERNEL);
 	if (!lookup->dev_id)
 		goto err_dup;
@@ -757,6 +748,6 @@ MODULE_VERSION(VERSION);
 MODULE_DESCRIPTION("Driver for the 'Simple PCIe FMC Carrier' a.k.a. SPEC");
 MODULE_DEVICE_TABLE(pci, spec_pci_tbl);
 
-MODULE_SOFTDEP("pre: gn412x_gpio gn412x_fcl htvic spec_gn412x_dma i2c_mux i2c_ohwr spi-ocores");
+MODULE_SOFTDEP("pre: gn412x_gpio gn412x_fcl htvic spec_gn412x_dma i2c_mux i2c-ocores spi-ocores");
 
 ADDITIONAL_VERSIONS;