Skip to contentSkip to conversation

mfd: lpc_sch: Intel Quark support

PATCH Superseded Andy Shevchenko 4 participants 26 messages Aug 22, 2014 – Sep 2, 2014

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover mfd: lpc_sch: Intel Quark support

This brings support of the LPC SCH device found on Intel Quark SoC. Patches were compile tested, and driver runs on actual hardware.

Please, note that PCI ID will be used in future in the gpio-sch driver.

Andy Shevchenko (4):
mfd: lpc_sch: reduce duplicate code
mfd: lpc_sch: better code manageability with chipset info struct
mfd: lpc_sch: Add support for Intel Quark X1000
mfd: lpc_sch: remove FSF address

Josef Ahmad (1):
pci_ids: add support for Intel Quark ILB

 drivers/mfd/lpc_sch.c   | 207 ++++++++++++++++++++++++++++--------------------
 include/linux/pci_ids.h |   1 +
 2 files changed, 122 insertions(+), 86 deletions(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/5 mfd: lpc_sch: reduce duplicate code

This patch refactors the driver to use helper functions instead of copy'n'pasted pieces of code.

---
 drivers/mfd/lpc_sch.c | 146 ++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 82 deletions(-)
drivers/mfd/lpc_sch.c +64 -82
index 4ee7550..0f01ef0 100644
@@ -40,41 +40,6 @@
 #define WDTBASE		0x84
 #define WDT_IO_SIZE	64
 
-static struct resource smbus_sch_resource = {
-		.flags = IORESOURCE_IO,
-};
-
-static struct resource gpio_sch_resource = {
-		.flags = IORESOURCE_IO,
-};
-
-static struct resource wdt_sch_resource = {
-		.flags = IORESOURCE_IO,
-};
-
-static struct mfd_cell lpc_sch_cells[3];
-
-static struct mfd_cell isch_smbus_cell = {
-	.name = "isch_smbus",
-	.num_resources = 1,
-	.resources = &smbus_sch_resource,
-	.ignore_resource_conflicts = true,
-};
-
-static struct mfd_cell sch_gpio_cell = {
-	.name = "sch_gpio",
-	.num_resources = 1,
-	.resources = &gpio_sch_resource,
-	.ignore_resource_conflicts = true,
-};
-
-static struct mfd_cell wdt_sch_cell = {
-	.name = "ie6xx_wdt",
-	.num_resources = 1,
-	.resources = &wdt_sch_resource,
-	.ignore_resource_conflicts = true,
-};
-
 static const struct pci_device_id lpc_sch_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) },
@@ -83,67 +48,87 @@ static const struct pci_device_id lpc_sch_ids[] = {
 };
 MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
 
