ALSA: non-cached memalloc helper
Subsystems (2)
cover ALSA: non-cached memalloc helper
Hi,
this is a patchset to add the non-cached page handling in the memory allocation helpers, which have been implemented individually in several driver codes. This also fixes a long-time bug of HD-audio non-mmap behavior in the non-snoop mode, which was reported recently.
Takashi
===
Takashi Iwai (8):
ALSA: memalloc: Don't align the size to power-of-two
ALSA: memalloc: Simplify snd_malloc_dev_pages() calls
ALSA: memalloc: Add non-cached buffer type
ALSA: hda: Check the non-cached stream buffers more explicitly
ALSA: hda: Use new non-cached allocation for non-snoop mode
ALSA: hda: Remove substream allocation/free ops
ALSA: intel8x0: Use the new non-cached allocation for 440MX workaround
ALSA: intel_hdmi: Use the new non-cached allocation
include/sound/memalloc.h | 3 + sound/core/memalloc.c | 40 ++++++++----- sound/core/sgbuf.c | 15 ++++- sound/pci/hda/hda_controller.c | 13 +++-- sound/pci/hda/hda_controller.h | 7 +-- sound/pci/hda/hda_intel.c | 103 ++++----------------------------- sound/pci/hda/hda_tegra.c | 18 +----- sound/pci/intel8x0.c | 89 ++++------------------------ sound/x86/intel_hdmi_audio.c | 29 +--------- 9 files changed, 75 insertions(+), 242 deletions(-)
Signature · 1 line
2.18.0
PATCH 1/8 ALSA: memalloc: Don't align the size to power-of-two
The size passed to dma_alloc_coherent() doesn't have to be aligned with power-of-two, rather it should be the raw size. As a minor optimization, remove the size adjustment in the current code.
--- sound/core/memalloc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
sound/core/memalloc.c +2 -7
@@ -84,29 +84,24 @@ EXPORT_SYMBOL(snd_free_pages);/* allocate the coherent DMA pages */ static void *snd_malloc_dev_pages (struct device *dev,size_t size,dma_addr_t *dma) { -int pg;gfp_t gfp_flags;if (WARN_ON (!dma))return NULL ; - pg =get_order (size); gfp_flags =GFP_KERNEL | __GFP_COMP/* compound page lets parts be mapped */ | __GFP_NORETRY/* don't trigger OOM-killer */ | __GFP_NOWARN;/* no stack trace print - this call is non-critical */ -return dma_alloc_coherent (dev,PAGE_SIZE << pg, dma, gfp_flags); +return dma_alloc_coherent (dev, size, dma, gfp_flags); }/* free the coherent DMA pages */ static void snd_free_dev_pages (struct device *dev,size_t size,void *ptr,dma_addr_t dma) { -int pg; -if (ptr ==NULL )return ; - pg =get_order (size); -dma_free_coherent (dev,PAGE_SIZE << pg, ptr, dma); +dma_free_coherent (dev, size, ptr, dma); }#ifdef CONFIG_GENERIC_ALLOCATOR
Signature · 1 line
2.18.0
PATCH 2/8 ALSA: memalloc: Simplify snd_malloc_dev_pages() calls
In reply to Takashi Iwaisnd_malloc_dev_pages() and snd_free_dev_pages() are local functions and the parameters passed there are all contained in snd_dma_buffer object. As a code-simplification, pass snd_dma_buffer object and assign the address there like other allocators do (except for snd_malloc_pages() which is called from outside, hence we can't change easily).
Only code refactoring, no functional changes.
--- sound/core/memalloc.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
sound/core/memalloc.c +7 -11
@@ -82,26 +82,22 @@ EXPORT_SYMBOL(snd_free_pages);#ifdef CONFIG_HAS_DMA /* allocate the coherent DMA pages */ -static void *snd_malloc_dev_pages (struct device *dev,size_t size,dma_addr_t *dma) +static void snd_malloc_dev_pages (struct snd_dma_buffer *dmab,size_t size) {gfp_t gfp_flags; -if (WARN_ON (!dma)) -return NULL ; gfp_flags =GFP_KERNEL | __GFP_COMP/* compound page lets parts be mapped */ | __GFP_NORETRY/* don't trigger OOM-killer */ | __GFP_NOWARN;/* no stack trace print - this call is non-critical */ -return dma_alloc_coherent (dev, size, dma, gfp_flags); + dmab->area =dma_alloc_coherent (dmab->dev.dev, size, &dmab->addr, + gfp_flags); }/* free the coherent DMA pages */ -static void snd_free_dev_pages (struct device *dev,size_t size,void *ptr, -dma_addr_t dma) +static void snd_free_dev_pages (struct snd_dma_buffer *dmab) { -if (ptr ==NULL ) -return ; -dma_free_coherent (dev, size, ptr, dma); +dma_free_coherent (dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); }#ifdef CONFIG_GENERIC_ALLOCATOR
@@ -195,7 +191,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, dmab->dev.type =SNDRV_DMA_TYPE_DEV ;#endif /* CONFIG_GENERIC_ALLOCATOR */ case SNDRV_DMA_TYPE_DEV : - dmab->area =snd_malloc_dev_pages (device, size, &dmab->addr); +snd_malloc_dev_pages (dmab, size);break ;#endif #ifdef CONFIG_SND_DMA_SGBUF
@@ -270,7 +266,7 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)break ;#endif /* CONFIG_GENERIC_ALLOCATOR */ case SNDRV_DMA_TYPE_DEV : -snd_free_dev_pages (dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); +snd_free_dev_pages (dmab);break ;#endif #ifdef CONFIG_SND_DMA_SGBUF
Signature · 1 line
2.18.0
PATCH 3/8 ALSA: memalloc: Add non-cached buffer type
In reply to Takashi IwaiIn some cases (mainly for x86), we need the DMA coherent buffer with non-cached pages. Although this has been done in each driver side like HD-audio and intel8x0, it can be done cleaner in the core memory allocator.
This patch adds the new types, SNDRV_DMA_TYPE_DEV_UC and SNDRV_DMA_TYPE_DEV_UC_SG, for allocating such non-cached buffer pages. On non-x86 architectures, they work as same as the standard SNDRV_DMA_TYPE_DEV and *_SG.
One additional change by this move is that we can assure to pass the non-cached pgprot to the vmapped buffer, too. It eventually fixes the case like non-snoop mode without mmap access on HD-audio.
--- include/sound/memalloc.h | 3 +++ sound/core/memalloc.c | 17 +++++++++++++++++ sound/core/sgbuf.c | 15 +++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-)
include/sound/memalloc.h +3 -0
@@ -47,10 +47,13 @@ struct snd_dma_device {#define SNDRV_DMA_TYPE_UNKNOWN 0/* not defined */ #define SNDRV_DMA_TYPE_CONTINUOUS 1/* continuous no-DMA memory */ #define SNDRV_DMA_TYPE_DEV 2/* generic device continuous */ +#define SNDRV_DMA_TYPE_DEV_UC 5/* continuous non-cahced */ #ifdef CONFIG_SND_DMA_SGBUF #define SNDRV_DMA_TYPE_DEV_SG 3/* generic device SG-buffer */ +#define SNDRV_DMA_TYPE_DEV_UC_SG 6/* SG non-cached */ #else #define SNDRV_DMA_TYPE_DEV_SG SNDRV_DMA_TYPE_DEV/* no SG-buf support */ +#define SNDRV_DMA_TYPE_DEV_UC_SG SNDRV_DMA_TYPE_DEV_UC#endif #ifdef CONFIG_GENERIC_ALLOCATOR #define SNDRV_DMA_TYPE_DEV_IRAM 4/* generic device iram-buffer */
sound/core/memalloc.c +17 -0
@@ -25,6 +25,9 @@#include <linux/mm.h> #include <linux/dma-mapping.h> #include <linux/genalloc.h> +#ifdef CONFIG_X86 +#include <asm/set_memory.h> +#endif #include <sound/memalloc.h> /*
@@ -92,11 +95,21 @@ static void snd_malloc_dev_pages(struct snd_dma_buffer *dmab, size_t size) | __GFP_NOWARN; /* no stack trace print - this call is non-critical */ dmab->area =dma_alloc_coherent (dmab->dev.dev, size, &dmab->addr, gfp_flags); +#ifdef CONFIG_X86 +if (dmab->area && dmab->dev.type ==SNDRV_DMA_TYPE_DEV_UC ) +set_memory_wc ((unsigned long )dmab->area, +PAGE_ALIGN (size) >>PAGE_SHIFT ); +#endif }/* free the coherent DMA pages */ static void snd_free_dev_pages (struct snd_dma_buffer *dmab) { +#ifdef CONFIG_X86 +if (dmab->dev.type ==SNDRV_DMA_TYPE_DEV_UC ) +set_memory_wb ((unsigned long )dmab->area, +PAGE_ALIGN (dmab->bytes) >>PAGE_SHIFT ); +#endif dma_free_coherent (dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); }
@@ -191,11 +204,13 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, dmab->dev.type =SNDRV_DMA_TYPE_DEV ;#endif /* CONFIG_GENERIC_ALLOCATOR */ case SNDRV_DMA_TYPE_DEV : +case SNDRV_DMA_TYPE_DEV_UC :snd_malloc_dev_pages (dmab, size);break ;#endif #ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG : +case SNDRV_DMA_TYPE_DEV_UC_SG :snd_malloc_sgbuf_pages (device, size, dmab,NULL );break ;#endif
@@ -266,11 +281,13 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)break ;#endif /* CONFIG_GENERIC_ALLOCATOR */ case SNDRV_DMA_TYPE_DEV : +case SNDRV_DMA_TYPE_DEV_UC :snd_free_dev_pages (dmab);break ;#endif #ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG : +case SNDRV_DMA_TYPE_DEV_UC_SG :snd_free_sgbuf_pages (dmab);break ;#endif
sound/core/sgbuf.c +13 -2
@@ -23,6 +23,7 @@#include <linux/mm.h> #include <linux/vmalloc.h> #include <linux/export.h> +#include <asm/pgtable.h> #include <sound/memalloc.h>
@@ -43,6 +44,8 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab) dmab->area =NULL ; tmpb.dev.type =SNDRV_DMA_TYPE_DEV ; +if (dmab->dev.type ==SNDRV_DMA_TYPE_DEV_UC_SG ) + tmpb.dev.type =SNDRV_DMA_TYPE_DEV_UC ; tmpb.dev.dev = sgbuf->dev;for (i =0 ; i < sgbuf->pages; i++) {if (!(sgbuf->table[i].addr & ~PAGE_MASK ))
@@ -72,12 +75,20 @@ void *snd_malloc_sgbuf_pages(struct device *device,struct snd_dma_buffer tmpb;struct snd_sg_page *table;struct page **pgtable; +int type =SNDRV_DMA_TYPE_DEV ; +pgprot_t prot =PAGE_KERNEL ; dmab->area =NULL ; dmab->addr =0 ; dmab->private_data = sgbuf =kzalloc (sizeof (*sgbuf),GFP_KERNEL );if (! sgbuf)return NULL ; +if (dmab->dev.type ==SNDRV_DMA_TYPE_DEV_UC_SG ) { + type =SNDRV_DMA_TYPE_DEV_UC ; +#ifdef pgprot_noncached + prot =pgprot_noncached (PAGE_KERNEL ); +#endif + } sgbuf->dev = device; pages =snd_sgbuf_aligned_pages (size); sgbuf->tblsize =sgbuf_align_table (pages);
@@ -98,7 +109,7 @@ void *snd_malloc_sgbuf_pages(struct device *device,if (chunk > maxpages) chunk = maxpages; chunk <<=PAGE_SHIFT ; -if (snd_dma_alloc_pages_fallback (SNDRV_DMA_TYPE_DEV , device, +if (snd_dma_alloc_pages_fallback (type, device, chunk, &tmpb) <0 ) {if (!sgbuf->pages) goto _failed;
@@ -125,7 +136,7 @@ void *snd_malloc_sgbuf_pages(struct device *device, } sgbuf->size = size; - dmab->area =vmap (sgbuf->page_table, sgbuf->pages,VM_MAP ,PAGE_KERNEL ); + dmab->area =vmap (sgbuf->page_table, sgbuf->pages,VM_MAP , prot);if (! dmab->area) goto _failed;if (res_size)
Signature · 1 line
2.18.0
PATCH 4/8 ALSA: hda: Check the non-cached stream buffers more explicitly
In reply to Takashi IwaiIntroduce a new flag, uc_buffer, to indicate that the controller requires the non-cached pages for stream buffers, either as a chip-specific requirement or specified via snoop=0 option. This improves the code-readability.
Also, this patch fixes the incorrect behavior for C-Media chip where the stream buffers were never handled as non-cached due to the check of driver_type even if you pass snoop=0 option.
--- sound/pci/hda/hda_controller.h | 1 + sound/pci/hda/hda_intel.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)
sound/pci/hda/hda_controller.h +1 -0
@@ -160,6 +160,7 @@ struct azx { unsigned int msi:1; unsigned int probing:1; /* codec probing phase */ unsigned int snoop:1; + unsigned int uc_buffer:1; /* non-cached pages for stream buffers */ unsigned int align_buffer_size:1; unsigned int region_requested:1; unsigned int disabled:1; /* disabled by vga_switcheroo */
sound/pci/hda/hda_intel.c +8 -3
@@ -410,7 +410,7 @@ static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool#ifdef CONFIG_SND_DMA_SGBUF if (dmab->dev.type ==SNDRV_DMA_TYPE_DEV_SG ) {struct snd_sg_buf *sgbuf = dmab->private_data; -if (chip->driver_type ==AZX_DRIVER_CMEDIA ) +if (!chip->uc_buffer)return ;/* deal with only CORB/RIRB buffers */ if (on)set_pages_array_wc (sgbuf->page_table, sgbuf->pages);
@@ -1637,6 +1637,7 @@ static void azx_check_snoop_available(struct azx *chip)dev_info (chip->card->dev,"Force to %s mode by module option\n" , snoop ?"snoop" :"non-snoop" ); chip->snoop = snoop; + chip->uc_buffer = !snoop;return ; }
@@ -1657,8 +1658,12 @@ static void azx_check_snoop_available(struct azx *chip) snoop = false; chip->snoop = snoop; -if (!snoop) +if (!snoop) {dev_info (chip->card->dev,"Force to non-snoop mode\n" ); +/* C-Media requires non-cached pages only for CORB/RIRB */ +if (chip->driver_type !=AZX_DRIVER_CMEDIA ) + chip->uc_buffer = true; + } }static void azx_probe_work (struct work_struct *work)
@@ -2097,7 +2102,7 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream,#ifdef CONFIG_X86 struct azx_pcm *apcm =snd_pcm_substream_chip (substream);struct azx *chip = apcm->chip; -if (!azx_snoop (chip) && chip->driver_type !=AZX_DRIVER_CMEDIA ) +if (chip->uc_buffer) area->vm_page_prot =pgprot_writecombine (area->vm_page_prot);#endif }
Signature · 1 line
2.18.0
PATCH 5/8 ALSA: hda: Use new non-cached allocation for non-snoop mode
In reply to Takashi IwaiNow the ALSA memory allocator helper supports the new non-cached pages, let's use the new type, SNDRV_DMA_TYPE_DEV_UC_SG, for HD-audio driver. This allows us to reduce lots of codes.
As another positive side-effect by this patch, the long-standing issue with non-snoop mode playing in the non-mmap mode is fixed. The core memalloc helper does the proper pgprot setup for non-cached pages for vmap(), which was missing in the past.
--- sound/pci/hda/hda_controller.c | 5 ++- sound/pci/hda/hda_controller.h | 1 - sound/pci/hda/hda_intel.c | 81 ++-------------------------------- 3 files changed, 8 insertions(+), 79 deletions(-)
sound/pci/hda/hda_controller.c +4 -1
@@ -732,6 +732,7 @@ int snd_hda_attach_pcm_stream(struct hda_bus *_bus, struct hda_codec *codec,int pcm_dev = cpcm->device;unsigned int size;int s, err; +int type =SNDRV_DMA_TYPE_DEV_SG ;list_for_each_entry (apcm, &chip->pcm_list, list) {if (apcm->pcm->device == pcm_dev) {
@@ -770,7 +771,9 @@ int snd_hda_attach_pcm_stream(struct hda_bus *_bus, struct hda_codec *codec, size =CONFIG_SND_HDA_PREALLOC_SIZE *1024 ;if (size >MAX_PREALLOC_SIZE ) size =MAX_PREALLOC_SIZE ; -snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV_SG , +if (chip->uc_buffer) + type =SNDRV_DMA_TYPE_DEV_UC_SG ; +snd_pcm_lib_preallocate_pages_for_all (pcm, type, chip->card->dev, size,MAX_PREALLOC_SIZE );return 0 ;
sound/pci/hda/hda_controller.h +0 -1
@@ -76,7 +76,6 @@ struct azx_dev {* when link position is not greater than FIFO size */ unsigned int insufficient:1; - unsigned int wc_marked:1; };#define azx_stream (dev) (&(dev)->core)
sound/pci/hda/hda_intel.c +4 -77
109 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH 6/8 ALSA: hda: Remove substream allocation/free ops
In reply to Takashi IwaiSince we dropped the memory page fiddling in the own allocators in hda_intel.c, the substream allocation and free ops in both hda_intel.c and hda_tegra.c became nothing but the simple calls of the standard snd_pcm_lib helpers. As both are identical, there is no longer need for indirect calls via ops; it's a good opportunity for removing ops and simplifying the codes.
--- sound/pci/hda/hda_controller.c | 8 ++++---- sound/pci/hda/hda_controller.h | 5 ----- sound/pci/hda/hda_intel.c | 15 --------------- sound/pci/hda/hda_tegra.c | 18 +----------------- 4 files changed, 5 insertions(+), 41 deletions(-)
sound/pci/hda/hda_controller.c +4 -4
@@ -130,8 +130,9 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream, azx_dev->core.bufsize =0 ; azx_dev->core.period_bytes =0 ; azx_dev->core.format_val =0 ; - ret = chip->ops->substream_alloc_pages (chip, substream, -params_buffer_bytes (hw_params)); + ret =snd_pcm_lib_malloc_pages (substream, +params_buffer_bytes (hw_params)); + unlock:dsp_unlock (azx_dev);return ret;
@@ -141,7 +142,6 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream) {struct azx_pcm *apcm =snd_pcm_substream_chip (substream);struct azx_dev *azx_dev =get_azx_dev (substream); -struct azx *chip = apcm->chip;struct hda_pcm_stream *hinfo =to_hda_pcm_stream (substream);int err;
@@ -152,7 +152,7 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)snd_hda_codec_cleanup (apcm->codec, hinfo, substream); - err = chip->ops->substream_free_pages (chip, substream); + err =snd_pcm_lib_free_pages (substream);azx_stream (azx_dev)->prepared =0 ;dsp_unlock (azx_dev);return err;
sound/pci/hda/hda_controller.h +0 -5
@@ -87,11 +87,6 @@ struct azx;struct hda_controller_ops {/* Disable msi if supported, PCI only */ int (*disable_msi_reset_irq)(struct azx *); -int (*substream_alloc_pages)(struct azx *chip, -struct snd_pcm_substream *substream, -size_t size); -int (*substream_free_pages)(struct azx *chip, -struct snd_pcm_substream *substream);void (*pcm_mmap_prepare)(struct snd_pcm_substream *substream,struct vm_area_struct *area);/* Check if current position is acceptable */
sound/pci/hda/hda_intel.c +0 -15
@@ -2010,19 +2010,6 @@ static void dma_free_pages(struct hdac_bus *bus, struct snd_dma_buffer *buf)snd_dma_free_pages (buf); } -static int substream_alloc_pages (struct azx *chip, -struct snd_pcm_substream *substream, -size_t size) -{ -return snd_pcm_lib_malloc_pages (substream, size); -} - -static int substream_free_pages (struct azx *chip, -struct snd_pcm_substream *substream) -{ -return snd_pcm_lib_free_pages (substream); -} -static void pcm_mmap_prepare (struct snd_pcm_substream *substream,struct vm_area_struct *area) {
@@ -2047,8 +2034,6 @@ static const struct hdac_io_ops pci_hda_io_ops = {static const struct hda_controller_ops pci_hda_ops = { .disable_msi_reset_irq = disable_msi_reset_irq, - .substream_alloc_pages = substream_alloc_pages, - .substream_free_pages = substream_free_pages, .pcm_mmap_prepare = pcm_mmap_prepare, .position_check = azx_position_check, .link_power = azx_intel_link_power,
sound/pci/hda/hda_tegra.c +1 -17
@@ -99,19 +99,6 @@ static void dma_free_pages(struct hdac_bus *bus, struct snd_dma_buffer *buf)snd_dma_free_pages (buf); } -static int substream_alloc_pages (struct azx *chip, -struct snd_pcm_substream *substream, -size_t size) -{ -return snd_pcm_lib_malloc_pages (substream, size); -} - -static int substream_free_pages (struct azx *chip, -struct snd_pcm_substream *substream) -{ -return snd_pcm_lib_free_pages (substream); -} -/* * Register access ops. Tegra HDA register access is DWORD only. */
@@ -180,10 +167,7 @@ static const struct hdac_io_ops hda_tegra_io_ops = { .dma_free_pages = dma_free_pages, }; -static const struct hda_controller_ops hda_tegra_ops = { - .substream_alloc_pages = substream_alloc_pages, - .substream_free_pages = substream_free_pages, -}; +static const struct hda_controller_ops hda_tegra_ops;/* nothing special */ static void hda_tegra_init (struct hda_tegra *hda) {
Signature · 1 line
2.18.0
PATCH 7/8 ALSA: intel8x0: Use the new non-cached allocation for 440MX workaround
In reply to Takashi Iwaiintel8x0 driver requires the non-cached pages for 440MX workaround, and this can be implemented more easily with the new memalloc type, SNDRV_DMA_TYPE_DEV_UC. This allows us to reduce lots of code.
--- sound/pci/intel8x0.c | 89 ++++++-------------------------------------- 1 file changed, 12 insertions(+), 77 deletions(-)
sound/pci/intel8x0.c +12 -77
@@ -38,11 +38,6 @@#include <sound/ac97_codec.h> #include <sound/info.h> #include <sound/initval.h> -/* for 440MX workaround */ -#include <asm/pgtable.h> -#ifdef CONFIG_X86 -#include <asm/set_memory.h> -#endif MODULE_AUTHOR ("Jaroslav Kysela <[email protected]>" );MODULE_DESCRIPTION ("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455" );
@@ -374,7 +369,6 @@ struct ichdev {unsigned int ali_slot;/* ALI DMA slot */ struct ac97_pcm *pcm;int pcm_open_flag; - unsigned int page_attr_changed: 1; unsigned int suspended: 1; };
@@ -724,25 +718,6 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ichiputbyte (chip, port + ichdev->roff_sr,ICH_FIFOE |ICH_BCIS |ICH_LVBCI ); } -#ifdef __i386__ -/* -* Intel 82443MX running a 100MHz processor system bus has a hardware bug, -* which aborts PCI busmaster for audio transfer. A workaround is to set -* the pages as non-cached. For details, see the errata in -* http://download.intel.com/design/chipsets/specupdt/24505108.pdf -*/ -static void fill_nocache (void *buf,int size,int nocache) -{ - size = (size +PAGE_SIZE -1 ) >>PAGE_SHIFT ; -if (nocache) -set_pages_uc (virt_to_page (buf), size); -else -set_pages_wb (virt_to_page (buf), size); -} -#else -#define fill_nocache (buf, size, nocache) do { ; } while (0) -#endif -/* * Interrupt handler */
@@ -938,23 +913,12 @@ static int snd_intel8x0_hw_params(struct snd_pcm_substream *substream, {struct intel8x0 *chip =snd_pcm_substream_chip (substream);struct ichdev *ichdev =get_ichdev (substream); -struct snd_pcm_runtime *runtime = substream->runtime;int dbl =params_rate (hw_params) >48000 ;int err; -if (chip->fix_nocache && ichdev->page_attr_changed) { -fill_nocache (runtime->dma_area, runtime->dma_bytes,0 );/* clear */ - ichdev->page_attr_changed =0 ; - } err =snd_pcm_lib_malloc_pages (substream,params_buffer_bytes (hw_params));if (err <0 )return err; -if (chip->fix_nocache) { -if (runtime->dma_area && ! ichdev->page_attr_changed) { -fill_nocache (runtime->dma_area, runtime->dma_bytes,1 ); - ichdev->page_attr_changed =1 ; - } - }if (ichdev->pcm_open_flag) {snd_ac97_pcm_close (ichdev->pcm); ichdev->pcm_open_flag =0 ;
@@ -974,17 +938,12 @@ static int snd_intel8x0_hw_params(struct snd_pcm_substream *substream,static int snd_intel8x0_hw_free (struct snd_pcm_substream *substream) { -struct intel8x0 *chip =snd_pcm_substream_chip (substream);struct ichdev *ichdev =get_ichdev (substream);if (ichdev->pcm_open_flag) {snd_ac97_pcm_close (ichdev->pcm); ichdev->pcm_open_flag =0 ; } -if (chip->fix_nocache && ichdev->page_attr_changed) { -fill_nocache (substream->runtime->dma_area, substream->runtime->dma_bytes,0 ); - ichdev->page_attr_changed =0 ; - }return snd_pcm_lib_free_pages (substream); }
@@ -1510,6 +1469,9 @@ struct ich_pcm_table {int ac97_idx; }; +#define intel8x0_dma_type (chip) \ + ((chip)->fix_nocache ? SNDRV_DMA_TYPE_DEV_UC : SNDRV_DMA_TYPE_DEV) +static int snd_intel8x0_pcm1 (struct intel8x0 *chip,int device,struct ich_pcm_table *rec) {
@@ -1540,7 +1502,7 @@ static int snd_intel8x0_pcm1(struct intel8x0 *chip, int device,strcpy (pcm->name, chip->card->shortname); chip->pcm[device] = pcm; -snd_pcm_lib_preallocate_pages_for_all (pcm,SNDRV_DMA_TYPE_DEV , +snd_pcm_lib_preallocate_pages_for_all (pcm,intel8x0_dma_type (chip),snd_dma_pci_data (chip->pci), rec->prealloc_size, rec->prealloc_max_size);
@@ -2629,11 +2591,8 @@ static int snd_intel8x0_free(struct intel8x0 *chip) __hw_end:if (chip->irq >=0 )free_irq (chip->irq, chip); -if (chip->bdbars.area) { -if (chip->fix_nocache) -fill_nocache (chip->bdbars.area, chip->bdbars.bytes,0 ); +if (chip->bdbars.area)snd_dma_free_pages (&chip->bdbars); - }if (chip->addr)pci_iounmap (chip->pci, chip->addr);if (chip->bmaddr)
@@ -2657,17 +2616,6 @@ static int intel8x0_suspend(struct device *dev)snd_power_change_state (card, SNDRV_CTL_POWER_D3hot);for (i =0 ; i < chip->pcm_devs; i++)snd_pcm_suspend_all (chip->pcm[i]); -/* clear nocache */ -if (chip->fix_nocache) { -for (i =0 ; i < chip->bdbars_count; i++) { -struct ichdev *ichdev = &chip->ichd[i]; -if (ichdev->substream && ichdev->page_attr_changed) { -struct snd_pcm_runtime *runtime = ichdev->substream->runtime; -if (runtime->dma_area) -fill_nocache (runtime->dma_area, runtime->dma_bytes,0 ); - } - } - }for (i =0 ; i < chip->ncodecs; i++)snd_ac97_suspend (chip->ac97[i]);if (chip->device_type ==DEVICE_INTEL_ICH4 )
@@ -2708,25 +2656,9 @@ static int intel8x0_resume(struct device *dev) ICH_PCM_SPDIF_1011); } -/* refill nocache */ -if (chip->fix_nocache) -fill_nocache (chip->bdbars.area, chip->bdbars.bytes,1 ); -for (i =0 ; i < chip->ncodecs; i++)snd_ac97_resume (chip->ac97[i]); -/* refill nocache */ -if (chip->fix_nocache) { -for (i =0 ; i < chip->bdbars_count; i++) { -struct ichdev *ichdev = &chip->ichd[i]; -if (ichdev->substream && ichdev->page_attr_changed) { -struct snd_pcm_runtime *runtime = ichdev->substream->runtime; -if (runtime->dma_area) -fill_nocache (runtime->dma_area, runtime->dma_bytes,1 ); - } - } - } -/* resume status */ for (i =0 ; i < chip->bdbars_count; i++) {struct ichdev *ichdev = &chip->ichd[i];
@@ -3057,6 +2989,12 @@ static int snd_intel8x0_create(struct snd_card *card, chip->inside_vm =snd_intel8x0_inside_vm (pci); +/* +* Intel 82443MX running a 100MHz processor system bus has a hardware +* bug, which aborts PCI busmaster for audio transfer. A workaround +* is to set the pages as non-cached. For details, see the errata in +* http://download.intel.com/design/chipsets/specupdt/24505108.pdf +*/ if (pci->vendor ==PCI_VENDOR_ID_INTEL && pci->device ==PCI_DEVICE_ID_INTEL_440MX ) chip->fix_nocache =1 ;/* enable workaround */
@@ -3128,7 +3066,7 @@ static int snd_intel8x0_create(struct snd_card *card,/* allocate buffer descriptor lists */ /* the start of each lists must be aligned to 8 bytes */ -if (snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV ,snd_dma_pci_data (pci), +if (snd_dma_alloc_pages (intel8x0_dma_type (chip),snd_dma_pci_data (pci), chip->bdbars_count *sizeof (u32) *ICH_MAX_FRAGS *2 , &chip->bdbars) <0 ) {snd_intel8x0_free (chip);
@@ -3137,9 +3075,6 @@ static int snd_intel8x0_create(struct snd_card *card, }/* tables must be aligned to 8 bytes here, but the kernel pages are much bigger, so we don't care (on i386) */ -/* workaround for 440MX */ -if (chip->fix_nocache) -fill_nocache (chip->bdbars.area, chip->bdbars.bytes,1 ); int_sta_masks =0 ;for (i =0 ; i < chip->bdbars_count; i++) { ichdev = &chip->ichd[i];
Signature · 1 line
2.18.0
PATCH 8/8 ALSA: intel_hdmi: Use the new non-cached allocation
In reply to Takashi IwaiThe HDMI LPE audio driver requires the non-cached page allocations for its buffers. With the recent support of SNDRV_DMA_TYPE_DEV_UC type, we can reduce lots of codes in the driver side and let the memalloc core doing it properly.
--- sound/x86/intel_hdmi_audio.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-)
sound/x86/intel_hdmi_audio.c +3 -26
@@ -30,7 +30,6 @@#include <linux/pm_runtime.h> #include <linux/dma-mapping.h> #include <linux/delay.h> -#include <asm/set_memory.h> #include <sound/core.h> #include <sound/asoundef.h> #include <sound/pcm.h>
@@ -1141,8 +1140,7 @@ static int had_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hw_params) {struct snd_intelhad *intelhaddata; -unsigned long addr; -int pages, buf_size, retval; +int buf_size, retval; intelhaddata =snd_pcm_substream_chip (substream); buf_size =params_buffer_bytes (hw_params);
@@ -1151,17 +1149,6 @@ static int had_pcm_hw_params(struct snd_pcm_substream *substream,return retval;dev_dbg (intelhaddata->dev,"%s:allocated memory = %d\n" , __func__, buf_size); -/* mark the pages as uncached region */ - addr = (unsigned long ) substream->runtime->dma_area; - pages = (substream->runtime->dma_bytes +PAGE_SIZE -1 ) /PAGE_SIZE ; - retval =set_memory_uc (addr, pages); -if (retval) { -dev_err (intelhaddata->dev,"set_memory_uc failed.Error:%d\n" , - retval); -return retval; - } -memset (substream->runtime->dma_area,0 , buf_size); -return retval; }
@@ -1171,21 +1158,11 @@ static int had_pcm_hw_params(struct snd_pcm_substream *substream,static int had_pcm_hw_free (struct snd_pcm_substream *substream) {struct snd_intelhad *intelhaddata; -unsigned long addr; -u32 pages; intelhaddata =snd_pcm_substream_chip (substream);had_do_reset (intelhaddata); -/* mark back the pages as cached/writeback region before the free */ -if (substream->runtime->dma_area !=NULL ) { - addr = (unsigned long ) substream->runtime->dma_area; - pages = (substream->runtime->dma_bytes +PAGE_SIZE -1 ) / -PAGE_SIZE ; -set_memory_wb (addr, pages); -return snd_pcm_lib_free_pages (substream); - } -return 0 ; +return snd_pcm_lib_free_pages (substream); }/*
@@ -1860,7 +1837,7 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)* try to allocate 600k buffer as default which is large enough */ snd_pcm_lib_preallocate_pages_for_all (pcm, -SNDRV_DMA_TYPE_DEV ,NULL , +SNDRV_DMA_TYPE_DEV_UC ,NULL ,HAD_DEFAULT_BUFFER ,HAD_MAX_BUFFER );/* create controls */
Signature · 1 line
2.18.0