[MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT.

All of lore.kernel.org
 help / color / mirror / Atom feed

* [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT.
@ 2015-11-30 22:47 Deepak M
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 01/13] drm/i915: Adding the parsing logic for the i2c element Deepak M
                   ` (8 more replies)
  0 siblings, 9 replies; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M

Currently in our kernel we ioremap 8KB of memory for the
opregion and holds a maximum of 6KB sized RAW vbt data.

As per the latest opregion spec when the VBT size exceeds
6KB it cant be placed in the mailbox4 of the opregion, so
the physical address of the buffer where the Raw VBT is
stored will be mentioned in the mailbox3 with the VBT size
in the opregion version 2 and above.
A non-zero value here is an indication to driver that a
valid Raw VBT is stored here and driver should not refer
to mailbox4 for getting VBT. This is implemented in one
of the patches in this series.

link for the opregion spec : https://securewiki.ith.intel.com/pages/viewpage.action?pageId=48147378
(spec is under intel firewall)

In the version 3 of the MIPI sequence block, the size
field is 4 bytes so that it can support block size of
more than 64KB, but the vbt size field in the bdb header is only
2 bytes. Based on the below points this issue can be handled.
1. When the VBT is not present in the mailbox4 then VBT size
needs to be read from the mailbox3 and this VBT size field
is of 4 bytes which implies that it can be more than 64KB also.
2. If the VBT size is more than 64KB then the VBT size field
in the bdb header cant be relied. So its better to consider
the vbt size from the mailbox3 when the VBT is not present in
mailbox4.

Other patches implements the parsing of the new sequence type
which are added in the block 53.

v2: Addressed Jani`s review comments.
v3: Addressed Jani`s review comments.

Deepak M (8):
  drm/i915: Updating asle structure with new fields
  drm/i915: Add Intel opregion mailbox 5 structure
  drm/i915: Do opregion VBT validation during opregion setup
  drm/i915: Add debug entry to get the opregion VBT blob
  drm/i915: Parsing VBT if size of VBT exceeds 6KB
  drm/i915: Extend gpio read/write to other cores
  drm/i915: Added the generic gpio sequence support and gpio table
  drm: Add few more wrapper functions for drm panel

Gaurav K Singh (1):
  drm/i915: Add functions to execute the new sequences from VBT

Uma Shankar (1):
  drm/i915: BXT GPIO support for backlight and panel control

Yogesh Mohan Marimuthu (1):
  drm/i915: GPIO for CHT generic MIPI

vkorjani (2):
  drm/i915: Adding the parsing logic for the i2c element
  drm/i915: Added support the v3 mipi sequence block

 drivers/gpu/drm/i915/i915_debugfs.c        |  29 +
 drivers/gpu/drm/i915/i915_drv.h            |  10 +-
 drivers/gpu/drm/i915/i915_reg.h            |  28 +
 drivers/gpu/drm/i915/intel_bios.c          | 175 ++++--
 drivers/gpu/drm/i915/intel_bios.h          |  10 +-
 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 887 +++++++++++++++++++++++++++--
 drivers/gpu/drm/i915/intel_opregion.c      |  72 ++-
 drivers/gpu/drm/i915/intel_sideband.c      |   9 +-
 include/drm/drm_panel.h                    |  47 ++
 9 files changed, 1170 insertions(+), 97 deletions(-)

-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [MIPI SEQ PARSING v3 01/13] drm/i915: Adding the parsing logic for the i2c element
  2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
@ 2015-11-30 22:47 ` Deepak M
  2015-12-11  8:40   ` Mika Kahola
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 02/13] drm/i915: Updating asle structure with new fields Deepak M
                   ` (7 subsequent siblings)
  8 siblings, 1 reply; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jani Nikula, Deepak M

From: vkorjani <vikas.korjani@intel.com>

New sequence element for i2c is been added in the
mipi sequence block of the VBT. This patch parses
and executes the i2c sequence.

v2: Add i2c_put_adapter call(Jani), rebase
v3: corrected the retry loop(Jani), rebase

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: vkorjani <vikas.korjani@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---
 drivers/gpu/drm/i915/intel_bios.c          |  6 +++
 drivers/gpu/drm/i915/intel_bios.h          |  1 +
 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 60 ++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index ce82f9c..6756a1c 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -718,6 +718,12 @@ static u8 *goto_next_sequence(u8 *data, int *size)
 
 			data += 3;
 			break;
+		case MIPI_SEQ_ELEM_I2C:
+			/* skip by this element payload size */
+			data += 7;
+			len = *data;
+			data += len + 1;
+			break;
 		default:
 			DRM_ERROR("Unknown element\n");
 			return NULL;
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index 7ec8c9a..4ec73f5 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -954,6 +954,7 @@ enum mipi_seq_element {
 	MIPI_SEQ_ELEM_SEND_PKT,
 	MIPI_SEQ_ELEM_DELAY,
 	MIPI_SEQ_ELEM_GPIO,
+	MIPI_SEQ_ELEM_I2C,
 	MIPI_SEQ_ELEM_STATUS,
 	MIPI_SEQ_ELEM_MAX
 };
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index a5e99ac..92d619a 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -31,6 +31,7 @@
 #include <drm/drm_panel.h>
 #include <linux/slab.h>
 #include <video/mipi_display.h>
+#include <linux/i2c.h>
 #include <asm/intel-mid.h>
 #include <video/mipi_display.h>
 #include "i915_drv.h"
@@ -104,6 +105,64 @@ static struct gpio_table gtable[] = {
 	{ GPIO_NC_11_PCONF0, GPIO_NC_11_PAD, 0}
 };
 
+static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data)
+{
+	struct i2c_adapter *adapter;
+	int ret;
+	u8 reg_offset, payload_size, retries = 5;
+	struct i2c_msg msg;
+	u8 *transmit_buffer = NULL;
+	u8 flag = *data++;
+	u8 index = *data++;
+	u8 bus_number = *data++;
+	u16 slave_add = *(u16 *)(data);
+
+	data = data + 2;
+	reg_offset = *data++;
+	payload_size = *data++;
+
+	adapter = i2c_get_adapter(bus_number);
+
+	if (!adapter) {
+		DRM_ERROR("i2c_get_adapter(%u)\n", bus_number);
+		goto out;
+	}
+
+	transmit_buffer = kmalloc(1 + payload_size, GFP_TEMPORARY);
+
+	if (!transmit_buffer)
+		goto out;
+
+	transmit_buffer[0] = reg_offset;
+	memcpy(&transmit_buffer[1], data, payload_size);
+
+	msg.addr   = slave_add;
+	msg.flags  = 0;
+	msg.len    = payload_size + 1;
+	msg.buf    = &transmit_buffer[0];
+
+	do {
+		ret =  i2c_transfer(adapter, &msg, 1);
+		if (ret == 1)
+			goto out;
+		else if (ret == -EAGAIN)
+			usleep_range(1000, 2500);
+		else {
+			DRM_ERROR("i2c transfer failed, error code:%d\n", ret);
+			goto out;
+		}
+	} while (retries--);
+
+	if (retries == 0)
+		DRM_ERROR("i2c transfer failed, error code:%d\n", ret);
+out:
+	kfree(transmit_buffer);
+	i2c_put_adapter(adapter);
+
+	data = data + payload_size;
+	return data;
+}
+
 static inline enum port intel_dsi_seq_port_to_port(u8 port)
 {
 	return port ? PORT_C : PORT_A;
@@ -236,6 +295,7 @@ static const fn_mipi_elem_exec exec_elem[] = {
 	mipi_exec_send_packet,
 	mipi_exec_delay,
 	mipi_exec_gpio,
+	mipi_exec_i2c,
 	NULL, /* status read; later */
 };
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [MIPI SEQ PARSING v3 02/13] drm/i915: Updating asle structure with new fields
  2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 01/13] drm/i915: Adding the parsing logic for the i2c element Deepak M
@ 2015-11-30 22:47 ` Deepak M
  2015-12-11  8:41   ` Mika Kahola
  2015-12-14 11:02   ` Jani Nikula
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 03/13] drm/i915: Add Intel opregion mailbox 5 structure Deepak M
                   ` (6 subsequent siblings)
  8 siblings, 2 replies; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M, Jani Nikula

v3: rebase

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---
 drivers/gpu/drm/i915/intel_opregion.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index e362a30..64efedf 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -120,7 +120,9 @@ struct opregion_asle {
 	u64 fdss;
 	u32 fdsp;
 	u32 stat;
-	u8 rsvd[70];
+	u64 rvda;	/* Physical address of raw vbt data */
+	u32 rvds;	/* Size of raw vbt data */
+	u8 rsvd[58];
 } __packed;
 
 /* Driver readiness indicator */
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [MIPI SEQ PARSING v3 03/13] drm/i915: Add Intel opregion mailbox 5 structure
  2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 01/13] drm/i915: Adding the parsing logic for the i2c element Deepak M
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 02/13] drm/i915: Updating asle structure with new fields Deepak M
@ 2015-11-30 22:47 ` Deepak M
  2015-12-11  8:42   ` Mika Kahola
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 04/13] drm/i915: Do opregion VBT validation during opregion setup Deepak M
                   ` (5 subsequent siblings)
  8 siblings, 1 reply; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M, Jani Nikula

Mailbox 5 is BIOS to Driver Notification mailbox is intended
to support BIOS to Driver event notification or data storage
for BIOS to Driver data synchronization purpose. Mailbox 5 is
the extension of mailbox 3.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h       | 1 +
 drivers/gpu/drm/i915/intel_opregion.c | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 71bd1dc..135d32a 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -457,6 +457,7 @@ struct intel_opregion {
 	u32 swsci_sbcb_sub_functions;
 	struct opregion_asle *asle;
 	void *vbt;
+	struct opregion_asle_ext *asle_ext;
 	u32 *lid_state;
 	struct work_struct asle_work;
 };
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 64efedf..43b7c3b 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -46,6 +46,7 @@
 #define OPREGION_SWSCI_OFFSET  0x200
 #define OPREGION_ASLE_OFFSET   0x300
 #define OPREGION_VBT_OFFSET    0x400
+#define OPREGION_ASLE_EXT_OFFSET	0x1C00
 
 #define OPREGION_SIGNATURE "IntelGraphicsMem"
 #define MBOX_ACPI      (1<<0)
@@ -125,6 +126,13 @@ struct opregion_asle {
 	u8 rsvd[58];
 } __packed;
 
+/* OpRegion mailbox #5: ASLE ext */
+struct opregion_asle_ext {
+	u32 phed;	/* Panel Header */
+	u32 bddc[64];	/* Panel EDID */
+	u32 rsvd[191];
+} __packed;
+
 /* Driver readiness indicator */
 #define ASLE_ARDY_READY		(1 << 0)
 #define ASLE_ARDY_NOT_READY	(0 << 0)
@@ -936,6 +944,7 @@ int intel_opregion_setup(struct drm_device *dev)
 	opregion->vbt = base + OPREGION_VBT_OFFSET;
 
 	opregion->lid_state = base + ACPI_CLID;
+	opregion->asle_ext = base + OPREGION_ASLE_EXT_OFFSET;
 
 	mboxes = opregion->header->mboxes;
 	if (mboxes & MBOX_ACPI) {
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [MIPI SEQ PARSING v3 04/13] drm/i915: Do opregion VBT validation during opregion setup
  2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
                   ` (2 preceding siblings ...)
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 03/13] drm/i915: Add Intel opregion mailbox 5 structure Deepak M
@ 2015-11-30 22:47 ` Deepak M
  2015-12-11  8:43   ` Mika Kahola
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 05/13] drm/i915: Add debug entry to get the opregion VBT blob Deepak M
                   ` (4 subsequent siblings)
  8 siblings, 1 reply; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M, Jani Nikula

Calling the validate_vbt before assiging the opregion vbt blob.
Size of the VBT blob cant be more than 6KB when VBT is present
in mailbox 4.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h       |  3 +++
 drivers/gpu/drm/i915/intel_bios.c     | 43 +++++++++++++++++++----------------
 drivers/gpu/drm/i915/intel_opregion.c | 31 +++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 135d32a..8cf8375 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3324,6 +3324,9 @@ intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
 }
 #endif
 
+const struct vbt_header *validate_vbt(const void *_vbt, size_t size,
+						const char *source);
+
 /* intel_acpi.c */
 #ifdef CONFIG_ACPI
 extern void intel_register_dsm_handler(void);
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 6756a1c..57a77aa 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1237,16 +1237,15 @@ static const struct dmi_system_id intel_no_opregion_vbt[] = {
 	{ }
 };
 
-static const struct bdb_header *validate_vbt(const void *base,
+const struct vbt_header *validate_vbt(const void *_vbt,
 					     size_t size,
-					     const void *_vbt,
 					     const char *source)
 {
-	size_t offset = _vbt - base;
-	const struct vbt_header *vbt = _vbt;
+	const struct vbt_header *vbt = (const struct vbt_header *)_vbt;
 	const struct bdb_header *bdb;
+	size_t offset;
 
-	if (offset + sizeof(struct vbt_header) > size) {
+	if (sizeof(struct vbt_header) > size) {
 		DRM_DEBUG_DRIVER("VBT header incomplete\n");
 		return NULL;
 	}
@@ -1256,26 +1255,26 @@ static const struct bdb_header *validate_vbt(const void *base,
 		return NULL;
 	}
 
-	offset += vbt->bdb_offset;
+	offset = vbt->bdb_offset;
 	if (offset + sizeof(struct bdb_header) > size) {
 		DRM_DEBUG_DRIVER("BDB header incomplete\n");
 		return NULL;
 	}
 
-	bdb = base + offset;
+	bdb = (const void *)_vbt + offset;
 	if (offset + bdb->bdb_size > size) {
 		DRM_DEBUG_DRIVER("BDB incomplete\n");
 		return NULL;
 	}
 
 	DRM_DEBUG_KMS("Using VBT from %s: %20s\n",
-		      source, vbt->signature);
-	return bdb;
+			source, vbt->signature);
+	return vbt;
 }
 
-static const struct bdb_header *find_vbt(void __iomem *bios, size_t size)
+static const struct vbt_header *find_vbt(void __iomem *bios, size_t size)
 {
-	const struct bdb_header *bdb = NULL;
+	const struct vbt_header *vbt = NULL;
 	size_t i;
 
 	/* Scour memory looking for the VBT signature. */
@@ -1289,12 +1288,12 @@ static const struct bdb_header *find_vbt(void __iomem *bios, size_t size)
 			 */
 			void *_bios = (void __force *) bios;
 
-			bdb = validate_vbt(_bios, size, _bios + i, "PCI ROM");
+			vbt = validate_vbt(_bios + i, size - i, "PCI ROM");
 			break;
 		}
 	}
 
-	return bdb;
+	return vbt;
 }
 
 /**
@@ -1311,6 +1310,7 @@ intel_parse_bios(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct pci_dev *pdev = dev->pdev;
+	const struct vbt_header *vbt = NULL;
 	const struct bdb_header *bdb = NULL;
 	u8 __iomem *bios = NULL;
 
@@ -1319,23 +1319,26 @@ intel_parse_bios(struct drm_device *dev)
 
 	init_vbt_defaults(dev_priv);
 
-	/* XXX Should this validation be moved to intel_opregion.c? */
-	if (!dmi_check_system(intel_no_opregion_vbt) && dev_priv->opregion.vbt)
-		bdb = validate_vbt(dev_priv->opregion.header, OPREGION_SIZE,
-				   dev_priv->opregion.vbt, "OpRegion");
+	if (!dmi_check_system(intel_no_opregion_vbt) &&
+					dev_priv->opregion.vbt) {
+		vbt = (const struct vbt_header *)dev_priv->opregion.vbt;
+		bdb = (const void *)dev_priv->opregion.vbt + vbt->bdb_offset;
+	}
 
-	if (bdb == NULL) {
+	if (vbt == NULL) {
 		size_t size;
 
 		bios = pci_map_rom(pdev, &size);
 		if (!bios)
 			return -1;
 
-		bdb = find_vbt(bios, size);
-		if (!bdb) {
+		vbt = find_vbt(bios, size);
+		if (!vbt) {
 			pci_unmap_rom(pdev, bios);
 			return -1;
 		}
+
+		bdb = (const void *)vbt + vbt->bdb_offset;
 	}
 
 	/* Grab useful general definitions */
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 43b7c3b..4a78282 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -48,6 +48,27 @@
 #define OPREGION_VBT_OFFSET    0x400
 #define OPREGION_ASLE_EXT_OFFSET	0x1C00
 
+#define MAILBOX_4_SIZE		0x1800
+
+/*
+ *	Opregion Structure:
+ *	      +-------------------------------+
+ *            |      Mailbox1 : ACPI          |
+ *            |      Offset   : 0x100         |
+ *            +-------------------------------+
+ *            |      Mailbox2 : SWSCI	      |
+ *            |      Offset   : 0x200         |
+ *            +-------------------------------+
+ *            |      Mailbox3 : ASLE	      |
+ *            |      Offset   : 0x300         |
+ *            +-------------------------------+
+ *            |      Mailbox4 : VBT	      |
+ *            |      Offset   : 0x400         |
+ *            +-------------------------------+
+ *            |      Mailbox5 : ASLE_EXT      |
+ *            |      Offset   : 0x1C00        |
+ *            +-------------------------------+
+*/
 #define OPREGION_SIGNATURE "IntelGraphicsMem"
 #define MBOX_ACPI      (1<<0)
 #define MBOX_SWSCI     (1<<1)
@@ -910,6 +931,7 @@ int intel_opregion_setup(struct drm_device *dev)
 	struct intel_opregion *opregion = &dev_priv->opregion;
 	u32 asls, mboxes;
 	char buf[sizeof(OPREGION_SIGNATURE)];
+	const struct vbt_header *vbt = NULL;
 	int err = 0;
 	void *base;
 
@@ -940,6 +962,15 @@ int intel_opregion_setup(struct drm_device *dev)
 		err = -EINVAL;
 		goto err_out;
 	}
+
+	vbt = validate_vbt(base + OPREGION_VBT_OFFSET,
+				MAILBOX_4_SIZE, "OpRegion");
+
+	if (vbt == NULL) {
+		err = -EINVAL;
+		goto err_out;
+	}
+
 	opregion->header = base;
 	opregion->vbt = base + OPREGION_VBT_OFFSET;
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [MIPI SEQ PARSING v3 05/13] drm/i915: Add debug entry to get the opregion VBT blob
  2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
                   ` (3 preceding siblings ...)
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 04/13] drm/i915: Do opregion VBT validation during opregion setup Deepak M
@ 2015-11-30 22:47 ` Deepak M
  2015-12-11  8:46   ` Mika Kahola
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 06/13] " Deepak M
                   ` (3 subsequent siblings)
  8 siblings, 1 reply; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M, Jani Nikula

Currently there is a entry to get the complete opregion
dump, this patch adds entry to get the VBT alone from
the opregion.

Adding this entry helps developer to get the VBT easily,
instead of following the old way where we get the complete
opregion dump and pick the VBT from the dump wrt to
the VBT offset.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c   | 29 +++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h       |  1 +
 drivers/gpu/drm/i915/intel_bios.c     |  1 +
 drivers/gpu/drm/i915/intel_opregion.c |  3 +++
 4 files changed, 34 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index d6d69f4..9b7fb00 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1865,6 +1865,34 @@ out:
 	return 0;
 }
 
+static int i915_opregion_vbt(struct seq_file *m, void *unused)
+{
+	struct drm_info_node *node = m->private;
+	struct drm_device *dev = node->minor->dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct intel_opregion *opregion = &dev_priv->opregion;
+	void *data = kmalloc(opregion->vbt_size, GFP_KERNEL);
+	int ret;
+
+	if (data == NULL)
+		return -ENOMEM;
+
+	ret = mutex_lock_interruptible(&dev->struct_mutex);
+	if (ret)
+		goto out;
+
+	if (opregion->vbt) {
+		memcpy(data, opregion->vbt, opregion->vbt_size);
+		seq_write(m, data, opregion->vbt_size);
+	}
+
+	mutex_unlock(&dev->struct_mutex);
+
+out:
+	kfree(data);
+	return 0;
+}
+
 static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
 {
 	struct drm_info_node *node = m->private;
@@ -5383,6 +5411,7 @@ static const struct drm_info_list i915_debugfs_list[] = {
 	{"i915_ips_status", i915_ips_status, 0},
 	{"i915_sr_status", i915_sr_status, 0},
 	{"i915_opregion", i915_opregion, 0},
+	{"i915_opregion_vbt", i915_opregion_vbt, 0},
 	{"i915_gem_framebuffer", i915_gem_framebuffer_info, 0},
 	{"i915_context_status", i915_context_status, 0},
 	{"i915_dump_lrc", i915_dump_lrc, 0},
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 8cf8375..59a39d1 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -457,6 +457,7 @@ struct intel_opregion {
 	u32 swsci_sbcb_sub_functions;
 	struct opregion_asle *asle;
 	void *vbt;
+	u32 vbt_size;
 	struct opregion_asle_ext *asle_ext;
 	u32 *lid_state;
 	struct work_struct asle_work;
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 57a77aa..98b0e2a 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1338,6 +1338,7 @@ intel_parse_bios(struct drm_device *dev)
 			return -1;
 		}
 
+		dev_priv->opregion.vbt_size = vbt->vbt_size;
 		bdb = (const void *)vbt + vbt->bdb_offset;
 	}
 
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 4a78282..7908a1d 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -971,6 +971,9 @@ int intel_opregion_setup(struct drm_device *dev)
 		goto err_out;
 	}
 
+	vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
+	dev_priv->opregion.vbt_size = vbt->vbt_size;
+
 	opregion->header = base;
 	opregion->vbt = base + OPREGION_VBT_OFFSET;
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [MIPI SEQ PARSING v3 06/13] drm/i915: Parsing VBT if size of VBT exceeds 6KB
  2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
                   ` (4 preceding siblings ...)
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 05/13] drm/i915: Add debug entry to get the opregion VBT blob Deepak M
@ 2015-11-30 22:47 ` Deepak M
  2015-12-11  8:51   ` Mika Kahola
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 07/13] drm/i915: Added support the v3 mipi sequence block Deepak M
                   ` (2 subsequent siblings)
  8 siblings, 1 reply; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M, Jani Nikula

Currently the iomap for VBT works only if the size of the
VBT is less than 6KB, but if the size of the VBT exceeds
6KB than the physical address and the size of the VBT to
be iomapped is specified in the mailbox3 and is iomapped
accordingly.

v3: -Splitted the patch into small ones
    -Handeled memory unmap in intel_opregion_fini
    -removed the new file created for opregion macro`s

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---
 drivers/gpu/drm/i915/intel_opregion.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 7908a1d..b3a5709 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -856,6 +856,8 @@ void intel_opregion_fini(struct drm_device *dev)
 	}
 
 	/* just clear all opregion memory pointers now */
+	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
+		memunmap(opregion->vbt);
 	memunmap(opregion->header);
 	opregion->header = NULL;
 	opregion->acpi = NULL;
@@ -933,7 +935,8 @@ int intel_opregion_setup(struct drm_device *dev)
 	char buf[sizeof(OPREGION_SIGNATURE)];
 	const struct vbt_header *vbt = NULL;
 	int err = 0;
-	void *base;
+	void *base, *vbt_base;
+	size_t size;
 
 	BUILD_BUG_ON(sizeof(struct opregion_header) != 0x100);
 	BUILD_BUG_ON(sizeof(struct opregion_acpi) != 0x100);
@@ -963,19 +966,37 @@ int intel_opregion_setup(struct drm_device *dev)
 		goto err_out;
 	}
 
-	vbt = validate_vbt(base + OPREGION_VBT_OFFSET,
-				MAILBOX_4_SIZE, "OpRegion");
+	/*
+	 * Non-zero value in rvda field is an indication to driver that a
+	 * valid Raw VBT is stored in that address and driver should not refer
+	 * to mailbox4 for getting VBT.
+	 */
+	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda) {
+		size = opregion->asle->rvds;
+		vbt_base = memremap(opregion->asle->rvda,
+				size, MEMREMAP_WB);
+	} else {
+		size = MAILBOX_4_SIZE;
+		vbt_base = base + OPREGION_VBT_OFFSET;
+	}
+
+	vbt = validate_vbt(vbt_base, size, "OpRegion");
 
 	if (vbt == NULL) {
 		err = -EINVAL;
 		goto err_out;
 	}
 
-	vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
-	dev_priv->opregion.vbt_size = vbt->vbt_size;
+	/* Assigning the vbt_size based on the VBT location */
+	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
+		dev_priv->opregion.vbt_size = opregion->asle->rvds;
+	else {
+		vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
+		dev_priv->opregion.vbt_size = vbt->vbt_size;
+	}
 
 	opregion->header = base;
-	opregion->vbt = base + OPREGION_VBT_OFFSET;
+	opregion->vbt = vbt_base;
 
 	opregion->lid_state = base + ACPI_CLID;
 	opregion->asle_ext = base + OPREGION_ASLE_EXT_OFFSET;
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [MIPI SEQ PARSING v3 07/13] drm/i915: Added support the v3 mipi sequence block
  2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
                   ` (5 preceding siblings ...)
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 06/13] " Deepak M
@ 2015-11-30 22:47 ` Deepak M
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 08/13] drm/i915: Extend gpio read/write to other cores Deepak M
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 09/13] drm/i915: Added the generic gpio sequence support and gpio table Deepak M
  8 siblings, 0 replies; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jani Nikula, Deepak M

From: vkorjani <vikas.korjani@intel.com>

The Block 53 of the VBT, which is the MIPI sequence block
has undergone a design change because of which the parsing
logic has to be changed.

The current code will handle the parsing of v3 and other
lower versions of the MIPI sequence block.

v2: rebase
v3: minor comments fixed.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: vkorjani <vikas.korjani@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---

Addressed most of the minor comments in this version,
except the one where Jani had suggested to change the
logic in the goto_next_sequence(), Thought of handling
this as a new patch after this series.

http://lists.freedesktop.org/archives/intel-gfx/2015-September/076273.html

 drivers/gpu/drm/i915/intel_bios.c          | 125 ++++++++++++++++++++++++-----
 drivers/gpu/drm/i915/intel_bios.h          |   9 ++-
 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c |   7 ++
 3 files changed, 120 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 98b0e2a..5cfb862 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -745,6 +745,72 @@ static u8 *goto_next_sequence(u8 *data, int *size)
 	return data;
 }
 