-static int lpc_sch_probe(struct pci_dev *dev,
-				const struct pci_device_id *id)
+static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
+			  struct resource *res, int size)
 {
 	unsigned int base_addr_cfg;
 	unsigned short base_addr;
-	int i, cells = 0;
-	int ret;
 
-	pci_read_config_dword(dev, SMBASE, &base_addr_cfg);
+	pci_read_config_dword(pdev, where, &base_addr_cfg);
 	base_addr = 0;
 	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the SMBus I/O range disabled\n");
+		dev_warn(&pdev->dev, "Decode of the %s I/O range disabled\n",
+			 name);
 	else
 		base_addr = (unsigned short)base_addr_cfg;
 
 	if (base_addr == 0) {
-		dev_warn(&dev->dev, "I/O space for SMBus uninitialized\n");
-	} else {
-		lpc_sch_cells[cells++] = isch_smbus_cell;
-		smbus_sch_resource.start = base_addr;
-		smbus_sch_resource.end = base_addr + SMBUS_IO_SIZE - 1;
+		dev_warn(&pdev->dev, "I/O space for %s uninitialized\n", name);
+		return -ENODEV;
 	}
 
-	pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg);
-	base_addr = 0;
-	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the GPIO I/O range disabled\n");
+	res->start = base_addr;
+	res->end = base_addr + size - 1;
+	res->flags = IORESOURCE_IO;
+
+	return 0;
+}
+
+static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
+				 const char *name, int size, int id,
+				 struct mfd_cell *cell)
+{
+	struct resource *res;
+	int ret;
+
+	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	if (!res)
+		return -ENOMEM;
+
+	ret = lpc_sch_get_io(pdev, where, name, res, size);
+	if (ret)
+		return ret;
+
+	memset(cell, 0, sizeof(*cell));
+
+	cell->name = name;
+	cell->resources = res;
+	cell->num_resources = 1;
+	cell->ignore_resource_conflicts = true;
+	cell->id = id;
+
+	return 0;
+}
+
+static int lpc_sch_probe(struct pci_dev *dev,
+			 const struct pci_device_id *id)
+{
+	struct mfd_cell lpc_sch_cells[3];
+	int size, cells = 0;
+	int ret;
+
+	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus", SMBUS_IO_SIZE,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;
+
+	if (id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB)
+		size = GPIO_IO_SIZE_CENTERTON;
 	else
-		base_addr = (unsigned short)base_addr_cfg;
+		size = GPIO_IO_SIZE;
 
-	if (base_addr == 0) {
-		dev_warn(&dev->dev, "I/O space for GPIO uninitialized\n");
-	} else {
-		lpc_sch_cells[cells++] = sch_gpio_cell;
-		gpio_sch_resource.start = base_addr;
-		if (id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB)
-			gpio_sch_resource.end = base_addr + GPIO_IO_SIZE_CENTERTON - 1;
-		else
-			gpio_sch_resource.end = base_addr + GPIO_IO_SIZE - 1;
-	}
+	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio", size,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;
 
 	if (id->device == PCI_DEVICE_ID_INTEL_ITC_LPC
 	    || id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB) {
-		pci_read_config_dword(dev, WDTBASE, &base_addr_cfg);
-		base_addr = 0;
-		if (!(base_addr_cfg & (1 << 31)))
-			dev_warn(&dev->dev, "Decode of the WDT I/O range disabled\n");
-		else
-			base_addr = (unsigned short)base_addr_cfg;
-		if (base_addr == 0)
-			dev_warn(&dev->dev, "I/O space for WDT uninitialized\n");
-		else {
-			lpc_sch_cells[cells++] = wdt_sch_cell;
-			wdt_sch_resource.start = base_addr;
-			wdt_sch_resource.end = base_addr + WDT_IO_SIZE - 1;
-		}
-	}
-
-	if (WARN_ON(cells > ARRAY_SIZE(lpc_sch_cells))) {
-		dev_err(&dev->dev, "Cell count exceeds array size");
-		return -ENODEV;
+		ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",
+					    WDT_IO_SIZE,
+					    id->device, &lpc_sch_cells[cells]);
+		if (!ret)
+			cells++;
 	}
 
 	if (cells == 0) {
@@ -151,9 +136,6 @@ static int lpc_sch_probe(struct pci_dev *dev,
 		return -ENODEV;
 	}
 
-	for (i = 0; i < cells; i++)
-		lpc_sch_cells[i].id = id->device;
-
 	ret = mfd_add_devices(&dev->dev, 0, lpc_sch_cells, cells, NULL, 0, NULL);
 	if (ret)
 		mfd_remove_devices(&dev->dev);
Signature · 1 line
2.1.0
#2 lore raw

Re: [PATCH v1 1/5] mfd: lpc_sch: reduce duplicate code

Quoted 14 lines · Andy Shevchenko

This patch refactors the driver to use helper functions instead of copy'n'pasted pieces of code.

---
 drivers/mfd/lpc_sch.c | 146 ++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 82 deletions(-)
drivers/mfd/lpc_sch.c +0 -0
index 4ee7550..0f01ef0 100644
@@ -40,41 +40,6 @@

[...]

Quoted 18 lines
drivers/mfd/lpc_sch.c +5 -6
-static int lpc_sch_probe(struct pci_dev *dev,
-				const struct pci_device_id *id)
+static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
+			  struct resource *res, int size)
 {
 	unsigned int base_addr_cfg;
 	unsigned short base_addr;
-	int i, cells = 0;
-	int ret;
 
-	pci_read_config_dword(dev, SMBASE, &base_addr_cfg);
+	pci_read_config_dword(pdev, where, &base_addr_cfg);
 	base_addr = 0;
 	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the SMBus I/O range disabled\n");
+		dev_warn(&pdev->dev, "Decode of the %s I/O range disabled\n",
+			 name);
 	else

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 67

Quoted 10 lines
drivers/mfd/lpc_sch.c +2 -5
 		base_addr = (unsigned short)base_addr_cfg;
 
 	if (base_addr == 0) {
-		dev_warn(&dev->dev, "I/O space for SMBus uninitialized\n");
-	} else {
-		lpc_sch_cells[cells++] = isch_smbus_cell;
-		smbus_sch_resource.start = base_addr;
-		smbus_sch_resource.end = base_addr + SMBUS_IO_SIZE - 1;
+		dev_warn(&pdev->dev, "I/O space for %s uninitialized\n", name);
+		return -ENODEV;

If you're going to return an error, you need to use dev_err() above.

Quoted 40 lines
drivers/mfd/lpc_sch.c +34 -4
 	}
 
-	pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg);
-	base_addr = 0;
-	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the GPIO I/O range disabled\n");
+	res->start = base_addr;
+	res->end = base_addr + size - 1;
+	res->flags = IORESOURCE_IO;
+
+	return 0;
+}
+
+static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
+				 const char *name, int size, int id,
+				 struct mfd_cell *cell)
+{
+	struct resource *res;
+	int ret;
+
+	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	if (!res)
+		return -ENOMEM;
+
+	ret = lpc_sch_get_io(pdev, where, name, res, size);
+	if (ret)
+		return ret;
+
+	memset(cell, 0, sizeof(*cell));
+
+	cell->name = name;
+	cell->resources = res;
+	cell->num_resources = 1;
+	cell->ignore_resource_conflicts = true;
+	cell->id = id;
+
+	return 0;
+}
+
+static int lpc_sch_probe(struct pci_dev *dev,

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 113

Quoted 10 lines
drivers/mfd/lpc_sch.c +10 -0
+			 const struct pci_device_id *id)
+{
+	struct mfd_cell lpc_sch_cells[3];
+	int size, cells = 0;
+	int ret;
+
+	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus", SMBUS_IO_SIZE,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;

You're masking errors here. You need to return on error.

Quoted 59 lines
drivers/mfd/lpc_sch.c +12 -32
+	if (id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB)
+		size = GPIO_IO_SIZE_CENTERTON;
 	else
-		base_addr = (unsigned short)base_addr_cfg;
+		size = GPIO_IO_SIZE;
 
-	if (base_addr == 0) {
-		dev_warn(&dev->dev, "I/O space for GPIO uninitialized\n");
-	} else {
-		lpc_sch_cells[cells++] = sch_gpio_cell;
-		gpio_sch_resource.start = base_addr;
-		if (id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB)
-			gpio_sch_resource.end = base_addr + GPIO_IO_SIZE_CENTERTON - 1;
-		else
-			gpio_sch_resource.end = base_addr + GPIO_IO_SIZE - 1;
-	}
+	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio", size,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;
 
 	if (id->device == PCI_DEVICE_ID_INTEL_ITC_LPC
 	    || id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB) {
-		pci_read_config_dword(dev, WDTBASE, &base_addr_cfg);
-		base_addr = 0;
-		if (!(base_addr_cfg & (1 << 31)))
-			dev_warn(&dev->dev, "Decode of the WDT I/O range disabled\n");
-		else
-			base_addr = (unsigned short)base_addr_cfg;
-		if (base_addr == 0)
-			dev_warn(&dev->dev, "I/O space for WDT uninitialized\n");
-		else {
-			lpc_sch_cells[cells++] = wdt_sch_cell;
-			wdt_sch_resource.start = base_addr;
-			wdt_sch_resource.end = base_addr + WDT_IO_SIZE - 1;
-		}
-	}
-
-	if (WARN_ON(cells > ARRAY_SIZE(lpc_sch_cells))) {
-		dev_err(&dev->dev, "Cell count exceeds array size");
-		return -ENODEV;
+		ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",
+					    WDT_IO_SIZE,
+					    id->device, &lpc_sch_cells[cells]);
+		if (!ret)
+			cells++;
 	}
 
 	if (cells == 0) {
@@ -151,9 +136,6 @@ static int lpc_sch_probe(struct pci_dev *dev,
 		return -ENODEV;
 	}
 
-	for (i = 0; i < cells; i++)
-		lpc_sch_cells[i].id = id->device;
-
 	ret = mfd_add_devices(&dev->dev, 0, lpc_sch_cells, cells, NULL, 0, NULL);
 	if (ret)
 		mfd_remove_devices(&dev->dev);
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw

Re: [PATCH v1 1/5] mfd: lpc_sch: reduce duplicate code

Quoted 11 lines · Lee Jones
Quoted 9 lines · Andy Shevchenko

This patch refactors the driver to use helper functions instead of copy'n'pasted pieces of code.

---
 drivers/mfd/lpc_sch.c | 146 ++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 82 deletions(-)
Quoted 7 lines
Quoted 5 lines
drivers/mfd/lpc_sch.c +0 -0
index 4ee7550..0f01ef0 100644
@@ -40,41 +40,6 @@

[...]

Thanks for review, my answers below.

Quoted 21 lines
Quoted 21 lines
drivers/mfd/lpc_sch.c +5 -6
-static int lpc_sch_probe(struct pci_dev *dev,
-				const struct pci_device_id *id)
+static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
+			  struct resource *res, int size)
 {
 	unsigned int base_addr_cfg;
 	unsigned short base_addr;
-	int i, cells = 0;
-	int ret;
 
-	pci_read_config_dword(dev, SMBASE, &base_addr_cfg);
+	pci_read_config_dword(pdev, where, &base_addr_cfg);
 	base_addr = 0;
 	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the SMBus I/O range disabled\n");
+		dev_warn(&pdev->dev, "Decode of the %s I/O range disabled\n",
+			 name);
 	else
 		base_addr = (unsigned short)base_addr_cfg;
Quoted 10 lines

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 67

Quoted 8 lines
drivers/mfd/lpc_sch.c +2 -5
 	if (base_addr == 0) {
-		dev_warn(&dev->dev, "I/O space for SMBus uninitialized\n");
-	} else {
-		lpc_sch_cells[cells++] = isch_smbus_cell;
-		smbus_sch_resource.start = base_addr;
-		smbus_sch_resource.end = base_addr + SMBUS_IO_SIZE - 1;
+		dev_warn(&pdev->dev, "I/O space for %s uninitialized\n", name);
+		return -ENODEV;

If you're going to return an error, you need to use dev_err() above.

Okay.

Quoted 44 lines
Quoted 44 lines
drivers/mfd/lpc_sch.c +38 -4
 	}
 
-	pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg);
-	base_addr = 0;
-	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the GPIO I/O range disabled\n");
+	res->start = base_addr;
+	res->end = base_addr + size - 1;
+	res->flags = IORESOURCE_IO;
+
+	return 0;
+}
+
+static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
+				 const char *name, int size, int id,
+				 struct mfd_cell *cell)
+{
+	struct resource *res;
+	int ret;
+
+	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	if (!res)
+		return -ENOMEM;
+
+	ret = lpc_sch_get_io(pdev, where, name, res, size);
+	if (ret)
+		return ret;
+
+	memset(cell, 0, sizeof(*cell));
+
+	cell->name = name;
+	cell->resources = res;
+	cell->num_resources = 1;
+	cell->ignore_resource_conflicts = true;
+	cell->id = id;
+
+	return 0;
+}
+
+static int lpc_sch_probe(struct pci_dev *dev,
+			 const struct pci_device_id *id)
+{
+	struct mfd_cell lpc_sch_cells[3];
+	int size, cells = 0;
Quoted 8 lines

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 113

Quoted 6 lines
drivers/mfd/lpc_sch.c +6 -0
+	int ret;
+
+	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus", SMBUS_IO_SIZE,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;

You're masking errors here. You need to return on error.

No, I don't. It's a local error, I just need to understand if the HW has or hasn't the IP part we're looking for.

I could, let's say, return true or false, if you prefer, with the above meaning.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#4 lore raw

Re: [PATCH v1 1/5] mfd: lpc_sch: reduce duplicate code

Quoted 109 lines · Andy Shevchenko
Quoted 11 lines · Lee Jones
Quoted 9 lines · Andy Shevchenko

This patch refactors the driver to use helper functions instead of copy'n'pasted pieces of code.

---
 drivers/mfd/lpc_sch.c | 146 ++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 82 deletions(-)
Quoted 7 lines
Quoted 5 lines
drivers/mfd/lpc_sch.c +0 -0
index 4ee7550..0f01ef0 100644
@@ -40,41 +40,6 @@

[...]

Thanks for review, my answers below.

Quoted 21 lines
Quoted 21 lines
drivers/mfd/lpc_sch.c +5 -6
-static int lpc_sch_probe(struct pci_dev *dev,
-				const struct pci_device_id *id)
+static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
+			  struct resource *res, int size)
 {
 	unsigned int base_addr_cfg;
 	unsigned short base_addr;
-	int i, cells = 0;
-	int ret;
 
-	pci_read_config_dword(dev, SMBASE, &base_addr_cfg);
+	pci_read_config_dword(pdev, where, &base_addr_cfg);
 	base_addr = 0;
 	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the SMBus I/O range disabled\n");
+		dev_warn(&pdev->dev, "Decode of the %s I/O range disabled\n",
+			 name);
 	else
 		base_addr = (unsigned short)base_addr_cfg;
Quoted 10 lines

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 67

Quoted 8 lines
drivers/mfd/lpc_sch.c +2 -5
 	if (base_addr == 0) {
-		dev_warn(&dev->dev, "I/O space for SMBus uninitialized\n");
-	} else {
-		lpc_sch_cells[cells++] = isch_smbus_cell;
-		smbus_sch_resource.start = base_addr;
-		smbus_sch_resource.end = base_addr + SMBUS_IO_SIZE - 1;
+		dev_warn(&pdev->dev, "I/O space for %s uninitialized\n", name);
+		return -ENODEV;

If you're going to return an error, you need to use dev_err() above.

Okay.

Quoted 44 lines
Quoted 44 lines
drivers/mfd/lpc_sch.c +38 -4
 	}
 
-	pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg);
-	base_addr = 0;
-	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the GPIO I/O range disabled\n");
+	res->start = base_addr;
+	res->end = base_addr + size - 1;
+	res->flags = IORESOURCE_IO;
+
+	return 0;
+}
+
+static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
+				 const char *name, int size, int id,
+				 struct mfd_cell *cell)
+{
+	struct resource *res;
+	int ret;
+
+	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	if (!res)
+		return -ENOMEM;
+
+	ret = lpc_sch_get_io(pdev, where, name, res, size);
+	if (ret)
+		return ret;
+
+	memset(cell, 0, sizeof(*cell));
+
+	cell->name = name;
+	cell->resources = res;
+	cell->num_resources = 1;
+	cell->ignore_resource_conflicts = true;
+	cell->id = id;
+
+	return 0;
+}
+
+static int lpc_sch_probe(struct pci_dev *dev,
+			 const struct pci_device_id *id)
+{
+	struct mfd_cell lpc_sch_cells[3];
+	int size, cells = 0;
Quoted 8 lines

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 113

Quoted 6 lines
drivers/mfd/lpc_sch.c +6 -0
+	int ret;
+
+	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus", SMBUS_IO_SIZE,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;

You're masking errors here. You need to return on error.

Quoted 2 lines

No, I don't. It's a local error, I just need to understand if the HW has or hasn't the IP part we're looking for.

Yes, you do. -ENOMEM is not a local error, it needs to be returned.

Quoted 2 lines

I could, let's say, return true or false, if you prefer, with the above meaning.

I don't see this very often, which makes me wonder if it's the right thing to do at all; however, if you're going to this then please return a local state, instead of a Linux Error Code.

#define LCP_SKIP_RESOURCE /* Seems resonable? */

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#5 lore raw

Re: [PATCH v1 1/5] mfd: lpc_sch: reduce duplicate code

Quoted 114 lines · Lee Jones
Quoted 109 lines · Andy Shevchenko
Quoted 11 lines · Lee Jones
Quoted 9 lines · Andy Shevchenko

This patch refactors the driver to use helper functions instead of copy'n'pasted pieces of code.

---
 drivers/mfd/lpc_sch.c | 146 ++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 82 deletions(-)
Quoted 7 lines
Quoted 5 lines
drivers/mfd/lpc_sch.c +0 -0
index 4ee7550..0f01ef0 100644
@@ -40,41 +40,6 @@

[...]

Thanks for review, my answers below.

Quoted 21 lines
Quoted 21 lines
drivers/mfd/lpc_sch.c +5 -6
-static int lpc_sch_probe(struct pci_dev *dev,
-				const struct pci_device_id *id)
+static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
+			  struct resource *res, int size)
 {
 	unsigned int base_addr_cfg;
 	unsigned short base_addr;
-	int i, cells = 0;
-	int ret;
 
-	pci_read_config_dword(dev, SMBASE, &base_addr_cfg);
+	pci_read_config_dword(pdev, where, &base_addr_cfg);
 	base_addr = 0;
 	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the SMBus I/O range disabled\n");
+		dev_warn(&pdev->dev, "Decode of the %s I/O range disabled\n",
+			 name);
 	else
 		base_addr = (unsigned short)base_addr_cfg;
Quoted 10 lines

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 67

Quoted 8 lines
drivers/mfd/lpc_sch.c +2 -5
 	if (base_addr == 0) {
-		dev_warn(&dev->dev, "I/O space for SMBus uninitialized\n");
-	} else {
-		lpc_sch_cells[cells++] = isch_smbus_cell;
-		smbus_sch_resource.start = base_addr;
-		smbus_sch_resource.end = base_addr + SMBUS_IO_SIZE - 1;
+		dev_warn(&pdev->dev, "I/O space for %s uninitialized\n", name);
+		return -ENODEV;

If you're going to return an error, you need to use dev_err() above.

Okay.

Quoted 44 lines
Quoted 44 lines
drivers/mfd/lpc_sch.c +38 -4
 	}
 
-	pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg);
-	base_addr = 0;
-	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the GPIO I/O range disabled\n");
+	res->start = base_addr;
+	res->end = base_addr + size - 1;
+	res->flags = IORESOURCE_IO;
+
+	return 0;
+}
+
+static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
+				 const char *name, int size, int id,
+				 struct mfd_cell *cell)
+{
+	struct resource *res;
+	int ret;
+
+	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	if (!res)
+		return -ENOMEM;
+
+	ret = lpc_sch_get_io(pdev, where, name, res, size);
+	if (ret)
+		return ret;
+
+	memset(cell, 0, sizeof(*cell));
+
+	cell->name = name;
+	cell->resources = res;
+	cell->num_resources = 1;
+	cell->ignore_resource_conflicts = true;
+	cell->id = id;
+
+	return 0;
+}
+
+static int lpc_sch_probe(struct pci_dev *dev,
+			 const struct pci_device_id *id)
+{
+	struct mfd_cell lpc_sch_cells[3];
+	int size, cells = 0;
Quoted 8 lines

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 113

Quoted 6 lines
drivers/mfd/lpc_sch.c +6 -0
+	int ret;
+
+	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus", SMBUS_IO_SIZE,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;

You're masking errors here. You need to return on error.

Quoted 2 lines

No, I don't. It's a local error, I just need to understand if the HW has or hasn't the IP part we're looking for.

Quoted 8 lines

Yes, you do. -ENOMEM is not a local error, it needs to be returned.

Quoted 2 lines

I could, let's say, return true or false, if you prefer, with the above meaning.

I don't see this very often, which makes me wonder if it's the right thing to do at all; however, if you're going to this then please return a local state, instead of a Linux Error Code.

Okay, what about 1 — IP is present and we have no error, 0 — no ip, no error, -err — error that should be returned, would it work for you?

Quoted 1 line

#define LCP_SKIP_RESOURCE /* Seems resonable? */

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#6 lore raw

Re: [PATCH v1 1/5] mfd: lpc_sch: reduce duplicate code

Quoted 120 lines · Andy Shevchenko
Quoted 119 lines · Lee Jones
Quoted 109 lines · Andy Shevchenko
Quoted 11 lines · Lee Jones
Quoted 9 lines · Andy Shevchenko

This patch refactors the driver to use helper functions instead of copy'n'pasted pieces of code.

---
 drivers/mfd/lpc_sch.c | 146 ++++++++++++++++++++++----------------------------
 1 file changed, 64 insertions(+), 82 deletions(-)
Quoted 7 lines
Quoted 5 lines
drivers/mfd/lpc_sch.c +0 -0
index 4ee7550..0f01ef0 100644
@@ -40,41 +40,6 @@

[...]

Thanks for review, my answers below.

Quoted 21 lines
Quoted 21 lines
drivers/mfd/lpc_sch.c +5 -6
-static int lpc_sch_probe(struct pci_dev *dev,
-				const struct pci_device_id *id)
+static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
+			  struct resource *res, int size)
 {
 	unsigned int base_addr_cfg;
 	unsigned short base_addr;
-	int i, cells = 0;
-	int ret;
 
-	pci_read_config_dword(dev, SMBASE, &base_addr_cfg);
+	pci_read_config_dword(pdev, where, &base_addr_cfg);
 	base_addr = 0;
 	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the SMBus I/O range disabled\n");
+		dev_warn(&pdev->dev, "Decode of the %s I/O range disabled\n",
+			 name);
 	else
 		base_addr = (unsigned short)base_addr_cfg;
Quoted 10 lines

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 67

Quoted 8 lines
drivers/mfd/lpc_sch.c +2 -5
 	if (base_addr == 0) {
-		dev_warn(&dev->dev, "I/O space for SMBus uninitialized\n");
-	} else {
-		lpc_sch_cells[cells++] = isch_smbus_cell;
-		smbus_sch_resource.start = base_addr;
-		smbus_sch_resource.end = base_addr + SMBUS_IO_SIZE - 1;
+		dev_warn(&pdev->dev, "I/O space for %s uninitialized\n", name);
+		return -ENODEV;

If you're going to return an error, you need to use dev_err() above.

Okay.

Quoted 44 lines
Quoted 44 lines
drivers/mfd/lpc_sch.c +38 -4
 	}
 
-	pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg);
-	base_addr = 0;
-	if (!(base_addr_cfg & (1 << 31)))
-		dev_warn(&dev->dev, "Decode of the GPIO I/O range disabled\n");
+	res->start = base_addr;
+	res->end = base_addr + size - 1;
+	res->flags = IORESOURCE_IO;
+
+	return 0;
+}
+
+static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
+				 const char *name, int size, int id,
+				 struct mfd_cell *cell)
+{
+	struct resource *res;
+	int ret;
+
+	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	if (!res)
+		return -ENOMEM;
+
+	ret = lpc_sch_get_io(pdev, where, name, res, size);
+	if (ret)
+		return ret;
+
+	memset(cell, 0, sizeof(*cell));
+
+	cell->name = name;
+	cell->resources = res;
+	cell->num_resources = 1;
+	cell->ignore_resource_conflicts = true;
+	cell->id = id;
+
+	return 0;
+}
+
+static int lpc_sch_probe(struct pci_dev *dev,
+			 const struct pci_device_id *id)
+{
+	struct mfd_cell lpc_sch_cells[3];
+	int size, cells = 0;
Quoted 8 lines

drivers/mfd/lpc_sch.c static const struct pci_device_id lpc_sch_ids[] = { · line 113

Quoted 6 lines
drivers/mfd/lpc_sch.c +6 -0
+	int ret;
+
+	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus", SMBUS_IO_SIZE,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;

You're masking errors here. You need to return on error.

Quoted 2 lines

No, I don't. It's a local error, I just need to understand if the HW has or hasn't the IP part we're looking for.

Yes, you do. -ENOMEM is not a local error, it needs to be returned.

Quoted 2 lines

I could, let's say, return true or false, if you prefer, with the above meaning.

Quoted 6 lines
Quoted 3 lines

I don't see this very often, which makes me wonder if it's the right thing to do at all; however, if you're going to this then please return a local state, instead of a Linux Error Code.

Okay, what about 1 — IP is present and we have no error, 0 — no ip, no error, -err — error that should be returned, would it work for you?

I would suggest -E<error_message> for messages to be passed back, 0 for 'everything found and correct' and >0 (#defined of course) for any local messages you wish to pass 'IP not found', etc.

Quoted 4 lines
Quoted 1 line

#define LCP_SKIP_RESOURCE /* Seems resonable? */

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#7 lore raw

Re: [PATCH v1 1/5] mfd: lpc_sch: reduce duplicate code

On Mon, 2014-09-01 at 14:46 +0100, Lee Jones wrote:

[]

Quoted 8 lines
Quoted 2 lines

Okay, what about 1 — IP is present and we have no error, 0 — no ip, no error, -err — error that should be returned, would it work for you?

I would suggest -E<error_message> for messages to be passed back, 0 for 'everything found and correct' and >0 (#defined of course) for any local messages you wish to pass 'IP not found', etc.

Quoted 1 line
Quoted 1 line

#define LCP_SKIP_RESOURCE /* Seems resonable? */

Okay, makes sense. Will do this in v2.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#8 lore raw

PATCH 2/5 mfd: lpc_sch: better code manageability with chipset info struct

In reply to Andy Shevchenko

Introduce additional struct to hold chipset info. This chipset info will be used to store features that are supported by specific processor or chipset. LPC_SCH supports SMBUS, GPIO and WDT features. As this code base might expand further to support more processors, this implementation will help to keep code base clean and manageable.

---
 drivers/mfd/lpc_sch.c | 65 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 19 deletions(-)
drivers/mfd/lpc_sch.c +46 -19
index 0f01ef0..c4eb359 100644
@@ -40,10 +40,39 @@
 #define WDTBASE		0x84
 #define WDT_IO_SIZE	64
 
+enum sch_chipsets {
+	LPC_SCH = 0,		/* Intel Poulsbo SCH */
+	LPC_ITC,		/* Intel Tunnel Creek */
+	LPC_CENTERTON,		/* Intel Centerton */
+};
+
+struct lpc_sch_info {
+	unsigned int io_size_smbus;
+	unsigned int io_size_gpio;
+	unsigned int io_size_wdt;
+};
+
+static struct lpc_sch_info sch_chipset_info[] = {
+	[LPC_SCH] = {
+		.io_size_smbus = SMBUS_IO_SIZE,
+		.io_size_gpio = GPIO_IO_SIZE,
+	},
+	[LPC_ITC] = {
+		.io_size_smbus = SMBUS_IO_SIZE,
+		.io_size_gpio = GPIO_IO_SIZE,
+		.io_size_wdt = WDT_IO_SIZE,
+	},
+	[LPC_CENTERTON] = {
+		.io_size_smbus = SMBUS_IO_SIZE,
+		.io_size_gpio = GPIO_IO_SIZE_CENTERTON,
+		.io_size_wdt = WDT_IO_SIZE,
+	},
+};
+
 static const struct pci_device_id lpc_sch_ids[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB) },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC), LPC_SCH },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC), LPC_ITC },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB), LPC_CENTERTON },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
