drm/i915: rename intel_sideband.[ch] to intel_sbi.[ch]

Now that intel_sideband.[ch] has been decluttered, it's pure lpt/wpt
iosf sideband. Let's call it intel_sbi, following the function naming.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/183423ff23b2d259e4a197e74daf6bcd750bfe14.1634207064.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index e44c72533a8c58b00a0b2b6a263cfe5448eb866f..660bb03de6fc1c290586a12749190b2969bab838 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -51,7 +51,7 @@ i915-y += i915_drv.o \
          intel_pm.o \
          intel_region_ttm.o \
          intel_runtime_pm.o \
-         intel_sideband.o \
+         intel_sbi.o \
          intel_step.o \
          intel_uncore.o \
          intel_wakeref.o \

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b070cdcb3674ae74611b4135565e5b6a1d4707ae..ff598b6cd953034ae2bf10a2570b5fd00eb9b949 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -103,7 +103,7 @@
 #include "intel_pps.h"
 #include "intel_psr.h"
 #include "intel_quirks.h"
-#include "intel_sideband.h"
+#include "intel_sbi.h"
 #include "intel_sprite.h"
 #include "intel_tc.h"
 #include "intel_vga.h"

diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c
index 51d6f810e69b9dc71d64d135bd701d1c9587559a..dd2cf0c59921d3e1b6c28839c8b1952fc6246a67 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fdi.c
+++ b/drivers/gpu/drm/i915/display/intel_fdi.c
@@ -8,7 +8,7 @@
 #include "intel_de.h"
 #include "intel_display_types.h"
 #include "intel_fdi.h"
-#include "intel_sideband.h"
+#include "intel_sbi.h"
 
 static void assert_fdi_tx(struct drm_i915_private *dev_priv,
                          enum pipe pipe, bool state)

diff --git a/drivers/gpu/drm/i915/intel_sbi.c b/drivers/gpu/drm/i915/intel_sbi.c
new file mode 100644 (file)
index 0000000..5ba8490
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_sbi.c
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2013-2021 Intel Corporation
+ *
+ * LPT/WPT IOSF sideband.
+ */
+
+#include "i915_drv.h"
+#include "intel_sbi.h"
+
+/* SBI access */
+static int intel_sbi_rw(struct drm_i915_private *i915, u16 reg,
+                       enum intel_sbi_destination destination,
+                       u32 *val, bool is_read)
+{
+       struct intel_uncore *uncore = &i915->uncore;
+       u32 cmd;
+
+       lockdep_assert_held(&i915->sb_lock);
+
+       if (intel_wait_for_register_fw(uncore,
+                                      SBI_CTL_STAT, SBI_BUSY, 0,
+                                      100)) {
+               drm_err(&i915->drm,
+                       "timeout waiting for SBI to become ready\n");
+               return -EBUSY;
+       }
+
+       intel_uncore_write_fw(uncore, SBI_ADDR, (u32)reg << 16);
+       intel_uncore_write_fw(uncore, SBI_DATA, is_read ? 0 : *val);
+
+       if (destination == SBI_ICLK)
+               cmd = SBI_CTL_DEST_ICLK | SBI_CTL_OP_CRRD;
+       else
+               cmd = SBI_CTL_DEST_MPHY | SBI_CTL_OP_IORD;
+       if (!is_read)
+               cmd |= BIT(8);
+       intel_uncore_write_fw(uncore, SBI_CTL_STAT, cmd | SBI_BUSY);
+
+       if (__intel_wait_for_register_fw(uncore,
+                                        SBI_CTL_STAT, SBI_BUSY, 0,
+                                        100, 100, &cmd)) {
+               drm_err(&i915->drm,
+                       "timeout waiting for SBI to complete read\n");
+               return -ETIMEDOUT;
+       }
+
+       if (cmd & SBI_RESPONSE_FAIL) {
+               drm_err(&i915->drm, "error during SBI read of reg %x\n", reg);
+               return -ENXIO;
+       }
+
+       if (is_read)
+               *val = intel_uncore_read_fw(uncore, SBI_DATA);
+
+       return 0;
+}
+
+u32 intel_sbi_read(struct drm_i915_private *i915, u16 reg,
+                  enum intel_sbi_destination destination)
+{
+       u32 result = 0;
+
+       intel_sbi_rw(i915, reg, destination, &result, true);
+
+       return result;
+}
+
+void intel_sbi_write(struct drm_i915_private *i915, u16 reg, u32 value,
+                    enum intel_sbi_destination destination)
+{
+       intel_sbi_rw(i915, reg, destination, &value, false);
+}

diff --git a/drivers/gpu/drm/i915/intel_sbi.h b/drivers/gpu/drm/i915/intel_sbi.h
new file mode 100644 (file)
index 0000000..f5a8622
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_sbi.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2013-2021 Intel Corporation
+ */
+
+#ifndef _INTEL_SBI_H_
+#define _INTEL_SBI_H_
+
+#include <linux/types.h>
+
+struct drm_i915_private;
+
+enum intel_sbi_destination {
+       SBI_ICLK,
+       SBI_MPHY,
+};
+
+u32 intel_sbi_read(struct drm_i915_private *i915, u16 reg,
+                  enum intel_sbi_destination destination);
+void intel_sbi_write(struct drm_i915_private *i915, u16 reg, u32 value,
+                    enum intel_sbi_destination destination);
+
+#endif /* _INTEL_SBI_H_ */

diff --git a/drivers/gpu/drm/i915/intel_sideband.c b/drivers/gpu/drm/i915/intel_sideband.c
deleted file mode 100644 (file)
index 1d30273..0000000
--- a/drivers/gpu/drm/i915/intel_sideband.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright © 2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- */
-
-#include <asm/iosf_mbi.h>
-
-#include "i915_drv.h"
-#include "intel_sideband.h"
-
-/* SBI access */
-static int intel_sbi_rw(struct drm_i915_private *i915, u16 reg,
-                       enum intel_sbi_destination destination,
-                       u32 *val, bool is_read)
-{
-       struct intel_uncore *uncore = &i915->uncore;
-       u32 cmd;
-
-       lockdep_assert_held(&i915->sb_lock);
-
-       if (intel_wait_for_register_fw(uncore,
-                                      SBI_CTL_STAT, SBI_BUSY, 0,
-                                      100)) {
-               drm_err(&i915->drm,
-                       "timeout waiting for SBI to become ready\n");
-               return -EBUSY;
-       }
-
-       intel_uncore_write_fw(uncore, SBI_ADDR, (u32)reg << 16);
-       intel_uncore_write_fw(uncore, SBI_DATA, is_read ? 0 : *val);
-
-       if (destination == SBI_ICLK)
-               cmd = SBI_CTL_DEST_ICLK | SBI_CTL_OP_CRRD;
-       else
-               cmd = SBI_CTL_DEST_MPHY | SBI_CTL_OP_IORD;
-       if (!is_read)
-               cmd |= BIT(8);
-       intel_uncore_write_fw(uncore, SBI_CTL_STAT, cmd | SBI_BUSY);
-
-       if (__intel_wait_for_register_fw(uncore,
-                                        SBI_CTL_STAT, SBI_BUSY, 0,
-                                        100, 100, &cmd)) {
-               drm_err(&i915->drm,
-                       "timeout waiting for SBI to complete read\n");
-               return -ETIMEDOUT;
-       }
-
-       if (cmd & SBI_RESPONSE_FAIL) {
-               drm_err(&i915->drm, "error during SBI read of reg %x\n", reg);
-               return -ENXIO;
-       }
-
-       if (is_read)
-               *val = intel_uncore_read_fw(uncore, SBI_DATA);
-
-       return 0;
-}
-
-u32 intel_sbi_read(struct drm_i915_private *i915, u16 reg,
-                  enum intel_sbi_destination destination)
-{
-       u32 result = 0;
-
-       intel_sbi_rw(i915, reg, destination, &result, true);
-
-       return result;
-}
-
-void intel_sbi_write(struct drm_i915_private *i915, u16 reg, u32 value,
-                    enum intel_sbi_destination destination)
-{
-       intel_sbi_rw(i915, reg, destination, &value, false);
-}

diff --git a/drivers/gpu/drm/i915/intel_sideband.h b/drivers/gpu/drm/i915/intel_sideband.h
deleted file mode 100644 (file)
index 9d93757..0000000
--- a/drivers/gpu/drm/i915/intel_sideband.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-
-#ifndef _INTEL_SIDEBAND_H_
-#define _INTEL_SIDEBAND_H_
-
-#include <linux/types.h>
-
-struct drm_i915_private;
-
-enum intel_sbi_destination {
-       SBI_ICLK,
-       SBI_MPHY,
-};
-
-u32 intel_sbi_read(struct drm_i915_private *i915, u16 reg,
-                  enum intel_sbi_destination destination);
-void intel_sbi_write(struct drm_i915_private *i915, u16 reg, u32 value,
-                    enum intel_sbi_destination destination);
-
-#endif /* _INTEL_SIDEBAND_H */