soundwire: intel_ace2.x: add AC timing extensions for PantherLake

The ACE3 IP used in PantherLake exposes new bitfields in the ACTMCTL
register to better control clocks/delays. These bitfields were
reserved/zero in the ACE2.x IP, to simplify the integration the new
bifields are added unconditionally. The behavior will only be impacted
when the firmware exposes DSD properties to set non-zero values.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20240603070240.5165-1-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel.h b/drivers/soundwire/intel.h
index b68e74c294e70f083231f3a5248217eef368f383..68838e843b543e4abbb0806849bda8d26ff0500b 100644 (file)
--- a/drivers/soundwire/intel.h
+++ b/drivers/soundwire/intel.h
@@ -59,6 +59,11 @@ struct sdw_intel {
 };
 
 struct sdw_intel_prop {
+       u16 clde;
+       u16 doaise2;
+       u16 dodse2;
+       u16 clds;
+       u16 clss;
        u16 doaise;
        u16 doais;
        u16 dodse;

diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2x.c
index 8b1b6ad420cf14b86d920cf5769da5ad00292a4c..0dadf46faca6a6860b2674e1a1f0fc592cc4cee6 100644 (file)
--- a/drivers/soundwire/intel_ace2x.c
+++ b/drivers/soundwire/intel_ace2x.c
@@ -27,6 +27,11 @@ static void intel_shim_vs_init(struct sdw_intel *sdw)
        void __iomem *shim_vs = sdw->link_res->shim_vs;
        struct sdw_bus *bus = &sdw->cdns.bus;
        struct sdw_intel_prop *intel_prop;
+       u16 clde;
+       u16 doaise2;
+       u16 dodse2;
+       u16 clds;
+       u16 clss;
        u16 doaise;
        u16 doais;
        u16 dodse;
@@ -34,12 +39,22 @@ static void intel_shim_vs_init(struct sdw_intel *sdw)
        u16 act;
 
        intel_prop = bus->vendor_specific_prop;
+       clde = intel_prop->clde;
+       doaise2 = intel_prop->doaise2;
+       dodse2 = intel_prop->dodse2;
+       clds = intel_prop->clds;
+       clss = intel_prop->clss;
        doaise = intel_prop->doaise;
        doais = intel_prop->doais;
        dodse = intel_prop->dodse;
        dods = intel_prop->dods;
 
        act = intel_readw(shim_vs, SDW_SHIM2_INTEL_VS_ACTMCTL);
+       u16p_replace_bits(&act, clde, SDW_SHIM3_INTEL_VS_ACTMCTL_CLDE);
+       u16p_replace_bits(&act, doaise2, SDW_SHIM3_INTEL_VS_ACTMCTL_DOAISE2);
+       u16p_replace_bits(&act, dodse2, SDW_SHIM3_INTEL_VS_ACTMCTL_DODSE2);
+       u16p_replace_bits(&act, clds, SDW_SHIM3_INTEL_VS_ACTMCTL_CLDS);
+       u16p_replace_bits(&act, clss, SDW_SHIM3_INTEL_VS_ACTMCTL_CLSS);
        u16p_replace_bits(&act, doaise, SDW_SHIM2_INTEL_VS_ACTMCTL_DOAISE);
        u16p_replace_bits(&act, doais, SDW_SHIM2_INTEL_VS_ACTMCTL_DOAIS);
        u16p_replace_bits(&act, dodse, SDW_SHIM2_INTEL_VS_ACTMCTL_DODSE);

diff --git a/drivers/soundwire/intel_auxdevice.c b/drivers/soundwire/intel_auxdevice.c
index 17cf27e6ea738c3e2c126437c99cf863f036c97f..54cb455ed8706e5b0d041d305bdb165268b8fa3e 100644 (file)
--- a/drivers/soundwire/intel_auxdevice.c
+++ b/drivers/soundwire/intel_auxdevice.c
@@ -159,11 +159,31 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
                return -ENOMEM;
 
        /* initialize with hardware defaults, in case the properties are not found */
+       intel_prop->clde = 0x0;
+       intel_prop->doaise2 = 0x0;
+       intel_prop->dodse2 = 0x0;
+       intel_prop->clds = 0x0;
+       intel_prop->clss = 0x0;
        intel_prop->doaise = 0x1;
        intel_prop->doais = 0x3;
        intel_prop->dodse  = 0x0;
        intel_prop->dods  = 0x1;
 
+       fwnode_property_read_u16(link,
+                                "intel-sdw-clde",
+                                &intel_prop->clde);
+       fwnode_property_read_u16(link,
+                                "intel-sdw-doaise2",
+                                &intel_prop->doaise2);
+       fwnode_property_read_u16(link,
+                                "intel-sdw-dodse2",
+                                &intel_prop->dodse2);
+       fwnode_property_read_u16(link,
+                                "intel-sdw-clds",
+                                &intel_prop->clds);
+       fwnode_property_read_u16(link,
+                                "intel-sdw-clss",
+                                &intel_prop->clss);
        fwnode_property_read_u16(link,
                                 "intel-sdw-doaise",
                                 &intel_prop->doaise);

diff --git a/include/linux/soundwire/sdw_intel.h b/include/linux/soundwire/sdw_intel.h
index 8e78417156e3c6beb7866d07e44520453a518367..d537587b4499248e6d935c8a72fe2afa5b67cf30 100644 (file)
--- a/include/linux/soundwire/sdw_intel.h
+++ b/include/linux/soundwire/sdw_intel.h
@@ -182,6 +182,11 @@
 #define SDW_SHIM2_INTEL_VS_ACTMCTL_DODSE       BIT(2)
 #define SDW_SHIM2_INTEL_VS_ACTMCTL_DOAIS       GENMASK(4, 3)
 #define SDW_SHIM2_INTEL_VS_ACTMCTL_DOAISE      BIT(5)
+#define SDW_SHIM3_INTEL_VS_ACTMCTL_CLSS                BIT(6)
+#define SDW_SHIM3_INTEL_VS_ACTMCTL_CLDS                GENMASK(11, 7)
+#define SDW_SHIM3_INTEL_VS_ACTMCTL_DODSE2      GENMASK(13, 12)
+#define SDW_SHIM3_INTEL_VS_ACTMCTL_DOAISE2     BIT(14)
+#define SDW_SHIM3_INTEL_VS_ACTMCTL_CLDE                BIT(15)
 
 /**
  * struct sdw_intel_stream_params_data: configuration passed during