@@ -54,6 +83,9 @@ static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
 	unsigned int base_addr_cfg;
 	unsigned short base_addr;
 
+	if (size == 0)
+		return -EINVAL;
+
 	pci_read_config_dword(pdev, where, &base_addr_cfg);
 	base_addr = 0;
 	if (!(base_addr_cfg & (1 << 31)))
@@ -104,32 +136,27 @@ static int lpc_sch_probe(struct pci_dev *dev,
 			 const struct pci_device_id *id)
 {
 	struct mfd_cell lpc_sch_cells[3];
-	int size, cells = 0;
+	struct lpc_sch_info *info = &sch_chipset_info[id->driver_data];
+	int cells = 0;
 	int ret;
 
-	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus", SMBUS_IO_SIZE,
+	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus",
+				    info->io_size_smbus,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
-	if (id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB)
-		size = GPIO_IO_SIZE_CENTERTON;
-	else
-		size = GPIO_IO_SIZE;
-
-	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio", size,
+	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio",
+				    info->io_size_gpio,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
-	if (id->device == PCI_DEVICE_ID_INTEL_ITC_LPC
-	    || id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB) {
-		ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",
-					    WDT_IO_SIZE,
-					    id->device, &lpc_sch_cells[cells]);
-		if (!ret)
-			cells++;
-	}
+	ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",
+				    info->io_size_wdt,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;
 
 	if (cells == 0) {
 		dev_err(&dev->dev, "All decode registers disabled.\n");
Signature · 1 line
2.1.0
#9 lore raw

Re: [PATCH v1 2/5] mfd: lpc_sch: better code manageability with chipset info struct

Quoted 101 lines · Andy Shevchenko

Introduce additional struct to hold chipset info. This chipset info will be used to store features that are supported by specific processor or chipset. LPC_SCH supports SMBUS, GPIO and WDT features. As this code base might expand further to support more processors, this implementation will help to keep code base clean and manageable.

---
 drivers/mfd/lpc_sch.c | 65 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 19 deletions(-)
drivers/mfd/lpc_sch.c +41 -14
index 0f01ef0..c4eb359 100644
@@ -40,10 +40,39 @@
 #define WDTBASE		0x84
 #define WDT_IO_SIZE	64
 
+enum sch_chipsets {
+	LPC_SCH = 0,		/* Intel Poulsbo SCH */
+	LPC_ITC,		/* Intel Tunnel Creek */
+	LPC_CENTERTON,		/* Intel Centerton */
+};
+
+struct lpc_sch_info {
+	unsigned int io_size_smbus;
+	unsigned int io_size_gpio;
+	unsigned int io_size_wdt;
+};
+
+static struct lpc_sch_info sch_chipset_info[] = {
+	[LPC_SCH] = {
+		.io_size_smbus = SMBUS_IO_SIZE,
+		.io_size_gpio = GPIO_IO_SIZE,
+	},
+	[LPC_ITC] = {
+		.io_size_smbus = SMBUS_IO_SIZE,
+		.io_size_gpio = GPIO_IO_SIZE,
+		.io_size_wdt = WDT_IO_SIZE,
+	},
+	[LPC_CENTERTON] = {
+		.io_size_smbus = SMBUS_IO_SIZE,
+		.io_size_gpio = GPIO_IO_SIZE_CENTERTON,
+		.io_size_wdt = WDT_IO_SIZE,
+	},
+};
+
 static const struct pci_device_id lpc_sch_ids[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB) },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC), LPC_SCH },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC), LPC_ITC },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB), LPC_CENTERTON },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