+
+/*
+ *	Structure of single sequence in v3 version.
+ *	 ___________ _________ __________ ________ ________ 	_________
+ *	|	    |         | First    |Size of |Payload |	|End of |
+ *	| Sequence  | Size of | Opreation|First Op|First Op|	|Current|
+ *	| byte	    | Sequence|	byte     |byte    |byte    |	|Seq(00)|
+ *	|___________|_________|__________|________|________| ...|_______|
+ *	|  1 byte   | 4 Bytes | 1 byte   |1 bytes | Y byte |	|1 byte	|
+ *	|	    |	(X)   |		 |  (Y)   |	   |	|	|
+ *	|___________|_________|__________|________|________|    |_______|
+ *
+ *					 	  |<--Y--->|
+ *			      |<-----------------------X--------------->|
+ */
+
+static u8 *goto_next_sequence_v3(u8 *data, int *size)
+{
+	int tmp = *size;
+	int op_size;
+
+	if (--tmp < 0)
+		return NULL;
+
+	/* Skip the panel id and the sequence byte */
+	data = data + 5;
+	tmp = tmp - 5;
+	while (*data != 0) {
+		u8 operation_type = *data++;
+
+		switch (operation_type) {
+		default:
+			DRM_ERROR("Unknown operation type %d\n", operation_type);
+		case MIPI_SEQ_ELEM_SEND_PKT:
+		case MIPI_SEQ_ELEM_DELAY:
+		case MIPI_SEQ_ELEM_GPIO:
+		case MIPI_SEQ_ELEM_I2C:
+		case MIPI_SEQ_ELEM_SPI:
+		case MIPI_SEQ_ELEM_PMIC:
+			/*
+			 * skip by this element payload size
+			 * skip elem id, command flag and data type
+			 */
+			op_size = *data++;
+			tmp = tmp - (op_size + 1);
+			if (tmp < 0)
+				return NULL;
+
+			/* skip by len */
+			data += op_size;
+			break;
+		}
+	}
+
+	/* goto next sequence or end of block byte */
+	if (--tmp < 0)
+		return NULL;
+
+	/* Skip the end element marker */
+	data++;
+
+	/* update amount of data left for the sequence block to be parsed */
+	*size = tmp;
+	return data;
+}
+
 static void
 parse_mipi(struct drm_i915_private *dev_priv, const struct bdb_header *bdb)
 {
@@ -754,8 +820,8 @@ parse_mipi(struct drm_i915_private *dev_priv, const struct bdb_header *bdb)
 	const struct mipi_pps_data *pps;
 	u8 *data;
 	const u8 *seq_data;
-	int i, panel_id, seq_size;
-	u16 block_size;
+	int i, panel_id, panel_seq_size;
+	u32 block_size;
 
 	/* parse MIPI blocks only if LFP type is MIPI */
 	if (!dev_priv->vbt.has_mipi)
@@ -817,29 +883,40 @@ parse_mipi(struct drm_i915_private *dev_priv, const struct bdb_header *bdb)
 
 	DRM_DEBUG_DRIVER("Found MIPI sequence block\n");
 
-	block_size = get_blocksize(sequence);
-
 	/*
 	 * parse the sequence block for individual sequences
 	 */
 	dev_priv->vbt.dsi.seq_version = sequence->version;
 
 	seq_data = &sequence->data[0];
+	if (dev_priv->vbt.dsi.seq_version >= 3) {
+		block_size = *((unsigned int *)seq_data);
+		seq_data = seq_data + 4;
+	} else
+		block_size = get_blocksize(sequence);
 
 	/*
 	 * sequence block is variable length and hence we need to parse and
 	 * get the sequence data for specific panel id
 	 */
 	for (i = 0; i < MAX_MIPI_CONFIGURATIONS; i++) {
-		panel_id = *seq_data;
-		seq_size = *((u16 *) (seq_data + 1));
+		panel_id = *seq_data++;
+		if (dev_priv->vbt.dsi.seq_version >= 3) {
+			panel_seq_size = *((u32 *)seq_data);
+			seq_data += sizeof(u32);
+		} else {
+			panel_seq_size = *((u16 *)seq_data);
+			seq_data += sizeof(u16);
+		}
+
 		if (panel_id == panel_type)
 			break;
 
-		/* skip the sequence including seq header of 3 bytes */
-		seq_data = seq_data + 3 + seq_size;
+		seq_data += panel_seq_size;
+
 		if ((seq_data - &sequence->data[0]) > block_size) {
-			DRM_ERROR("Sequence start is beyond sequence block size, corrupted sequence block\n");
+			DRM_ERROR("Sequence start is beyond seq block size \
+					corrupted sequence block\n");
 			return;
 		}
 	}
@@ -851,13 +928,14 @@ parse_mipi(struct drm_i915_private *dev_priv, const struct bdb_header *bdb)
 
 	/* check if found sequence is completely within the sequence block
 	 * just being paranoid */
-	if (seq_size > block_size) {
+	if (panel_seq_size > block_size) {
 		DRM_ERROR("Corrupted sequence/size, bailing out\n");
 		return;
 	}
 
-	/* skip the panel id(1 byte) and seq size(2 bytes) */
-	dev_priv->vbt.dsi.data = kmemdup(seq_data + 3, seq_size, GFP_KERNEL);
+
+	dev_priv->vbt.dsi.data = kmemdup(seq_data, panel_seq_size, GFP_KERNEL);
+
 	if (!dev_priv->vbt.dsi.data)
 		return;
 
@@ -866,29 +944,36 @@ parse_mipi(struct drm_i915_private *dev_priv, const struct bdb_header *bdb)
 	 * There are only 5 types of sequences as of now
 	 */
 	data = dev_priv->vbt.dsi.data;
-	dev_priv->vbt.dsi.size = seq_size;
+	dev_priv->vbt.dsi.size = panel_seq_size;
 
 	/* two consecutive 0x00 indicate end of all sequences */
-	while (1) {
+	while (*data != 0) {
 		int seq_id = *data;
+		int seq_size;
+
 		if (MIPI_SEQ_MAX > seq_id && seq_id > MIPI_SEQ_UNDEFINED) {
 			dev_priv->vbt.dsi.sequence[seq_id] = data;
 			DRM_DEBUG_DRIVER("Found mipi sequence - %d\n", seq_id);
 		} else {
-			DRM_ERROR("undefined sequence\n");
-			goto err;
+			DRM_ERROR("undefined sequence - %d\n", seq_id);
+			seq_size = *(data + 1);
+			if (dev_priv->vbt.dsi.seq_version >= 3) {
+				data = data + seq_size + 1;
+				continue;
+			} else
+				goto err;
 		}
 
 		/* partial parsing to skip elements */
-		data = goto_next_sequence(data, &seq_size);
+		if (dev_priv->vbt.dsi.seq_version >= 3)
+			data = goto_next_sequence_v3(data, &panel_seq_size);
+		else
+			data = goto_next_sequence(data, &panel_seq_size);
 
 		if (data == NULL) {
 			DRM_ERROR("Sequence elements going beyond block itself. Sequence block parsing failed\n");
 			goto err;
 		}
-
-		if (*data == 0)
-			break; /* end of sequence reached */
 	}
 
 	DRM_DEBUG_DRIVER("MIPI related vbt parsing complete\n");
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index 4ec73f5..2422221 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -946,6 +946,12 @@ enum mipi_seq {
 	MIPI_SEQ_DISPLAY_ON,
 	MIPI_SEQ_DISPLAY_OFF,
 	MIPI_SEQ_DEASSERT_RESET,
+	MIPI_SEQ_BACKLIGHT_ON,
+	MIPI_SEQ_BACKLIGHT_OFF,
+	MIPI_SEQ_TEAR_ON,
+	MIPI_SEQ_TEAR_OFF,
+	MIPI_SEQ_POWER_ON,
+	MIPI_SEQ_POWER_OFF,
 	MIPI_SEQ_MAX
 };
 
@@ -955,7 +961,8 @@ enum mipi_seq_element {
 	MIPI_SEQ_ELEM_DELAY,
 	MIPI_SEQ_ELEM_GPIO,
 	MIPI_SEQ_ELEM_I2C,
-	MIPI_SEQ_ELEM_STATUS,
+	MIPI_SEQ_ELEM_SPI,
+	MIPI_SEQ_ELEM_PMIC,
 	MIPI_SEQ_ELEM_MAX
 };
 
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index 92d619a..eb0697b 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -316,6 +316,8 @@ static const char * const seq_name[] = {
 
 static void generic_exec_sequence(struct intel_dsi *intel_dsi, const u8 *data)
 {
+	struct drm_device *dev = intel_dsi->base.base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	fn_mipi_elem_exec mipi_elem_exec;
 	int index;
 
@@ -326,6 +328,8 @@ static void generic_exec_sequence(struct intel_dsi *intel_dsi, const u8 *data)
 
 	/* go to the first element of the sequence */
 	data++;
+	if (dev_priv->vbt.dsi.seq_version >= 3)
+		data = data + 4;
 
 	/* parse each byte till we reach end of sequence byte - 0x00 */
 	while (1) {
@@ -339,6 +343,9 @@ static void generic_exec_sequence(struct intel_dsi *intel_dsi, const u8 *data)
 		/* goto element payload */
 		data++;
 
+		if (dev_priv->vbt.dsi.seq_version >= 3)
+			data++;
+
 		/* execute the element specific rotines */
 		data = mipi_elem_exec(intel_dsi, data);
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [MIPI SEQ PARSING v3 08/13] drm/i915: Extend gpio read/write to other cores
  2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
                   ` (6 preceding siblings ...)
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 07/13] drm/i915: Added support the v3 mipi sequence block Deepak M
@ 2015-11-30 22:47 ` Deepak M
  2015-12-15 19:53   ` Ville Syrjälä
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 09/13] drm/i915: Added the generic gpio sequence support and gpio table Deepak M
  8 siblings, 1 reply; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M, Jani Nikula

Adding a argument to the gpio read/write functions
which accepts the block name.

v2: rebase
v3: rebase

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h            | 5 +++--
 drivers/gpu/drm/i915/i915_reg.h            | 5 +++++
 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 4 ++--
 drivers/gpu/drm/i915/intel_sideband.c      | 9 +++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 59a39d1..ca865f4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3379,8 +3379,9 @@ int sandybridge_pcode_write(struct drm_i915_private *dev_priv, u32 mbox, u32 val
 u32 vlv_punit_read(struct drm_i915_private *dev_priv, u32 addr);
 void vlv_punit_write(struct drm_i915_private *dev_priv, u32 addr, u32 val);
 u32 vlv_nc_read(struct drm_i915_private *dev_priv, u8 addr);
-u32 vlv_gpio_nc_read(struct drm_i915_private *dev_priv, u32 reg);
-void vlv_gpio_nc_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
+u32 vlv_gpio_read(struct drm_i915_private *dev_priv, u8 core_offset, u32 reg);
+void vlv_gpio_write(struct drm_i915_private *dev_priv, u8 core_offset,
+			u32 reg, u32 val);
 u32 vlv_cck_read(struct drm_i915_private *dev_priv, u32 reg);
 void vlv_cck_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
 u32 vlv_ccu_read(struct drm_i915_private *dev_priv, u32 reg);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 8bd2699..e29f7ef 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -572,6 +572,11 @@
 #define   IOSF_PORT_DPIO			0x12
 #define   IOSF_PORT_DPIO_2			0x1a
 #define   IOSF_PORT_GPIO_NC			0x13
+#define   IOSF_PORT_GPIO_SC			0x48
+#define   IOSF_PORT_GPIO_SUS			0xA8
+#define   MAX_GPIO_NUM_NC			26
+#define   MAX_GPIO_NUM_SC			128
+#define   MAX_GPIO_NUM				172
 #define   IOSF_PORT_CCK				0x14
 #define   IOSF_PORT_CCU				0xA9
 #define   IOSF_PORT_GPS_CORE			0x48
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index eb0697b..bc33e3a 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -275,14 +275,14 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
 	if (!gtable[gpio].init) {
 		/* program the function */
 		/* FIXME: remove constant below */
-		vlv_gpio_nc_write(dev_priv, function, 0x2000CC00);
+		vlv_gpio_write(dev_priv, IOSF_PORT_GPIO_NC, function, 0x2000CC00);
 		gtable[gpio].init = 1;
 	}
 
 	val = 0x4 | action;
 
 	/* pull up/down */
-	vlv_gpio_nc_write(dev_priv, pad, val);
+	vlv_gpio_write(dev_priv, IOSF_PORT_GPIO_NC, pad, val);
 	mutex_unlock(&dev_priv->sb_lock);
 
 	return data;
diff --git a/drivers/gpu/drm/i915/intel_sideband.c b/drivers/gpu/drm/i915/intel_sideband.c
index 8831fc5..3e0cbe6 100644
--- a/drivers/gpu/drm/i915/intel_sideband.c
+++ b/drivers/gpu/drm/i915/intel_sideband.c
@@ -129,17 +129,18 @@ u32 vlv_nc_read(struct drm_i915_private *dev_priv, u8 addr)
 	return val;
 }
 
-u32 vlv_gpio_nc_read(struct drm_i915_private *dev_priv, u32 reg)
+u32 vlv_gpio_read(struct drm_i915_private *dev_priv, u8 core_offset, u32 reg)
 {
 	u32 val = 0;
-	vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPIO_NC,
+	vlv_sideband_rw(dev_priv, PCI_DEVFN(2, 0), core_offset,
 			SB_CRRDDA_NP, reg, &val);
 	return val;
 }
 
-void vlv_gpio_nc_write(struct drm_i915_private *dev_priv, u32 reg, u32 val)
+void vlv_gpio_write(struct drm_i915_private *dev_priv, u8 core_offset,
+				u32 reg, u32 val)
 {
-	vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPIO_NC,
+	vlv_sideband_rw(dev_priv, PCI_DEVFN(2, 0), core_offset,
 			SB_CRWRDA_NP, reg, &val);
 }
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [MIPI SEQ PARSING v3 09/13] drm/i915: Added the generic gpio sequence support and gpio table
  2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
                   ` (7 preceding siblings ...)
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 08/13] drm/i915: Extend gpio read/write to other cores Deepak M
@ 2015-11-30 22:47 ` Deepak M
  2015-12-15 20:05   ` Ville Syrjälä
  8 siblings, 1 reply; 22+ messages in thread
From: Deepak M @ 2015-11-30 22:47 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M, Jani Nikula

The generic gpio is sequence is parsed from the VBT and the
GPIO table is updated with the North core, South core and
SUS core elements.

v2: Move changes in sideband.c file to new patch(Jani), rebase
v3: Moved the Macro`s to intel_dsi_panel_vbt.c (Jani)

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---
 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 589 +++++++++++++++++++++++++++--
 1 file changed, 553 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index bc33e3a..13f0fb7 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -59,30 +59,356 @@ static inline struct vbt_panel *to_vbt_panel(struct drm_panel *panel)
 
 #define NS_KHZ_RATIO 1000000
 
-#define GPI0_NC_0_HV_DDI0_HPD           0x4130
-#define GPIO_NC_0_HV_DDI0_PAD           0x4138
-#define GPIO_NC_1_HV_DDI0_DDC_SDA       0x4120
-#define GPIO_NC_1_HV_DDI0_DDC_SDA_PAD   0x4128
-#define GPIO_NC_2_HV_DDI0_DDC_SCL       0x4110
-#define GPIO_NC_2_HV_DDI0_DDC_SCL_PAD   0x4118
-#define GPIO_NC_3_PANEL0_VDDEN          0x4140
-#define GPIO_NC_3_PANEL0_VDDEN_PAD      0x4148
-#define GPIO_NC_4_PANEL0_BLKEN          0x4150
-#define GPIO_NC_4_PANEL0_BLKEN_PAD      0x4158
-#define GPIO_NC_5_PANEL0_BLKCTL         0x4160
-#define GPIO_NC_5_PANEL0_BLKCTL_PAD     0x4168
-#define GPIO_NC_6_PCONF0                0x4180
-#define GPIO_NC_6_PAD                   0x4188
-#define GPIO_NC_7_PCONF0                0x4190
-#define GPIO_NC_7_PAD                   0x4198
-#define GPIO_NC_8_PCONF0                0x4170
-#define GPIO_NC_8_PAD                   0x4178
-#define GPIO_NC_9_PCONF0                0x4100
-#define GPIO_NC_9_PAD                   0x4108
-#define GPIO_NC_10_PCONF0               0x40E0
-#define GPIO_NC_10_PAD                  0x40E8
-#define GPIO_NC_11_PCONF0               0x40F0
-#define GPIO_NC_11_PAD                  0x40F8
+#define HV_DDI0_HPD_GPIONC_0_PCONF0             0x4130
+#define HV_DDI0_HPD_GPIONC_0_PAD                0x4138
+#define HV_DDI0_DDC_SDA_GPIONC_1_PCONF0         0x4120
+#define HV_DDI0_DDC_SDA_GPIONC_1_PAD            0x4128
+#define HV_DDI0_DDC_SCL_GPIONC_2_PCONF0         0x4110
+#define HV_DDI0_DDC_SCL_GPIONC_2_PAD            0x4118
+#define PANEL0_VDDEN_GPIONC_3_PCONF0            0x4140
+#define PANEL0_VDDEN_GPIONC_3_PAD               0x4148
+#define PANEL0_BKLTEN_GPIONC_4_PCONF0           0x4150
+#define PANEL0_BKLTEN_GPIONC_4_PAD              0x4158
+#define PANEL0_BKLTCTL_GPIONC_5_PCONF0          0x4160
+#define PANEL0_BKLTCTL_GPIONC_5_PAD             0x4168
+#define HV_DDI1_HPD_GPIONC_6_PCONF0             0x4180
+#define HV_DDI1_HPD_GPIONC_6_PAD                0x4188
+#define HV_DDI1_DDC_SDA_GPIONC_7_PCONF0         0x4190
+#define HV_DDI1_DDC_SDA_GPIONC_7_PAD            0x4198
+#define HV_DDI1_DDC_SCL_GPIONC_8_PCONF0         0x4170
+#define HV_DDI1_DDC_SCL_GPIONC_8_PAD            0x4178
+#define PANEL1_VDDEN_GPIONC_9_PCONF0            0x4100
+#define PANEL1_VDDEN_GPIONC_9_PAD               0x4108
+#define PANEL1_BKLTEN_GPIONC_10_PCONF0          0x40E0
+#define PANEL1_BKLTEN_GPIONC_10_PAD             0x40E8
+#define PANEL1_BKLTCTL_GPIONC_11_PCONF0         0x40F0
+#define PANEL1_BKLTCTL_GPIONC_11_PAD            0x40F8
+#define GP_INTD_DSI_TE1_GPIONC_12_PCONF0        0x40C0
+#define GP_INTD_DSI_TE1_GPIONC_12_PAD           0x40C8
+#define HV_DDI2_DDC_SDA_GPIONC_13_PCONF0        0x41A0
+#define HV_DDI2_DDC_SDA_GPIONC_13_PAD           0x41A8
+#define HV_DDI2_DDC_SCL_GPIONC_14_PCONF0        0x41B0
+#define HV_DDI2_DDC_SCL_GPIONC_14_PAD           0x41B8
+#define GP_CAMERASB00_GPIONC_15_PCONF0          0x4010
+#define GP_CAMERASB00_GPIONC_15_PAD             0x4018
+#define GP_CAMERASB01_GPIONC_16_PCONF0          0x4040
+#define GP_CAMERASB01_GPIONC_16_PAD             0x4048
+#define GP_CAMERASB02_GPIONC_17_PCONF0          0x4080
+#define GP_CAMERASB02_GPIONC_17_PAD             0x4088
+#define GP_CAMERASB03_GPIONC_18_PCONF0          0x40B0
+#define GP_CAMERASB03_GPIONC_18_PAD             0x40B8
+#define GP_CAMERASB04_GPIONC_19_PCONF0          0x4000
+#define GP_CAMERASB04_GPIONC_19_PAD             0x4008
+#define GP_CAMERASB05_GPIONC_20_PCONF0          0x4030
+#define GP_CAMERASB05_GPIONC_20_PAD             0x4038
+#define GP_CAMERASB06_GPIONC_21_PCONF0          0x4060
+#define GP_CAMERASB06_GPIONC_21_PAD             0x4068
+#define GP_CAMERASB07_GPIONC_22_PCONF0          0x40A0
+#define GP_CAMERASB07_GPIONC_22_PAD             0x40A8
+#define GP_CAMERASB08_GPIONC_23_PCONF0          0x40D0
+#define GP_CAMERASB08_GPIONC_23_PAD             0x40D8
+#define GP_CAMERASB09_GPIONC_24_PCONF0          0x4020
+#define GP_CAMERASB09_GPIONC_24_PAD             0x4028
+#define GP_CAMERASB10_GPIONC_25_PCONF0          0x4050
+#define GP_CAMERASB10_GPIONC_25_PAD             0x4058
+#define GP_CAMERASB11_GPIONC_26_PCONF0          0x4090
+#define GP_CAMERASB11_GPIONC_26_PAD             0x4098
+
+#define SATA_GP0_GPIOC_0_PCONF0                 0x4550
+#define SATA_GP0_GPIOC_0_PAD                    0x4558
+#define SATA_GP1_GPIOC_1_PCONF0                 0x4590
+#define SATA_GP1_GPIOC_1_PAD                    0x4598
+#define SATA_LEDN_GPIOC_2_PCONF0                0x45D0
+#define SATA_LEDN_GPIOC_2_PAD                   0x45D8
+#define PCIE_CLKREQ0B_GPIOC_3_PCONF0            0x4600
+#define PCIE_CLKREQ0B_GPIOC_3_PAD               0x4608
+#define PCIE_CLKREQ1B_GPIOC_4_PCONF0            0x4630
+#define PCIE_CLKREQ1B_GPIOC_4_PAD               0x4638
+#define PCIE_CLKREQ2B_GPIOC_5_PCONF0            0x4660
+#define PCIE_CLKREQ2B_GPIOC_5_PAD               0x4668
+#define PCIE_CLKREQ3B_GPIOC_6_PCONF0            0x4620
+#define PCIE_CLKREQ3B_GPIOC_6_PAD               0x4628
+#define PCIE_CLKREQ4B_GPIOC_7_PCONF0            0x4650
+#define PCIE_CLKREQ4B_GPIOC_7_PAD               0x4658
+#define HDA_RSTB_GPIOC_8_PCONF0                 0x4220
+#define HDA_RSTB_GPIOC_8_PAD                    0x4228
+#define HDA_SYNC_GPIOC_9_PCONF0                 0x4250
+#define HDA_SYNC_GPIOC_9_PAD                    0x4258
+#define HDA_CLK_GPIOC_10_PCONF0                 0x4240
+#define HDA_CLK_GPIOC_10_PAD                    0x4248
+#define HDA_SDO_GPIOC_11_PCONF0                 0x4260
+#define HDA_SDO_GPIOC_11_PAD                    0x4268
+#define HDA_SDI0_GPIOC_12_PCONF0                0x4270
+#define HDA_SDI0_GPIOC_12_PAD                   0x4278
+#define HDA_SDI1_GPIOC_13_PCONF0                0x4230
+#define HDA_SDI1_GPIOC_13_PAD                   0x4238
+#define HDA_DOCKRSTB_GPIOC_14_PCONF0            0x4280
+#define HDA_DOCKRSTB_GPIOC_14_PAD               0x4288
+#define HDA_DOCKENB_GPIOC_15_PCONF0             0x4540
+#define HDA_DOCKENB_GPIOC_15_PAD                0x4548
+#define SDMMC1_CLK_GPIOC_16_PCONF0              0x43E0
+#define SDMMC1_CLK_GPIOC_16_PAD                 0x43E8
+#define SDMMC1_D0_GPIOC_17_PCONF0               0x43D0
+#define SDMMC1_D0_GPIOC_17_PAD                  0x43D8
+#define SDMMC1_D1_GPIOC_18_PCONF0               0x4400
+#define SDMMC1_D1_GPIOC_18_PAD                  0x4408
+#define SDMMC1_D2_GPIOC_19_PCONF0               0x43B0
+#define SDMMC1_D2_GPIOC_19_PAD                  0x43B8
+#define SDMMC1_D3_CD_B_GPIOC_20_PCONF0          0x4360
+#define SDMMC1_D3_CD_B_GPIOC_20_PAD             0x4368
+#define MMC1_D4_SD_WE_GPIOC_21_PCONF0           0x4380
+#define MMC1_D4_SD_WE_GPIOC_21_PAD              0x4388
+#define MMC1_D5_GPIOC_22_PCONF0                 0x43C0
+#define MMC1_D5_GPIOC_22_PAD                    0x43C8
+#define MMC1_D6_GPIOC_23_PCONF0                 0x4370
+#define MMC1_D6_GPIOC_23_PAD                    0x4378
+#define MMC1_D7_GPIOC_24_PCONF0                 0x43F0
+#define MMC1_D7_GPIOC_24_PAD                    0x43F8
+#define SDMMC1_CMD_GPIOC_25_PCONF0              0x4390
+#define SDMMC1_CMD_GPIOC_25_PAD                 0x4398
+#define MMC1_RESET_B_GPIOC_26_PCONF0            0x4330
+#define MMC1_RESET_B_GPIOC_26_PAD               0x4338
+#define SDMMC2_CLK_GPIOC_27_PCONF0              0x4320
+#define SDMMC2_CLK_GPIOC_27_PAD                 0x4328
+#define SDMMC2_D0_GPIOC_28_PCONF0               0x4350
+#define SDMMC2_D0_GPIOC_28_PAD                  0x4358
+#define SDMMC2_D1_GPIOC_29_PCONF0               0x42F0
+#define SDMMC2_D1_GPIOC_29_PAD                  0x42F8
+#define SDMMC2_D2_GPIOC_30_PCONF0               0x4340
+#define SDMMC2_D2_GPIOC_30_PAD                  0x4348
+#define SDMMC2_D3_CD_B_GPIOC_31_PCONF0          0x4310
+#define SDMMC2_D3_CD_B_GPIOC_31_PAD             0x4318
+#define SDMMC2_CMD_GPIOC_32_PCONF0              0x4300
+#define SDMMC2_CMD_GPIOC_32_PAD                 0x4308
+#define SDMMC3_CLK_GPIOC_33_PCONF0              0x42B0
+#define SDMMC3_CLK_GPIOC_33_PAD                 0x42B8
+#define SDMMC3_D0_GPIOC_34_PCONF0               0x42E0
+#define SDMMC3_D0_GPIOC_34_PAD                  0x42E8
+#define SDMMC3_D1_GPIOC_35_PCONF0               0x4290
+#define SDMMC3_D1_GPIOC_35_PAD                  0x4298
+#define SDMMC3_D2_GPIOC_36_PCONF0               0x42D0
+#define SDMMC3_D2_GPIOC_36_PAD                  0x42D8
+#define SDMMC3_D3_GPIOC_37_PCONF0               0x42A0
+#define SDMMC3_D3_GPIOC_37_PAD                  0x42A8
+#define SDMMC3_CD_B_GPIOC_38_PCONF0             0x43A0
+#define SDMMC3_CD_B_GPIOC_38_PAD                0x43A8
+#define SDMMC3_CMD_GPIOC_39_PCONF0              0x42C0
+#define SDMMC3_CMD_GPIOC_39_PAD                 0x42C8
+#define SDMMC3_1P8_EN_GPIOC_40_PCONF0           0x45F0
+#define SDMMC3_1P8_EN_GPIOC_40_PAD              0x45F8
+#define SDMMC3_PWR_EN_B_GPIOC_41_PCONF0         0x4690
+#define SDMMC3_PWR_EN_B_GPIOC_41_PAD            0x4698
+#define LPC_AD0_GPIOC_42_PCONF0                 0x4460
+#define LPC_AD0_GPIOC_42_PAD                    0x4468
+#define LPC_AD1_GPIOC_43_PCONF0                 0x4440
+#define LPC_AD1_GPIOC_43_PAD                    0x4448
+#define LPC_AD2_GPIOC_44_PCONF0                 0x4430
+#define LPC_AD2_GPIOC_44_PAD                    0x4438
+#define LPC_AD3_GPIOC_45_PCONF0                 0x4420
+#define LPC_AD3_GPIOC_45_PAD                    0x4428
+#define LPC_FRAMEB_GPIOC_46_PCONF0              0x4450
+#define LPC_FRAMEB_GPIOC_46_PAD                 0x4458
+#define LPC_CLKOUT0_GPIOC_47_PCONF0             0x4470
+#define LPC_CLKOUT0_GPIOC_47_PAD                0x4478
+#define LPC_CLKOUT1_GPIOC_48_PCONF0             0x4410
+#define LPC_CLKOUT1_GPIOC_48_PAD                0x4418
+#define LPC_CLKRUNB_GPIOC_49_PCONF0             0x4480
+#define LPC_CLKRUNB_GPIOC_49_PAD                0x4488
+#define ILB_SERIRQ_GPIOC_50_PCONF0              0x4560
+#define ILB_SERIRQ_GPIOC_50_PAD                 0x4568
+#define SMB_DATA_GPIOC_51_PCONF0                0x45A0
+#define SMB_DATA_GPIOC_51_PAD                   0x45A8
+#define SMB_CLK_GPIOC_52_PCONF0                 0x4580
+#define SMB_CLK_GPIOC_52_PAD                    0x4588
+#define SMB_ALERTB_GPIOC_53_PCONF0              0x45C0
+#define SMB_ALERTB_GPIOC_53_PAD                 0x45C8
+#define SPKR_GPIOC_54_PCONF0                    0x4670
+#define SPKR_GPIOC_54_PAD                       0x4678
+#define MHSI_ACDATA_GPIOC_55_PCONF0             0x44D0
+#define MHSI_ACDATA_GPIOC_55_PAD                0x44D8
+#define MHSI_ACFLAG_GPIOC_56_PCONF0             0x44F0
+#define MHSI_ACFLAG_GPIOC_56_PAD                0x44F8
+#define MHSI_ACREADY_GPIOC_57_PCONF0            0x4530
+#define MHSI_ACREADY_GPIOC_57_PAD               0x4538
+#define MHSI_ACWAKE_GPIOC_58_PCONF0             0x44E0
+#define MHSI_ACWAKE_GPIOC_58_PAD                0x44E8
+#define MHSI_CADATA_GPIOC_59_PCONF0             0x4510
+#define MHSI_CADATA_GPIOC_59_PAD                0x4518
+#define MHSI_CAFLAG_GPIOC_60_PCONF0             0x4500
+#define MHSI_CAFLAG_GPIOC_60_PAD                0x4508
+#define MHSI_CAREADY_GPIOC_61_PCONF0            0x4520
+#define MHSI_CAREADY_GPIOC_61_PAD               0x4528
+#define GP_SSP_2_CLK_GPIOC_62_PCONF0            0x40D0
+#define GP_SSP_2_CLK_GPIOC_62_PAD               0x40D8
+#define GP_SSP_2_FS_GPIOC_63_PCONF0             0x40C0
+#define GP_SSP_2_FS_GPIOC_63_PAD                0x40C8
+#define GP_SSP_2_RXD_GPIOC_64_PCONF0            0x40F0
+#define GP_SSP_2_RXD_GPIOC_64_PAD               0x40F8
+#define GP_SSP_2_TXD_GPIOC_65_PCONF0            0x40E0
+#define GP_SSP_2_TXD_GPIOC_65_PAD               0x40E8
+#define SPI1_CS0_B_GPIOC_66_PCONF0              0x4110
+#define SPI1_CS0_B_GPIOC_66_PAD                 0x4118
+#define SPI1_MISO_GPIOC_67_PCONF0               0x4120
+#define SPI1_MISO_GPIOC_67_PAD                  0x4128
+#define SPI1_MOSI_GPIOC_68_PCONF0               0x4130
+#define SPI1_MOSI_GPIOC_68_PAD                  0x4138
+#define SPI1_CLK_GPIOC_69_PCONF0                0x4100
+#define SPI1_CLK_GPIOC_69_PAD                   0x4108
+#define UART1_RXD_GPIOC_70_PCONF0               0x4020
+#define UART1_RXD_GPIOC_70_PAD                  0x4028
+#define UART1_TXD_GPIOC_71_PCONF0               0x4010
+#define UART1_TXD_GPIOC_71_PAD                  0x4018
+#define UART1_RTS_B_GPIOC_72_PCONF0             0x4000
+#define UART1_RTS_B_GPIOC_72_PAD                0x4008
+#define UART1_CTS_B_GPIOC_73_PCONF0             0x4040
+#define UART1_CTS_B_GPIOC_73_PAD                0x4048
+#define UART2_RXD_GPIOC_74_PCONF0               0x4060
+#define UART2_RXD_GPIOC_74_PAD                  0x4068
+#define UART2_TXD_GPIOC_75_PCONF0               0x4070
+#define UART2_TXD_GPIOC_75_PAD                  0x4078
+#define UART2_RTS_B_GPIOC_76_PCONF0             0x4090
+#define UART2_RTS_B_GPIOC_76_PAD                0x4098
+#define UART2_CTS_B_GPIOC_77_PCONF0             0x4080
+#define UART2_CTS_B_GPIOC_77_PAD                0x4088
+#define I2C0_SDA_GPIOC_78_PCONF0                0x4210
+#define I2C0_SDA_GPIOC_78_PAD                   0x4218
+#define I2C0_SCL_GPIOC_79_PCONF0                0x4200
+#define I2C0_SCL_GPIOC_79_PAD                   0x4208
+#define I2C1_SDA_GPIOC_80_PCONF0                0x41F0
+#define I2C1_SDA_GPIOC_80_PAD                   0x41F8
+#define I2C1_SCL_GPIOC_81_PCONF0                0x41E0
+#define I2C1_SCL_GPIOC_81_PAD                   0x41E8
+#define I2C2_SDA_GPIOC_82_PCONF0                0x41D0
+#define I2C2_SDA_GPIOC_82_PAD                   0x41D8
+#define I2C2_SCL_GPIOC_83_PCONF0                0x41B0
+#define I2C2_SCL_GPIOC_83_PAD                   0x41B8
+#define I2C3_SDA_GPIOC_84_PCONF0                0x4190
+#define I2C2_SCL_GPIOC_83_PAD                   0x41B8
+#define I2C3_SDA_GPIOC_84_PCONF0                0x4190
+#define I2C3_SDA_GPIOC_84_PAD                   0x4198
+#define I2C3_SCL_GPIOC_85_PCONF0                0x41C0
+#define I2C3_SCL_GPIOC_85_PAD                   0x41C8
+#define I2C4_SDA_GPIOC_86_PCONF0                0x41A0
+#define I2C4_SDA_GPIOC_86_PAD                   0x41A8
+#define I2C4_SCL_GPIOC_87_PCONF0                0x4170
+#define I2C4_SCL_GPIOC_87_PAD                   0x4178
+#define I2C5_SDA_GPIOC_88_PCONF0                0x4150
+#define I2C5_SDA_GPIOC_88_PAD                   0x4158
+#define I2C5_SCL_GPIOC_89_PCONF0                0x4140
+#define I2C5_SCL_GPIOC_89_PAD                   0x4148
+#define I2C6_SDA_GPIOC_90_PCONF0                0x4180
+#define I2C6_SDA_GPIOC_90_PAD                   0x4188
+#define I2C6_SCL_GPIOC_91_PCONF0                0x4160
+#define I2C6_SCL_GPIOC_91_PAD                   0x4168
+#define I2C_NFC_SDA_GPIOC_92_PCONF0             0x4050
+#define I2C_NFC_SDA_GPIOC_92_PAD                0x4058
+#define I2C_NFC_SCL_GPIOC_93_PCONF0             0x4030
+#define I2C_NFC_SCL_GPIOC_93_PAD                0x4038
+#define PWM0_GPIOC_94_PCONF0                    0x40A0
+#define PWM0_GPIOC_94_PAD                       0x40A8
+#define PWM1_GPIOC_95_PCONF0                    0x40B0
+#define PWM1_GPIOC_95_PAD                       0x40B8
+#define PLT_CLK0_GPIOC_96_PCONF0                0x46A0
+#define PLT_CLK0_GPIOC_96_PAD                   0x46A8
+#define PLT_CLK1_GPIOC_97_PCONF0                0x4570
+#define PLT_CLK1_GPIOC_97_PAD                   0x4578
+#define PLT_CLK2_GPIOC_98_PCONF0                0x45B0
+#define PLT_CLK2_GPIOC_98_PAD                   0x45B8
+#define PLT_CLK3_GPIOC_99_PCONF0                0x4680
+#define PLT_CLK3_GPIOC_99_PAD                   0x4688
+#define PLT_CLK4_GPIOC_100_PCONF0               0x4610
+#define PLT_CLK4_GPIOC_100_PAD                  0x4618
+#define PLT_CLK5_GPIOC_101_PCONF0               0x4640
+#define PLT_CLK5_GPIOC_101_PAD                  0x4648
+
+#define GPIO_SUS0_GPIO_SUS0_PCONF0              0x41D0
+#define GPIO_SUS0_GPIO_SUS0_PAD                 0x41D8
+#define GPIO_SUS1_GPIO_SUS1_PCONF0              0x4210
+#define GPIO_SUS1_GPIO_SUS1_PAD                 0x4218
+#define GPIO_SUS2_GPIO_SUS2_PCONF0              0x41E0
+#define GPIO_SUS2_GPIO_SUS2_PAD                 0x41E8
+#define GPIO_SUS3_GPIO_SUS3_PCONF0              0x41F0
+#define GPIO_SUS3_GPIO_SUS3_PAD                 0x41F8
+#define GPIO_SUS4_GPIO_SUS4_PCONF0              0x4200
+#define GPIO_SUS4_GPIO_SUS4_PAD                 0x4208
+#define GPIO_SUS5_GPIO_SUS5_PCONF0              0x4220
+#define GPIO_SUS5_GPIO_SUS5_PAD                 0x4228
+#define GPIO_SUS6_GPIO_SUS6_PCONF0              0x4240
+#define GPIO_SUS6_GPIO_SUS6_PAD                 0x4248
+#define GPIO_SUS7_GPIO_SUS7_PCONF0              0x4230
+#define GPIO_SUS7_GPIO_SUS7_PAD                 0x4238
+#define SEC_GPIO_SUS8_GPIO_SUS8_PCONF0          0x4260
+#define SEC_GPIO_SUS8_GPIO_SUS8_PAD             0x4268
+#define SEC_GPIO_SUS9_GPIO_SUS9_PCONF0          0x4250
+#define SEC_GPIO_SUS9_GPIO_SUS9_PAD             0x4258
+#define SEC_GPIO_SUS10_GPIO_SUS10_PCONF0        0x4120
+#define SEC_GPIO_SUS10_GPIO_SUS10_PAD           0x4128
+#define SUSPWRDNACK_GPIOS_11_PCONF0             0x4070
+#define SUSPWRDNACK_GPIOS_11_PAD                0x4078
+#define PMU_SUSCLK_GPIOS_12_PCONF0              0x40B0
+#define PMU_SUSCLK_GPIOS_12_PAD                 0x40B8
+#define PMU_SLP_S0IX_B_GPIOS_13_PCONF0          0x4140
+#define PMU_SLP_S0IX_B_GPIOS_13_PAD             0x4148
+#define PMU_SLP_LAN_B_GPIOS_14_PCONF0           0x4110
+#define PMU_SLP_LAN_B_GPIOS_14_PAD              0x4118
+#define PMU_WAKE_B_GPIOS_15_PCONF0              0x4010
+#define PMU_WAKE_B_GPIOS_15_PAD                 0x4018
+#define PMU_PWRBTN_B_GPIOS_16_PCONF0            0x4080
+#define PMU_PWRBTN_B_GPIOS_16_PAD               0x4088
+#define PMU_WAKE_LAN_B_GPIOS_17_PCONF0          0x40A0
+#define PMU_WAKE_LAN_B_GPIOS_17_PAD             0x40A8
+#define SUS_STAT_B_GPIOS_18_PCONF0              0x4130
+#define SUS_STAT_B_GPIOS_18_PAD                 0x4138
+#define USB_OC0_B_GPIOS_19_PCONF0               0x40C0
+#define USB_OC0_B_GPIOS_19_PAD                  0x40C8
+#define USB_OC1_B_GPIOS_20_PCONF0               0x4000
+#define USB_OC1_B_GPIOS_20_PAD                  0x4008
+#define SPI_CS1_B_GPIOS_21_PCONF0               0x4020
+#define SPI_CS1_B_GPIOS_21_PAD                  0x4028
+#define GPIO_DFX0_GPIOS_22_PCONF0               0x4170
+#define GPIO_DFX0_GPIOS_22_PAD                  0x4178
+#define GPIO_DFX1_GPIOS_23_PCONF0               0x4270
+#define GPIO_DFX1_GPIOS_23_PAD                  0x4278
+#define GPIO_DFX2_GPIOS_24_PCONF0               0x41C0
+#define GPIO_DFX2_GPIOS_24_PAD                  0x41C8
+#define GPIO_DFX3_GPIOS_25_PCONF0               0x41B0
+#define GPIO_DFX3_GPIOS_25_PAD                  0x41B8
+#define GPIO_DFX4_GPIOS_26_PCONF0               0x4160
+#define GPIO_DFX4_GPIOS_26_PAD                  0x4168
+#define GPIO_DFX5_GPIOS_27_PCONF0               0x4150
+#define GPIO_DFX5_GPIOS_27_PAD                  0x4158
+#define GPIO_DFX6_GPIOS_28_PCONF0               0x4180
+#define GPIO_DFX6_GPIOS_28_PAD                  0x4188
+#define GPIO_DFX7_GPIOS_29_PCONF0               0x4190
+#define GPIO_DFX7_GPIOS_29_PAD                  0x4198
+#define GPIO_DFX8_GPIOS_30_PCONF0               0x41A0
+#define GPIO_DFX8_GPIOS_30_PAD                  0x41A8
+#define USB_ULPI_0_CLK_GPIOS_31_PCONF0          0x4330
+#define USB_ULPI_0_CLK_GPIOS_31_PAD             0x4338
+#define USB_ULPI_0_DATA0_GPIOS_32_PCONF0        0x4380
+#define USB_ULPI_0_DATA0_GPIOS_32_PAD           0x4388
+#define USB_ULPI_0_DATA1_GPIOS_33_PCONF0        0x4360
+#define USB_ULPI_0_DATA1_GPIOS_33_PAD           0x4368
+#define USB_ULPI_0_DATA2_GPIOS_34_PCONF0        0x4310
+#define USB_ULPI_0_DATA2_GPIOS_34_PAD           0x4318
+#define USB_ULPI_0_DATA3_GPIOS_35_PCONF0        0x4370
+#define USB_ULPI_0_DATA3_GPIOS_35_PAD           0x4378
+#define USB_ULPI_0_DATA4_GPIOS_36_PCONF0        0x4300
+#define USB_ULPI_0_DATA4_GPIOS_36_PAD           0x4308
+#define USB_ULPI_0_DATA5_GPIOS_37_PCONF0        0x4390
+#define USB_ULPI_0_DATA5_GPIOS_37_PAD           0x4398
+#define USB_ULPI_0_DATA6_GPIOS_38_PCONF0        0x4320
+#define USB_ULPI_0_DATA6_GPIOS_38_PAD           0x4328
+#define USB_ULPI_0_DATA7_GPIOS_39_PCONF0        0x43A0
+#define USB_ULPI_0_DATA7_GPIOS_39_PAD           0x43A8
+#define USB_ULPI_0_DIR_GPIOS_40_PCONF0          0x4340
+#define USB_ULPI_0_DIR_GPIOS_40_PAD             0x4348
+#define USB_ULPI_0_NXT_GPIOS_41_PCONF0          0x4350
+#define USB_ULPI_0_NXT_GPIOS_41_PAD             0x4358
+#define USB_ULPI_0_STP_GPIOS_42_PCONF0          0x43B0
+#define USB_ULPI_0_STP_GPIOS_42_PAD             0x43B8
+#define USB_ULPI_0_REFCLK_GPIOS_43_PCONF0       0x4280
+#define USB_ULPI_0_REFCLK_GPIOS_43_PAD          0x4288
 
 struct gpio_table {
 	u16 function_reg;
@@ -91,18 +417,181 @@ struct gpio_table {
 };
 
 static struct gpio_table gtable[] = {
-	{ GPI0_NC_0_HV_DDI0_HPD, GPIO_NC_0_HV_DDI0_PAD, 0 },
-	{ GPIO_NC_1_HV_DDI0_DDC_SDA, GPIO_NC_1_HV_DDI0_DDC_SDA_PAD, 0 },
-	{ GPIO_NC_2_HV_DDI0_DDC_SCL, GPIO_NC_2_HV_DDI0_DDC_SCL_PAD, 0 },
-	{ GPIO_NC_3_PANEL0_VDDEN, GPIO_NC_3_PANEL0_VDDEN_PAD, 0 },
-	{ GPIO_NC_4_PANEL0_BLKEN, GPIO_NC_4_PANEL0_BLKEN_PAD, 0 },
-	{ GPIO_NC_5_PANEL0_BLKCTL, GPIO_NC_5_PANEL0_BLKCTL_PAD, 0 },
-	{ GPIO_NC_6_PCONF0, GPIO_NC_6_PAD, 0 },
-	{ GPIO_NC_7_PCONF0, GPIO_NC_7_PAD, 0 },
-	{ GPIO_NC_8_PCONF0, GPIO_NC_8_PAD, 0 },
-	{ GPIO_NC_9_PCONF0, GPIO_NC_9_PAD, 0 },
-	{ GPIO_NC_10_PCONF0, GPIO_NC_10_PAD, 0},
-	{ GPIO_NC_11_PCONF0, GPIO_NC_11_PAD, 0}
+	{ HV_DDI0_HPD_GPIONC_0_PCONF0, HV_DDI0_HPD_GPIONC_0_PAD, 0},
+	{ HV_DDI0_DDC_SDA_GPIONC_1_PCONF0, HV_DDI0_DDC_SDA_GPIONC_1_PAD, 0},
+	{ HV_DDI0_DDC_SCL_GPIONC_2_PCONF0, HV_DDI0_DDC_SCL_GPIONC_2_PAD, 0},
+	{ PANEL0_VDDEN_GPIONC_3_PCONF0, PANEL0_VDDEN_GPIONC_3_PAD, 0},
+	{ PANEL0_BKLTEN_GPIONC_4_PCONF0, PANEL0_BKLTEN_GPIONC_4_PAD, 0},
+	{ PANEL0_BKLTCTL_GPIONC_5_PCONF0, PANEL0_BKLTCTL_GPIONC_5_PAD, 0},
+	{ HV_DDI1_HPD_GPIONC_6_PCONF0, HV_DDI1_HPD_GPIONC_6_PAD, 0},
+	{ HV_DDI1_DDC_SDA_GPIONC_7_PCONF0, HV_DDI1_DDC_SDA_GPIONC_7_PAD, 0},
+	{ HV_DDI1_DDC_SCL_GPIONC_8_PCONF0, HV_DDI1_DDC_SCL_GPIONC_8_PAD, 0},
+	{ PANEL1_VDDEN_GPIONC_9_PCONF0, PANEL1_VDDEN_GPIONC_9_PAD, 0},
+	{ PANEL1_BKLTEN_GPIONC_10_PCONF0, PANEL1_BKLTEN_GPIONC_10_PAD, 0},
+	{ PANEL1_BKLTCTL_GPIONC_11_PCONF0, PANEL1_BKLTCTL_GPIONC_11_PAD, 0},
+	{ GP_INTD_DSI_TE1_GPIONC_12_PCONF0, GP_INTD_DSI_TE1_GPIONC_12_PAD, 0},
+	{ HV_DDI2_DDC_SDA_GPIONC_13_PCONF0, HV_DDI2_DDC_SDA_GPIONC_13_PAD, 0},
+	{ HV_DDI2_DDC_SCL_GPIONC_14_PCONF0, HV_DDI2_DDC_SCL_GPIONC_14_PAD, 0},
+	{ GP_CAMERASB00_GPIONC_15_PCONF0, GP_CAMERASB00_GPIONC_15_PAD, 0},
+	{ GP_CAMERASB01_GPIONC_16_PCONF0, GP_CAMERASB01_GPIONC_16_PAD, 0},
+	{ GP_CAMERASB02_GPIONC_17_PCONF0, GP_CAMERASB02_GPIONC_17_PAD, 0},
+	{ GP_CAMERASB03_GPIONC_18_PCONF0, GP_CAMERASB03_GPIONC_18_PAD, 0},
+	{ GP_CAMERASB04_GPIONC_19_PCONF0, GP_CAMERASB04_GPIONC_19_PAD, 0},
+	{ GP_CAMERASB05_GPIONC_20_PCONF0, GP_CAMERASB05_GPIONC_20_PAD, 0},
+	{ GP_CAMERASB06_GPIONC_21_PCONF0, GP_CAMERASB06_GPIONC_21_PAD, 0},
+	{ GP_CAMERASB07_GPIONC_22_PCONF0, GP_CAMERASB07_GPIONC_22_PAD, 0},
+	{ GP_CAMERASB08_GPIONC_23_PCONF0, GP_CAMERASB08_GPIONC_23_PAD, 0},
+	{ GP_CAMERASB09_GPIONC_24_PCONF0, GP_CAMERASB09_GPIONC_24_PAD, 0},
+	{ GP_CAMERASB10_GPIONC_25_PCONF0, GP_CAMERASB10_GPIONC_25_PAD, 0},
+	{ GP_CAMERASB11_GPIONC_26_PCONF0, GP_CAMERASB11_GPIONC_26_PAD, 0},
+
+	{ SATA_GP0_GPIOC_0_PCONF0, SATA_GP0_GPIOC_0_PAD, 0},
+	{ SATA_GP1_GPIOC_1_PCONF0, SATA_GP1_GPIOC_1_PAD, 0},
+	{ SATA_LEDN_GPIOC_2_PCONF0, SATA_LEDN_GPIOC_2_PAD, 0},
+	{ PCIE_CLKREQ0B_GPIOC_3_PCONF0, PCIE_CLKREQ0B_GPIOC_3_PAD, 0},
+	{ PCIE_CLKREQ1B_GPIOC_4_PCONF0, PCIE_CLKREQ1B_GPIOC_4_PAD, 0},
+	{ PCIE_CLKREQ2B_GPIOC_5_PCONF0, PCIE_CLKREQ2B_GPIOC_5_PAD, 0},
+	{ PCIE_CLKREQ3B_GPIOC_6_PCONF0, PCIE_CLKREQ3B_GPIOC_6_PAD, 0},
+	{ PCIE_CLKREQ4B_GPIOC_7_PCONF0, PCIE_CLKREQ4B_GPIOC_7_PAD, 0},
+	{ HDA_RSTB_GPIOC_8_PCONF0, HDA_RSTB_GPIOC_8_PAD, 0},
+	{ HDA_SYNC_GPIOC_9_PCONF0, HDA_SYNC_GPIOC_9_PAD, 0},
+	{ HDA_CLK_GPIOC_10_PCONF0, HDA_CLK_GPIOC_10_PAD, 0},
+	{ HDA_SDO_GPIOC_11_PCONF0, HDA_SDO_GPIOC_11_PAD, 0},
+	{ HDA_SDI0_GPIOC_12_PCONF0, HDA_SDI0_GPIOC_12_PAD, 0},
+	{ HDA_SDI1_GPIOC_13_PCONF0, HDA_SDI1_GPIOC_13_PAD, 0},
+	{ HDA_DOCKRSTB_GPIOC_14_PCONF0, HDA_DOCKRSTB_GPIOC_14_PAD, 0},
+	{ HDA_DOCKENB_GPIOC_15_PCONF0, HDA_DOCKENB_GPIOC_15_PAD, 0},
+	{ SDMMC1_CLK_GPIOC_16_PCONF0, SDMMC1_CLK_GPIOC_16_PAD, 0},
+	{ SDMMC1_D0_GPIOC_17_PCONF0, SDMMC1_D0_GPIOC_17_PAD, 0},
+	{ SDMMC1_D1_GPIOC_18_PCONF0, SDMMC1_D1_GPIOC_18_PAD, 0},
+	{ SDMMC1_D2_GPIOC_19_PCONF0, SDMMC1_D2_GPIOC_19_PAD, 0},
+	{ SDMMC1_D3_CD_B_GPIOC_20_PCONF0, SDMMC1_D3_CD_B_GPIOC_20_PAD, 0},
+	{ MMC1_D4_SD_WE_GPIOC_21_PCONF0, MMC1_D4_SD_WE_GPIOC_21_PAD, 0},
+	{ MMC1_D5_GPIOC_22_PCONF0, MMC1_D5_GPIOC_22_PAD, 0},
+	{ MMC1_D6_GPIOC_23_PCONF0, MMC1_D6_GPIOC_23_PAD, 0},
+	{ MMC1_D7_GPIOC_24_PCONF0, MMC1_D7_GPIOC_24_PAD, 0},
+	{ SDMMC1_CMD_GPIOC_25_PCONF0, SDMMC1_CMD_GPIOC_25_PAD, 0},
+	{ MMC1_RESET_B_GPIOC_26_PCONF0, MMC1_RESET_B_GPIOC_26_PAD, 0},
+	{ SDMMC2_CLK_GPIOC_27_PCONF0, SDMMC2_CLK_GPIOC_27_PAD, 0},
+	{ SDMMC2_D0_GPIOC_28_PCONF0, SDMMC2_D0_GPIOC_28_PAD, 0},
+	{ SDMMC2_D1_GPIOC_29_PCONF0, SDMMC2_D1_GPIOC_29_PAD, 0},
+	{ SDMMC2_D2_GPIOC_30_PCONF0, SDMMC2_D2_GPIOC_30_PAD, 0},
+	{ SDMMC2_D3_CD_B_GPIOC_31_PCONF0, SDMMC2_D3_CD_B_GPIOC_31_PAD, 0},
+	{ SDMMC2_CMD_GPIOC_32_PCONF0, SDMMC2_CMD_GPIOC_32_PAD, 0},
+	{ SDMMC3_CLK_GPIOC_33_PCONF0, SDMMC3_CLK_GPIOC_33_PAD, 0},
+	{ SDMMC3_D0_GPIOC_34_PCONF0, SDMMC3_D0_GPIOC_34_PAD, 0},
+	{ SDMMC3_D1_GPIOC_35_PCONF0, SDMMC3_D1_GPIOC_35_PAD, 0},
+	{ SDMMC3_D2_GPIOC_36_PCONF0, SDMMC3_D2_GPIOC_36_PAD, 0},
+	{ SDMMC3_D3_GPIOC_37_PCONF0, SDMMC3_D3_GPIOC_37_PAD, 0},
+	{ SDMMC3_CD_B_GPIOC_38_PCONF0, SDMMC3_CD_B_GPIOC_38_PAD, 0},
+	{ SDMMC3_CMD_GPIOC_39_PCONF0, SDMMC3_CMD_GPIOC_39_PAD, 0},
+	{ SDMMC3_1P8_EN_GPIOC_40_PCONF0, SDMMC3_1P8_EN_GPIOC_40_PAD, 0},
+	{ SDMMC3_PWR_EN_B_GPIOC_41_PCONF0, SDMMC3_PWR_EN_B_GPIOC_41_PAD, 0},
+	{ LPC_AD0_GPIOC_42_PCONF0, LPC_AD0_GPIOC_42_PAD, 0},
+	{ LPC_AD1_GPIOC_43_PCONF0, LPC_AD1_GPIOC_43_PAD, 0},
+	{ LPC_AD2_GPIOC_44_PCONF0, LPC_AD2_GPIOC_44_PAD, 0},
+	{ LPC_AD3_GPIOC_45_PCONF0, LPC_AD3_GPIOC_45_PAD, 0},
+	{ LPC_FRAMEB_GPIOC_46_PCONF0, LPC_FRAMEB_GPIOC_46_PAD, 0},
+	{ LPC_CLKOUT0_GPIOC_47_PCONF0, LPC_CLKOUT0_GPIOC_47_PAD, 0},
+	{ LPC_CLKOUT1_GPIOC_48_PCONF0, LPC_CLKOUT1_GPIOC_48_PAD, 0},
+	{ LPC_CLKRUNB_GPIOC_49_PCONF0, LPC_CLKRUNB_GPIOC_49_PAD, 0},
+	{ ILB_SERIRQ_GPIOC_50_PCONF0, ILB_SERIRQ_GPIOC_50_PAD, 0},
+	{ SMB_DATA_GPIOC_51_PCONF0, SMB_DATA_GPIOC_51_PAD, 0},
+	{ SMB_CLK_GPIOC_52_PCONF0, SMB_CLK_GPIOC_52_PAD, 0},
+	{ SMB_ALERTB_GPIOC_53_PCONF0, SMB_ALERTB_GPIOC_53_PAD, 0},
+	{ SPKR_GPIOC_54_PCONF0, SPKR_GPIOC_54_PAD, 0},
+	{ MHSI_ACDATA_GPIOC_55_PCONF0, MHSI_ACDATA_GPIOC_55_PAD, 0},
+	{ MHSI_ACFLAG_GPIOC_56_PCONF0, MHSI_ACFLAG_GPIOC_56_PAD, 0},
+	{ MHSI_ACREADY_GPIOC_57_PCONF0, MHSI_ACREADY_GPIOC_57_PAD, 0},
+	{ MHSI_ACWAKE_GPIOC_58_PCONF0, MHSI_ACWAKE_GPIOC_58_PAD, 0},
+	{ MHSI_CADATA_GPIOC_59_PCONF0, MHSI_CADATA_GPIOC_59_PAD, 0},
+	{ MHSI_CAFLAG_GPIOC_60_PCONF0, MHSI_CAFLAG_GPIOC_60_PAD, 0},
+	{ MHSI_CAREADY_GPIOC_61_PCONF0, MHSI_CAREADY_GPIOC_61_PAD, 0},
+	{ GP_SSP_2_CLK_GPIOC_62_PCONF0, GP_SSP_2_CLK_GPIOC_62_PAD, 0},
+	{ GP_SSP_2_FS_GPIOC_63_PCONF0, GP_SSP_2_FS_GPIOC_63_PAD, 0},
+	{ GP_SSP_2_RXD_GPIOC_64_PCONF0, GP_SSP_2_RXD_GPIOC_64_PAD, 0},
+	{ GP_SSP_2_TXD_GPIOC_65_PCONF0, GP_SSP_2_TXD_GPIOC_65_PAD, 0},
+	{ SPI1_CS0_B_GPIOC_66_PCONF0, SPI1_CS0_B_GPIOC_66_PAD, 0},
+	{ SPI1_MISO_GPIOC_67_PCONF0, SPI1_MISO_GPIOC_67_PAD, 0},
+	{ SPI1_MOSI_GPIOC_68_PCONF0, SPI1_MOSI_GPIOC_68_PAD, 0},
+	{ SPI1_CLK_GPIOC_69_PCONF0, SPI1_CLK_GPIOC_69_PAD, 0},
+	{ UART1_RXD_GPIOC_70_PCONF0, UART1_RXD_GPIOC_70_PAD, 0},
+	{ UART1_TXD_GPIOC_71_PCONF0, UART1_TXD_GPIOC_71_PAD, 0},
+	{ UART1_RTS_B_GPIOC_72_PCONF0, UART1_RTS_B_GPIOC_72_PAD, 0},
+	{ UART1_CTS_B_GPIOC_73_PCONF0, UART1_CTS_B_GPIOC_73_PAD, 0},
+	{ UART2_RXD_GPIOC_74_PCONF0, UART2_RXD_GPIOC_74_PAD, 0},
+	{ UART2_TXD_GPIOC_75_PCONF0, UART2_TXD_GPIOC_75_PAD, 0},
+	{ UART2_RTS_B_GPIOC_76_PCONF0, UART2_RTS_B_GPIOC_76_PAD, 0},
+	{ UART2_CTS_B_GPIOC_77_PCONF0, UART2_CTS_B_GPIOC_77_PAD, 0},
+	{ I2C0_SDA_GPIOC_78_PCONF0, I2C0_SDA_GPIOC_78_PAD, 0},
+	{ I2C0_SCL_GPIOC_79_PCONF0, I2C0_SCL_GPIOC_79_PAD, 0},
+	{ I2C1_SDA_GPIOC_80_PCONF0, I2C1_SDA_GPIOC_80_PAD, 0},
+	{ I2C1_SCL_GPIOC_81_PCONF0, I2C1_SCL_GPIOC_81_PAD, 0},
+	{ I2C2_SDA_GPIOC_82_PCONF0, I2C2_SDA_GPIOC_82_PAD, 0},
+	{ I2C2_SCL_GPIOC_83_PCONF0, I2C2_SCL_GPIOC_83_PAD, 0},
+	{ I2C3_SDA_GPIOC_84_PCONF0, I2C3_SDA_GPIOC_84_PAD, 0},
+	{ I2C3_SCL_GPIOC_85_PCONF0, I2C3_SCL_GPIOC_85_PAD, 0},
+	{ I2C4_SDA_GPIOC_86_PCONF0, I2C4_SDA_GPIOC_86_PAD, 0},
+	{ I2C4_SCL_GPIOC_87_PCONF0, I2C4_SCL_GPIOC_87_PAD, 0},
+	{ I2C5_SDA_GPIOC_88_PCONF0, I2C5_SDA_GPIOC_88_PAD, 0},
+	{ I2C5_SCL_GPIOC_89_PCONF0, I2C5_SCL_GPIOC_89_PAD, 0},
+	{ I2C6_SDA_GPIOC_90_PCONF0, I2C6_SDA_GPIOC_90_PAD, 0},
+	{ I2C6_SCL_GPIOC_91_PCONF0, I2C6_SCL_GPIOC_91_PAD, 0},
+	{ I2C_NFC_SDA_GPIOC_92_PCONF0, I2C_NFC_SDA_GPIOC_92_PAD, 0},
+	{ I2C_NFC_SCL_GPIOC_93_PCONF0, I2C_NFC_SCL_GPIOC_93_PAD, 0},
+	{ PWM0_GPIOC_94_PCONF0, PWM0_GPIOC_94_PAD, 0},
+	{ PWM1_GPIOC_95_PCONF0, PWM1_GPIOC_95_PAD, 0},
+	{ PLT_CLK0_GPIOC_96_PCONF0, PLT_CLK0_GPIOC_96_PAD, 0},
+	{ PLT_CLK1_GPIOC_97_PCONF0, PLT_CLK1_GPIOC_97_PAD, 0},
+	{ PLT_CLK2_GPIOC_98_PCONF0, PLT_CLK2_GPIOC_98_PAD, 0},
+	{ PLT_CLK3_GPIOC_99_PCONF0, PLT_CLK3_GPIOC_99_PAD, 0},
+	{ PLT_CLK4_GPIOC_100_PCONF0, PLT_CLK4_GPIOC_100_PAD, 0},
+	{ PLT_CLK5_GPIOC_101_PCONF0, PLT_CLK5_GPIOC_101_PAD, 0},
+
+	{ GPIO_SUS0_GPIO_SUS0_PCONF0, GPIO_SUS0_GPIO_SUS0_PAD, 0},
+	{ GPIO_SUS1_GPIO_SUS1_PCONF0, GPIO_SUS1_GPIO_SUS1_PAD, 0},
+	{ GPIO_SUS2_GPIO_SUS2_PCONF0, GPIO_SUS2_GPIO_SUS2_PAD, 0},
+	{ GPIO_SUS3_GPIO_SUS3_PCONF0, GPIO_SUS3_GPIO_SUS3_PAD, 0},
+	{ GPIO_SUS4_GPIO_SUS4_PCONF0, GPIO_SUS4_GPIO_SUS4_PAD, 0},
+	{ GPIO_SUS5_GPIO_SUS5_PCONF0, GPIO_SUS5_GPIO_SUS5_PAD, 0},
+	{ GPIO_SUS6_GPIO_SUS6_PCONF0, GPIO_SUS6_GPIO_SUS6_PAD, 0},
+	{ GPIO_SUS7_GPIO_SUS7_PCONF0, GPIO_SUS7_GPIO_SUS7_PAD, 0},
+	{ SEC_GPIO_SUS8_GPIO_SUS8_PCONF0, SEC_GPIO_SUS8_GPIO_SUS8_PAD, 0},
+	{ SEC_GPIO_SUS9_GPIO_SUS9_PCONF0, SEC_GPIO_SUS9_GPIO_SUS9_PAD, 0},
+	{ SEC_GPIO_SUS10_GPIO_SUS10_PCONF0, SEC_GPIO_SUS10_GPIO_SUS10_PAD, 0},
+	{ SUSPWRDNACK_GPIOS_11_PCONF0, SUSPWRDNACK_GPIOS_11_PAD, 0},
+	{ PMU_SUSCLK_GPIOS_12_PCONF0, PMU_SUSCLK_GPIOS_12_PAD, 0},
+	{ PMU_SLP_S0IX_B_GPIOS_13_PCONF0, PMU_SLP_S0IX_B_GPIOS_13_PAD, 0},
+	{ PMU_SLP_LAN_B_GPIOS_14_PCONF0, PMU_SLP_LAN_B_GPIOS_14_PAD, 0},
+	{ PMU_WAKE_B_GPIOS_15_PCONF0, PMU_WAKE_B_GPIOS_15_PAD, 0},
+	{ PMU_PWRBTN_B_GPIOS_16_PCONF0, PMU_PWRBTN_B_GPIOS_16_PAD, 0},
+	{ PMU_WAKE_LAN_B_GPIOS_17_PCONF0, PMU_WAKE_LAN_B_GPIOS_17_PAD, 0},
+	{ SUS_STAT_B_GPIOS_18_PCONF0, SUS_STAT_B_GPIOS_18_PAD, 0},
+	{ USB_OC0_B_GPIOS_19_PCONF0, USB_OC0_B_GPIOS_19_PAD, 0},
+	{ USB_OC1_B_GPIOS_20_PCONF0, USB_OC1_B_GPIOS_20_PAD, 0},
+	{ SPI_CS1_B_GPIOS_21_PCONF0, SPI_CS1_B_GPIOS_21_PAD, 0},
+	{ GPIO_DFX0_GPIOS_22_PCONF0, GPIO_DFX0_GPIOS_22_PAD, 0},
+	{ GPIO_DFX1_GPIOS_23_PCONF0, GPIO_DFX1_GPIOS_23_PAD, 0},
+	{ GPIO_DFX2_GPIOS_24_PCONF0, GPIO_DFX2_GPIOS_24_PAD, 0},
+	{ GPIO_DFX3_GPIOS_25_PCONF0, GPIO_DFX3_GPIOS_25_PAD, 0},
+	{ GPIO_DFX4_GPIOS_26_PCONF0, GPIO_DFX4_GPIOS_26_PAD, 0},
+	{ GPIO_DFX5_GPIOS_27_PCONF0, GPIO_DFX5_GPIOS_27_PAD, 0},
+	{ GPIO_DFX6_GPIOS_28_PCONF0, GPIO_DFX6_GPIOS_28_PAD, 0},
+	{ GPIO_DFX7_GPIOS_29_PCONF0, GPIO_DFX7_GPIOS_29_PAD, 0},
+	{ GPIO_DFX8_GPIOS_30_PCONF0, GPIO_DFX8_GPIOS_30_PAD, 0},
+	{ USB_ULPI_0_CLK_GPIOS_31_PCONF0, USB_ULPI_0_CLK_GPIOS_31_PAD, 0},
+	{ USB_ULPI_0_DATA0_GPIOS_32_PCONF0, USB_ULPI_0_DATA0_GPIOS_32_PAD, 0},
+	{ USB_ULPI_0_DATA1_GPIOS_33_PCONF0, USB_ULPI_0_DATA1_GPIOS_33_PAD, 0},
+	{ USB_ULPI_0_DATA2_GPIOS_34_PCONF0, USB_ULPI_0_DATA2_GPIOS_34_PAD, 0},
+	{ USB_ULPI_0_DATA3_GPIOS_35_PCONF0, USB_ULPI_0_DATA3_GPIOS_35_PAD, 0},
+	{ USB_ULPI_0_DATA4_GPIOS_36_PCONF0, USB_ULPI_0_DATA4_GPIOS_36_PAD, 0},
+	{ USB_ULPI_0_DATA5_GPIOS_37_PCONF0, USB_ULPI_0_DATA5_GPIOS_37_PAD, 0},
+	{ USB_ULPI_0_DATA6_GPIOS_38_PCONF0, USB_ULPI_0_DATA6_GPIOS_38_PAD, 0},
+	{ USB_ULPI_0_DATA7_GPIOS_39_PCONF0, USB_ULPI_0_DATA7_GPIOS_39_PAD, 0},
+	{ USB_ULPI_0_DIR_GPIOS_40_PCONF0, USB_ULPI_0_DIR_GPIOS_40_PAD, 0},
+	{ USB_ULPI_0_NXT_GPIOS_41_PCONF0, USB_ULPI_0_NXT_GPIOS_41_PAD, 0},
+	{ USB_ULPI_0_STP_GPIOS_42_PCONF0, USB_ULPI_0_STP_GPIOS_42_PAD, 0},
+	{ USB_ULPI_0_REFCLK_GPIOS_43_PCONF0, USB_ULPI_0_REFCLK_GPIOS_43_PAD, 0}
 };
 
 static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data)
@@ -260,14 +749,42 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
 	u8 gpio, action;
 	u16 function, pad;
 	u32 val;
+	u8 block;
 	struct drm_device *dev = intel_dsi->base.base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
+	DRM_DEBUG_DRIVER("MIPI: executing gpio element\n");
+
+	/*
+	 * Skipping the first byte as it is of no
+	 * interest for android in new version
+	 */
+	if (dev_priv->vbt.dsi.seq_version >= 3)
+		data++;
+
 	gpio = *data++;
 
 	/* pull up/down */
 	action = *data++;
 
+	if (dev_priv->vbt.dsi.seq_version >= 3) {
+		if (gpio <= MAX_GPIO_NUM_NC) {
+			DRM_DEBUG_DRIVER("GPIO is in the north Block\n");
+			block = IOSF_PORT_GPIO_NC;
+		} else if (gpio > MAX_GPIO_NUM_NC && gpio <= MAX_GPIO_NUM_SC) {
+			DRM_DEBUG_DRIVER("GPIO is in the south Block\n");
+			block = IOSF_PORT_GPIO_SC;
+		} else if (gpio > MAX_GPIO_NUM_SC && gpio <= MAX_GPIO_NUM) {
+			DRM_DEBUG_DRIVER("GPIO is in the SUS Block\n");
+			block = IOSF_PORT_GPIO_SUS;
+		} else {
+			DRM_ERROR("GPIO number is not present in the table\n");
+			return NULL;
+		}
+	} else {
+		block = IOSF_PORT_GPIO_NC;
+	}
+
 	function = gtable[gpio].function_reg;
 	pad = gtable[gpio].pad_reg;
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [MIPI SEQ PARSING v3 01/13] drm/i915: Adding the parsing logic for the i2c element
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 01/13] drm/i915: Adding the parsing logic for the i2c element Deepak M
@ 2015-12-11  8:40   ` Mika Kahola
  0 siblings, 0 replies; 22+ messages in thread
From: Mika Kahola @ 2015-12-11  8:40 UTC (permalink / raw)
  To: Deepak M; +Cc: Jani Nikula, intel-gfx

On Tue, 2015-12-01 at 04:17 +0530, Deepak M wrote:
> From: vkorjani <vikas.korjani@intel.com>
> 
> New sequence element for i2c is been added in the
> mipi sequence block of the VBT. This patch parses
> and executes the i2c sequence.
> 
> v2: Add i2c_put_adapter call(Jani), rebase
> v3: corrected the retry loop(Jani), rebase
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
Tested-by: Mika Kahola <mika.kahola@intel.com>
> Signed-off-by: vkorjani <vikas.korjani@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_bios.c          |  6 +++
>  drivers/gpu/drm/i915/intel_bios.h          |  1 +
>  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 60 ++++++++++++++++++++++++++++++
>  3 files changed, 67 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index ce82f9c..6756a1c 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -718,6 +718,12 @@ static u8 *goto_next_sequence(u8 *data, int *size)
>  
>  			data += 3;
>  			break;
> +		case MIPI_SEQ_ELEM_I2C:
> +			/* skip by this element payload size */
> +			data += 7;
> +			len = *data;
> +			data += len + 1;
> +			break;
>  		default:
>  			DRM_ERROR("Unknown element\n");
>  			return NULL;
> diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
> index 7ec8c9a..4ec73f5 100644
> --- a/drivers/gpu/drm/i915/intel_bios.h
> +++ b/drivers/gpu/drm/i915/intel_bios.h
> @@ -954,6 +954,7 @@ enum mipi_seq_element {
>  	MIPI_SEQ_ELEM_SEND_PKT,
>  	MIPI_SEQ_ELEM_DELAY,
>  	MIPI_SEQ_ELEM_GPIO,
> +	MIPI_SEQ_ELEM_I2C,
>  	MIPI_SEQ_ELEM_STATUS,
>  	MIPI_SEQ_ELEM_MAX
>  };
> diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
> index a5e99ac..92d619a 100644
> --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
> +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
> @@ -31,6 +31,7 @@
>  #include <drm/drm_panel.h>
>  #include <linux/slab.h>
>  #include <video/mipi_display.h>
> +#include <linux/i2c.h>
>  #include <asm/intel-mid.h>
>  #include <video/mipi_display.h>
>  #include "i915_drv.h"
> @@ -104,6 +105,64 @@ static struct gpio_table gtable[] = {
>  	{ GPIO_NC_11_PCONF0, GPIO_NC_11_PAD, 0}
>  };
>  
> +static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data)
> +{
> +	struct i2c_adapter *adapter;
> +	int ret;
> +	u8 reg_offset, payload_size, retries = 5;
> +	struct i2c_msg msg;
> +	u8 *transmit_buffer = NULL;
> +	u8 flag = *data++;
> +	u8 index = *data++;
> +	u8 bus_number = *data++;
> +	u16 slave_add = *(u16 *)(data);
> +
> +	data = data + 2;
> +	reg_offset = *data++;
> +	payload_size = *data++;
> +
> +	adapter = i2c_get_adapter(bus_number);
> +
> +	if (!adapter) {
> +		DRM_ERROR("i2c_get_adapter(%u)\n", bus_number);
> +		goto out;
> +	}
> +
> +	transmit_buffer = kmalloc(1 + payload_size, GFP_TEMPORARY);
> +
> +	if (!transmit_buffer)
> +		goto out;
> +
> +	transmit_buffer[0] = reg_offset;
> +	memcpy(&transmit_buffer[1], data, payload_size);
> +
> +	msg.addr   = slave_add;
> +	msg.flags  = 0;
> +	msg.len    = payload_size + 1;
> +	msg.buf    = &transmit_buffer[0];
> +
> +	do {
> +		ret =  i2c_transfer(adapter, &msg, 1);
> +		if (ret == 1)
> +			goto out;
> +		else if (ret == -EAGAIN)
> +			usleep_range(1000, 2500);
> +		else {
> +			DRM_ERROR("i2c transfer failed, error code:%d\n", ret);
> +			goto out;
> +		}
> +	} while (retries--);
> +
> +	if (retries == 0)
> +		DRM_ERROR("i2c transfer failed, error code:%d\n", ret);
> +out:
> +	kfree(transmit_buffer);
> +	i2c_put_adapter(adapter);
> +
> +	data = data + payload_size;
> +	return data;
> +}
> +
>  static inline enum port intel_dsi_seq_port_to_port(u8 port)
>  {
>  	return port ? PORT_C : PORT_A;
> @@ -236,6 +295,7 @@ static const fn_mipi_elem_exec exec_elem[] = {
>  	mipi_exec_send_packet,
>  	mipi_exec_delay,
>  	mipi_exec_gpio,
> +	mipi_exec_i2c,
>  	NULL, /* status read; later */
>  };
>  


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [MIPI SEQ PARSING v3 02/13] drm/i915: Updating asle structure with new fields
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 02/13] drm/i915: Updating asle structure with new fields Deepak M
@ 2015-12-11  8:41   ` Mika Kahola
  2015-12-14 11:02   ` Jani Nikula
  1 sibling, 0 replies; 22+ messages in thread
From: Mika Kahola @ 2015-12-11  8:41 UTC (permalink / raw)
  To: Deepak M; +Cc: Jani Nikula, intel-gfx

On Tue, 2015-12-01 at 04:17 +0530, Deepak M wrote:
> v3: rebase
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
Tested-by: Mika Kahola <mika.kahola@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_opregion.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index e362a30..64efedf 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -120,7 +120,9 @@ struct opregion_asle {
>  	u64 fdss;
>  	u32 fdsp;
>  	u32 stat;
> -	u8 rsvd[70];
> +	u64 rvda;	/* Physical address of raw vbt data */
> +	u32 rvds;	/* Size of raw vbt data */
> +	u8 rsvd[58];
>  } __packed;
>  
>  /* Driver readiness indicator */


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [MIPI SEQ PARSING v3 03/13] drm/i915: Add Intel opregion mailbox 5 structure
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 03/13] drm/i915: Add Intel opregion mailbox 5 structure Deepak M
@ 2015-12-11  8:42   ` Mika Kahola
  0 siblings, 0 replies; 22+ messages in thread
From: Mika Kahola @ 2015-12-11  8:42 UTC (permalink / raw)
  To: Deepak M; +Cc: Jani Nikula, intel-gfx

On Tue, 2015-12-01 at 04:17 +0530, Deepak M wrote:
> Mailbox 5 is BIOS to Driver Notification mailbox is intended
> to support BIOS to Driver event notification or data storage
> for BIOS to Driver data synchronization purpose. Mailbox 5 is
> the extension of mailbox 3.
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
Tested-by: Mika Kahola <mika.kahola@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h       | 1 +
>  drivers/gpu/drm/i915/intel_opregion.c | 9 +++++++++
>  2 files changed, 10 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 71bd1dc..135d32a 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -457,6 +457,7 @@ struct intel_opregion {
>  	u32 swsci_sbcb_sub_functions;
>  	struct opregion_asle *asle;
>  	void *vbt;
> +	struct opregion_asle_ext *asle_ext;
>  	u32 *lid_state;
>  	struct work_struct asle_work;
>  };
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 64efedf..43b7c3b 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -46,6 +46,7 @@
>  #define OPREGION_SWSCI_OFFSET  0x200
>  #define OPREGION_ASLE_OFFSET   0x300
>  #define OPREGION_VBT_OFFSET    0x400
> +#define OPREGION_ASLE_EXT_OFFSET	0x1C00
>  
>  #define OPREGION_SIGNATURE "IntelGraphicsMem"
>  #define MBOX_ACPI      (1<<0)
> @@ -125,6 +126,13 @@ struct opregion_asle {
>  	u8 rsvd[58];
>  } __packed;
>  
> +/* OpRegion mailbox #5: ASLE ext */
> +struct opregion_asle_ext {
> +	u32 phed;	/* Panel Header */
> +	u32 bddc[64];	/* Panel EDID */
> +	u32 rsvd[191];
> +} __packed;
> +
>  /* Driver readiness indicator */
>  #define ASLE_ARDY_READY		(1 << 0)
>  #define ASLE_ARDY_NOT_READY	(0 << 0)
> @@ -936,6 +944,7 @@ int intel_opregion_setup(struct drm_device *dev)
>  	opregion->vbt = base + OPREGION_VBT_OFFSET;
>  
>  	opregion->lid_state = base + ACPI_CLID;
> +	opregion->asle_ext = base + OPREGION_ASLE_EXT_OFFSET;
>  
>  	mboxes = opregion->header->mboxes;
>  	if (mboxes & MBOX_ACPI) {


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [MIPI SEQ PARSING v3 04/13] drm/i915: Do opregion VBT validation during opregion setup
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 04/13] drm/i915: Do opregion VBT validation during opregion setup Deepak M
@ 2015-12-11  8:43   ` Mika Kahola
  0 siblings, 0 replies; 22+ messages in thread
From: Mika Kahola @ 2015-12-11  8:43 UTC (permalink / raw)
  To: Deepak M; +Cc: Jani Nikula, intel-gfx

On Tue, 2015-12-01 at 04:17 +0530, Deepak M wrote:
> Calling the validate_vbt before assiging the opregion vbt blob.
> Size of the VBT blob cant be more than 6KB when VBT is present
> in mailbox 4.
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
Tested-by: Mika Kahola <mika.kahola@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h       |  3 +++
>  drivers/gpu/drm/i915/intel_bios.c     | 43 +++++++++++++++++++----------------
>  drivers/gpu/drm/i915/intel_opregion.c | 31 +++++++++++++++++++++++++
>  3 files changed, 57 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 135d32a..8cf8375 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3324,6 +3324,9 @@ intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
>  }
>  #endif
>  
> +const struct vbt_header *validate_vbt(const void *_vbt, size_t size,
> +						const char *source);
> +
>  /* intel_acpi.c */
>  #ifdef CONFIG_ACPI
>  extern void intel_register_dsm_handler(void);
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 6756a1c..57a77aa 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1237,16 +1237,15 @@ static const struct dmi_system_id intel_no_opregion_vbt[] = {
>  	{ }
>  };
>  
> -static const struct bdb_header *validate_vbt(const void *base,
> +const struct vbt_header *validate_vbt(const void *_vbt,
>  					     size_t size,
> -					     const void *_vbt,
>  					     const char *source)
>  {
> -	size_t offset = _vbt - base;
> -	const struct vbt_header *vbt = _vbt;
> +	const struct vbt_header *vbt = (const struct vbt_header *)_vbt;
>  	const struct bdb_header *bdb;
> +	size_t offset;
>  
> -	if (offset + sizeof(struct vbt_header) > size) {
> +	if (sizeof(struct vbt_header) > size) {
>  		DRM_DEBUG_DRIVER("VBT header incomplete\n");
>  		return NULL;
>  	}
> @@ -1256,26 +1255,26 @@ static const struct bdb_header *validate_vbt(const void *base,
>  		return NULL;
>  	}
>  
> -	offset += vbt->bdb_offset;
> +	offset = vbt->bdb_offset;
>  	if (offset + sizeof(struct bdb_header) > size) {
>  		DRM_DEBUG_DRIVER("BDB header incomplete\n");
>  		return NULL;
>  	}
>  
> -	bdb = base + offset;
> +	bdb = (const void *)_vbt + offset;
>  	if (offset + bdb->bdb_size > size) {
>  		DRM_DEBUG_DRIVER("BDB incomplete\n");
>  		return NULL;
>  	}
>  
>  	DRM_DEBUG_KMS("Using VBT from %s: %20s\n",
> -		      source, vbt->signature);
> -	return bdb;
> +			source, vbt->signature);
> +	return vbt;
>  }
>  
> -static const struct bdb_header *find_vbt(void __iomem *bios, size_t size)
> +static const struct vbt_header *find_vbt(void __iomem *bios, size_t size)
>  {
> -	const struct bdb_header *bdb = NULL;
> +	const struct vbt_header *vbt = NULL;
>  	size_t i;
>  
>  	/* Scour memory looking for the VBT signature. */
> @@ -1289,12 +1288,12 @@ static const struct bdb_header *find_vbt(void __iomem *bios, size_t size)
>  			 */
>  			void *_bios = (void __force *) bios;
>  
> -			bdb = validate_vbt(_bios, size, _bios + i, "PCI ROM");
> +			vbt = validate_vbt(_bios + i, size - i, "PCI ROM");
>  			break;
>  		}
>  	}
>  
> -	return bdb;
> +	return vbt;
>  }
>  
>  /**
> @@ -1311,6 +1310,7 @@ intel_parse_bios(struct drm_device *dev)
>  {
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct pci_dev *pdev = dev->pdev;
> +	const struct vbt_header *vbt = NULL;
>  	const struct bdb_header *bdb = NULL;
>  	u8 __iomem *bios = NULL;
>  
> @@ -1319,23 +1319,26 @@ intel_parse_bios(struct drm_device *dev)
>  
>  	init_vbt_defaults(dev_priv);
>  
> -	/* XXX Should this validation be moved to intel_opregion.c? */
> -	if (!dmi_check_system(intel_no_opregion_vbt) && dev_priv->opregion.vbt)
> -		bdb = validate_vbt(dev_priv->opregion.header, OPREGION_SIZE,
> -				   dev_priv->opregion.vbt, "OpRegion");
> +	if (!dmi_check_system(intel_no_opregion_vbt) &&
> +					dev_priv->opregion.vbt) {
> +		vbt = (const struct vbt_header *)dev_priv->opregion.vbt;
> +		bdb = (const void *)dev_priv->opregion.vbt + vbt->bdb_offset;
> +	}
>  
> -	if (bdb == NULL) {
> +	if (vbt == NULL) {
>  		size_t size;
>  
>  		bios = pci_map_rom(pdev, &size);
>  		if (!bios)
>  			return -1;
>  
> -		bdb = find_vbt(bios, size);
> -		if (!bdb) {
> +		vbt = find_vbt(bios, size);
> +		if (!vbt) {
>  			pci_unmap_rom(pdev, bios);
>  			return -1;
>  		}
> +
> +		bdb = (const void *)vbt + vbt->bdb_offset;
>  	}
>  
>  	/* Grab useful general definitions */
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 43b7c3b..4a78282 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -48,6 +48,27 @@
>  #define OPREGION_VBT_OFFSET    0x400
>  #define OPREGION_ASLE_EXT_OFFSET	0x1C00
>  
> +#define MAILBOX_4_SIZE		0x1800
> +
> +/*
> + *	Opregion Structure:
> + *	      +-------------------------------+
> + *            |      Mailbox1 : ACPI          |
> + *            |      Offset   : 0x100         |
> + *            +-------------------------------+
> + *            |      Mailbox2 : SWSCI	      |
> + *            |      Offset   : 0x200         |
> + *            +-------------------------------+
> + *            |      Mailbox3 : ASLE	      |
> + *            |      Offset   : 0x300         |
> + *            +-------------------------------+
> + *            |      Mailbox4 : VBT	      |
> + *            |      Offset   : 0x400         |
> + *            +-------------------------------+
> + *            |      Mailbox5 : ASLE_EXT      |
> + *            |      Offset   : 0x1C00        |
> + *            +-------------------------------+
> +*/
>  #define OPREGION_SIGNATURE "IntelGraphicsMem"
>  #define MBOX_ACPI      (1<<0)
>  #define MBOX_SWSCI     (1<<1)
> @@ -910,6 +931,7 @@ int intel_opregion_setup(struct drm_device *dev)
>  	struct intel_opregion *opregion = &dev_priv->opregion;
>  	u32 asls, mboxes;
>  	char buf[sizeof(OPREGION_SIGNATURE)];
> +	const struct vbt_header *vbt = NULL;
>  	int err = 0;
>  	void *base;
>  
> @@ -940,6 +962,15 @@ int intel_opregion_setup(struct drm_device *dev)
>  		err = -EINVAL;
>  		goto err_out;
>  	}
> +
> +	vbt = validate_vbt(base + OPREGION_VBT_OFFSET,
> +				MAILBOX_4_SIZE, "OpRegion");
> +
> +	if (vbt == NULL) {
> +		err = -EINVAL;
> +		goto err_out;
> +	}
> +
>  	opregion->header = base;
>  	opregion->vbt = base + OPREGION_VBT_OFFSET;
>  


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [MIPI SEQ PARSING v3 05/13] drm/i915: Add debug entry to get the opregion VBT blob
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 05/13] drm/i915: Add debug entry to get the opregion VBT blob Deepak M
@ 2015-12-11  8:46   ` Mika Kahola
  2015-12-14 12:16     ` [PATCH] drm/i915: Parsing VBT if size of VBT exceeds 6KB Deepak M
  0 siblings, 1 reply; 22+ messages in thread
From: Mika Kahola @ 2015-12-11  8:46 UTC (permalink / raw)
  To: Deepak M; +Cc: Jani Nikula, intel-gfx

On Tue, 2015-12-01 at 04:17 +0530, Deepak M wrote:
> Currently there is a entry to get the complete opregion
> dump, this patch adds entry to get the VBT alone from
> the opregion.
> 
> Adding this entry helps developer to get the VBT easily,
> instead of following the old way where we get the complete
> opregion dump and pick the VBT from the dump wrt to
> the VBT offset.
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
Tested-by: Mika Kahola <mika.kahola@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c   | 29 +++++++++++++++++++++++++++++
>  drivers/gpu/drm/i915/i915_drv.h       |  1 +
>  drivers/gpu/drm/i915/intel_bios.c     |  1 +
>  drivers/gpu/drm/i915/intel_opregion.c |  3 +++
>  4 files changed, 34 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index d6d69f4..9b7fb00 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1865,6 +1865,34 @@ out:
>  	return 0;
>  }
>  
> +static int i915_opregion_vbt(struct seq_file *m, void *unused)
> +{
> +	struct drm_info_node *node = m->private;
> +	struct drm_device *dev = node->minor->dev;
> +	struct drm_i915_private *dev_priv = dev->dev_private;
> +	struct intel_opregion *opregion = &dev_priv->opregion;
> +	void *data = kmalloc(opregion->vbt_size, GFP_KERNEL);
> +	int ret;
> +
> +	if (data == NULL)
> +		return -ENOMEM;
> +
> +	ret = mutex_lock_interruptible(&dev->struct_mutex);
> +	if (ret)
> +		goto out;
> +
> +	if (opregion->vbt) {
> +		memcpy(data, opregion->vbt, opregion->vbt_size);
> +		seq_write(m, data, opregion->vbt_size);
> +	}
> +
> +	mutex_unlock(&dev->struct_mutex);
> +
> +out:
> +	kfree(data);
> +	return 0;
> +}
> +
>  static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
>  {
>  	struct drm_info_node *node = m->private;
> @@ -5383,6 +5411,7 @@ static const struct drm_info_list i915_debugfs_list[] = {
>  	{"i915_ips_status", i915_ips_status, 0},
>  	{"i915_sr_status", i915_sr_status, 0},
>  	{"i915_opregion", i915_opregion, 0},
> +	{"i915_opregion_vbt", i915_opregion_vbt, 0},
>  	{"i915_gem_framebuffer", i915_gem_framebuffer_info, 0},
>  	{"i915_context_status", i915_context_status, 0},
>  	{"i915_dump_lrc", i915_dump_lrc, 0},
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 8cf8375..59a39d1 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -457,6 +457,7 @@ struct intel_opregion {
>  	u32 swsci_sbcb_sub_functions;
>  	struct opregion_asle *asle;
>  	void *vbt;
> +	u32 vbt_size;
>  	struct opregion_asle_ext *asle_ext;
>  	u32 *lid_state;
>  	struct work_struct asle_work;
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 57a77aa..98b0e2a 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1338,6 +1338,7 @@ intel_parse_bios(struct drm_device *dev)
>  			return -1;
>  		}
>  
> +		dev_priv->opregion.vbt_size = vbt->vbt_size;
>  		bdb = (const void *)vbt + vbt->bdb_offset;
>  	}
>  
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 4a78282..7908a1d 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -971,6 +971,9 @@ int intel_opregion_setup(struct drm_device *dev)
>  		goto err_out;
>  	}
>  
> +	vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
> +	dev_priv->opregion.vbt_size = vbt->vbt_size;
> +
>  	opregion->header = base;
>  	opregion->vbt = base + OPREGION_VBT_OFFSET;
>  


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [MIPI SEQ PARSING v3 06/13] drm/i915: Parsing VBT if size of VBT exceeds 6KB
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 06/13] " Deepak M
@ 2015-12-11  8:51   ` Mika Kahola
  0 siblings, 0 replies; 22+ messages in thread
From: Mika Kahola @ 2015-12-11  8:51 UTC (permalink / raw)
  To: Deepak M; +Cc: Jani Nikula, intel-gfx

When testing this patch on my BXT-M I received this error message

Hardware name: Intel Corp. Broxton M/RVP, BIOS
BXTM_IFWI_X64_R_2015_49_2_03 11/25/2015

[    0.000000] ------------[ cut here ]------------
[    0.000000] WARNING: CPU: 0 PID: 0 at drivers/iommu/dmar.c:829
warn_invalid_dmar+0x81/0xa0()
[    0.000000] Your BIOS is broken; DMAR reported at address ff000000
returns all ones!
[    0.000000] BIOS vendor: Intel Corp.; Ver:
BXTM_IFWI_X64_R_2015_49_2_03; Product Version: A1
[    0.000000] Modules linked in:
[    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 4.4.0-rc3-bxt-p6
#1
[    0.000000] Hardware name: Intel Corp. Broxton M/RVP, BIOS
BXTM_IFWI_X64_R_2015_49_2_03 11/25/2015
[    0.000000]  ffffffff81cfa5a7 ffffffff81e03da0 ffffffff813f8609
ffffffff81e03de8
[    0.000000]  ffffffff81e03dd8 ffffffff8107c17e ffffffff830a600c
ffffffff830a60ec
[    0.000000]  00000000ff000000 ffffffffffffffff 000000000000017b
ffffffff81e03e38
[    0.000000] Call Trace:
[    0.000000]  [<ffffffff813f8609>] dump_stack+0x4e/0x85
[    0.000000]  [<ffffffff8107c17e>] warn_slowpath_common+0x9e/0xc0
[    0.000000]  [<ffffffff8107c234>] warn_slowpath_fmt_taint+0x44/0x50
[    0.000000]  [<ffffffff81f94950>] ? __acpi_map_table+0x13/0x1a
[    0.000000]  [<ffffffff81892113>] ? acpi_os_map_iomem+0x26/0x167
[    0.000000]  [<ffffffff814fb471>] warn_invalid_dmar+0x81/0xa0
[    0.000000]  [<ffffffff818923fc>] dmar_validate_one_drhd+0xac/0xc0
[    0.000000]  [<ffffffff814fb5cd>] dmar_walk_remapping_entries
+0x13d/0x180
[    0.000000]  [<ffffffff81fc77bc>] detect_intel_iommu+0x52/0xd1
[    0.000000]  [<ffffffff81892350>] ? acpi_os_unmap_memory+0x17/0x17
[    0.000000]  [<ffffffff81f8cd51>] pci_iommu_alloc+0x43/0x6c
[    0.000000]  [<ffffffff81f9b337>] mem_init+0x9/0x3e
[    0.000000]  [<ffffffff81f86def>] start_kernel+0x231/0x474
[    0.000000]  [<ffffffff81f868ed>] ? set_init_arg+0x57/0x57
[    0.000000]  [<ffffffff81f865ad>] x86_64_start_reservations+0x2a/0x2c
[    0.000000]  [<ffffffff81f86699>] x86_64_start_kernel+0xea/0xed
[    0.000000] ---[ end trace e354834df7810082 ]---

And later on

[   15.615809] IP: [<ffffffffa01a7d9c>] intel_opregion_setup+0x15c/0x420
[i915]
[   15.623687] PGD 0 
[   15.625909] Oops: 0000 [#1] PREEMPT SMP 
[   15.630246] Modules linked in: snd_seq_oss snd_seq_midi snd_rawmidi
snd_seq_midi_event i915(+)[   15.638805] sdhci-pci 0000:00:1c.0: power
 state changed by ACPI to D3cold

[   15.647060]  snd_seq i2c_algo_bit snd_seq_device drm_kms_helper
syscopyarea snd_timer sysfillrect sysimgblt fb_sys_fops drm intel_gtt
snd 
tpm_tis agpgart tpm fuse
[   15.663370] CPU: 3 PID: 341 Comm: systemd-udevd Tainted: G          I
4.4.0-rc3-bxt-p6 #1
[   15.672794] Hardware name: Intel Corp. Broxton M/RVP, BIOS
BXTM_IFWI_X64_R_2015_49_2_03 11/25/2015
[   15.672797] task: ffff8800791b4c80 ti: ffff880179e5c000 task.ti:
ffff880179e5c000
[   15.672875] RIP: 0010:[<ffffffffa01a7d9c>]  [<ffffffffa01a7d9c>]
intel_opregion_setup+0x15c/0x420 [i915]
[   15.672878] RSP: 0018:ffff880179e5f8f8  EFLAGS: 00010246
[   15.672880] RAX: 0000000000000000 RBX: ffff880079370000 RCX:
000000000000000f
[   15.672881] RDX: 000000000000000f RSI: ffffffffa0204a5c RDI:
ffff880179e5f917
[   15.672883] RBP: ffff880179e5f950 R08: 000000000000006d R09:
0000000000000000
[   15.672884] R10: ffff8800791b4c80 R11: ffff8800791b54d8 R12:
ffffc900000b8018
[   15.672885] R13: ffff880178256000 R14: ffff880179e5facc R15:
0000000000000000
[   15.672888] FS:  00007f6693826880(0000) GS:ffff88017fd80000(0000)
knlGS:0000000000000000
[   15.672889] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[   15.672891] CR2: 0000000000000014 CR3: 000000017812a000 CR4:
00000000003406e0
[   15.672892] Stack:
[   15.672897]  00000000000018b8 ffff8800793717c8 79d77018a01e5bb0
49ffffffa01e5c30
[   15.672900]  706172476c65746e 086d654d73636968 ffff880079370000
ffff880178256000
[   15.672904]  0000000000000048 ffff880179e5facc ffff880079370000
ffff880179e5fb00
[   15.672905] Call Trace:
[   15.672975]  [<ffffffffa01d23ac>] i915_driver_load+0xa7c/0x15b0
[i915]
[   15.673007]  [<ffffffffa009928f>] drm_dev_register+0x6f/0xb0 [drm]
[   15.673025]  [<ffffffffa009b81a>] drm_get_pci_dev+0x10a/0x1d0 [drm]
[   15.673034]  [<ffffffff818988b1>] ? _raw_spin_unlock_irqrestore
+0x51/0x70
[   15.673074]  [<ffffffffa0118249>] i915_pci_probe+0x49/0x50 [i915]
[   15.673082]  [<ffffffff81437f50>] pci_device_probe+0x80/0xf0
[   15.673088]  [<ffffffff8150d3b8>] driver_probe_device+0x168/0x3d0
[   15.673091]  [<ffffffff8150d686>] __driver_attach+0x66/0x90
[   15.673093]  [<ffffffff8150d620>] ? driver_probe_device+0x3d0/0x3d0
[   15.673099]  [<ffffffff8150b15b>] bus_for_each_dev+0x5b/0xa0
[   15.673102]  [<ffffffff8150cd8e>] driver_attach+0x1e/0x20
[   15.673105]  [<ffffffff8150c771>] bus_add_driver+0x151/0x270
[   15.673108]  [<ffffffff8150e23c>] driver_register+0x8c/0xd0
[   15.673113]  [<ffffffff81436620>] __pci_register_driver+0x60/0x70
[   15.673130]  [<ffffffffa009b938>] drm_pci_init+0x58/0xf0 [drm]
[   15.673136]  [<ffffffff810cd27d>] ? trace_hardirqs_on+0xd/0x10
[   15.673139]  [<ffffffffa023f000>] ? 0xffffffffa023f000
[   15.673179]  [<ffffffffa023f094>] i915_init+0x94/0x9b [i915]
[   15.673185]  [<ffffffff81000436>] do_one_initcall+0x106/0x1d0
[   15.673191]  [<ffffffff810e93ee>] ? rcu_read_lock_sched_held
+0x6e/0xa0
[   15.673196]  [<ffffffff811d9a21>] ? kmem_cache_alloc_trace
+0x1c1/0x230
[   15.673203]  [<ffffffff8118bd6d>] do_init_module+0x60/0x1ea
[   15.673209]  [<ffffffff811107e0>] load_module+0x1df0/0x25a0
[   15.673212]  [<ffffffff8110c900>] ? store_uevent+0x40/0x40
[   15.673217]  [<ffffffff8110d0e5>] ? copy_module_from_fd.isra.38
+0xa5/0x140
[   15.673221]  [<ffffffff8111117f>] SyS_finit_module+0x8f/0xa0
[   15.673226]  [<ffffffff8189915b>] entry_SYSCALL_64_fastpath+0x16/0x73
[   15.673275] Code: 5c f2 ff 02 0f 84 aa 02 00 00 48 c7 c6 6d 4a 20 a0
48 c7 c7 50 26 1e a0 31 c0 e8 30 11 ef ff e9 90 02 00 00 48 8b 83 30 
96 00 00 <83> 78 14 01 76 33 48 8b 83 50 96 00 00 48 8b b8 ba 00 00 00
48 
[   15.673332] RIP  [<ffffffffa01a7d9c>] intel_opregion_setup
+0x15c/0x420 [i915]
[   15.673333]  RSP <ffff880179e5f8f8>
[   15.673334] CR2: 0000000000000014
[   15.673339] ---[ end trace e354834df7810084 ]---


On Tue, 2015-12-01 at 04:17 +0530, Deepak M wrote:
> Currently the iomap for VBT works only if the size of the
> VBT is less than 6KB, but if the size of the VBT exceeds
> 6KB than the physical address and the size of the VBT to
> be iomapped is specified in the mailbox3 and is iomapped
> accordingly.
> 
> v3: -Splitted the patch into small ones
>     -Handeled memory unmap in intel_opregion_fini
>     -removed the new file created for opregion macro`s
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_opregion.c | 33 +++++++++++++++++++++++++++------
>  1 file changed, 27 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 7908a1d..b3a5709 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -856,6 +856,8 @@ void intel_opregion_fini(struct drm_device *dev)
>  	}
>  
>  	/* just clear all opregion memory pointers now */
> +	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
> +		memunmap(opregion->vbt);
>  	memunmap(opregion->header);
>  	opregion->header = NULL;
>  	opregion->acpi = NULL;
> @@ -933,7 +935,8 @@ int intel_opregion_setup(struct drm_device *dev)
>  	char buf[sizeof(OPREGION_SIGNATURE)];
>  	const struct vbt_header *vbt = NULL;
>  	int err = 0;
> -	void *base;
> +	void *base, *vbt_base;
> +	size_t size;
>  
>  	BUILD_BUG_ON(sizeof(struct opregion_header) != 0x100);
>  	BUILD_BUG_ON(sizeof(struct opregion_acpi) != 0x100);
> @@ -963,19 +966,37 @@ int intel_opregion_setup(struct drm_device *dev)
>  		goto err_out;
>  	}
>  
> -	vbt = validate_vbt(base + OPREGION_VBT_OFFSET,
> -				MAILBOX_4_SIZE, "OpRegion");
> +	/*
> +	 * Non-zero value in rvda field is an indication to driver that a
> +	 * valid Raw VBT is stored in that address and driver should not refer
> +	 * to mailbox4 for getting VBT.
> +	 */
> +	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda) {
> +		size = opregion->asle->rvds;
> +		vbt_base = memremap(opregion->asle->rvda,
> +				size, MEMREMAP_WB);
> +	} else {
> +		size = MAILBOX_4_SIZE;
> +		vbt_base = base + OPREGION_VBT_OFFSET;
> +	}
> +
> +	vbt = validate_vbt(vbt_base, size, "OpRegion");
>  
>  	if (vbt == NULL) {
>  		err = -EINVAL;
>  		goto err_out;
>  	}
>  
> -	vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
> -	dev_priv->opregion.vbt_size = vbt->vbt_size;
> +	/* Assigning the vbt_size based on the VBT location */
> +	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
> +		dev_priv->opregion.vbt_size = opregion->asle->rvds;
> +	else {
> +		vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
> +		dev_priv->opregion.vbt_size = vbt->vbt_size;
> +	}
>  
>  	opregion->header = base;
> -	opregion->vbt = base + OPREGION_VBT_OFFSET;
> +	opregion->vbt = vbt_base;
>  
>  	opregion->lid_state = base + ACPI_CLID;
>  	opregion->asle_ext = base + OPREGION_ASLE_EXT_OFFSET;


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH] drm/i915: Parsing VBT if size of VBT exceeds 6KB
  2015-12-14 12:16     ` [PATCH] drm/i915: Parsing VBT if size of VBT exceeds 6KB Deepak M
@ 2015-12-14  9:19       ` Chris Wilson
  2015-12-14 10:56         ` Jani Nikula
  0 siblings, 1 reply; 22+ messages in thread
From: Chris Wilson @ 2015-12-14  9:19 UTC (permalink / raw)
  To: Deepak M; +Cc: Jani Nikula, intel-gfx

On Mon, Dec 14, 2015 at 05:46:41PM +0530, Deepak M wrote:
> Currently the iomap for VBT works only if the size of the
> VBT is less than 6KB, but if the size of the VBT exceeds
> 6KB than the physical address and the size of the VBT to
> be iomapped is specified in the mailbox3 and is iomapped
> accordingly.
> 
> v3: -Splitted the patch into small ones
>     -Handeled memory unmap in intel_opregion_fini
>     -removed the new file created for opregion macro`s
> v4: Moving the vbt assignment after the opregion fields are assigned
> 
> Cc: Mika Kahola <mika.kahola@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>
> ---
> 
>  drivers/gpu/drm/i915/intel_opregion.c | 47 +++++++++++++++++++++++++----------
>  1 file changed, 34 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 7908a1d..5116690 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -856,6 +856,8 @@ void intel_opregion_fini(struct drm_device *dev)
>  	}
>  
>  	/* just clear all opregion memory pointers now */
> +	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
> +		memunmap(opregion->vbt);
>  	memunmap(opregion->header);
>  	opregion->header = NULL;
>  	opregion->acpi = NULL;
> @@ -933,7 +935,8 @@ int intel_opregion_setup(struct drm_device *dev)
>  	char buf[sizeof(OPREGION_SIGNATURE)];
>  	const struct vbt_header *vbt = NULL;
>  	int err = 0;
> -	void *base;
> +	void *base, *vbt_base;
> +	size_t size;
>  
>  	BUILD_BUG_ON(sizeof(struct opregion_header) != 0x100);
>  	BUILD_BUG_ON(sizeof(struct opregion_acpi) != 0x100);
> @@ -963,19 +966,7 @@ int intel_opregion_setup(struct drm_device *dev)
>  		goto err_out;
>  	}
>  
> -	vbt = validate_vbt(base + OPREGION_VBT_OFFSET,
> -				MAILBOX_4_SIZE, "OpRegion");
> -
> -	if (vbt == NULL) {
> -		err = -EINVAL;
> -		goto err_out;
> -	}
> -
> -	vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
> -	dev_priv->opregion.vbt_size = vbt->vbt_size;
> -
>  	opregion->header = base;
> -	opregion->vbt = base + OPREGION_VBT_OFFSET;
>  
>  	opregion->lid_state = base + ACPI_CLID;
>  	opregion->asle_ext = base + OPREGION_ASLE_EXT_OFFSET;
> @@ -998,6 +989,36 @@ int intel_opregion_setup(struct drm_device *dev)
>  		opregion->asle->ardy = ASLE_ARDY_NOT_READY;
>  	}
>  
> +	/*
> +	 * Non-zero value in rvda field is an indication to driver that a
> +	 * valid Raw VBT is stored in that address and driver should not refer
> +	 * to mailbox4 for getting VBT.
> +	 */
> +	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda) {
> +		size = opregion->asle->rvds;
> +		vbt_base = memremap(opregion->asle->rvda,
> +				size, MEMREMAP_WB);
> +	} else {
> +		size = MAILBOX_4_SIZE;
> +		vbt_base = base + OPREGION_VBT_OFFSET;
> +	}
> +
> +	vbt = validate_vbt(vbt_base, size, "OpRegion");
> +
> +	if (vbt == NULL) {
> +		err = -EINVAL;
> +		goto err_out;
> +	}
> +
> +	/* Assigning the vbt_size based on the VBT location */
> +	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
> +		dev_priv->opregion.vbt_size = opregion->asle->rvds;
> +	else {
> +		vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
i.e. vbt = vbt_base;

which is already done by vbt = validate_vbt;

> +		dev_priv->opregion.vbt_size = vbt->vbt_size;
> +	}

