[v2] wifi: ath11k: Add missing platform IDs for quirk table

[PATCH v2] wifi: ath11k: Add missing platform IDs for quirk table

Posted by Mark Pearson 4 months, 1 week ago

Lenovo platforms can come with one of two different IDs.
The pm_quirk table was missing the second ID for each platform.

Add missing ID and some extra platform identification comments.
Reported on https://bugzilla.kernel.org/show_bug.cgi?id=219196

Tested-on: P14s G4 AMD.
Fixes: ce8669a27016 ("wifi: ath11k: determine PM policy based on machine model")
Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca>
---
Changes in v2:
 - Correct typo for T14s G4 AMD to use correct ID. Sorry!
 - Added in Fixes and Tested-on tags correctly.

 drivers/net/wireless/ath/ath11k/core.c | 54 +++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index d49353b6b2e7..47522fa186a1 100644
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -912,42 +912,84 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
 static const struct dmi_system_id ath11k_pm_quirk_table[] = {
 	{
 		.driver_data = (void *)ATH11K_PM_WOW,
-		.matches = {
+		.matches = { /* X13 G4 AMD #1 */
+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "21J3"),
+		},
+	},
+	{
+		.driver_data = (void *)ATH11K_PM_WOW,
+		.matches = { /* X13 G4 AMD #2 */
 			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "21J4"),
 		},
 	},
 	{
 		.driver_data = (void *)ATH11K_PM_WOW,
-		.matches = {
+		.matches = { /* T14 G4 AMD #1 */
+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "21K3"),
+		},
+	},
+	{
+		.driver_data = (void *)ATH11K_PM_WOW,
+		.matches = { /* T14 G4 AMD #2 */
 			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "21K4"),
 		},
 	},
 	{
 		.driver_data = (void *)ATH11K_PM_WOW,
-		.matches = {
+		.matches = { /* P14s G4 AMD #1 */
+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "21K5"),
+		},
+	},
+	{
+		.driver_data = (void *)ATH11K_PM_WOW,
+		.matches = { /* P14s G4 AMD #2 */
 			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "21K6"),
 		},
 	},
 	{
 		.driver_data = (void *)ATH11K_PM_WOW,
-		.matches = {
+		.matches = { /* T16 G2 AMD #1 */
+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "21K7"),
+		},
+	},
+	{
+		.driver_data = (void *)ATH11K_PM_WOW,
+		.matches = { /* T16 G2 AMD #2 */
 			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "21K8"),
 		},
 	},
 	{
 		.driver_data = (void *)ATH11K_PM_WOW,
-		.matches = {
+		.matches = { /*P16s G2 AMD #1 */
+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "21K9"),
+		},
+	},
+	{
+		.driver_data = (void *)ATH11K_PM_WOW,
+		.matches = { /*P16s G2 AMD #2 */
 			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "21KA"),
 		},
 	},
 	{
 		.driver_data = (void *)ATH11K_PM_WOW,
-		.matches = {
+		.matches = { /*T14s G4 AMD #1 */
+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "21F8"),
+		},
+	},
+	{
+		.driver_data = (void *)ATH11K_PM_WOW,
+		.matches = { /*T14s G4 AMD #2 */
 			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "21F9"),
 		},
-- 
2.43.0

Re: [PATCH v2] wifi: ath11k: Add missing platform IDs for quirk table

Posted by Jeff Johnson 4 months ago

On Mon, 29 Sep 2025 15:21:35 -0400, Mark Pearson wrote:
> Lenovo platforms can come with one of two different IDs.
> The pm_quirk table was missing the second ID for each platform.
> 
> Add missing ID and some extra platform identification comments.
> Reported on https://bugzilla.kernel.org/show_bug.cgi?id=219196
> 
> 
> [...]

Applied, thanks!

[1/1] wifi: ath11k: Add missing platform IDs for quirk table
      commit: 0eb002c93c3b47f88244cecb1e356eaeab61a6bf

Best regards,
-- 
Jeff Johnson <jeff.johnson@oss.qualcomm.com>

Re: [PATCH v2] wifi: ath11k: Add missing platform IDs for quirk table

Posted by Baochen Qiang 4 months, 1 week ago


On 9/30/2025 3:21 AM, Mark Pearson wrote:
> Lenovo platforms can come with one of two different IDs.
> The pm_quirk table was missing the second ID for each platform.
> 
> Add missing ID and some extra platform identification comments.
> Reported on https://bugzilla.kernel.org/show_bug.cgi?id=219196
> 
> Tested-on: P14s G4 AMD.

Leave a blank line as 'Tested-on:' is not an official tag

> Fixes: ce8669a27016 ("wifi: ath11k: determine PM policy based on machine model")

Better to move the bugzilla link here and reword as below?

Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219196

> Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca>
> ---
> Changes in v2:
>  - Correct typo for T14s G4 AMD to use correct ID. Sorry!
>  - Added in Fixes and Tested-on tags correctly.
> 
>  drivers/net/wireless/ath/ath11k/core.c | 54 +++++++++++++++++++++++---
>  1 file changed, 48 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
> index d49353b6b2e7..47522fa186a1 100644
> --- a/drivers/net/wireless/ath/ath11k/core.c
> +++ b/drivers/net/wireless/ath/ath11k/core.c
> @@ -912,42 +912,84 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
>  static const struct dmi_system_id ath11k_pm_quirk_table[] = {
>  	{
>  		.driver_data = (void *)ATH11K_PM_WOW,
> -		.matches = {
> +		.matches = { /* X13 G4 AMD #1 */
> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "21J3"),
> +		},
> +	},
> +	{
> +		.driver_data = (void *)ATH11K_PM_WOW,
> +		.matches = { /* X13 G4 AMD #2 */
>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "21J4"),
>  		},
>  	},
>  	{
>  		.driver_data = (void *)ATH11K_PM_WOW,
> -		.matches = {
> +		.matches = { /* T14 G4 AMD #1 */
> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "21K3"),
> +		},
> +	},
> +	{
> +		.driver_data = (void *)ATH11K_PM_WOW,
> +		.matches = { /* T14 G4 AMD #2 */
>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "21K4"),
>  		},
>  	},
>  	{
>  		.driver_data = (void *)ATH11K_PM_WOW,
> -		.matches = {
> +		.matches = { /* P14s G4 AMD #1 */
> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "21K5"),
> +		},
> +	},
> +	{
> +		.driver_data = (void *)ATH11K_PM_WOW,
> +		.matches = { /* P14s G4 AMD #2 */
>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "21K6"),
>  		},
>  	},
>  	{
>  		.driver_data = (void *)ATH11K_PM_WOW,
> -		.matches = {
> +		.matches = { /* T16 G2 AMD #1 */
> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "21K7"),
> +		},
> +	},
> +	{
> +		.driver_data = (void *)ATH11K_PM_WOW,
> +		.matches = { /* T16 G2 AMD #2 */
>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "21K8"),
>  		},
>  	},
>  	{
>  		.driver_data = (void *)ATH11K_PM_WOW,
> -		.matches = {
> +		.matches = { /*P16s G2 AMD #1 */
> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "21K9"),
> +		},
> +	},
> +	{
> +		.driver_data = (void *)ATH11K_PM_WOW,
> +		.matches = { /*P16s G2 AMD #2 */
>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "21KA"),
>  		},
>  	},
>  	{
>  		.driver_data = (void *)ATH11K_PM_WOW,
> -		.matches = {
> +		.matches = { /*T14s G4 AMD #1 */
> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "21F8"),
> +		},
> +	},
> +	{
> +		.driver_data = (void *)ATH11K_PM_WOW,
> +		.matches = { /*T14s G4 AMD #2 */
>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "21F9"),
>  		},

assuming Jeff can resolve above nits ...

Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>

Re: [PATCH v2] wifi: ath11k: Add missing platform IDs for quirk table

Posted by Jeff Johnson 4 months, 1 week ago