@@ -54,6 +83,9 @@ static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
 	unsigned int base_addr_cfg;
 	unsigned short base_addr;
 
+	if (size == 0)
+		return -EINVAL;
+
 	pci_read_config_dword(pdev, where, &base_addr_cfg);
 	base_addr = 0;
 	if (!(base_addr_cfg & (1 << 31)))
@@ -104,32 +136,27 @@ static int lpc_sch_probe(struct pci_dev *dev,
 			 const struct pci_device_id *id)
 {
 	struct mfd_cell lpc_sch_cells[3];
-	int size, cells = 0;
+	struct lpc_sch_info *info = &sch_chipset_info[id->driver_data];
+	int cells = 0;
 	int ret;
 
-	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus", SMBUS_IO_SIZE,
+	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus",
+				    info->io_size_smbus,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
-	if (id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB)
-		size = GPIO_IO_SIZE_CENTERTON;
-	else
-		size = GPIO_IO_SIZE;
-
-	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio", size,
+	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio",
+				    info->io_size_gpio,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
-	if (id->device == PCI_DEVICE_ID_INTEL_ITC_LPC
-	    || id->device == PCI_DEVICE_ID_INTEL_CENTERTON_ILB) {
-		ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",

drivers/mfd/lpc_sch.c static int lpc_sch_probe(struct pci_dev *dev, · line 159

Quoted 10 lines
drivers/mfd/lpc_sch.c +5 -5
-					    WDT_IO_SIZE,
-					    id->device, &lpc_sch_cells[cells]);
-		if (!ret)
-			cells++;
-	}
+	ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",
+				    info->io_size_wdt,
+				    id->device, &lpc_sch_cells[cells]);
+	if (!ret)
+		cells++;

