[PATCH 2/2] drm/i915/gmbus: Add Wa_16026159613 for PTL for bit-bashing

[Ankit Nautiyal]

As per Wa_16026159613 for PTL, set the GMBUS masks bit before starting
bit-bashing and maintain value through the bit-bashing sequence.
After bit-bashing sequence is done, clear the GMBUS masks bits.

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
---
 drivers/gpu/drm/i915/display/intel_gmbus.c | 37 +++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
index abf457e68ee9..1609bcea1fa1 100644
--- a/drivers/gpu/drm/i915/display/intel_gmbus.c
+++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
@@ -243,10 +243,17 @@ static u32 get_reserved(struct intel_gmbus *bus)
 	struct drm_i915_private *i915 = to_i915(display->drm);
 	u32 reserved = 0;
 
-	/* On most chips, these bits must be preserved in software. */
-	if (!IS_I830(i915) && !IS_I845G(i915))
-		reserved = intel_de_read_notrace(display, bus->gpio_reg) &
-			(GPIO_DATA_PULLUP_DISABLE | GPIO_CLOCK_PULLUP_DISABLE);
+	if (!IS_I830(i915) && !IS_I845G(i915)) {
+		/* On most chips, these bits must be preserved in software. */
+		u32 preserve_bits = GPIO_DATA_PULLUP_DISABLE | GPIO_CLOCK_PULLUP_DISABLE;
+
+		/* PTL: Wa_16026159613: the masks bits need to be preserved through out */
+		if (DISPLAY_VER(display) >= 30)
+			preserve_bits |= GPIO_CLOCK_DIR_MASK | GPIO_CLOCK_VAL_MASK |
+					 GPIO_DATA_DIR_MASK | GPIO_DATA_VAL_MASK;
+
+		reserved = intel_de_read_notrace(display, bus->gpio_reg) & preserve_bits;
+	}
 
 	return reserved;
 }
@@ -309,6 +316,22 @@ static void set_data(void *data, int state_high)
 	intel_de_posting_read(display, bus->gpio_reg);
 }
 
+static void
+ptl_handle_mask_bits(struct intel_gmbus *bus, bool set)
+{
+	struct intel_display *display = bus->display;
+	u32 reg_val = intel_de_read_notrace(display, bus->gpio_reg);
+	u32 mask_bits = GPIO_CLOCK_DIR_MASK | GPIO_CLOCK_VAL_MASK |
+			GPIO_DATA_DIR_MASK | GPIO_DATA_VAL_MASK;
+	if (set)
+		reg_val |= mask_bits;
+	else
+		reg_val &= ~mask_bits;
+
+	intel_de_write_notrace(display, bus->gpio_reg, reg_val | mask_bits);
+	intel_de_posting_read(display, bus->gpio_reg);
+}
+
 static int
 intel_gpio_pre_xfer(struct i2c_adapter *adapter)
 {
@@ -321,6 +344,9 @@ intel_gpio_pre_xfer(struct i2c_adapter *adapter)
 	if (IS_PINEVIEW(i915))
 		pnv_gmbus_clock_gating(display, false);
 
+	if (DISPLAY_VER(display) >= 30)
+		ptl_handle_mask_bits(bus, true);
+
 	set_data(bus, 1);
 	set_clock(bus, 1);
 	udelay(I2C_RISEFALL_TIME);
@@ -339,6 +365,9 @@ intel_gpio_post_xfer(struct i2c_adapter *adapter)
 
 	if (IS_PINEVIEW(i915))
 		pnv_gmbus_clock_gating(display, true);
+
+	if (DISPLAY_VER(display) >= 30)
+		ptl_handle_mask_bits(bus, false);
 }
 
 static void
-- 
2.45.2