So this reduces down to:

/* Explanation why the new method cannot store the size in vbt->vbt_size */
if (vbt != opregion->asle->rvda)
	size = vbt->vbt_size;
dev_priv->opregion.vbt_size = size;
opregrion->vbt = vbt;

And the vbt_base variable is redundant.

Cut out the tautology and reduce the apparent complex
interdependence between paths.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH] drm/i915: Parsing VBT if size of VBT exceeds 6KB
  2015-12-14  9:19       ` Chris Wilson
@ 2015-12-14 10:56         ` Jani Nikula
  0 siblings, 0 replies; 22+ messages in thread
From: Jani Nikula @ 2015-12-14 10:56 UTC (permalink / raw)
  To: Chris Wilson, Deepak M; +Cc: intel-gfx

On Mon, 14 Dec 2015, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Mon, Dec 14, 2015 at 05:46:41PM +0530, Deepak M wrote:
>> Currently the iomap for VBT works only if the size of the
>> VBT is less than 6KB, but if the size of the VBT exceeds
>> 6KB than the physical address and the size of the VBT to
>> be iomapped is specified in the mailbox3 and is iomapped
>> accordingly.
>> 
>> v3: -Splitted the patch into small ones
>>     -Handeled memory unmap in intel_opregion_fini
>>     -removed the new file created for opregion macro`s
>> v4: Moving the vbt assignment after the opregion fields are assigned
>> 
>> Cc: Mika Kahola <mika.kahola@intel.com>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Signed-off-by: Deepak M <m.deepak@intel.com>
>> ---
>> 
>>  drivers/gpu/drm/i915/intel_opregion.c | 47 +++++++++++++++++++++++++----------
>>  1 file changed, 34 insertions(+), 13 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
>> index 7908a1d..5116690 100644
>> --- a/drivers/gpu/drm/i915/intel_opregion.c
>> +++ b/drivers/gpu/drm/i915/intel_opregion.c
>> @@ -856,6 +856,8 @@ void intel_opregion_fini(struct drm_device *dev)
>>  	}
>>  
>>  	/* just clear all opregion memory pointers now */
>> +	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
>> +		memunmap(opregion->vbt);
>>  	memunmap(opregion->header);
>>  	opregion->header = NULL;
>>  	opregion->acpi = NULL;
>> @@ -933,7 +935,8 @@ int intel_opregion_setup(struct drm_device *dev)
>>  	char buf[sizeof(OPREGION_SIGNATURE)];
>>  	const struct vbt_header *vbt = NULL;
>>  	int err = 0;
>> -	void *base;
>> +	void *base, *vbt_base;
>> +	size_t size;
>>  
>>  	BUILD_BUG_ON(sizeof(struct opregion_header) != 0x100);
>>  	BUILD_BUG_ON(sizeof(struct opregion_acpi) != 0x100);
>> @@ -963,19 +966,7 @@ int intel_opregion_setup(struct drm_device *dev)
>>  		goto err_out;
>>  	}
>>  
>> -	vbt = validate_vbt(base + OPREGION_VBT_OFFSET,
>> -				MAILBOX_4_SIZE, "OpRegion");
>> -
>> -	if (vbt == NULL) {
>> -		err = -EINVAL;
>> -		goto err_out;
>> -	}
>> -
>> -	vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
>> -	dev_priv->opregion.vbt_size = vbt->vbt_size;
>> -
>>  	opregion->header = base;
>> -	opregion->vbt = base + OPREGION_VBT_OFFSET;
>>  
>>  	opregion->lid_state = base + ACPI_CLID;
>>  	opregion->asle_ext = base + OPREGION_ASLE_EXT_OFFSET;
>> @@ -998,6 +989,36 @@ int intel_opregion_setup(struct drm_device *dev)
>>  		opregion->asle->ardy = ASLE_ARDY_NOT_READY;
>>  	}
>>  
>> +	/*
>> +	 * Non-zero value in rvda field is an indication to driver that a
>> +	 * valid Raw VBT is stored in that address and driver should not refer
>> +	 * to mailbox4 for getting VBT.
>> +	 */
>> +	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda) {
>> +		size = opregion->asle->rvds;
>> +		vbt_base = memremap(opregion->asle->rvda,
>> +				size, MEMREMAP_WB);
>> +	} else {
>> +		size = MAILBOX_4_SIZE;
>> +		vbt_base = base + OPREGION_VBT_OFFSET;
>> +	}
>> +
>> +	vbt = validate_vbt(vbt_base, size, "OpRegion");
>> +
>> +	if (vbt == NULL) {
>> +		err = -EINVAL;
>> +		goto err_out;
>> +	}
>> +
>> +	/* Assigning the vbt_size based on the VBT location */
>> +	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
>> +		dev_priv->opregion.vbt_size = opregion->asle->rvds;
>> +	else {
>> +		vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
> i.e. vbt = vbt_base;
>
> which is already done by vbt = validate_vbt;
>
>> +		dev_priv->opregion.vbt_size = vbt->vbt_size;
>> +	}
>
> So this reduces down to:
>
> /* Explanation why the new method cannot store the size in vbt->vbt_size */
> if (vbt != opregion->asle->rvda)
> 	size = vbt->vbt_size;
> dev_priv->opregion.vbt_size = size;
> opregrion->vbt = vbt;
>
> And the vbt_base variable is redundant.
>
> Cut out the tautology and reduce the apparent complex
> interdependence between paths.

I rewrote patches 2-6 in this series into a new VBT/opregion refactoring
series [1] that should clean this up.

BR,
Jani.


[1] http://mid.gmane.org/cover.1450089383.git.jani.nikula@intel.com



-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [MIPI SEQ PARSING v3 02/13] drm/i915: Updating asle structure with new fields
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 02/13] drm/i915: Updating asle structure with new fields Deepak M
  2015-12-11  8:41   ` Mika Kahola