The first patch would look a great deal cleaner if it had these changes in too. Unless you have a really good reason not to, please consider squashing them.

Quoted 2 lines
drivers/mfd/lpc_sch.c +0 -0
 	if (cells == 0) {
 		dev_err(&dev->dev, "All decode registers disabled.\n");
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#10 lore raw

Re: [PATCH v1 2/5] mfd: lpc_sch: better code manageability with chipset info struct

Quoted 11 lines · Lee Jones
Quoted 9 lines · Andy Shevchenko

Introduce additional struct to hold chipset info. This chipset info will be used to store features that are supported by specific processor or chipset. LPC_SCH supports SMBUS, GPIO and WDT features. As this code base might expand further to support more processors, this implementation will help to keep code base clean and manageable.

[]

Quoted 3 lines

The first patch would look a great deal cleaner if it had these changes in too. Unless you have a really good reason not to, please consider squashing them.

The only reason behind is that this patch (in other form) was written by Rebecca in the first place. I recommended to clean up before, and actually did that clean up and amended Rebecca's patch.

So, if Rebecca has now objections I could squash it.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#11 lore raw

RE: [PATCH v1 2/5] mfd: lpc_sch: better code manageability with chipset info struct

Quoted 32 lines

-----Original Message-----
From: Andy Shevchenko [mailto:[email protected]]
Sent: 01 September, 2014 6:25 PM
To: Lee Jones
Cc: Bjorn Helgaas; [email protected]; Samuel Ortiz; Chang, Rebecca Swee Fun
Subject: Re: [PATCH v1 2/5] mfd: lpc_sch: better code manageability with chipset info struct

Quoted 8 lines · Lee Jones
Quoted 6 lines · Andy Shevchenko

Introduce additional struct to hold chipset info. This chipset info will be used to store features that are supported by specific processor or chipset. LPC_SCH supports SMBUS, GPIO and WDT features. As this code base might expand further to support more processors, this implementation will help to keep code base clean and manageable.

Quoted 4 lines
Quoted 4 lines

Signed-off-by: Chang Rebecca Swee Fun
<[email protected]>

[]

Quoted 3 lines

The first patch would look a great deal cleaner if it had these changes in too. Unless you have a really good reason not to, please consider squashing them.

Quoted 5 lines

The only reason behind is that this patch (in other form) was written by Rebecca in the first place. I recommended to clean up before, and actually did that clean up and amended Rebecca's patch.

So, if Rebecca has now objections I could squash it.

I have no objections. Thanks.

Quoted 4 lines

--
Andy Shevchenko <[email protected]> Intel Finland Oy

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

#12 lore raw

Re: [PATCH v1 2/5] mfd: lpc_sch: better code manageability with chipset info struct

Quoted 32 lines · Rebecca Swee Fun
Quoted 32 lines

-----Original Message-----
From: Andy Shevchenko [mailto:[email protected]]
Sent: 01 September, 2014 6:25 PM
To: Lee Jones
Cc: Bjorn Helgaas; [email protected]; Samuel Ortiz; Chang, Rebecca Swee Fun
Subject: Re: [PATCH v1 2/5] mfd: lpc_sch: better code manageability with chipset info struct

Quoted 8 lines · Lee Jones
Quoted 6 lines · Andy Shevchenko

Introduce additional struct to hold chipset info. This chipset info will be used to store features that are supported by specific processor or chipset. LPC_SCH supports SMBUS, GPIO and WDT features. As this code base might expand further to support more processors, this implementation will help to keep code base clean and manageable.

Quoted 4 lines
Quoted 4 lines

Signed-off-by: Chang Rebecca Swee Fun
<[email protected]>

[]

Quoted 3 lines

The first patch would look a great deal cleaner if it had these changes in too. Unless you have a really good reason not to, please consider squashing them.

Quoted 7 lines
Quoted 5 lines

The only reason behind is that this patch (in other form) was written by Rebecca in the first place. I recommended to clean up before, and actually did that clean up and amended Rebecca's patch.

So, if Rebecca has now objections I could squash it.

I have no objections. Thanks.

Thanks Rebecca.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#13 lore raw

PATCH 3/5 pci_ids: add support for Intel Quark ILB

In reply to Andy Shevchenko

From: Josef Ahmad <[email protected]>

This patch adds the PCI id for Intel Quark ILB. It will be used for GPIO and Multifunction device driver.

---
 include/linux/pci_ids.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/pci_ids.h +1 -0
index 6ed0bb7..4e82195 100644
@@ -2557,6 +2557,7 @@
 #define PCI_DEVICE_ID_INTEL_MFD_EMMC0	0x0823
 #define PCI_DEVICE_ID_INTEL_MFD_EMMC1	0x0824
 #define PCI_DEVICE_ID_INTEL_MRST_SD2	0x084F
+#define PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB	0x095E
 #define PCI_DEVICE_ID_INTEL_I960	0x0960
 #define PCI_DEVICE_ID_INTEL_I960RM	0x0962
 #define PCI_DEVICE_ID_INTEL_CENTERTON_ILB	0x0c60
Signature · 1 line
2.1.0
maintainer Acked-by on v1 3/5
#14 lore raw

Re: [PATCH v1 3/5] pci_ids: add support for Intel Quark ILB

Quoted 7 lines · Andy Shevchenko

From: Josef Ahmad <[email protected]>

This patch adds the PCI id for Intel Quark ILB. It will be used for GPIO and Multifunction device driver.

Assuming that this will actually be used in more than one place:

Quoted 19 lines
---
 include/linux/pci_ids.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/pci_ids.h +1 -1
index 6ed0bb7..4e82195 100644
@@ -2557,6 +2557,7 @@
 #define PCI_DEVICE_ID_INTEL_MFD_EMMC0  0x0823
 #define PCI_DEVICE_ID_INTEL_MFD_EMMC1  0x0824
 #define PCI_DEVICE_ID_INTEL_MRST_SD2   0x084F
+#define PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB    0x095E
 #define PCI_DEVICE_ID_INTEL_I960       0x0960
 #define PCI_DEVICE_ID_INTEL_I960RM     0x0962
 #define PCI_DEVICE_ID_INTEL_CENTERTON_ILB      0x0c60
--

2.1.0

#15 lore raw

Re: [PATCH v1 3/5] pci_ids: add support for Intel Quark ILB

Quoted 11 lines · Bjorn Helgaas
Quoted 7 lines · Andy Shevchenko

From: Josef Ahmad <[email protected]>

This patch adds the PCI id for Intel Quark ILB. It will be used for GPIO and Multifunction device driver.

Assuming that this will actually be used in more than one place:

Yes, look for the other IDs in the same driver (lpc_sch).

The question is will we have the update for sch_gpio in time to be included to v3.18? I think Rebecca can answer to this one.

Quoted 22 lines
Quoted 19 lines
---
 include/linux/pci_ids.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/pci_ids.h +1 -1
index 6ed0bb7..4e82195 100644
@@ -2557,6 +2557,7 @@
 #define PCI_DEVICE_ID_INTEL_MFD_EMMC0  0x0823
 #define PCI_DEVICE_ID_INTEL_MFD_EMMC1  0x0824
 #define PCI_DEVICE_ID_INTEL_MRST_SD2   0x084F
+#define PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB    0x095E
 #define PCI_DEVICE_ID_INTEL_I960       0x0960
 #define PCI_DEVICE_ID_INTEL_I960RM     0x0962
 #define PCI_DEVICE_ID_INTEL_CENTERTON_ILB      0x0c60
--

2.1.0

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#16 lore raw

RE: [PATCH v1 3/5] pci_ids: add support for Intel Quark ILB

Quoted 21 lines

-----Original Message-----
From: Andy Shevchenko [mailto:[email protected]]
Sent: 01 September, 2014 5:14 PM
To: Bjorn Helgaas
Cc: Lee Jones; [email protected]; Samuel Ortiz; Chang, Rebecca Swee Fun; Ahmad, Josef
Subject: Re: [PATCH v1 3/5] pci_ids: add support for Intel Quark ILB

Quoted 10 lines · Bjorn Helgaas
Quoted 7 lines · Andy Shevchenko

From: Josef Ahmad <[email protected]>

This patch adds the PCI id for Intel Quark ILB. It will be used for GPIO and Multifunction device driver.

Quoted 6 lines
Quoted 1 line

Assuming that this will actually be used in more than one place:

Yes, look for the other IDs in the same driver (lpc_sch).

The question is will we have the update for sch_gpio in time to be included to v3.18? I think Rebecca can answer to this one.

Yes, we are working on updating sch_gpio but I can't give you a confirm answer whether it will be included in v3.18. Sch_gpio has been scheduled as my 2nd priority work currently. However, I will try to make it in time if possible.

Rebecca

Quoted 19 lines
Quoted 19 lines
Quoted 15 lines
---
 include/linux/pci_ids.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/pci_ids.h index renamed from include/linux/pci_ids.h +0 -0

6ed0bb7..4e82195 100644

include/linux/pci_ids.h +0 -0
@@ -2557,6 +2557,7 @@
 #define PCI_DEVICE_ID_INTEL_MFD_EMMC0  0x0823  #define

PCI_DEVICE_ID_INTEL_MFD_EMMC1 0x0824
#define PCI_DEVICE_ID_INTEL_MRST_SD2 0x084F
+#define PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB 0x095E
#define PCI_DEVICE_ID_INTEL_I960 0x0960
#define PCI_DEVICE_ID_INTEL_I960RM 0x0962

Quoted 8 lines
Quoted 4 lines
Quoted 4 lines

#define PCI_DEVICE_ID_INTEL_CENTERTON_ILB 0x0c60
--
2.1.0

--
Andy Shevchenko <[email protected]> Intel Finland Oy

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

#17 lore raw

PATCH 4/5 mfd: lpc_sch: Add support for Intel Quark X1000

In reply to Andy Shevchenko

Intel Quark X1000 SoC supports IRQ based GPIO. This patch will enable MFD support for Quark X1000 and provide IRQ resources to Quark X1000 GPIO device driver.

---
 drivers/mfd/lpc_sch.c | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)
