[PATCH 1/2] ALSA: hda: Replace numeric device IDs with constant values

[PATCH 1/2] ALSA: hda: Replace numeric device IDs with constant values

[Rui Salvaterra]

We have self-explanatory constants for Intel HDA devices, let's use them instead
of magic numbers and code comments.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
---
 sound/pci/hda/hda_intel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 2276adc84478..66f013ee160d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1729,8 +1729,8 @@ static int default_bdl_pos_adj(struct azx *chip)
 	/* some exceptions: Atoms seem problematic with value 1 */
 	if (chip->pci->vendor == PCI_VENDOR_ID_INTEL) {
 		switch (chip->pci->device) {
-		case 0x0f04: /* Baytrail */
-		case 0x2284: /* Braswell */
+		case PCI_DEVICE_ID_INTEL_HDA_BYT:
+		case PCI_DEVICE_ID_INTEL_HDA_BSW:
 			return 32;
 		}
 	}
-- 
2.43.0

[PATCH 2/2] ALSA: hda: Increase default bdl_pos_adj for Apollo Lake

[Rui Salvaterra]

Apollo Lake seems to also suffer from IRQ timing issues. After being up for ~4
minutes, a Pentium N4200 system ends up falling back to workqueue-based IRQ
handling:

[  208.019906] snd_hda_intel 0000:00:0e.0: IRQ timing workaround is activated
for card #0. Suggest a bigger bdl_pos_adj.

Unfortunately, the Baytrail and Braswell workaround value of 32 samples isn't
enough to fix the issue here. Default to 64 samples.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
---
 sound/pci/hda/hda_intel.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 66f013ee160d..1b550c42db09 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1732,6 +1732,8 @@ static int default_bdl_pos_adj(struct azx *chip)
 		case PCI_DEVICE_ID_INTEL_HDA_BYT:
 		case PCI_DEVICE_ID_INTEL_HDA_BSW:
 			return 32;
+		case PCI_DEVICE_ID_INTEL_HDA_APL:
+			return 64;
 		}
 	}
 
-- 
2.43.0

Re: [PATCH 1/2] ALSA: hda: Replace numeric device IDs with constant values

[Amadeusz Sławiński]

On 1/22/2024 12:45 PM, Rui Salvaterra wrote:
> We have self-explanatory constants for Intel HDA devices, let's use them instead
> of magic numbers and code comments.
> 
> Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
> ---
>   sound/pci/hda/hda_intel.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 2276adc84478..66f013ee160d 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -1729,8 +1729,8 @@ static int default_bdl_pos_adj(struct azx *chip)
>   	/* some exceptions: Atoms seem problematic with value 1 */
>   	if (chip->pci->vendor == PCI_VENDOR_ID_INTEL) {
>   		switch (chip->pci->device) {
> -		case 0x0f04: /* Baytrail */
> -		case 0x2284: /* Braswell */
> +		case PCI_DEVICE_ID_INTEL_HDA_BYT:
> +		case PCI_DEVICE_ID_INTEL_HDA_BSW:
>   			return 32;
>   		}
>   	}

Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

Re: [PATCH 2/2] ALSA: hda: Increase default bdl_pos_adj for Apollo Lake

[Amadeusz Sławiński]

On 1/22/2024 12:45 PM, Rui Salvaterra wrote:
> Apollo Lake seems to also suffer from IRQ timing issues. After being up for ~4
> minutes, a Pentium N4200 system ends up falling back to workqueue-based IRQ
> handling:
> 
> [  208.019906] snd_hda_intel 0000:00:0e.0: IRQ timing workaround is activated
> for card #0. Suggest a bigger bdl_pos_adj.
> 
> Unfortunately, the Baytrail and Braswell workaround value of 32 samples isn't
> enough to fix the issue here. Default to 64 samples.
> 
> Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
> ---
>   sound/pci/hda/hda_intel.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 66f013ee160d..1b550c42db09 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -1732,6 +1732,8 @@ static int default_bdl_pos_adj(struct azx *chip)
>   		case PCI_DEVICE_ID_INTEL_HDA_BYT:
>   		case PCI_DEVICE_ID_INTEL_HDA_BSW:
>   			return 32;
> +		case PCI_DEVICE_ID_INTEL_HDA_APL:
> +			return 64;
>   		}
>   	}
>   

Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

Re: [PATCH 1/2] ALSA: hda: Replace numeric device IDs with constant values

[Takashi Iwai]

On Mon, 22 Jan 2024 12:45:12 +0100,
Rui Salvaterra wrote:
> 
> We have self-explanatory constants for Intel HDA devices, let's use them instead
> of magic numbers and code comments.
> 
> Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>

Applied both patches now.  Thanks.


Takashi