@ 2015-12-14 11:02   ` Jani Nikula
  1 sibling, 0 replies; 22+ messages in thread
From: Jani Nikula @ 2015-12-14 11:02 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M

On Tue, 01 Dec 2015, Deepak M <m.deepak@intel.com> wrote:
> v3: rebase
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>

Pushed this one as "drm/i915: add VBT address and size fields to ASLE
mailbox struct". Thanks for the patch.

BR,
Jani.


> ---
>  drivers/gpu/drm/i915/intel_opregion.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index e362a30..64efedf 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -120,7 +120,9 @@ struct opregion_asle {
>  	u64 fdss;
>  	u32 fdsp;
>  	u32 stat;
> -	u8 rsvd[70];
> +	u64 rvda;	/* Physical address of raw vbt data */
> +	u32 rvds;	/* Size of raw vbt data */
> +	u8 rsvd[58];
>  } __packed;
>  
>  /* Driver readiness indicator */

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH] drm/i915: Parsing VBT if size of VBT exceeds 6KB
  2015-12-11  8:46   ` Mika Kahola
@ 2015-12-14 12:16     ` Deepak M
  2015-12-14  9:19       ` Chris Wilson
  0 siblings, 1 reply; 22+ messages in thread
From: Deepak M @ 2015-12-14 12:16 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak M, Jani Nikula