drivers/mfd/lpc_sch.c +35 -6
index c4eb359..6145a4c 100644
@@ -37,6 +37,9 @@
 #define GPIO_IO_SIZE	64
 #define GPIO_IO_SIZE_CENTERTON	128
 
+/* Intel Quark X1000 GPIO IRQ Number */
+#define GPIO_IRQ_QUARK_X1000	9
+
 #define WDTBASE		0x84
 #define WDT_IO_SIZE	64
 
@@ -44,28 +47,37 @@ enum sch_chipsets {
 	LPC_SCH = 0,		/* Intel Poulsbo SCH */
 	LPC_ITC,		/* Intel Tunnel Creek */
 	LPC_CENTERTON,		/* Intel Centerton */
+	LPC_QUARK_X1000,	/* Intel Quark X1000 */
 };
 
 struct lpc_sch_info {
 	unsigned int io_size_smbus;
 	unsigned int io_size_gpio;
 	unsigned int io_size_wdt;
+	int irq_gpio;
 };
 
 static struct lpc_sch_info sch_chipset_info[] = {
 	[LPC_SCH] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE,
+		.irq_gpio = -1,
 	},
 	[LPC_ITC] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE,
 		.io_size_wdt = WDT_IO_SIZE,
+		.irq_gpio = -1,
 	},
 	[LPC_CENTERTON] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE_CENTERTON,
 		.io_size_wdt = WDT_IO_SIZE,
+		.irq_gpio = -1,
+	},
+	[LPC_QUARK_X1000] = {
+		.io_size_gpio = GPIO_IO_SIZE,
+		.irq_gpio = GPIO_IRQ_QUARK_X1000,
 	},
 };
 
@@ -73,6 +85,7 @@ static const struct pci_device_id lpc_sch_ids[] = {
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC), LPC_SCH },
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC), LPC_ITC },
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB), LPC_CENTERTON },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB), LPC_QUARK_X1000 },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
@@ -106,14 +119,26 @@ static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
 	return 0;
 }
 
+static int lpc_sch_get_irq(struct resource *res, int irq)
+{
+	if (irq < 0)
+		return -EINVAL;
+
+	res->start = irq;
+	res->end = irq;
+	res->flags = IORESOURCE_IRQ;
+
+	return 0;
+}
+
 static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
-				 const char *name, int size, int id,
-				 struct mfd_cell *cell)
+				 const char *name, int size, int irq,
+				 int id, struct mfd_cell *cell)
 {
 	struct resource *res;
 	int ret;
 
-	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	res = devm_kcalloc(&pdev->dev, 2, sizeof(*res), GFP_KERNEL);
 	if (!res)
 		return -ENOMEM;
 
@@ -129,6 +154,10 @@ static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
 	cell->ignore_resource_conflicts = true;
 	cell->id = id;
 
+	ret = lpc_sch_get_irq(++res, irq);
+	if (!ret)
+		cell->num_resources++;
+
 	return 0;
 }
 
@@ -141,19 +170,19 @@ static int lpc_sch_probe(struct pci_dev *dev,
 	int ret;
 
 	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus",
-				    info->io_size_smbus,
+				    info->io_size_smbus, -1,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
 	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio",
-				    info->io_size_gpio,
+				    info->io_size_gpio, info->irq_gpio,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
 	ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",
-				    info->io_size_wdt,
+				    info->io_size_wdt, -1,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
Signature · 1 line
2.1.0
#18 lore raw

Re: [PATCH v1 4/5] mfd: lpc_sch: Add support for Intel Quark X1000

Quoted 76 lines · Andy Shevchenko

Intel Quark X1000 SoC supports IRQ based GPIO. This patch will enable MFD support for Quark X1000 and provide IRQ resources to Quark X1000 GPIO device driver.

---
 drivers/mfd/lpc_sch.c | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)
drivers/mfd/lpc_sch.c +14 -0
index c4eb359..6145a4c 100644
@@ -37,6 +37,9 @@
 #define GPIO_IO_SIZE	64
 #define GPIO_IO_SIZE_CENTERTON	128
 
+/* Intel Quark X1000 GPIO IRQ Number */
+#define GPIO_IRQ_QUARK_X1000	9
+
 #define WDTBASE		0x84
 #define WDT_IO_SIZE	64
 
@@ -44,28 +47,37 @@ enum sch_chipsets {
 	LPC_SCH = 0,		/* Intel Poulsbo SCH */
 	LPC_ITC,		/* Intel Tunnel Creek */
 	LPC_CENTERTON,		/* Intel Centerton */
+	LPC_QUARK_X1000,	/* Intel Quark X1000 */
 };
 
 struct lpc_sch_info {
 	unsigned int io_size_smbus;
 	unsigned int io_size_gpio;
 	unsigned int io_size_wdt;
+	int irq_gpio;
 };
 
 static struct lpc_sch_info sch_chipset_info[] = {
 	[LPC_SCH] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE,
+		.irq_gpio = -1,
 	},
 	[LPC_ITC] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE,
 		.io_size_wdt = WDT_IO_SIZE,
+		.irq_gpio = -1,
 	},
 	[LPC_CENTERTON] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE_CENTERTON,
 		.io_size_wdt = WDT_IO_SIZE,
+		.irq_gpio = -1,
+	},
+	[LPC_QUARK_X1000] = {
+		.io_size_gpio = GPIO_IO_SIZE,
+		.irq_gpio = GPIO_IRQ_QUARK_X1000,
 	},
 };
 
