[PATCH] soundwire: dmi-quirks: add a global ghost list

[PATCH] soundwire: dmi-quirks: add a global ghost list

[Bard Liao]

Not like other ghost devices, the 0x000000D010010500 ADR doesn't belong
to any codec. We should disable it in all devices.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
 drivers/soundwire/dmi-quirks.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/drivers/soundwire/dmi-quirks.c b/drivers/soundwire/dmi-quirks.c
index 2a98fc8c104d..62cee6e2179d 100644
--- a/drivers/soundwire/dmi-quirks.c
+++ b/drivers/soundwire/dmi-quirks.c
@@ -15,6 +15,14 @@ struct adr_remap {
 	u64 remapped_adr;
 };
 
+static const struct adr_remap global_ghost_adr[] = {
+	{
+		0x000000D010010500ull,
+		0x0000000000000000ull
+	},
+	{}
+};
+
 /*
  * Some TigerLake devices based on an initial Intel BIOS do not expose
  * the correct _ADR in the DSDT.
@@ -212,6 +220,7 @@ static const struct dmi_system_id adr_remap_quirk_table[] = {
 u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr)
 {
 	const struct dmi_system_id *dmi_id;
+	int i;
 
 	/* check if any address remap quirk applies */
 	dmi_id = dmi_first_match(adr_remap_quirk_table);
@@ -223,10 +232,20 @@ u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr)
 				dev_dbg(bus->dev, "remapped _ADR 0x%llx as 0x%llx\n",
 					addr, map->remapped_adr);
 				addr = map->remapped_adr;
-				break;
+				goto out;
 			}
 		}
 	}
 
+	/* remap the ghost ADRs */
+	for (i = 0; i < ARRAY_SIZE(global_ghost_adr); i++) {
+		if (global_ghost_adr[i].adr == addr) {
+			dev_dbg(bus->dev, "remapped _ADR 0x%llx as 0x%llx\n",
+				addr, global_ghost_adr[i].remapped_adr);
+			addr = global_ghost_adr[i].remapped_adr;
+			break;
+		}
+	}
+out:
 	return addr;
 }
-- 
2.43.0

Re: [PATCH] soundwire: dmi-quirks: add a global ghost list

[Pierre-Louis Bossart]

On 7/3/26 03:16, Bard Liao wrote:
> Not like other ghost devices, the 0x000000D010010500 ADR doesn't belong
> to any codec. We should disable it in all devices.

for the record the address is remapped to a zero value which is ignored by the existing core logic.

> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
> Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>

> ---
>  drivers/soundwire/dmi-quirks.c | 21 ++++++++++++++++++++-
>  1 file changed, 20 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/soundwire/dmi-quirks.c b/drivers/soundwire/dmi-quirks.c
> index 2a98fc8c104d..62cee6e2179d 100644
> --- a/drivers/soundwire/dmi-quirks.c
> +++ b/drivers/soundwire/dmi-quirks.c
> @@ -15,6 +15,14 @@ struct adr_remap {
>  	u64 remapped_adr;
>  };
>  
> +static const struct adr_remap global_ghost_adr[] = {
> +	{
> +		0x000000D010010500ull,
> +		0x0000000000000000ull
> +	},
> +	{}
> +};
> +
>  /*
>   * Some TigerLake devices based on an initial Intel BIOS do not expose
>   * the correct _ADR in the DSDT.
> @@ -212,6 +220,7 @@ static const struct dmi_system_id adr_remap_quirk_table[] = {
>  u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr)
>  {
>  	const struct dmi_system_id *dmi_id;
> +	int i;
>  
>  	/* check if any address remap quirk applies */
>  	dmi_id = dmi_first_match(adr_remap_quirk_table);
> @@ -223,10 +232,20 @@ u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr)
>  				dev_dbg(bus->dev, "remapped _ADR 0x%llx as 0x%llx\n",
>  					addr, map->remapped_adr);
>  				addr = map->remapped_adr;
> -				break;
> +				goto out;
>  			}
>  		}
>  	}
>  
> +	/* remap the ghost ADRs */
> +	for (i = 0; i < ARRAY_SIZE(global_ghost_adr); i++) {
> +		if (global_ghost_adr[i].adr == addr) {
> +			dev_dbg(bus->dev, "remapped _ADR 0x%llx as 0x%llx\n",
> +				addr, global_ghost_adr[i].remapped_adr);
> +			addr = global_ghost_adr[i].remapped_adr;
> +			break;
> +		}
> +	}
> +out:
>  	return addr;
>  }