Currently the iomap for VBT works only if the size of the
VBT is less than 6KB, but if the size of the VBT exceeds
6KB than the physical address and the size of the VBT to
be iomapped is specified in the mailbox3 and is iomapped
accordingly.

v3: -Splitted the patch into small ones
    -Handeled memory unmap in intel_opregion_fini
    -removed the new file created for opregion macro`s
v4: Moving the vbt assignment after the opregion fields are assigned

Cc: Mika Kahola <mika.kahola@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Deepak M <m.deepak@intel.com>
---

 drivers/gpu/drm/i915/intel_opregion.c | 47 +++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 7908a1d..5116690 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -856,6 +856,8 @@ void intel_opregion_fini(struct drm_device *dev)
 	}
 
 	/* just clear all opregion memory pointers now */
+	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
+		memunmap(opregion->vbt);
 	memunmap(opregion->header);
 	opregion->header = NULL;
 	opregion->acpi = NULL;
@@ -933,7 +935,8 @@ int intel_opregion_setup(struct drm_device *dev)
 	char buf[sizeof(OPREGION_SIGNATURE)];
 	const struct vbt_header *vbt = NULL;
 	int err = 0;
-	void *base;
+	void *base, *vbt_base;
+	size_t size;
 
 	BUILD_BUG_ON(sizeof(struct opregion_header) != 0x100);
 	BUILD_BUG_ON(sizeof(struct opregion_acpi) != 0x100);
@@ -963,19 +966,7 @@ int intel_opregion_setup(struct drm_device *dev)
 		goto err_out;
 	}
 
-	vbt = validate_vbt(base + OPREGION_VBT_OFFSET,
-				MAILBOX_4_SIZE, "OpRegion");
-
-	if (vbt == NULL) {
-		err = -EINVAL;
-		goto err_out;
-	}
-
-	vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
-	dev_priv->opregion.vbt_size = vbt->vbt_size;
-
 	opregion->header = base;
-	opregion->vbt = base + OPREGION_VBT_OFFSET;
 
 	opregion->lid_state = base + ACPI_CLID;
 	opregion->asle_ext = base + OPREGION_ASLE_EXT_OFFSET;
@@ -998,6 +989,36 @@ int intel_opregion_setup(struct drm_device *dev)
 		opregion->asle->ardy = ASLE_ARDY_NOT_READY;
 	}
 
+	/*
+	 * Non-zero value in rvda field is an indication to driver that a
+	 * valid Raw VBT is stored in that address and driver should not refer
+	 * to mailbox4 for getting VBT.
+	 */
+	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda) {
+		size = opregion->asle->rvds;
+		vbt_base = memremap(opregion->asle->rvda,
+				size, MEMREMAP_WB);
+	} else {
+		size = MAILBOX_4_SIZE;
+		vbt_base = base + OPREGION_VBT_OFFSET;
+	}
+
+	vbt = validate_vbt(vbt_base, size, "OpRegion");
+
+	if (vbt == NULL) {
+		err = -EINVAL;
+		goto err_out;
+	}
+
+	/* Assigning the vbt_size based on the VBT location */
+	if (opregion->header->opregion_ver >= 2 && opregion->asle->rvda)
+		dev_priv->opregion.vbt_size = opregion->asle->rvds;
+	else {
+		vbt = (const struct vbt_header *)(base + OPREGION_VBT_OFFSET);
+		dev_priv->opregion.vbt_size = vbt->vbt_size;
+	}
+
+	opregion->vbt = vbt_base;
 	return 0;
 
 err_out:
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [MIPI SEQ PARSING v3 08/13] drm/i915: Extend gpio read/write to other cores
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 08/13] drm/i915: Extend gpio read/write to other cores Deepak M
@ 2015-12-15 19:53   ` Ville Syrjälä
  0 siblings, 0 replies; 22+ messages in thread