@@ -73,6 +85,7 @@ static const struct pci_device_id lpc_sch_ids[] = {
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC), LPC_SCH },
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC), LPC_ITC },
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB), LPC_CENTERTON },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB), LPC_QUARK_X1000 },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
@@ -106,14 +119,26 @@ static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
 	return 0;
 }
 
+static int lpc_sch_get_irq(struct resource *res, int irq)

drivers/mfd/lpc_sch.c static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name, · line 132

Quoted 10 lines
drivers/mfd/lpc_sch.c +10 -0
+{
+	if (irq < 0)
+		return -EINVAL;
+
+	res->start = irq;
+	res->end = irq;
+	res->flags = IORESOURCE_IRQ;
+
+	return 0;
+}

Why does this need to be a separate function?

I fear that the code will become unnecessarily fragmented, just for the sake of it.

Quoted 15 lines
drivers/mfd/lpc_sch.c +3 -3
 static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
-				 const char *name, int size, int id,
-				 struct mfd_cell *cell)
+				 const char *name, int size, int irq,
+				 int id, struct mfd_cell *cell)
 {
 	struct resource *res;
 	int ret;
 
-	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	res = devm_kcalloc(&pdev->dev, 2, sizeof(*res), GFP_KERNEL);
 	if (!res)
 		return -ENOMEM;
 

drivers/mfd/lpc_sch.c static int lpc_sch_populate_cell(struct pci_dev *pdev, int where, · line 159

Quoted 6 lines
drivers/mfd/lpc_sch.c +3 -0
@@ -129,6 +154,10 @@ static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
 	cell->ignore_resource_conflicts = true;
 	cell->id = id;
 
+	ret = lpc_sch_get_irq(++res, irq);
+	if (!ret)
+		cell->num_resources++;

Once again, you're masking errors. If it's not an error, don't return one. If it is, filter it back and fail the bind.

Quoted 26 lines
drivers/mfd/lpc_sch.c +3 -3
 	return 0;
 }
 
@@ -141,19 +170,19 @@ static int lpc_sch_probe(struct pci_dev *dev,
 	int ret;
 
 	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus",
-				    info->io_size_smbus,
+				    info->io_size_smbus, -1,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
 	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio",
-				    info->io_size_gpio,
+				    info->io_size_gpio, info->irq_gpio,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
 	ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",
-				    info->io_size_wdt,
+				    info->io_size_wdt, -1,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#19 lore raw

Re: [PATCH v1 4/5] mfd: lpc_sch: Add support for Intel Quark X1000

Quoted 9 lines · Lee Jones
Quoted 7 lines · Andy Shevchenko

Intel Quark X1000 SoC supports IRQ based GPIO. This patch will enable MFD support for Quark X1000 and provide IRQ resources to Quark X1000 GPIO device driver.

See my answers below.

Quoted 82 lines
Quoted 69 lines
---
 drivers/mfd/lpc_sch.c | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)
drivers/mfd/lpc_sch.c +14 -0
index c4eb359..6145a4c 100644
@@ -37,6 +37,9 @@
 #define GPIO_IO_SIZE	64
 #define GPIO_IO_SIZE_CENTERTON	128
 
+/* Intel Quark X1000 GPIO IRQ Number */
+#define GPIO_IRQ_QUARK_X1000	9
+
 #define WDTBASE		0x84
 #define WDT_IO_SIZE	64
 
@@ -44,28 +47,37 @@ enum sch_chipsets {
 	LPC_SCH = 0,		/* Intel Poulsbo SCH */
 	LPC_ITC,		/* Intel Tunnel Creek */
 	LPC_CENTERTON,		/* Intel Centerton */
+	LPC_QUARK_X1000,	/* Intel Quark X1000 */
 };
 
 struct lpc_sch_info {
 	unsigned int io_size_smbus;
 	unsigned int io_size_gpio;
 	unsigned int io_size_wdt;
+	int irq_gpio;
 };
 
 static struct lpc_sch_info sch_chipset_info[] = {
 	[LPC_SCH] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE,
+		.irq_gpio = -1,
 	},
 	[LPC_ITC] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE,
 		.io_size_wdt = WDT_IO_SIZE,
+		.irq_gpio = -1,
 	},
 	[LPC_CENTERTON] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE_CENTERTON,
 		.io_size_wdt = WDT_IO_SIZE,
+		.irq_gpio = -1,
+	},
+	[LPC_QUARK_X1000] = {
+		.io_size_gpio = GPIO_IO_SIZE,
+		.irq_gpio = GPIO_IRQ_QUARK_X1000,
 	},
 };
 
@@ -73,6 +85,7 @@ static const struct pci_device_id lpc_sch_ids[] = {
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC), LPC_SCH },
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC), LPC_ITC },
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB), LPC_CENTERTON },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB), LPC_QUARK_X1000 },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
@@ -106,14 +119,26 @@ static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
 	return 0;
 }
 
+static int lpc_sch_get_irq(struct resource *res, int irq)

drivers/mfd/lpc_sch.c static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name, · line 132

Quoted 10 lines
drivers/mfd/lpc_sch.c +10 -0
+{
+	if (irq < 0)
+		return -EINVAL;
+
+	res->start = irq;
+	res->end = irq;
+	res->flags = IORESOURCE_IRQ;
+
+	return 0;
+}

Why does this need to be a separate function?

Quoted 2 lines

I fear that the code will become unnecessarily fragmented, just for the sake of it.

I could do this as a condition branch.

Quoted 19 lines
Quoted 19 lines
drivers/mfd/lpc_sch.c +3 -3
 static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
-				 const char *name, int size, int id,
-				 struct mfd_cell *cell)
+				 const char *name, int size, int irq,
+				 int id, struct mfd_cell *cell)
 {
 	struct resource *res;
 	int ret;
 
-	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	res = devm_kcalloc(&pdev->dev, 2, sizeof(*res), GFP_KERNEL);
 	if (!res)
 		return -ENOMEM;
 
@@ -129,6 +154,10 @@ static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
 	cell->ignore_resource_conflicts = true;
 	cell->id = id;
 
Quoted 6 lines

drivers/mfd/lpc_sch.c static int lpc_sch_populate_cell(struct pci_dev *pdev, int where, · line 159

Quoted 3 lines
drivers/mfd/lpc_sch.c +3 -0
+	ret = lpc_sch_get_irq(++res, irq);
+	if (!ret)
+		cell->num_resources++;

Once again, you're masking errors. If it's not an error, don't return one. If it is, filter it back and fail the bind.

I have to know if there is such resource or not. Taking into account you prefer to see lpc_sch_get_irq embedded in here I just can do as a condition branch and there will be no more question I hope.

Quoted 27 lines
Quoted 27 lines
drivers/mfd/lpc_sch.c +3 -3
 	return 0;
 }
 
@@ -141,19 +170,19 @@ static int lpc_sch_probe(struct pci_dev *dev,
 	int ret;
 
 	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus",
-				    info->io_size_smbus,
+				    info->io_size_smbus, -1,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
 	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio",
-				    info->io_size_gpio,
+				    info->io_size_gpio, info->irq_gpio,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
 	ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",
-				    info->io_size_wdt,
+				    info->io_size_wdt, -1,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#20 lore raw

Re: [PATCH v1 4/5] mfd: lpc_sch: Add support for Intel Quark X1000

Quoted 95 lines · Andy Shevchenko
Quoted 9 lines · Lee Jones
Quoted 7 lines · Andy Shevchenko

Intel Quark X1000 SoC supports IRQ based GPIO. This patch will enable MFD support for Quark X1000 and provide IRQ resources to Quark X1000 GPIO device driver.

See my answers below.

Quoted 82 lines
Quoted 69 lines
---
 drivers/mfd/lpc_sch.c | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)
drivers/mfd/lpc_sch.c +14 -0
index c4eb359..6145a4c 100644
@@ -37,6 +37,9 @@
 #define GPIO_IO_SIZE	64
 #define GPIO_IO_SIZE_CENTERTON	128
 
+/* Intel Quark X1000 GPIO IRQ Number */
+#define GPIO_IRQ_QUARK_X1000	9
+
 #define WDTBASE		0x84
 #define WDT_IO_SIZE	64
 
@@ -44,28 +47,37 @@ enum sch_chipsets {
 	LPC_SCH = 0,		/* Intel Poulsbo SCH */
 	LPC_ITC,		/* Intel Tunnel Creek */
 	LPC_CENTERTON,		/* Intel Centerton */
+	LPC_QUARK_X1000,	/* Intel Quark X1000 */
 };
 
 struct lpc_sch_info {
 	unsigned int io_size_smbus;
 	unsigned int io_size_gpio;
 	unsigned int io_size_wdt;
+	int irq_gpio;
 };
 
 static struct lpc_sch_info sch_chipset_info[] = {
 	[LPC_SCH] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE,
+		.irq_gpio = -1,
 	},
 	[LPC_ITC] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE,
 		.io_size_wdt = WDT_IO_SIZE,
+		.irq_gpio = -1,
 	},
 	[LPC_CENTERTON] = {
 		.io_size_smbus = SMBUS_IO_SIZE,
 		.io_size_gpio = GPIO_IO_SIZE_CENTERTON,
 		.io_size_wdt = WDT_IO_SIZE,
+		.irq_gpio = -1,
+	},
+	[LPC_QUARK_X1000] = {
+		.io_size_gpio = GPIO_IO_SIZE,
+		.irq_gpio = GPIO_IRQ_QUARK_X1000,
 	},
 };
 