On 9/29/2025 7:17 PM, Baochen Qiang wrote:
> On 9/30/2025 3:21 AM, Mark Pearson wrote:
...>> +		.matches = { /*P16s G2 AMD #1 */
...>> +		.matches = { /*P16s G2 AMD #2 */
...>> +		.matches = { /*T14s G4 AMD #1 */
...>> +		.matches = { /*T14s G4 AMD #2 */

In addition to Baochen's comments, in my pending branch I've also fixed these
4 instances of missing space after /*

https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git/commit/?h=pending&id=79208b9ac68a7e71ad7e60cc37038c35b2b4252f

Re: [PATCH v2] wifi: ath11k: Add missing platform IDs for quirk table

Posted by Mark Pearson 4 months, 1 week ago

On Wed, Oct 1, 2025, at 8:11 PM, Jeff Johnson wrote:
> On 9/29/2025 7:17 PM, Baochen Qiang wrote:
>> On 9/30/2025 3:21 AM, Mark Pearson wrote:
> ...>> +		.matches = { /*P16s G2 AMD #1 */
> ...>> +		.matches = { /*P16s G2 AMD #2 */
> ...>> +		.matches = { /*T14s G4 AMD #1 */
> ...>> +		.matches = { /*T14s G4 AMD #2 */
>
> In addition to Baochen's comments, in my pending branch I've also fixed these
> 4 instances of missing space after /*
>
> https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git/commit/?h=pending&id=79208b9ac68a7e71ad7e60cc37038c35b2b4252f

Thanks Jeff

Mark

Re: [PATCH v2] wifi: ath11k: Add missing platform IDs for quirk table

Posted by Mark Pearson 4 months, 1 week ago

On Mon, Sep 29, 2025, at 10:17 PM, Baochen Qiang wrote:
> On 9/30/2025 3:21 AM, Mark Pearson wrote:
>> Lenovo platforms can come with one of two different IDs.
>> The pm_quirk table was missing the second ID for each platform.
>> 
>> Add missing ID and some extra platform identification comments.
>> Reported on https://bugzilla.kernel.org/show_bug.cgi?id=219196
>> 
>> Tested-on: P14s G4 AMD.
>
> Leave a blank line as 'Tested-on:' is not an official tag
>
>> Fixes: ce8669a27016 ("wifi: ath11k: determine PM policy based on machine model")
>
> Better to move the bugzilla link here and reword as below?
>
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219196
>
>> Signed-off-by: Mark Pearson <mpearson-lenovo@squebb.ca>
>> ---
>> Changes in v2:
>>  - Correct typo for T14s G4 AMD to use correct ID. Sorry!
>>  - Added in Fixes and Tested-on tags correctly.
>> 
>>  drivers/net/wireless/ath/ath11k/core.c | 54 +++++++++++++++++++++++---
>>  1 file changed, 48 insertions(+), 6 deletions(-)
>> 
>> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
>> index d49353b6b2e7..47522fa186a1 100644
>> --- a/drivers/net/wireless/ath/ath11k/core.c
>> +++ b/drivers/net/wireless/ath/ath11k/core.c
>> @@ -912,42 +912,84 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
>>  static const struct dmi_system_id ath11k_pm_quirk_table[] = {
>>  	{
>>  		.driver_data = (void *)ATH11K_PM_WOW,
>> -		.matches = {
>> +		.matches = { /* X13 G4 AMD #1 */
>> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>> +			DMI_MATCH(DMI_PRODUCT_NAME, "21J3"),
>> +		},
>> +	},
>> +	{
>> +		.driver_data = (void *)ATH11K_PM_WOW,
>> +		.matches = { /* X13 G4 AMD #2 */
>>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>>  			DMI_MATCH(DMI_PRODUCT_NAME, "21J4"),
>>  		},
>>  	},
>>  	{
>>  		.driver_data = (void *)ATH11K_PM_WOW,
>> -		.matches = {
>> +		.matches = { /* T14 G4 AMD #1 */
>> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>> +			DMI_MATCH(DMI_PRODUCT_NAME, "21K3"),
>> +		},
>> +	},
>> +	{
>> +		.driver_data = (void *)ATH11K_PM_WOW,
>> +		.matches = { /* T14 G4 AMD #2 */
>>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>>  			DMI_MATCH(DMI_PRODUCT_NAME, "21K4"),
>>  		},
>>  	},
>>  	{
>>  		.driver_data = (void *)ATH11K_PM_WOW,
>> -		.matches = {
>> +		.matches = { /* P14s G4 AMD #1 */
>> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>> +			DMI_MATCH(DMI_PRODUCT_NAME, "21K5"),
>> +		},
>> +	},
>> +	{
>> +		.driver_data = (void *)ATH11K_PM_WOW,
>> +		.matches = { /* P14s G4 AMD #2 */
>>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>>  			DMI_MATCH(DMI_PRODUCT_NAME, "21K6"),
>>  		},
>>  	},
>>  	{
>>  		.driver_data = (void *)ATH11K_PM_WOW,
>> -		.matches = {
>> +		.matches = { /* T16 G2 AMD #1 */
>> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>> +			DMI_MATCH(DMI_PRODUCT_NAME, "21K7"),
>> +		},
>> +	},
>> +	{
>> +		.driver_data = (void *)ATH11K_PM_WOW,
>> +		.matches = { /* T16 G2 AMD #2 */
>>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>>  			DMI_MATCH(DMI_PRODUCT_NAME, "21K8"),
>>  		},
>>  	},
>>  	{
>>  		.driver_data = (void *)ATH11K_PM_WOW,
>> -		.matches = {
>> +		.matches = { /*P16s G2 AMD #1 */
>> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>> +			DMI_MATCH(DMI_PRODUCT_NAME, "21K9"),
>> +		},
>> +	},
>> +	{
>> +		.driver_data = (void *)ATH11K_PM_WOW,
>> +		.matches = { /*P16s G2 AMD #2 */
>>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>>  			DMI_MATCH(DMI_PRODUCT_NAME, "21KA"),
>>  		},
>>  	},
>>  	{
>>  		.driver_data = (void *)ATH11K_PM_WOW,
>> -		.matches = {
>> +		.matches = { /*T14s G4 AMD #1 */
>> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>> +			DMI_MATCH(DMI_PRODUCT_NAME, "21F8"),
>> +		},
>> +	},
>> +	{
>> +		.driver_data = (void *)ATH11K_PM_WOW,
>> +		.matches = { /*T14s G4 AMD #2 */
>>  			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
>>  			DMI_MATCH(DMI_PRODUCT_NAME, "21F9"),
>>  		},
>
> assuming Jeff can resolve above nits ...
>
> Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>

Thanks for the review.
Jeff, let me know if you need a v3 with the small changes.

Mark

Re: [PATCH v2] wifi: ath11k: Add missing platform IDs for quirk table

Posted by Jeff Johnson 4 months, 1 week ago

On 9/30/2025 5:05 AM, Mark Pearson wrote:
> On Mon, Sep 29, 2025, at 10:17 PM, Baochen Qiang wrote:
>> On 9/30/2025 3:21 AM, Mark Pearson wrote:
...>> assuming Jeff can resolve above nits ...
>>
>> Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
> 
> Thanks for the review.
> Jeff, let me know if you need a v3 with the small changes.

I can address those in 'pending'

/jeff