From: Ville Syrjälä @ 2015-12-15 19:53 UTC (permalink / raw)
  To: Deepak M; +Cc: Jani Nikula, intel-gfx

On Tue, Dec 01, 2015 at 04:17:11AM +0530, Deepak M wrote:
> Adding a argument to the gpio read/write functions
> which accepts the block name.
> 
> v2: rebase
> v3: rebase
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h            | 5 +++--
>  drivers/gpu/drm/i915/i915_reg.h            | 5 +++++
>  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 4 ++--
>  drivers/gpu/drm/i915/intel_sideband.c      | 9 +++++----
>  4 files changed, 15 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 59a39d1..ca865f4 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3379,8 +3379,9 @@ int sandybridge_pcode_write(struct drm_i915_private *dev_priv, u32 mbox, u32 val
>  u32 vlv_punit_read(struct drm_i915_private *dev_priv, u32 addr);
>  void vlv_punit_write(struct drm_i915_private *dev_priv, u32 addr, u32 val);
>  u32 vlv_nc_read(struct drm_i915_private *dev_priv, u8 addr);
> -u32 vlv_gpio_nc_read(struct drm_i915_private *dev_priv, u32 reg);
> -void vlv_gpio_nc_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
> +u32 vlv_gpio_read(struct drm_i915_private *dev_priv, u8 core_offset, u32 reg);
> +void vlv_gpio_write(struct drm_i915_private *dev_priv, u8 core_offset,
> +			u32 reg, u32 val);
>  u32 vlv_cck_read(struct drm_i915_private *dev_priv, u32 reg);
>  void vlv_cck_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
>  u32 vlv_ccu_read(struct drm_i915_private *dev_priv, u32 reg);
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 8bd2699..e29f7ef 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -572,6 +572,11 @@
>  #define   IOSF_PORT_DPIO			0x12
>  #define   IOSF_PORT_DPIO_2			0x1a
>  #define   IOSF_PORT_GPIO_NC			0x13
> +#define   IOSF_PORT_GPIO_SC			0x48

We already have another name for this (IOSF_PORT_GPS_CORE).
No idea why someone added the '_' in the middle of it. Now it
makes me think it has something to do with GPS rather than
GPIOs.

I'd be fine with using your new names instead, but the old
define should be removed, as should the unused
vlv_gps_core_{read,write}() functions.

> +#define   IOSF_PORT_GPIO_SUS			0xA8
> +#define   MAX_GPIO_NUM_NC			26
> +#define   MAX_GPIO_NUM_SC			128
> +#define   MAX_GPIO_NUM				172

These contant don't seem to have much to do with the actual
hardware (eg. there seem to be at lest 32 pads in NC). Rather
I take it they're constants defines by the VBT spec? If so
they should not be defined here.

>  #define   IOSF_PORT_CCK				0x14
>  #define   IOSF_PORT_CCU				0xA9
>  #define   IOSF_PORT_GPS_CORE			0x48
> diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
> index eb0697b..bc33e3a 100644
> --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
> +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
> @@ -275,14 +275,14 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
>  	if (!gtable[gpio].init) {
>  		/* program the function */
>  		/* FIXME: remove constant below */
> -		vlv_gpio_nc_write(dev_priv, function, 0x2000CC00);
> +		vlv_gpio_write(dev_priv, IOSF_PORT_GPIO_NC, function, 0x2000CC00);

Side note:
Anyone ever figured out what this value actually means? Looking at
pinctrl-baytrail it seems that the right func_pin_mux value would maybe
depend on the specific pin you're dealing with. Would be nice if you
could add some defines or something for this stuff too. But that's
material for a separate patch clearly.

>  		gtable[gpio].init = 1;
>  	}
>  
>  	val = 0x4 | action;

0x4 could also use a define.

>  
>  	/* pull up/down */
> -	vlv_gpio_nc_write(dev_priv, pad, val);
> +	vlv_gpio_write(dev_priv, IOSF_PORT_GPIO_NC, pad, val);
>  	mutex_unlock(&dev_priv->sb_lock);
>  
>  	return data;
> diff --git a/drivers/gpu/drm/i915/intel_sideband.c b/drivers/gpu/drm/i915/intel_sideband.c
> index 8831fc5..3e0cbe6 100644
> --- a/drivers/gpu/drm/i915/intel_sideband.c
> +++ b/drivers/gpu/drm/i915/intel_sideband.c
> @@ -129,17 +129,18 @@ u32 vlv_nc_read(struct drm_i915_private *dev_priv, u8 addr)
>  	return val;
>  }
>  
> -u32 vlv_gpio_nc_read(struct drm_i915_private *dev_priv, u32 reg)
> +u32 vlv_gpio_read(struct drm_i915_private *dev_priv, u8 core_offset, u32 reg)
>  {
>  	u32 val = 0;
> -	vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPIO_NC,
> +	vlv_sideband_rw(dev_priv, PCI_DEVFN(2, 0), core_offset,
>  			SB_CRRDDA_NP, reg, &val);
>  	return val;
>  }
>  
> -void vlv_gpio_nc_write(struct drm_i915_private *dev_priv, u32 reg, u32 val)
> +void vlv_gpio_write(struct drm_i915_private *dev_priv, u8 core_offset,
> +				u32 reg, u32 val)
>  {
> -	vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPIO_NC,
> +	vlv_sideband_rw(dev_priv, PCI_DEVFN(2, 0), core_offset,
>  			SB_CRWRDA_NP, reg, &val);
>  }

There's nothing GPIO specific in these functions after this change. So
I'd just call them vlv_iosf_sb_read/write(). And the argument I would
just call 'port'.

>  
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [MIPI SEQ PARSING v3 09/13] drm/i915: Added the generic gpio sequence support and gpio table
  2015-11-30 22:47 ` [MIPI SEQ PARSING v3 09/13] drm/i915: Added the generic gpio sequence support and gpio table Deepak M
@ 2015-12-15 20:05   ` Ville Syrjälä
  0 siblings, 0 replies; 22+ messages in thread
From: Ville Syrjälä @ 2015-12-15 20:05 UTC (permalink / raw)
  To: Deepak M; +Cc: Jani Nikula, intel-gfx

On Tue, Dec 01, 2015 at 04:17:12AM +0530, Deepak M wrote:
> The generic gpio is sequence is parsed from the VBT and the
> GPIO table is updated with the North core, South core and
> SUS core elements.
> 
> v2: Move changes in sideband.c file to new patch(Jani), rebase
> v3: Moved the Macro`s to intel_dsi_panel_vbt.c (Jani)
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Deepak M <m.deepak@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 589 +++++++++++++++++++++++++++--
>  1 file changed, 553 insertions(+), 36 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
> index bc33e3a..13f0fb7 100644
> --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
> +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
> @@ -59,30 +59,356 @@ static inline struct vbt_panel *to_vbt_panel(struct drm_panel *panel)
>  
>  #define NS_KHZ_RATIO 1000000
>  
> -#define GPI0_NC_0_HV_DDI0_HPD           0x4130
> -#define GPIO_NC_0_HV_DDI0_PAD           0x4138
> -#define GPIO_NC_1_HV_DDI0_DDC_SDA       0x4120
> -#define GPIO_NC_1_HV_DDI0_DDC_SDA_PAD   0x4128
> -#define GPIO_NC_2_HV_DDI0_DDC_SCL       0x4110
> -#define GPIO_NC_2_HV_DDI0_DDC_SCL_PAD   0x4118
> -#define GPIO_NC_3_PANEL0_VDDEN          0x4140
> -#define GPIO_NC_3_PANEL0_VDDEN_PAD      0x4148
> -#define GPIO_NC_4_PANEL0_BLKEN          0x4150
> -#define GPIO_NC_4_PANEL0_BLKEN_PAD      0x4158
> -#define GPIO_NC_5_PANEL0_BLKCTL         0x4160
> -#define GPIO_NC_5_PANEL0_BLKCTL_PAD     0x4168
> -#define GPIO_NC_6_PCONF0                0x4180
> -#define GPIO_NC_6_PAD                   0x4188
> -#define GPIO_NC_7_PCONF0                0x4190
> -#define GPIO_NC_7_PAD                   0x4198
> -#define GPIO_NC_8_PCONF0                0x4170
> -#define GPIO_NC_8_PAD                   0x4178
> -#define GPIO_NC_9_PCONF0                0x4100
> -#define GPIO_NC_9_PAD                   0x4108
> -#define GPIO_NC_10_PCONF0               0x40E0
> -#define GPIO_NC_10_PAD                  0x40E8
> -#define GPIO_NC_11_PCONF0               0x40F0
> -#define GPIO_NC_11_PAD                  0x40F8
> +#define HV_DDI0_HPD_GPIONC_0_PCONF0             0x4130
> +#define HV_DDI0_HPD_GPIONC_0_PAD                0x4138

Hmm. All of this seems to be VLV specific. CHV uses totally different
looking registers for this stuff. There should be a comment before
the defines that that effect.

Also do we have some checks somewhere to make sure we don't
accidentally use these on CHV?

One thing to note is that there's always the same four registers
for each pin, so we could maybe keep this list a bit shorted by
defining just the base offset, and then have some generic macros
to give us the PCONF0 and PAD_VAL registers based on it. Eg.

#define GPIO_PCONF0(base) ((base) + 0x0)
#define GPIO_PAD_VAL(base) ((base) + 0x8)

I rather wish we could just use the regular pinctrl+gpio stuff
for this. We're sort of hand rolling our own versions of that
here. But I guess we'd then still have to remap from our numbers
to theirs, so not really any better in the end I suppose.

> +#define HV_DDI0_DDC_SDA_GPIONC_1_PCONF0         0x4120
> +#define HV_DDI0_DDC_SDA_GPIONC_1_PAD            0x4128
> +#define HV_DDI0_DDC_SCL_GPIONC_2_PCONF0         0x4110
> +#define HV_DDI0_DDC_SCL_GPIONC_2_PAD            0x4118
> +#define PANEL0_VDDEN_GPIONC_3_PCONF0            0x4140
> +#define PANEL0_VDDEN_GPIONC_3_PAD               0x4148
> +#define PANEL0_BKLTEN_GPIONC_4_PCONF0           0x4150
> +#define PANEL0_BKLTEN_GPIONC_4_PAD              0x4158
> +#define PANEL0_BKLTCTL_GPIONC_5_PCONF0          0x4160
> +#define PANEL0_BKLTCTL_GPIONC_5_PAD             0x4168
> +#define HV_DDI1_HPD_GPIONC_6_PCONF0             0x4180
> +#define HV_DDI1_HPD_GPIONC_6_PAD                0x4188
> +#define HV_DDI1_DDC_SDA_GPIONC_7_PCONF0         0x4190
> +#define HV_DDI1_DDC_SDA_GPIONC_7_PAD            0x4198
> +#define HV_DDI1_DDC_SCL_GPIONC_8_PCONF0         0x4170
> +#define HV_DDI1_DDC_SCL_GPIONC_8_PAD            0x4178
> +#define PANEL1_VDDEN_GPIONC_9_PCONF0            0x4100
> +#define PANEL1_VDDEN_GPIONC_9_PAD               0x4108
> +#define PANEL1_BKLTEN_GPIONC_10_PCONF0          0x40E0
> +#define PANEL1_BKLTEN_GPIONC_10_PAD             0x40E8
> +#define PANEL1_BKLTCTL_GPIONC_11_PCONF0         0x40F0
> +#define PANEL1_BKLTCTL_GPIONC_11_PAD            0x40F8
> +#define GP_INTD_DSI_TE1_GPIONC_12_PCONF0        0x40C0
> +#define GP_INTD_DSI_TE1_GPIONC_12_PAD           0x40C8
> +#define HV_DDI2_DDC_SDA_GPIONC_13_PCONF0        0x41A0
> +#define HV_DDI2_DDC_SDA_GPIONC_13_PAD           0x41A8
> +#define HV_DDI2_DDC_SCL_GPIONC_14_PCONF0        0x41B0
> +#define HV_DDI2_DDC_SCL_GPIONC_14_PAD           0x41B8
> +#define GP_CAMERASB00_GPIONC_15_PCONF0          0x4010
> +#define GP_CAMERASB00_GPIONC_15_PAD             0x4018
> +#define GP_CAMERASB01_GPIONC_16_PCONF0          0x4040
> +#define GP_CAMERASB01_GPIONC_16_PAD             0x4048
> +#define GP_CAMERASB02_GPIONC_17_PCONF0          0x4080
> +#define GP_CAMERASB02_GPIONC_17_PAD             0x4088
> +#define GP_CAMERASB03_GPIONC_18_PCONF0          0x40B0
> +#define GP_CAMERASB03_GPIONC_18_PAD             0x40B8
> +#define GP_CAMERASB04_GPIONC_19_PCONF0          0x4000
> +#define GP_CAMERASB04_GPIONC_19_PAD             0x4008
> +#define GP_CAMERASB05_GPIONC_20_PCONF0          0x4030
> +#define GP_CAMERASB05_GPIONC_20_PAD             0x4038
> +#define GP_CAMERASB06_GPIONC_21_PCONF0          0x4060
> +#define GP_CAMERASB06_GPIONC_21_PAD             0x4068
> +#define GP_CAMERASB07_GPIONC_22_PCONF0          0x40A0
> +#define GP_CAMERASB07_GPIONC_22_PAD             0x40A8
> +#define GP_CAMERASB08_GPIONC_23_PCONF0          0x40D0
> +#define GP_CAMERASB08_GPIONC_23_PAD             0x40D8
> +#define GP_CAMERASB09_GPIONC_24_PCONF0          0x4020
> +#define GP_CAMERASB09_GPIONC_24_PAD             0x4028
> +#define GP_CAMERASB10_GPIONC_25_PCONF0          0x4050
> +#define GP_CAMERASB10_GPIONC_25_PAD             0x4058
> +#define GP_CAMERASB11_GPIONC_26_PCONF0          0x4090
> +#define GP_CAMERASB11_GPIONC_26_PAD             0x4098
> +
> +#define SATA_GP0_GPIOC_0_PCONF0                 0x4550
> +#define SATA_GP0_GPIOC_0_PAD                    0x4558
> +#define SATA_GP1_GPIOC_1_PCONF0                 0x4590
> +#define SATA_GP1_GPIOC_1_PAD                    0x4598
> +#define SATA_LEDN_GPIOC_2_PCONF0                0x45D0
> +#define SATA_LEDN_GPIOC_2_PAD                   0x45D8
> +#define PCIE_CLKREQ0B_GPIOC_3_PCONF0            0x4600
> +#define PCIE_CLKREQ0B_GPIOC_3_PAD               0x4608
> +#define PCIE_CLKREQ1B_GPIOC_4_PCONF0            0x4630
> +#define PCIE_CLKREQ1B_GPIOC_4_PAD               0x4638
> +#define PCIE_CLKREQ2B_GPIOC_5_PCONF0            0x4660
> +#define PCIE_CLKREQ2B_GPIOC_5_PAD               0x4668
> +#define PCIE_CLKREQ3B_GPIOC_6_PCONF0            0x4620
> +#define PCIE_CLKREQ3B_GPIOC_6_PAD               0x4628
> +#define PCIE_CLKREQ4B_GPIOC_7_PCONF0            0x4650
> +#define PCIE_CLKREQ4B_GPIOC_7_PAD               0x4658
> +#define HDA_RSTB_GPIOC_8_PCONF0                 0x4220
> +#define HDA_RSTB_GPIOC_8_PAD                    0x4228
> +#define HDA_SYNC_GPIOC_9_PCONF0                 0x4250
> +#define HDA_SYNC_GPIOC_9_PAD                    0x4258
> +#define HDA_CLK_GPIOC_10_PCONF0                 0x4240
> +#define HDA_CLK_GPIOC_10_PAD                    0x4248
> +#define HDA_SDO_GPIOC_11_PCONF0                 0x4260
> +#define HDA_SDO_GPIOC_11_PAD                    0x4268
> +#define HDA_SDI0_GPIOC_12_PCONF0                0x4270
> +#define HDA_SDI0_GPIOC_12_PAD                   0x4278
> +#define HDA_SDI1_GPIOC_13_PCONF0                0x4230
> +#define HDA_SDI1_GPIOC_13_PAD                   0x4238
> +#define HDA_DOCKRSTB_GPIOC_14_PCONF0            0x4280
> +#define HDA_DOCKRSTB_GPIOC_14_PAD               0x4288
> +#define HDA_DOCKENB_GPIOC_15_PCONF0             0x4540
> +#define HDA_DOCKENB_GPIOC_15_PAD                0x4548
> +#define SDMMC1_CLK_GPIOC_16_PCONF0              0x43E0
> +#define SDMMC1_CLK_GPIOC_16_PAD                 0x43E8
> +#define SDMMC1_D0_GPIOC_17_PCONF0               0x43D0
> +#define SDMMC1_D0_GPIOC_17_PAD                  0x43D8
> +#define SDMMC1_D1_GPIOC_18_PCONF0               0x4400
> +#define SDMMC1_D1_GPIOC_18_PAD                  0x4408
> +#define SDMMC1_D2_GPIOC_19_PCONF0               0x43B0
> +#define SDMMC1_D2_GPIOC_19_PAD                  0x43B8
> +#define SDMMC1_D3_CD_B_GPIOC_20_PCONF0          0x4360
> +#define SDMMC1_D3_CD_B_GPIOC_20_PAD             0x4368
> +#define MMC1_D4_SD_WE_GPIOC_21_PCONF0           0x4380
> +#define MMC1_D4_SD_WE_GPIOC_21_PAD              0x4388
> +#define MMC1_D5_GPIOC_22_PCONF0                 0x43C0
> +#define MMC1_D5_GPIOC_22_PAD                    0x43C8
> +#define MMC1_D6_GPIOC_23_PCONF0                 0x4370
> +#define MMC1_D6_GPIOC_23_PAD                    0x4378
> +#define MMC1_D7_GPIOC_24_PCONF0                 0x43F0
> +#define MMC1_D7_GPIOC_24_PAD                    0x43F8
> +#define SDMMC1_CMD_GPIOC_25_PCONF0              0x4390
> +#define SDMMC1_CMD_GPIOC_25_PAD                 0x4398
> +#define MMC1_RESET_B_GPIOC_26_PCONF0            0x4330
> +#define MMC1_RESET_B_GPIOC_26_PAD               0x4338
> +#define SDMMC2_CLK_GPIOC_27_PCONF0              0x4320
> +#define SDMMC2_CLK_GPIOC_27_PAD                 0x4328
> +#define SDMMC2_D0_GPIOC_28_PCONF0               0x4350
> +#define SDMMC2_D0_GPIOC_28_PAD                  0x4358
> +#define SDMMC2_D1_GPIOC_29_PCONF0               0x42F0
> +#define SDMMC2_D1_GPIOC_29_PAD                  0x42F8
> +#define SDMMC2_D2_GPIOC_30_PCONF0               0x4340
> +#define SDMMC2_D2_GPIOC_30_PAD                  0x4348
> +#define SDMMC2_D3_CD_B_GPIOC_31_PCONF0          0x4310
> +#define SDMMC2_D3_CD_B_GPIOC_31_PAD             0x4318
> +#define SDMMC2_CMD_GPIOC_32_PCONF0              0x4300
> +#define SDMMC2_CMD_GPIOC_32_PAD                 0x4308
> +#define SDMMC3_CLK_GPIOC_33_PCONF0              0x42B0
> +#define SDMMC3_CLK_GPIOC_33_PAD                 0x42B8
> +#define SDMMC3_D0_GPIOC_34_PCONF0               0x42E0
> +#define SDMMC3_D0_GPIOC_34_PAD                  0x42E8
> +#define SDMMC3_D1_GPIOC_35_PCONF0               0x4290
> +#define SDMMC3_D1_GPIOC_35_PAD                  0x4298
> +#define SDMMC3_D2_GPIOC_36_PCONF0               0x42D0
> +#define SDMMC3_D2_GPIOC_36_PAD                  0x42D8
> +#define SDMMC3_D3_GPIOC_37_PCONF0               0x42A0
> +#define SDMMC3_D3_GPIOC_37_PAD                  0x42A8
> +#define SDMMC3_CD_B_GPIOC_38_PCONF0             0x43A0
> +#define SDMMC3_CD_B_GPIOC_38_PAD                0x43A8
> +#define SDMMC3_CMD_GPIOC_39_PCONF0              0x42C0
> +#define SDMMC3_CMD_GPIOC_39_PAD                 0x42C8
> +#define SDMMC3_1P8_EN_GPIOC_40_PCONF0           0x45F0
> +#define SDMMC3_1P8_EN_GPIOC_40_PAD              0x45F8
> +#define SDMMC3_PWR_EN_B_GPIOC_41_PCONF0         0x4690
> +#define SDMMC3_PWR_EN_B_GPIOC_41_PAD            0x4698
> +#define LPC_AD0_GPIOC_42_PCONF0                 0x4460
> +#define LPC_AD0_GPIOC_42_PAD                    0x4468
> +#define LPC_AD1_GPIOC_43_PCONF0                 0x4440
> +#define LPC_AD1_GPIOC_43_PAD                    0x4448
> +#define LPC_AD2_GPIOC_44_PCONF0                 0x4430
> +#define LPC_AD2_GPIOC_44_PAD                    0x4438
> +#define LPC_AD3_GPIOC_45_PCONF0                 0x4420
> +#define LPC_AD3_GPIOC_45_PAD                    0x4428
> +#define LPC_FRAMEB_GPIOC_46_PCONF0              0x4450
> +#define LPC_FRAMEB_GPIOC_46_PAD                 0x4458
> +#define LPC_CLKOUT0_GPIOC_47_PCONF0             0x4470
> +#define LPC_CLKOUT0_GPIOC_47_PAD                0x4478
> +#define LPC_CLKOUT1_GPIOC_48_PCONF0             0x4410
> +#define LPC_CLKOUT1_GPIOC_48_PAD                0x4418
> +#define LPC_CLKRUNB_GPIOC_49_PCONF0             0x4480
> +#define LPC_CLKRUNB_GPIOC_49_PAD                0x4488
> +#define ILB_SERIRQ_GPIOC_50_PCONF0              0x4560
> +#define ILB_SERIRQ_GPIOC_50_PAD                 0x4568
> +#define SMB_DATA_GPIOC_51_PCONF0                0x45A0
> +#define SMB_DATA_GPIOC_51_PAD                   0x45A8
> +#define SMB_CLK_GPIOC_52_PCONF0                 0x4580
> +#define SMB_CLK_GPIOC_52_PAD                    0x4588
> +#define SMB_ALERTB_GPIOC_53_PCONF0              0x45C0
> +#define SMB_ALERTB_GPIOC_53_PAD                 0x45C8
> +#define SPKR_GPIOC_54_PCONF0                    0x4670
> +#define SPKR_GPIOC_54_PAD                       0x4678
> +#define MHSI_ACDATA_GPIOC_55_PCONF0             0x44D0
> +#define MHSI_ACDATA_GPIOC_55_PAD                0x44D8
> +#define MHSI_ACFLAG_GPIOC_56_PCONF0             0x44F0
> +#define MHSI_ACFLAG_GPIOC_56_PAD                0x44F8
> +#define MHSI_ACREADY_GPIOC_57_PCONF0            0x4530
> +#define MHSI_ACREADY_GPIOC_57_PAD               0x4538
> +#define MHSI_ACWAKE_GPIOC_58_PCONF0             0x44E0
> +#define MHSI_ACWAKE_GPIOC_58_PAD                0x44E8
> +#define MHSI_CADATA_GPIOC_59_PCONF0             0x4510
> +#define MHSI_CADATA_GPIOC_59_PAD                0x4518
> +#define MHSI_CAFLAG_GPIOC_60_PCONF0             0x4500
> +#define MHSI_CAFLAG_GPIOC_60_PAD                0x4508
> +#define MHSI_CAREADY_GPIOC_61_PCONF0            0x4520
> +#define MHSI_CAREADY_GPIOC_61_PAD               0x4528
> +#define GP_SSP_2_CLK_GPIOC_62_PCONF0            0x40D0
> +#define GP_SSP_2_CLK_GPIOC_62_PAD               0x40D8
> +#define GP_SSP_2_FS_GPIOC_63_PCONF0             0x40C0
> +#define GP_SSP_2_FS_GPIOC_63_PAD                0x40C8
> +#define GP_SSP_2_RXD_GPIOC_64_PCONF0            0x40F0
> +#define GP_SSP_2_RXD_GPIOC_64_PAD               0x40F8
> +#define GP_SSP_2_TXD_GPIOC_65_PCONF0            0x40E0
> +#define GP_SSP_2_TXD_GPIOC_65_PAD               0x40E8
> +#define SPI1_CS0_B_GPIOC_66_PCONF0              0x4110
> +#define SPI1_CS0_B_GPIOC_66_PAD                 0x4118
> +#define SPI1_MISO_GPIOC_67_PCONF0               0x4120
> +#define SPI1_MISO_GPIOC_67_PAD                  0x4128
> +#define SPI1_MOSI_GPIOC_68_PCONF0               0x4130
> +#define SPI1_MOSI_GPIOC_68_PAD                  0x4138
> +#define SPI1_CLK_GPIOC_69_PCONF0                0x4100
> +#define SPI1_CLK_GPIOC_69_PAD                   0x4108
> +#define UART1_RXD_GPIOC_70_PCONF0               0x4020
> +#define UART1_RXD_GPIOC_70_PAD                  0x4028
> +#define UART1_TXD_GPIOC_71_PCONF0               0x4010
> +#define UART1_TXD_GPIOC_71_PAD                  0x4018
> +#define UART1_RTS_B_GPIOC_72_PCONF0             0x4000
> +#define UART1_RTS_B_GPIOC_72_PAD                0x4008
> +#define UART1_CTS_B_GPIOC_73_PCONF0             0x4040
> +#define UART1_CTS_B_GPIOC_73_PAD                0x4048
> +#define UART2_RXD_GPIOC_74_PCONF0               0x4060
> +#define UART2_RXD_GPIOC_74_PAD                  0x4068
> +#define UART2_TXD_GPIOC_75_PCONF0               0x4070
> +#define UART2_TXD_GPIOC_75_PAD                  0x4078
> +#define UART2_RTS_B_GPIOC_76_PCONF0             0x4090
> +#define UART2_RTS_B_GPIOC_76_PAD                0x4098
> +#define UART2_CTS_B_GPIOC_77_PCONF0             0x4080
> +#define UART2_CTS_B_GPIOC_77_PAD                0x4088
> +#define I2C0_SDA_GPIOC_78_PCONF0                0x4210
> +#define I2C0_SDA_GPIOC_78_PAD                   0x4218
> +#define I2C0_SCL_GPIOC_79_PCONF0                0x4200
> +#define I2C0_SCL_GPIOC_79_PAD                   0x4208
> +#define I2C1_SDA_GPIOC_80_PCONF0                0x41F0
> +#define I2C1_SDA_GPIOC_80_PAD                   0x41F8
> +#define I2C1_SCL_GPIOC_81_PCONF0                0x41E0
> +#define I2C1_SCL_GPIOC_81_PAD                   0x41E8
> +#define I2C2_SDA_GPIOC_82_PCONF0                0x41D0
> +#define I2C2_SDA_GPIOC_82_PAD                   0x41D8
> +#define I2C2_SCL_GPIOC_83_PCONF0                0x41B0
> +#define I2C2_SCL_GPIOC_83_PAD                   0x41B8
> +#define I2C3_SDA_GPIOC_84_PCONF0                0x4190
> +#define I2C2_SCL_GPIOC_83_PAD                   0x41B8
> +#define I2C3_SDA_GPIOC_84_PCONF0                0x4190
> +#define I2C3_SDA_GPIOC_84_PAD                   0x4198
> +#define I2C3_SCL_GPIOC_85_PCONF0                0x41C0
> +#define I2C3_SCL_GPIOC_85_PAD                   0x41C8
> +#define I2C4_SDA_GPIOC_86_PCONF0                0x41A0
> +#define I2C4_SDA_GPIOC_86_PAD                   0x41A8
> +#define I2C4_SCL_GPIOC_87_PCONF0                0x4170
> +#define I2C4_SCL_GPIOC_87_PAD                   0x4178
> +#define I2C5_SDA_GPIOC_88_PCONF0                0x4150
> +#define I2C5_SDA_GPIOC_88_PAD                   0x4158
> +#define I2C5_SCL_GPIOC_89_PCONF0                0x4140
> +#define I2C5_SCL_GPIOC_89_PAD                   0x4148
> +#define I2C6_SDA_GPIOC_90_PCONF0                0x4180
> +#define I2C6_SDA_GPIOC_90_PAD                   0x4188
> +#define I2C6_SCL_GPIOC_91_PCONF0                0x4160
> +#define I2C6_SCL_GPIOC_91_PAD                   0x4168
> +#define I2C_NFC_SDA_GPIOC_92_PCONF0             0x4050
> +#define I2C_NFC_SDA_GPIOC_92_PAD                0x4058
> +#define I2C_NFC_SCL_GPIOC_93_PCONF0             0x4030
> +#define I2C_NFC_SCL_GPIOC_93_PAD                0x4038
> +#define PWM0_GPIOC_94_PCONF0                    0x40A0
> +#define PWM0_GPIOC_94_PAD                       0x40A8
> +#define PWM1_GPIOC_95_PCONF0                    0x40B0
> +#define PWM1_GPIOC_95_PAD                       0x40B8
> +#define PLT_CLK0_GPIOC_96_PCONF0                0x46A0
> +#define PLT_CLK0_GPIOC_96_PAD                   0x46A8
> +#define PLT_CLK1_GPIOC_97_PCONF0                0x4570
> +#define PLT_CLK1_GPIOC_97_PAD                   0x4578
> +#define PLT_CLK2_GPIOC_98_PCONF0                0x45B0
> +#define PLT_CLK2_GPIOC_98_PAD                   0x45B8
> +#define PLT_CLK3_GPIOC_99_PCONF0                0x4680
> +#define PLT_CLK3_GPIOC_99_PAD                   0x4688
> +#define PLT_CLK4_GPIOC_100_PCONF0               0x4610
> +#define PLT_CLK4_GPIOC_100_PAD                  0x4618
> +#define PLT_CLK5_GPIOC_101_PCONF0               0x4640
> +#define PLT_CLK5_GPIOC_101_PAD                  0x4648
> +
> +#define GPIO_SUS0_GPIO_SUS0_PCONF0              0x41D0
> +#define GPIO_SUS0_GPIO_SUS0_PAD                 0x41D8
> +#define GPIO_SUS1_GPIO_SUS1_PCONF0              0x4210
> +#define GPIO_SUS1_GPIO_SUS1_PAD                 0x4218
> +#define GPIO_SUS2_GPIO_SUS2_PCONF0              0x41E0
> +#define GPIO_SUS2_GPIO_SUS2_PAD                 0x41E8
> +#define GPIO_SUS3_GPIO_SUS3_PCONF0              0x41F0
> +#define GPIO_SUS3_GPIO_SUS3_PAD                 0x41F8
> +#define GPIO_SUS4_GPIO_SUS4_PCONF0              0x4200
> +#define GPIO_SUS4_GPIO_SUS4_PAD                 0x4208
> +#define GPIO_SUS5_GPIO_SUS5_PCONF0              0x4220
> +#define GPIO_SUS5_GPIO_SUS5_PAD                 0x4228
> +#define GPIO_SUS6_GPIO_SUS6_PCONF0              0x4240
> +#define GPIO_SUS6_GPIO_SUS6_PAD                 0x4248
> +#define GPIO_SUS7_GPIO_SUS7_PCONF0              0x4230
> +#define GPIO_SUS7_GPIO_SUS7_PAD                 0x4238
> +#define SEC_GPIO_SUS8_GPIO_SUS8_PCONF0          0x4260
> +#define SEC_GPIO_SUS8_GPIO_SUS8_PAD             0x4268
> +#define SEC_GPIO_SUS9_GPIO_SUS9_PCONF0          0x4250
> +#define SEC_GPIO_SUS9_GPIO_SUS9_PAD             0x4258
> +#define SEC_GPIO_SUS10_GPIO_SUS10_PCONF0        0x4120
> +#define SEC_GPIO_SUS10_GPIO_SUS10_PAD           0x4128
> +#define SUSPWRDNACK_GPIOS_11_PCONF0             0x4070
> +#define SUSPWRDNACK_GPIOS_11_PAD                0x4078
> +#define PMU_SUSCLK_GPIOS_12_PCONF0              0x40B0
> +#define PMU_SUSCLK_GPIOS_12_PAD                 0x40B8
> +#define PMU_SLP_S0IX_B_GPIOS_13_PCONF0          0x4140
> +#define PMU_SLP_S0IX_B_GPIOS_13_PAD             0x4148
> +#define PMU_SLP_LAN_B_GPIOS_14_PCONF0           0x4110
> +#define PMU_SLP_LAN_B_GPIOS_14_PAD              0x4118
> +#define PMU_WAKE_B_GPIOS_15_PCONF0              0x4010
> +#define PMU_WAKE_B_GPIOS_15_PAD                 0x4018
> +#define PMU_PWRBTN_B_GPIOS_16_PCONF0            0x4080
> +#define PMU_PWRBTN_B_GPIOS_16_PAD               0x4088
> +#define PMU_WAKE_LAN_B_GPIOS_17_PCONF0          0x40A0
> +#define PMU_WAKE_LAN_B_GPIOS_17_PAD             0x40A8
> +#define SUS_STAT_B_GPIOS_18_PCONF0              0x4130
> +#define SUS_STAT_B_GPIOS_18_PAD                 0x4138
> +#define USB_OC0_B_GPIOS_19_PCONF0               0x40C0
> +#define USB_OC0_B_GPIOS_19_PAD                  0x40C8
> +#define USB_OC1_B_GPIOS_20_PCONF0               0x4000
> +#define USB_OC1_B_GPIOS_20_PAD                  0x4008
> +#define SPI_CS1_B_GPIOS_21_PCONF0               0x4020
> +#define SPI_CS1_B_GPIOS_21_PAD                  0x4028
> +#define GPIO_DFX0_GPIOS_22_PCONF0               0x4170
> +#define GPIO_DFX0_GPIOS_22_PAD                  0x4178
> +#define GPIO_DFX1_GPIOS_23_PCONF0               0x4270
> +#define GPIO_DFX1_GPIOS_23_PAD                  0x4278
> +#define GPIO_DFX2_GPIOS_24_PCONF0               0x41C0
> +#define GPIO_DFX2_GPIOS_24_PAD                  0x41C8
> +#define GPIO_DFX3_GPIOS_25_PCONF0               0x41B0
> +#define GPIO_DFX3_GPIOS_25_PAD                  0x41B8
> +#define GPIO_DFX4_GPIOS_26_PCONF0               0x4160
> +#define GPIO_DFX4_GPIOS_26_PAD                  0x4168
> +#define GPIO_DFX5_GPIOS_27_PCONF0               0x4150
> +#define GPIO_DFX5_GPIOS_27_PAD                  0x4158
> +#define GPIO_DFX6_GPIOS_28_PCONF0               0x4180
> +#define GPIO_DFX6_GPIOS_28_PAD                  0x4188
> +#define GPIO_DFX7_GPIOS_29_PCONF0               0x4190
> +#define GPIO_DFX7_GPIOS_29_PAD                  0x4198
> +#define GPIO_DFX8_GPIOS_30_PCONF0               0x41A0
> +#define GPIO_DFX8_GPIOS_30_PAD                  0x41A8
> +#define USB_ULPI_0_CLK_GPIOS_31_PCONF0          0x4330
> +#define USB_ULPI_0_CLK_GPIOS_31_PAD             0x4338
> +#define USB_ULPI_0_DATA0_GPIOS_32_PCONF0        0x4380
> +#define USB_ULPI_0_DATA0_GPIOS_32_PAD           0x4388
> +#define USB_ULPI_0_DATA1_GPIOS_33_PCONF0        0x4360
> +#define USB_ULPI_0_DATA1_GPIOS_33_PAD           0x4368
> +#define USB_ULPI_0_DATA2_GPIOS_34_PCONF0        0x4310
> +#define USB_ULPI_0_DATA2_GPIOS_34_PAD           0x4318
> +#define USB_ULPI_0_DATA3_GPIOS_35_PCONF0        0x4370
> +#define USB_ULPI_0_DATA3_GPIOS_35_PAD           0x4378
> +#define USB_ULPI_0_DATA4_GPIOS_36_PCONF0        0x4300
> +#define USB_ULPI_0_DATA4_GPIOS_36_PAD           0x4308
> +#define USB_ULPI_0_DATA5_GPIOS_37_PCONF0        0x4390
> +#define USB_ULPI_0_DATA5_GPIOS_37_PAD           0x4398
> +#define USB_ULPI_0_DATA6_GPIOS_38_PCONF0        0x4320
> +#define USB_ULPI_0_DATA6_GPIOS_38_PAD           0x4328
> +#define USB_ULPI_0_DATA7_GPIOS_39_PCONF0        0x43A0
> +#define USB_ULPI_0_DATA7_GPIOS_39_PAD           0x43A8
> +#define USB_ULPI_0_DIR_GPIOS_40_PCONF0          0x4340
> +#define USB_ULPI_0_DIR_GPIOS_40_PAD             0x4348
> +#define USB_ULPI_0_NXT_GPIOS_41_PCONF0          0x4350
> +#define USB_ULPI_0_NXT_GPIOS_41_PAD             0x4358
> +#define USB_ULPI_0_STP_GPIOS_42_PCONF0          0x43B0
> +#define USB_ULPI_0_STP_GPIOS_42_PAD             0x43B8
> +#define USB_ULPI_0_REFCLK_GPIOS_43_PCONF0       0x4280
> +#define USB_ULPI_0_REFCLK_GPIOS_43_PAD          0x4288
>  
>  struct gpio_table {
>  	u16 function_reg;
> @@ -91,18 +417,181 @@ struct gpio_table {
>  };
>  
>  static struct gpio_table gtable[] = {
> -	{ GPI0_NC_0_HV_DDI0_HPD, GPIO_NC_0_HV_DDI0_PAD, 0 },
> -	{ GPIO_NC_1_HV_DDI0_DDC_SDA, GPIO_NC_1_HV_DDI0_DDC_SDA_PAD, 0 },
> -	{ GPIO_NC_2_HV_DDI0_DDC_SCL, GPIO_NC_2_HV_DDI0_DDC_SCL_PAD, 0 },
> -	{ GPIO_NC_3_PANEL0_VDDEN, GPIO_NC_3_PANEL0_VDDEN_PAD, 0 },
> -	{ GPIO_NC_4_PANEL0_BLKEN, GPIO_NC_4_PANEL0_BLKEN_PAD, 0 },
> -	{ GPIO_NC_5_PANEL0_BLKCTL, GPIO_NC_5_PANEL0_BLKCTL_PAD, 0 },
> -	{ GPIO_NC_6_PCONF0, GPIO_NC_6_PAD, 0 },
> -	{ GPIO_NC_7_PCONF0, GPIO_NC_7_PAD, 0 },
> -	{ GPIO_NC_8_PCONF0, GPIO_NC_8_PAD, 0 },
> -	{ GPIO_NC_9_PCONF0, GPIO_NC_9_PAD, 0 },
> -	{ GPIO_NC_10_PCONF0, GPIO_NC_10_PAD, 0},
> -	{ GPIO_NC_11_PCONF0, GPIO_NC_11_PAD, 0}
> +	{ HV_DDI0_HPD_GPIONC_0_PCONF0, HV_DDI0_HPD_GPIONC_0_PAD, 0},

Here too we could save some space by just storing the base and
calculating the PCONF0 and PAD_VAL registers from it on demand.

> +	{ HV_DDI0_DDC_SDA_GPIONC_1_PCONF0, HV_DDI0_DDC_SDA_GPIONC_1_PAD, 0},
> +	{ HV_DDI0_DDC_SCL_GPIONC_2_PCONF0, HV_DDI0_DDC_SCL_GPIONC_2_PAD, 0},
> +	{ PANEL0_VDDEN_GPIONC_3_PCONF0, PANEL0_VDDEN_GPIONC_3_PAD, 0},
> +	{ PANEL0_BKLTEN_GPIONC_4_PCONF0, PANEL0_BKLTEN_GPIONC_4_PAD, 0},
> +	{ PANEL0_BKLTCTL_GPIONC_5_PCONF0, PANEL0_BKLTCTL_GPIONC_5_PAD, 0},
> +	{ HV_DDI1_HPD_GPIONC_6_PCONF0, HV_DDI1_HPD_GPIONC_6_PAD, 0},
> +	{ HV_DDI1_DDC_SDA_GPIONC_7_PCONF0, HV_DDI1_DDC_SDA_GPIONC_7_PAD, 0},
> +	{ HV_DDI1_DDC_SCL_GPIONC_8_PCONF0, HV_DDI1_DDC_SCL_GPIONC_8_PAD, 0},
> +	{ PANEL1_VDDEN_GPIONC_9_PCONF0, PANEL1_VDDEN_GPIONC_9_PAD, 0},
> +	{ PANEL1_BKLTEN_GPIONC_10_PCONF0, PANEL1_BKLTEN_GPIONC_10_PAD, 0},
> +	{ PANEL1_BKLTCTL_GPIONC_11_PCONF0, PANEL1_BKLTCTL_GPIONC_11_PAD, 0},
> +	{ GP_INTD_DSI_TE1_GPIONC_12_PCONF0, GP_INTD_DSI_TE1_GPIONC_12_PAD, 0},
> +	{ HV_DDI2_DDC_SDA_GPIONC_13_PCONF0, HV_DDI2_DDC_SDA_GPIONC_13_PAD, 0},
> +	{ HV_DDI2_DDC_SCL_GPIONC_14_PCONF0, HV_DDI2_DDC_SCL_GPIONC_14_PAD, 0},
> +	{ GP_CAMERASB00_GPIONC_15_PCONF0, GP_CAMERASB00_GPIONC_15_PAD, 0},
> +	{ GP_CAMERASB01_GPIONC_16_PCONF0, GP_CAMERASB01_GPIONC_16_PAD, 0},
> +	{ GP_CAMERASB02_GPIONC_17_PCONF0, GP_CAMERASB02_GPIONC_17_PAD, 0},
> +	{ GP_CAMERASB03_GPIONC_18_PCONF0, GP_CAMERASB03_GPIONC_18_PAD, 0},
> +	{ GP_CAMERASB04_GPIONC_19_PCONF0, GP_CAMERASB04_GPIONC_19_PAD, 0},
> +	{ GP_CAMERASB05_GPIONC_20_PCONF0, GP_CAMERASB05_GPIONC_20_PAD, 0},
> +	{ GP_CAMERASB06_GPIONC_21_PCONF0, GP_CAMERASB06_GPIONC_21_PAD, 0},
> +	{ GP_CAMERASB07_GPIONC_22_PCONF0, GP_CAMERASB07_GPIONC_22_PAD, 0},
> +	{ GP_CAMERASB08_GPIONC_23_PCONF0, GP_CAMERASB08_GPIONC_23_PAD, 0},
> +	{ GP_CAMERASB09_GPIONC_24_PCONF0, GP_CAMERASB09_GPIONC_24_PAD, 0},
> +	{ GP_CAMERASB10_GPIONC_25_PCONF0, GP_CAMERASB10_GPIONC_25_PAD, 0},
> +	{ GP_CAMERASB11_GPIONC_26_PCONF0, GP_CAMERASB11_GPIONC_26_PAD, 0},
> +
> +	{ SATA_GP0_GPIOC_0_PCONF0, SATA_GP0_GPIOC_0_PAD, 0},
> +	{ SATA_GP1_GPIOC_1_PCONF0, SATA_GP1_GPIOC_1_PAD, 0},
> +	{ SATA_LEDN_GPIOC_2_PCONF0, SATA_LEDN_GPIOC_2_PAD, 0},
> +	{ PCIE_CLKREQ0B_GPIOC_3_PCONF0, PCIE_CLKREQ0B_GPIOC_3_PAD, 0},
> +	{ PCIE_CLKREQ1B_GPIOC_4_PCONF0, PCIE_CLKREQ1B_GPIOC_4_PAD, 0},
> +	{ PCIE_CLKREQ2B_GPIOC_5_PCONF0, PCIE_CLKREQ2B_GPIOC_5_PAD, 0},
> +	{ PCIE_CLKREQ3B_GPIOC_6_PCONF0, PCIE_CLKREQ3B_GPIOC_6_PAD, 0},
> +	{ PCIE_CLKREQ4B_GPIOC_7_PCONF0, PCIE_CLKREQ4B_GPIOC_7_PAD, 0},
> +	{ HDA_RSTB_GPIOC_8_PCONF0, HDA_RSTB_GPIOC_8_PAD, 0},
> +	{ HDA_SYNC_GPIOC_9_PCONF0, HDA_SYNC_GPIOC_9_PAD, 0},
> +	{ HDA_CLK_GPIOC_10_PCONF0, HDA_CLK_GPIOC_10_PAD, 0},
> +	{ HDA_SDO_GPIOC_11_PCONF0, HDA_SDO_GPIOC_11_PAD, 0},
> +	{ HDA_SDI0_GPIOC_12_PCONF0, HDA_SDI0_GPIOC_12_PAD, 0},
> +	{ HDA_SDI1_GPIOC_13_PCONF0, HDA_SDI1_GPIOC_13_PAD, 0},
> +	{ HDA_DOCKRSTB_GPIOC_14_PCONF0, HDA_DOCKRSTB_GPIOC_14_PAD, 0},
> +	{ HDA_DOCKENB_GPIOC_15_PCONF0, HDA_DOCKENB_GPIOC_15_PAD, 0},
> +	{ SDMMC1_CLK_GPIOC_16_PCONF0, SDMMC1_CLK_GPIOC_16_PAD, 0},
> +	{ SDMMC1_D0_GPIOC_17_PCONF0, SDMMC1_D0_GPIOC_17_PAD, 0},
> +	{ SDMMC1_D1_GPIOC_18_PCONF0, SDMMC1_D1_GPIOC_18_PAD, 0},
> +	{ SDMMC1_D2_GPIOC_19_PCONF0, SDMMC1_D2_GPIOC_19_PAD, 0},
> +	{ SDMMC1_D3_CD_B_GPIOC_20_PCONF0, SDMMC1_D3_CD_B_GPIOC_20_PAD, 0},
> +	{ MMC1_D4_SD_WE_GPIOC_21_PCONF0, MMC1_D4_SD_WE_GPIOC_21_PAD, 0},
> +	{ MMC1_D5_GPIOC_22_PCONF0, MMC1_D5_GPIOC_22_PAD, 0},
> +	{ MMC1_D6_GPIOC_23_PCONF0, MMC1_D6_GPIOC_23_PAD, 0},
> +	{ MMC1_D7_GPIOC_24_PCONF0, MMC1_D7_GPIOC_24_PAD, 0},
> +	{ SDMMC1_CMD_GPIOC_25_PCONF0, SDMMC1_CMD_GPIOC_25_PAD, 0},
> +	{ MMC1_RESET_B_GPIOC_26_PCONF0, MMC1_RESET_B_GPIOC_26_PAD, 0},
> +	{ SDMMC2_CLK_GPIOC_27_PCONF0, SDMMC2_CLK_GPIOC_27_PAD, 0},
> +	{ SDMMC2_D0_GPIOC_28_PCONF0, SDMMC2_D0_GPIOC_28_PAD, 0},
> +	{ SDMMC2_D1_GPIOC_29_PCONF0, SDMMC2_D1_GPIOC_29_PAD, 0},
> +	{ SDMMC2_D2_GPIOC_30_PCONF0, SDMMC2_D2_GPIOC_30_PAD, 0},
> +	{ SDMMC2_D3_CD_B_GPIOC_31_PCONF0, SDMMC2_D3_CD_B_GPIOC_31_PAD, 0},
> +	{ SDMMC2_CMD_GPIOC_32_PCONF0, SDMMC2_CMD_GPIOC_32_PAD, 0},
> +	{ SDMMC3_CLK_GPIOC_33_PCONF0, SDMMC3_CLK_GPIOC_33_PAD, 0},
> +	{ SDMMC3_D0_GPIOC_34_PCONF0, SDMMC3_D0_GPIOC_34_PAD, 0},
> +	{ SDMMC3_D1_GPIOC_35_PCONF0, SDMMC3_D1_GPIOC_35_PAD, 0},
> +	{ SDMMC3_D2_GPIOC_36_PCONF0, SDMMC3_D2_GPIOC_36_PAD, 0},
> +	{ SDMMC3_D3_GPIOC_37_PCONF0, SDMMC3_D3_GPIOC_37_PAD, 0},
> +	{ SDMMC3_CD_B_GPIOC_38_PCONF0, SDMMC3_CD_B_GPIOC_38_PAD, 0},
> +	{ SDMMC3_CMD_GPIOC_39_PCONF0, SDMMC3_CMD_GPIOC_39_PAD, 0},
> +	{ SDMMC3_1P8_EN_GPIOC_40_PCONF0, SDMMC3_1P8_EN_GPIOC_40_PAD, 0},
> +	{ SDMMC3_PWR_EN_B_GPIOC_41_PCONF0, SDMMC3_PWR_EN_B_GPIOC_41_PAD, 0},
> +	{ LPC_AD0_GPIOC_42_PCONF0, LPC_AD0_GPIOC_42_PAD, 0},
> +	{ LPC_AD1_GPIOC_43_PCONF0, LPC_AD1_GPIOC_43_PAD, 0},
> +	{ LPC_AD2_GPIOC_44_PCONF0, LPC_AD2_GPIOC_44_PAD, 0},
> +	{ LPC_AD3_GPIOC_45_PCONF0, LPC_AD3_GPIOC_45_PAD, 0},
> +	{ LPC_FRAMEB_GPIOC_46_PCONF0, LPC_FRAMEB_GPIOC_46_PAD, 0},
> +	{ LPC_CLKOUT0_GPIOC_47_PCONF0, LPC_CLKOUT0_GPIOC_47_PAD, 0},
> +	{ LPC_CLKOUT1_GPIOC_48_PCONF0, LPC_CLKOUT1_GPIOC_48_PAD, 0},
> +	{ LPC_CLKRUNB_GPIOC_49_PCONF0, LPC_CLKRUNB_GPIOC_49_PAD, 0},
> +	{ ILB_SERIRQ_GPIOC_50_PCONF0, ILB_SERIRQ_GPIOC_50_PAD, 0},
> +	{ SMB_DATA_GPIOC_51_PCONF0, SMB_DATA_GPIOC_51_PAD, 0},
> +	{ SMB_CLK_GPIOC_52_PCONF0, SMB_CLK_GPIOC_52_PAD, 0},
> +	{ SMB_ALERTB_GPIOC_53_PCONF0, SMB_ALERTB_GPIOC_53_PAD, 0},
> +	{ SPKR_GPIOC_54_PCONF0, SPKR_GPIOC_54_PAD, 0},
> +	{ MHSI_ACDATA_GPIOC_55_PCONF0, MHSI_ACDATA_GPIOC_55_PAD, 0},
> +	{ MHSI_ACFLAG_GPIOC_56_PCONF0, MHSI_ACFLAG_GPIOC_56_PAD, 0},
> +	{ MHSI_ACREADY_GPIOC_57_PCONF0, MHSI_ACREADY_GPIOC_57_PAD, 0},
> +	{ MHSI_ACWAKE_GPIOC_58_PCONF0, MHSI_ACWAKE_GPIOC_58_PAD, 0},
> +	{ MHSI_CADATA_GPIOC_59_PCONF0, MHSI_CADATA_GPIOC_59_PAD, 0},
> +	{ MHSI_CAFLAG_GPIOC_60_PCONF0, MHSI_CAFLAG_GPIOC_60_PAD, 0},
> +	{ MHSI_CAREADY_GPIOC_61_PCONF0, MHSI_CAREADY_GPIOC_61_PAD, 0},
> +	{ GP_SSP_2_CLK_GPIOC_62_PCONF0, GP_SSP_2_CLK_GPIOC_62_PAD, 0},
> +	{ GP_SSP_2_FS_GPIOC_63_PCONF0, GP_SSP_2_FS_GPIOC_63_PAD, 0},
> +	{ GP_SSP_2_RXD_GPIOC_64_PCONF0, GP_SSP_2_RXD_GPIOC_64_PAD, 0},
> +	{ GP_SSP_2_TXD_GPIOC_65_PCONF0, GP_SSP_2_TXD_GPIOC_65_PAD, 0},
> +	{ SPI1_CS0_B_GPIOC_66_PCONF0, SPI1_CS0_B_GPIOC_66_PAD, 0},
> +	{ SPI1_MISO_GPIOC_67_PCONF0, SPI1_MISO_GPIOC_67_PAD, 0},
> +	{ SPI1_MOSI_GPIOC_68_PCONF0, SPI1_MOSI_GPIOC_68_PAD, 0},
> +	{ SPI1_CLK_GPIOC_69_PCONF0, SPI1_CLK_GPIOC_69_PAD, 0},
> +	{ UART1_RXD_GPIOC_70_PCONF0, UART1_RXD_GPIOC_70_PAD, 0},
> +	{ UART1_TXD_GPIOC_71_PCONF0, UART1_TXD_GPIOC_71_PAD, 0},
> +	{ UART1_RTS_B_GPIOC_72_PCONF0, UART1_RTS_B_GPIOC_72_PAD, 0},
> +	{ UART1_CTS_B_GPIOC_73_PCONF0, UART1_CTS_B_GPIOC_73_PAD, 0},
> +	{ UART2_RXD_GPIOC_74_PCONF0, UART2_RXD_GPIOC_74_PAD, 0},
> +	{ UART2_TXD_GPIOC_75_PCONF0, UART2_TXD_GPIOC_75_PAD, 0},
> +	{ UART2_RTS_B_GPIOC_76_PCONF0, UART2_RTS_B_GPIOC_76_PAD, 0},
> +	{ UART2_CTS_B_GPIOC_77_PCONF0, UART2_CTS_B_GPIOC_77_PAD, 0},
> +	{ I2C0_SDA_GPIOC_78_PCONF0, I2C0_SDA_GPIOC_78_PAD, 0},
> +	{ I2C0_SCL_GPIOC_79_PCONF0, I2C0_SCL_GPIOC_79_PAD, 0},
> +	{ I2C1_SDA_GPIOC_80_PCONF0, I2C1_SDA_GPIOC_80_PAD, 0},
> +	{ I2C1_SCL_GPIOC_81_PCONF0, I2C1_SCL_GPIOC_81_PAD, 0},
> +	{ I2C2_SDA_GPIOC_82_PCONF0, I2C2_SDA_GPIOC_82_PAD, 0},
> +	{ I2C2_SCL_GPIOC_83_PCONF0, I2C2_SCL_GPIOC_83_PAD, 0},
> +	{ I2C3_SDA_GPIOC_84_PCONF0, I2C3_SDA_GPIOC_84_PAD, 0},
> +	{ I2C3_SCL_GPIOC_85_PCONF0, I2C3_SCL_GPIOC_85_PAD, 0},
> +	{ I2C4_SDA_GPIOC_86_PCONF0, I2C4_SDA_GPIOC_86_PAD, 0},
> +	{ I2C4_SCL_GPIOC_87_PCONF0, I2C4_SCL_GPIOC_87_PAD, 0},
> +	{ I2C5_SDA_GPIOC_88_PCONF0, I2C5_SDA_GPIOC_88_PAD, 0},
> +	{ I2C5_SCL_GPIOC_89_PCONF0, I2C5_SCL_GPIOC_89_PAD, 0},
> +	{ I2C6_SDA_GPIOC_90_PCONF0, I2C6_SDA_GPIOC_90_PAD, 0},
> +	{ I2C6_SCL_GPIOC_91_PCONF0, I2C6_SCL_GPIOC_91_PAD, 0},
> +	{ I2C_NFC_SDA_GPIOC_92_PCONF0, I2C_NFC_SDA_GPIOC_92_PAD, 0},
> +	{ I2C_NFC_SCL_GPIOC_93_PCONF0, I2C_NFC_SCL_GPIOC_93_PAD, 0},
> +	{ PWM0_GPIOC_94_PCONF0, PWM0_GPIOC_94_PAD, 0},
> +	{ PWM1_GPIOC_95_PCONF0, PWM1_GPIOC_95_PAD, 0},
> +	{ PLT_CLK0_GPIOC_96_PCONF0, PLT_CLK0_GPIOC_96_PAD, 0},
> +	{ PLT_CLK1_GPIOC_97_PCONF0, PLT_CLK1_GPIOC_97_PAD, 0},
> +	{ PLT_CLK2_GPIOC_98_PCONF0, PLT_CLK2_GPIOC_98_PAD, 0},
> +	{ PLT_CLK3_GPIOC_99_PCONF0, PLT_CLK3_GPIOC_99_PAD, 0},
> +	{ PLT_CLK4_GPIOC_100_PCONF0, PLT_CLK4_GPIOC_100_PAD, 0},
> +	{ PLT_CLK5_GPIOC_101_PCONF0, PLT_CLK5_GPIOC_101_PAD, 0},
> +
> +	{ GPIO_SUS0_GPIO_SUS0_PCONF0, GPIO_SUS0_GPIO_SUS0_PAD, 0},
> +	{ GPIO_SUS1_GPIO_SUS1_PCONF0, GPIO_SUS1_GPIO_SUS1_PAD, 0},
> +	{ GPIO_SUS2_GPIO_SUS2_PCONF0, GPIO_SUS2_GPIO_SUS2_PAD, 0},
> +	{ GPIO_SUS3_GPIO_SUS3_PCONF0, GPIO_SUS3_GPIO_SUS3_PAD, 0},
> +	{ GPIO_SUS4_GPIO_SUS4_PCONF0, GPIO_SUS4_GPIO_SUS4_PAD, 0},
> +	{ GPIO_SUS5_GPIO_SUS5_PCONF0, GPIO_SUS5_GPIO_SUS5_PAD, 0},
> +	{ GPIO_SUS6_GPIO_SUS6_PCONF0, GPIO_SUS6_GPIO_SUS6_PAD, 0},
> +	{ GPIO_SUS7_GPIO_SUS7_PCONF0, GPIO_SUS7_GPIO_SUS7_PAD, 0},
> +	{ SEC_GPIO_SUS8_GPIO_SUS8_PCONF0, SEC_GPIO_SUS8_GPIO_SUS8_PAD, 0},
> +	{ SEC_GPIO_SUS9_GPIO_SUS9_PCONF0, SEC_GPIO_SUS9_GPIO_SUS9_PAD, 0},
> +	{ SEC_GPIO_SUS10_GPIO_SUS10_PCONF0, SEC_GPIO_SUS10_GPIO_SUS10_PAD, 0},
> +	{ SUSPWRDNACK_GPIOS_11_PCONF0, SUSPWRDNACK_GPIOS_11_PAD, 0},
> +	{ PMU_SUSCLK_GPIOS_12_PCONF0, PMU_SUSCLK_GPIOS_12_PAD, 0},
> +	{ PMU_SLP_S0IX_B_GPIOS_13_PCONF0, PMU_SLP_S0IX_B_GPIOS_13_PAD, 0},
> +	{ PMU_SLP_LAN_B_GPIOS_14_PCONF0, PMU_SLP_LAN_B_GPIOS_14_PAD, 0},
> +	{ PMU_WAKE_B_GPIOS_15_PCONF0, PMU_WAKE_B_GPIOS_15_PAD, 0},
> +	{ PMU_PWRBTN_B_GPIOS_16_PCONF0, PMU_PWRBTN_B_GPIOS_16_PAD, 0},
> +	{ PMU_WAKE_LAN_B_GPIOS_17_PCONF0, PMU_WAKE_LAN_B_GPIOS_17_PAD, 0},
> +	{ SUS_STAT_B_GPIOS_18_PCONF0, SUS_STAT_B_GPIOS_18_PAD, 0},
> +	{ USB_OC0_B_GPIOS_19_PCONF0, USB_OC0_B_GPIOS_19_PAD, 0},
> +	{ USB_OC1_B_GPIOS_20_PCONF0, USB_OC1_B_GPIOS_20_PAD, 0},
> +	{ SPI_CS1_B_GPIOS_21_PCONF0, SPI_CS1_B_GPIOS_21_PAD, 0},
> +	{ GPIO_DFX0_GPIOS_22_PCONF0, GPIO_DFX0_GPIOS_22_PAD, 0},
> +	{ GPIO_DFX1_GPIOS_23_PCONF0, GPIO_DFX1_GPIOS_23_PAD, 0},
> +	{ GPIO_DFX2_GPIOS_24_PCONF0, GPIO_DFX2_GPIOS_24_PAD, 0},
> +	{ GPIO_DFX3_GPIOS_25_PCONF0, GPIO_DFX3_GPIOS_25_PAD, 0},
> +	{ GPIO_DFX4_GPIOS_26_PCONF0, GPIO_DFX4_GPIOS_26_PAD, 0},
> +	{ GPIO_DFX5_GPIOS_27_PCONF0, GPIO_DFX5_GPIOS_27_PAD, 0},
> +	{ GPIO_DFX6_GPIOS_28_PCONF0, GPIO_DFX6_GPIOS_28_PAD, 0},
> +	{ GPIO_DFX7_GPIOS_29_PCONF0, GPIO_DFX7_GPIOS_29_PAD, 0},
> +	{ GPIO_DFX8_GPIOS_30_PCONF0, GPIO_DFX8_GPIOS_30_PAD, 0},
> +	{ USB_ULPI_0_CLK_GPIOS_31_PCONF0, USB_ULPI_0_CLK_GPIOS_31_PAD, 0},
> +	{ USB_ULPI_0_DATA0_GPIOS_32_PCONF0, USB_ULPI_0_DATA0_GPIOS_32_PAD, 0},
> +	{ USB_ULPI_0_DATA1_GPIOS_33_PCONF0, USB_ULPI_0_DATA1_GPIOS_33_PAD, 0},
> +	{ USB_ULPI_0_DATA2_GPIOS_34_PCONF0, USB_ULPI_0_DATA2_GPIOS_34_PAD, 0},
> +	{ USB_ULPI_0_DATA3_GPIOS_35_PCONF0, USB_ULPI_0_DATA3_GPIOS_35_PAD, 0},
> +	{ USB_ULPI_0_DATA4_GPIOS_36_PCONF0, USB_ULPI_0_DATA4_GPIOS_36_PAD, 0},
> +	{ USB_ULPI_0_DATA5_GPIOS_37_PCONF0, USB_ULPI_0_DATA5_GPIOS_37_PAD, 0},
> +	{ USB_ULPI_0_DATA6_GPIOS_38_PCONF0, USB_ULPI_0_DATA6_GPIOS_38_PAD, 0},
> +	{ USB_ULPI_0_DATA7_GPIOS_39_PCONF0, USB_ULPI_0_DATA7_GPIOS_39_PAD, 0},
> +	{ USB_ULPI_0_DIR_GPIOS_40_PCONF0, USB_ULPI_0_DIR_GPIOS_40_PAD, 0},
> +	{ USB_ULPI_0_NXT_GPIOS_41_PCONF0, USB_ULPI_0_NXT_GPIOS_41_PAD, 0},
> +	{ USB_ULPI_0_STP_GPIOS_42_PCONF0, USB_ULPI_0_STP_GPIOS_42_PAD, 0},
> +	{ USB_ULPI_0_REFCLK_GPIOS_43_PCONF0, USB_ULPI_0_REFCLK_GPIOS_43_PAD, 0}
>  };
>  
>  static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data)
> @@ -260,14 +749,42 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
>  	u8 gpio, action;
>  	u16 function, pad;
>  	u32 val;
> +	u8 block;
>  	struct drm_device *dev = intel_dsi->base.base.dev;
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  
> +	DRM_DEBUG_DRIVER("MIPI: executing gpio element\n");
> +
> +	/*
> +	 * Skipping the first byte as it is of no
> +	 * interest for android in new version
> +	 */

Might still be nice to say what it actually does. I have no idea, so
just judge if this is correct or not.

> +	if (dev_priv->vbt.dsi.seq_version >= 3)
> +		data++;
> +
>  	gpio = *data++;
>  
>  	/* pull up/down */
>  	action = *data++;
>  
> +	if (dev_priv->vbt.dsi.seq_version >= 3) {
> +		if (gpio <= MAX_GPIO_NUM_NC) {
> +			DRM_DEBUG_DRIVER("GPIO is in the north Block\n");
> +			block = IOSF_PORT_GPIO_NC;
> +		} else if (gpio > MAX_GPIO_NUM_NC && gpio <= MAX_GPIO_NUM_SC) {
> +			DRM_DEBUG_DRIVER("GPIO is in the south Block\n");
> +			block = IOSF_PORT_GPIO_SC;
> +		} else if (gpio > MAX_GPIO_NUM_SC && gpio <= MAX_GPIO_NUM) {
> +			DRM_DEBUG_DRIVER("GPIO is in the SUS Block\n");
> +			block = IOSF_PORT_GPIO_SUS;

Since we expect these limits to match the table sizes, I'd add some
BUILD_BUG_ONs to make sure.

> +		} else {
> +			DRM_ERROR("GPIO number is not present in the table\n");
> +			return NULL;
> +		}
> +	} else {
> +		block = IOSF_PORT_GPIO_NC;
> +	}
> +
>  	function = gtable[gpio].function_reg;
>  	pad = gtable[gpio].pad_reg;
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2015-12-15 20:05 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-30 22:47 [MIPI SEQ PARSING v3 00/13] Patches to support the version 3 of MIPI sequence in VBT Deepak M
2015-11-30 22:47 ` [MIPI SEQ PARSING v3 01/13] drm/i915: Adding the parsing logic for the i2c element Deepak M
2015-12-11  8:40   ` Mika Kahola
2015-11-30 22:47 ` [MIPI SEQ PARSING v3 02/13] drm/i915: Updating asle structure with new fields Deepak M
2015-12-11  8:41   ` Mika Kahola
2015-12-14 11:02   ` Jani Nikula
2015-11-30 22:47 ` [MIPI SEQ PARSING v3 03/13] drm/i915: Add Intel opregion mailbox 5 structure Deepak M
2015-12-11  8:42   ` Mika Kahola
2015-11-30 22:47 ` [MIPI SEQ PARSING v3 04/13] drm/i915: Do opregion VBT validation during opregion setup Deepak M
2015-12-11  8:43   ` Mika Kahola
2015-11-30 22:47 ` [MIPI SEQ PARSING v3 05/13] drm/i915: Add debug entry to get the opregion VBT blob Deepak M
2015-12-11  8:46   ` Mika Kahola
2015-12-14 12:16     ` [PATCH] drm/i915: Parsing VBT if size of VBT exceeds 6KB Deepak M
2015-12-14  9:19       ` Chris Wilson
2015-12-14 10:56         ` Jani Nikula
2015-11-30 22:47 ` [MIPI SEQ PARSING v3 06/13] " Deepak M
2015-12-11  8:51   ` Mika Kahola
2015-11-30 22:47 ` [MIPI SEQ PARSING v3 07/13] drm/i915: Added support the v3 mipi sequence block Deepak M
2015-11-30 22:47 ` [MIPI SEQ PARSING v3 08/13] drm/i915: Extend gpio read/write to other cores Deepak M
2015-12-15 19:53   ` Ville Syrjälä
2015-11-30 22:47 ` [MIPI SEQ PARSING v3 09/13] drm/i915: Added the generic gpio sequence support and gpio table Deepak M
2015-12-15 20:05   ` Ville Syrjälä

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.