@@ -73,6 +85,7 @@ static const struct pci_device_id lpc_sch_ids[] = {
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC), LPC_SCH },
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC), LPC_ITC },
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CENTERTON_ILB), LPC_CENTERTON },
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB), LPC_QUARK_X1000 },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
@@ -106,14 +119,26 @@ static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name,
 	return 0;
 }
 
+static int lpc_sch_get_irq(struct resource *res, int irq)

drivers/mfd/lpc_sch.c static int lpc_sch_get_io(struct pci_dev *pdev, int where, const char *name, · line 132

Quoted 10 lines
drivers/mfd/lpc_sch.c +10 -0
+{
+	if (irq < 0)
+		return -EINVAL;
+
+	res->start = irq;
+	res->end = irq;
+	res->flags = IORESOURCE_IRQ;
+
+	return 0;
+}

Why does this need to be a separate function?

Quoted 4 lines
Quoted 2 lines

I fear that the code will become unnecessarily fragmented, just for the sake of it.

I could do this as a condition branch.

You could, but you don't.

Quoted 25 lines
Quoted 18 lines
Quoted 18 lines
drivers/mfd/lpc_sch.c +3 -3
 static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
-				 const char *name, int size, int id,
-				 struct mfd_cell *cell)
+				 const char *name, int size, int irq,
+				 int id, struct mfd_cell *cell)
 {
 	struct resource *res;
 	int ret;
 
-	res = devm_kzalloc(&pdev->dev, sizeof(*res), GFP_KERNEL);
+	res = devm_kcalloc(&pdev->dev, 2, sizeof(*res), GFP_KERNEL);
 	if (!res)
 		return -ENOMEM;
 
@@ -129,6 +154,10 @@ static int lpc_sch_populate_cell(struct pci_dev *pdev, int where,
 	cell->ignore_resource_conflicts = true;
 	cell->id = id;
 
Quoted 6 lines

drivers/mfd/lpc_sch.c static int lpc_sch_populate_cell(struct pci_dev *pdev, int where, · line 159

Quoted 3 lines
drivers/mfd/lpc_sch.c +3 -0
+	ret = lpc_sch_get_irq(++res, irq);
+	if (!ret)
+		cell->num_resources++;

Once again, you're masking errors. If it's not an error, don't return one. If it is, filter it back and fail the bind.

Quoted 3 lines

I have to know if there is such resource or not. Taking into account you prefer to see lpc_sch_get_irq embedded in here I just can do as a condition branch and there will be no more question I hope.

This is true.

Quoted 28 lines
Quoted 26 lines
Quoted 26 lines
drivers/mfd/lpc_sch.c +3 -3
 	return 0;
 }
 
@@ -141,19 +170,19 @@ static int lpc_sch_probe(struct pci_dev *dev,
 	int ret;
 
 	ret = lpc_sch_populate_cell(dev, SMBASE, "isch_smbus",
-				    info->io_size_smbus,
+				    info->io_size_smbus, -1,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
 	ret = lpc_sch_populate_cell(dev, GPIOBASE, "sch_gpio",
-				    info->io_size_gpio,
+				    info->io_size_gpio, info->irq_gpio,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
 
 	ret = lpc_sch_populate_cell(dev, WDTBASE, "ie6xx_wdt",
-				    info->io_size_wdt,
+				    info->io_size_wdt, -1,
 				    id->device, &lpc_sch_cells[cells]);
 	if (!ret)
 		cells++;
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#21 lore raw

PATCH 5/5 mfd: lpc_sch: remove FSF address

In reply to Andy Shevchenko

This patch removes FSF address becase it can be changed. While here, update the copyright lines by adding Intel Corp. to them.

There is no functional change.

---
 drivers/mfd/lpc_sch.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/mfd/lpc_sch.c +1 -4
index 6145a4c..b14ca7c 100644
@@ -7,6 +7,7 @@
  *  Configuration Registers.
  *
  *  Copyright (c) 2010 CompuLab Ltd
+ *  Copyright (c) 2014 Intel Corp.
  *  Author: Denis Turischev <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -17,10 +18,6 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
Signature · 1 line
2.1.0
maintainer
#22 lore raw

Re: [PATCH v1 5/5] mfd: lpc_sch: remove FSF address

Quoted 1 line · Andy Shevchenko

This patch removes FSF address becase it can be changed. While here, update the

because

Quoted 35 lines

copyright lines by adding Intel Corp. to them.

There is no functional change.

---
 drivers/mfd/lpc_sch.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/mfd/lpc_sch.c +1 -5
index 6145a4c..b14ca7c 100644
@@ -7,6 +7,7 @@
  *  Configuration Registers.
  *
  *  Copyright (c) 2010 CompuLab Ltd
+ *  Copyright (c) 2014 Intel Corp.
  *  Author: Denis Turischev <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -17,10 +18,6 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
--

2.1.0

#23 lore raw
In reply to Andy Shevchenko
Quoted 4 lines · Andy Shevchenko

This brings support of the LPC SCH device found on Intel Quark SoC. Patches were compile tested, and driver runs on actual hardware.

Please, note that PCI ID will be used in future in the gpio-sch driver.

Bjorn, could you Ack or comment patch 3/5?

Lee, do you have any comments on the series?

Quoted 14 lines

Andy Shevchenko (4):
mfd: lpc_sch: reduce duplicate code
mfd: lpc_sch: better code manageability with chipset info struct
mfd: lpc_sch: Add support for Intel Quark X1000
mfd: lpc_sch: remove FSF address

Josef Ahmad (1):
pci_ids: add support for Intel Quark ILB

 drivers/mfd/lpc_sch.c   | 207 ++++++++++++++++++++++++++++--------------------
 include/linux/pci_ids.h |   1 +
 2 files changed, 122 insertions(+), 86 deletions(-)
Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#24 lore raw
Quoted 9 lines · Andy Shevchenko
Quoted 4 lines · Andy Shevchenko

This brings support of the LPC SCH device found on Intel Quark SoC. Patches were compile tested, and driver runs on actual hardware.

Please, note that PCI ID will be used in future in the gpio-sch driver.

Bjorn, could you Ack or comment patch 3/5?

Lee, do you have any comments on the series?

I have marked them as 'important' and will get round to them when I can. This week has been hectic. I will get round to it next week.

Quoted 15 lines
Quoted 13 lines

Andy Shevchenko (4):
mfd: lpc_sch: reduce duplicate code
mfd: lpc_sch: better code manageability with chipset info struct
mfd: lpc_sch: Add support for Intel Quark X1000
mfd: lpc_sch: remove FSF address

Josef Ahmad (1):
pci_ids: add support for Intel Quark ILB

 drivers/mfd/lpc_sch.c   | 207 ++++++++++++++++++++++++++++--------------------
 include/linux/pci_ids.h |   1 +
 2 files changed, 122 insertions(+), 86 deletions(-)
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#25 lore raw
Quoted 6 lines · Lee Jones
Quoted 4 lines · Andy Shevchenko
Quoted 3 lines · Andy Shevchenko

This brings support of the LPC SCH device found on Intel Quark SoC. Patches were compile tested, and driver runs on actual hardware.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Please, note that PCI ID will be used in future in the gpio-sch driver.

Bjorn, could you Ack or comment patch 3/5?

Lee, do you have any comments on the series?

I have marked them as 'important' and will get round to them when I can. This week has been hectic. I will get round to it next week.

Thanks for your comments. I will fix everything we agreed about and send v2. For now I'm waiting for Rebecca's comment regarding to squashing patch 1/5 and 2/5.

Quoted 17 lines
Quoted 16 lines
Quoted 14 lines

Andy Shevchenko (4):
mfd: lpc_sch: reduce duplicate code
mfd: lpc_sch: better code manageability with chipset info struct
mfd: lpc_sch: Add support for Intel Quark X1000
mfd: lpc_sch: remove FSF address

Josef Ahmad (1):
pci_ids: add support for Intel Quark ILB

 drivers/mfd/lpc_sch.c   | 207 ++++++++++++++++++++++++++++--------------------
 include/linux/pci_ids.h |   1 +
 2 files changed, 122 insertions(+), 86 deletions(-)
Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy