Re: [PATCH 5/7] PM: sleep: core: Rename DPM_FLAG_NEVER_SKIP
On Fri, Apr 10, 2020 at 9:03 AM Rafael J. Wysocki wrote: > > From: "Rafael J. Wysocki" > > Rename DPM_FLAG_NEVER_SKIP to DPM_FLAG_NO_DIRECT_COMPLETE which > matches its purpose more closely. > > No functional impact. > > Signed-off-by: Rafael J. Wysocki Acked-by: Jeff Kirsher For the driver changes to e1000e, igb and igc. > --- > Documentation/driver-api/pm/devices.rst| 6 +++--- > Documentation/power/pci.rst| 10 +- > drivers/base/power/main.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c| 2 +- > drivers/gpu/drm/i915/intel_runtime_pm.c| 2 +- > drivers/gpu/drm/radeon/radeon_kms.c| 2 +- > drivers/misc/mei/pci-me.c | 2 +- > drivers/misc/mei/pci-txe.c | 2 +- > drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- > drivers/net/ethernet/intel/igb/igb_main.c | 2 +- > drivers/net/ethernet/intel/igc/igc_main.c | 2 +- > drivers/pci/pcie/portdrv_pci.c | 2 +- > include/linux/pm.h | 6 +++--- > 13 files changed, 21 insertions(+), 21 deletions(-) > ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-wired-lan] [PATCH 1/3] treewide: Lift switch variables out of switches
On Wed, 2019-01-23 at 03:03 -0800, Kees Cook wrote: > Variables declared in a switch statement before any case statements > cannot be initialized, so move all instances out of the switches. > After this, future always-initialized stack variables will work > and not throw warnings like this: > > fs/fcntl.c: In function ‘send_sigio_to_task’: > fs/fcntl.c:738:13: warning: statement will never be executed [- > Wswitch-unreachable] >siginfo_t si; > ^~ > > Signed-off-by: Kees Cook Acked-by: Jeff Kirsher For the e1000 changes. > --- > arch/x86/xen/enlighten_pv.c | 7 --- > drivers/char/pcmcia/cm4000_cs.c | 2 +- > drivers/char/ppdev.c | 20 - > -- > drivers/gpu/drm/drm_edid.c| 4 ++-- > drivers/gpu/drm/i915/intel_display.c | 2 +- > drivers/gpu/drm/i915/intel_pm.c | 4 ++-- > drivers/net/ethernet/intel/e1000/e1000_main.c | 3 ++- > drivers/tty/n_tty.c | 3 +-- > drivers/usb/gadget/udc/net2280.c | 5 ++--- > fs/fcntl.c| 3 ++- > mm/shmem.c| 5 +++-- > net/core/skbuff.c | 4 ++-- > net/ipv6/ip6_gre.c| 4 ++-- > net/ipv6/ip6_tunnel.c | 4 ++-- > net/openvswitch/flow_netlink.c| 7 +++ > security/tomoyo/common.c | 3 ++- > security/tomoyo/condition.c | 7 --- > security/tomoyo/util.c| 4 ++-- > 18 files changed, 45 insertions(+), 46 deletions(-) signature.asc Description: This is a digitally signed message part ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-wired-lan] [PATCH V2] mm: Replace all open encodings for NUMA_NO_NODE
On Mon, 2018-11-26 at 17:56 +0530, Anshuman Khandual wrote: > At present there are multiple places where invalid node number is > encoded > as -1. Even though implicitly understood it is always better to have > macros > in there. Replace these open encodings for an invalid node number > with the > global macro NUMA_NO_NODE. This helps remove NUMA related assumptions > like > 'invalid node' from various places redirecting them to a common > definition. > > Signed-off-by: Anshuman Khandual For the 'ixgbe' driver changes. Acked-by: Jeff Kirsher > --- > Changes in V2: > > - Added inclusion of 'numa.h' header at various places per Andrew > - Updated 'dev_to_node' to use NUMA_NO_NODE instead per Vinod > > Changes in V1: (https://lkml.org/lkml/2018/11/23/485) > > - Dropped OCFS2 changes per Joseph > - Dropped media/video drivers changes per Hans > > RFC - https://patchwork.kernel.org/patch/10678035/ > > Build tested this with multiple cross compiler options like alpha, > sparc, > arm64, x86, powerpc, powerpc64le etc with their default config which > might > not have compiled tested all driver related changes. I will > appreciate > folks giving this a test in their respective build environment. > > All these places for replacement were found by running the following > grep > patterns on the entire kernel code. Please let me know if this might > have > missed some instances. This might also have replaced some false > positives. > I will appreciate suggestions, inputs and review. > > 1. git grep "nid == -1" > 2. git grep "node == -1" > 3. git grep "nid = -1" > 4. git grep "node = -1" > > arch/alpha/include/asm/topology.h | 3 ++- > arch/ia64/kernel/numa.c | 2 +- > arch/ia64/mm/discontig.c | 6 +++--- > arch/ia64/sn/kernel/io_common.c | 3 ++- > arch/powerpc/include/asm/pci-bridge.h | 3 ++- > arch/powerpc/kernel/paca.c| 3 ++- > arch/powerpc/kernel/pci-common.c | 3 ++- > arch/powerpc/mm/numa.c| 14 +++--- > arch/powerpc/platforms/powernv/memtrace.c | 5 +++-- > arch/sparc/kernel/auxio_32.c | 3 ++- > arch/sparc/kernel/pci_fire.c | 3 ++- > arch/sparc/kernel/pci_schizo.c| 3 ++- > arch/sparc/kernel/pcic.c | 7 --- > arch/sparc/kernel/psycho_common.c | 3 ++- > arch/sparc/kernel/sbus.c | 3 ++- > arch/sparc/mm/init_64.c | 6 +++--- > arch/sparc/prom/init_32.c | 3 ++- > arch/sparc/prom/init_64.c | 5 +++-- > arch/sparc/prom/tree_32.c | 13 +++-- > arch/sparc/prom/tree_64.c | 19 ++--- > -- > arch/x86/include/asm/pci.h| 3 ++- > arch/x86/kernel/apic/x2apic_uv_x.c| 7 --- > arch/x86/kernel/smpboot.c | 3 ++- > arch/x86/platform/olpc/olpc_dt.c | 17 + > drivers/block/mtip32xx/mtip32xx.c | 5 +++-- > drivers/dma/dmaengine.c | 4 +++- > drivers/infiniband/hw/hfi1/affinity.c | 3 ++- > drivers/infiniband/hw/hfi1/init.c | 3 ++- > drivers/iommu/dmar.c | 5 +++-- > drivers/iommu/intel-iommu.c | 3 ++- > drivers/misc/sgi-xp/xpc_uv.c | 3 ++- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++-- > include/linux/device.h| 2 +- > init/init_task.c | 3 ++- > kernel/kthread.c | 3 ++- > kernel/sched/fair.c | 15 --- > lib/cpumask.c | 3 ++- > mm/huge_memory.c | 13 +++-- > mm/hugetlb.c | 3 ++- > mm/ksm.c | 2 +- > mm/memory.c | 7 --- > mm/memory_hotplug.c | 12 ++-- > mm/mempolicy.c| 2 +- > mm/page_alloc.c | 4 ++-- > mm/page_ext.c | 2 +- > net/core/pktgen.c | 3 ++- > net/qrtr/qrtr.c | 3 ++- > tools/perf/bench/numa.c | 6 +++--- > 48 files changed, 146 insertions(+), 108 deletions(-) signature.asc Description: This is a digitally signed message part ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-wired-lan] [PATCH v3 16/27] docs: Fix more broken references
On Thu, 2018-06-14 at 13:09 -0300, Mauro Carvalho Chehab wrote: > As we move stuff around, some doc references are broken. Fix some of > them via this script: > ./scripts/documentation-file-ref-check --fix > > Manually checked that produced results are valid. > > Signed-off-by: Mauro Carvalho Chehab Acked-by: Jeff Kirsher For the Intel networking Kconfig changes. > --- > .../devicetree/bindings/clock/st/st,clkgen.txt | 8 > .../devicetree/bindings/clock/ti/gate.txt | 2 +- > .../devicetree/bindings/clock/ti/interface.txt | 2 +- > .../bindings/cpufreq/cpufreq-mediatek.txt | 2 +- > .../devicetree/bindings/devfreq/rk3399_dmc.txt | 2 +- > .../bindings/gpu/arm,mali-midgard.txt | 2 +- > .../bindings/gpu/arm,mali-utgard.txt | 2 +- > .../devicetree/bindings/mfd/mt6397.txt | 2 +- > .../devicetree/bindings/mfd/sun6i-prcm.txt | 2 +- > .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 2 +- > .../devicetree/bindings/net/dsa/ksz.txt| 2 +- > .../devicetree/bindings/net/dsa/mt7530.txt | 2 +- > .../devicetree/bindings/power/fsl,imx-gpc.txt | 2 +- > .../bindings/power/wakeup-source.txt | 2 +- > .../devicetree/bindings/usb/rockchip,dwc3.txt | 2 +- > Documentation/hwmon/ina2xx | 2 +- > Documentation/maintainer/pull-requests.rst | 2 +- > Documentation/translations/ko_KR/howto.rst | 2 +- > MAINTAINERS| 18 +--- > -- > drivers/net/ethernet/intel/Kconfig | 8 > drivers/soundwire/stream.c | 8 > fs/Kconfig.binfmt | 2 +- > fs/binfmt_misc.c | 2 +- > 23 files changed, 40 insertions(+), 40 deletions(-) signature.asc Description: This is a digitally signed message part ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-wired-lan] [PATCH v2 1/1] e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails
On Wed, 2017-06-28 at 05:28 +1000, Dave Airlie wrote:
> On 20 June 2017 at 18:49, Daniel Vetter wrote:
> > On Wed, Jun 07, 2017 at 01:07:33AM +, Brown, Aaron F wrote:
> > > > From: Intel-wired-lan [mailto:intel-wired-lan-boun...@osuosl.org]
> > > > On Behalf
> > > > Of Jeff Kirsher
> > > > Sent: Tuesday, June 6, 2017 1:46 PM
> > > > To: David Miller ; Nikula, Jani
> > > >
> > > > Cc: Ursulin, Tvrtko ; daniel.vetter@ffwll
> > > > .ch; intel-
> > > > g...@lists.freedesktop.org; linux-ker...@vger.kernel.org;
> > > > jani.nik...@linux.intel.com; ch...@chris-wilson.co.uk; Ertman,
> > > > David M
> > > > ; intel-wired-...@lists.osuosl.org; dri-
> > > > de...@lists.freedesktop.org; net...@vger.kernel.org; airlied@gmail.
> > > > com
> > > > Subject: Re: [Intel-wired-lan] [PATCH v2 1/1] e1000e: Undo
> > > > e1000e_pm_freeze if __e1000_shutdown fails
> > > >
> > > > On Fri, 2017-06-02 at 14:14 -0400, David Miller wrote:
> > > > > From: Jani Nikula
> > > > > Date: Wed, 31 May 2017 18:50:43 +0300
> > > > >
> > > > > > From: Chris Wilson
> > > > > >
> > > > > > An error during suspend (e100e_pm_suspend),
> > > > >
> > > > > ...
> > > > > > lead to complete failure:
> > > > >
> > > > > ...
> > > > > > The unwind failures stems from commit 2800209994f8 ("e1000e:
> > > > > > Refactor PM
> > > > > > flows"), but it may be a later patch that introduced the non-
> > > > > > recoverable
> > > > > > behaviour.
> > > > > >
> > > > > > Fixes: 2800209994f8 ("e1000e: Refactor PM flows")
> > > > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99847
> > > > > > Cc: Tvrtko Ursulin
> > > > > > Cc: Jeff Kirsher
> > > > > > Cc: Dave Ertman
> > > > > > Cc: Bruce Allan
> > > > > > Cc: intel-wired-...@lists.osuosl.org
> > > > > > Cc: net...@vger.kernel.org
> > > > > > Signed-off-by: Chris Wilson
> > > > > > [Jani: bikeshed repainted]
> > > > > > Signed-off-by: Jani Nikula
> > > > >
> > > > > Jeff, please make sure this gets submitted to me soon.
> > > >
> > > > Expect it later tonight, just finishing up testing.
> > >
> > > Tested-by: Aaron Brown
> >
> > Hm, I seem to be blind, but I can't find it anywhere in -rc6. Does
> > someone
> > have the sha1 from Linus' git for this patch?
>
> Guys this is a pretty serious regression, just left blowing in the
> wind, is anyone responsible for e1000e?
This was submitted and accepted into David Miller's net-next tree. I can
see if Dave can pull it into his net tree. DOes stable need to pick this
up as well?
signature.asc
Description: This is a digitally signed message part
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 1/1] e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails
On Fri, 2017-06-02 at 14:14 -0400, David Miller wrote:
> From: Jani Nikula
> Date: Wed, 31 May 2017 18:50:43 +0300
>
> > From: Chris Wilson
> >
> > An error during suspend (e100e_pm_suspend),
>
> ...
> > lead to complete failure:
>
> ...
> > The unwind failures stems from commit 2800209994f8 ("e1000e:
> > Refactor PM
> > flows"), but it may be a later patch that introduced the non-
> > recoverable
> > behaviour.
> >
> > Fixes: 2800209994f8 ("e1000e: Refactor PM flows")
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99847
> > Cc: Tvrtko Ursulin
> > Cc: Jeff Kirsher
> > Cc: Dave Ertman
> > Cc: Bruce Allan
> > Cc: intel-wired-...@lists.osuosl.org
> > Cc: net...@vger.kernel.org
> > Signed-off-by: Chris Wilson
> > [Jani: bikeshed repainted]
> > Signed-off-by: Jani Nikula
>
> Jeff, please make sure this gets submitted to me soon.
Expect it later tonight, just finishing up testing.
signature.asc
Description: This is a digitally signed message part
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
[PATCH 2/2] drm: Resolve shadow warning for s32
From: Mark Rustad
Resolve a shadow warning produced in a W=2 build by changing
the name of a local variable from s32 to ds32. Since s32 clashes
with the well-known typedef, any macro expansion that could
someday be used that might attempt to use an s32 type would fail
to compile. It is best to eliminate the hazard.
Signed-off-by: Mark Rustad
Signed-off-by: Jeff Kirsher
---
drivers/gpu/drm/drm_ioc32.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 2f4c4343..777ffd8 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -339,7 +339,7 @@ typedef struct drm_stats32 {
static int compat_drm_getstats(struct file *file, unsigned int cmd,
unsigned long arg)
{
- drm_stats32_t s32;
+ drm_stats32_t ds32;
drm_stats32_t __user *argp = (void __user *)arg;
struct drm_stats __user *stats;
int i, err;
@@ -352,14 +352,14 @@ static int compat_drm_getstats(struct file *file,
unsigned int cmd,
if (err)
return err;
- if (__get_user(s32.count, &stats->count))
+ if (__get_user(ds32.count, &stats->count))
return -EFAULT;
for (i = 0; i < 15; ++i)
- if (__get_user(s32.data[i].value, &stats->data[i].value)
- || __get_user(s32.data[i].type, &stats->data[i].type))
+ if (__get_user(ds32.data[i].value, &stats->data[i].value)
+ || __get_user(ds32.data[i].type, &stats->data[i].type))
return -EFAULT;
- if (copy_to_user(argp, &s32, sizeof(s32)))
+ if (copy_to_user(argp, &ds32, sizeof(ds32)))
return -EFAULT;
return 0;
}
--
1.9.3
[PATCH 1/2] drm: Resolve many missing-field-initializers warnings
From: Mark Rustad
Resolve many missing-field-initializers warnings that appear
in W=2 builds by changing nested object initialization syntax.
Signed-off-by: Mark Rustad
Signed-off-by: Jeff Kirsher
---
include/drm/drm_modes.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index 91d0582..0a118f3 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -86,7 +86,7 @@ enum drm_mode_status {
.htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \
.vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
.vscan = (vs), .flags = (f), \
- .base.type = DRM_MODE_OBJECT_MODE
+ .base = { .type = DRM_MODE_OBJECT_MODE }
#define CRTC_INTERLACE_HALVE_V (1 << 0) /* halve V values for interlacing */
#define CRTC_STEREO_DOUBLE (1 << 1) /* adjust timings for stereo modes */
--
1.9.3
[linux-nics] [PATCHv3 2/3] list: Fix order of arguments for hlist_add_after(_rcu)
On Sat, 2014-06-07 at 18:40 +0200, Ken Helias wrote: > From: Ken Helias > > All other add functions for lists have the new item as first argument > and the > position where it is added as second argument. This was changed for no > good > reason in this function and makes using it unnecessary confusing. > > The name was changed to let old code generate a compile errors instead > of > using the wrong parameter order. > > Signed-off-by: Ken Helias > Cc: Linux NICS > Cc: "Paul E. McKenney" > Cc: dri-devel at lists.freedesktop.org > Cc: e1000-devel at lists.sourceforge.net > Cc: netdev at vger.kernel.org > Cc: devel at driverdev.osuosl.org > Cc: linux-fsdevel at vger.kernel.org > Cc: b.a.t.m.a.n at lists.open-mesh.org > Cc: bridge at lists.linux-foundation.org For the Intel driver changes... Acked-by: Jeff Kirsher > --- > Patch based on "Add linux-next specific files for 20140606" > > v3: > renamed from hlist_add_after* to hlist_add_behind > > v2: > Splitted into two patches > reduced number of Cc > > Documentation/RCU/whatisRCU.txt | 2 +- > drivers/gpu/drm/drm_hashtab.c| 2 +- > drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- > drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 +- > drivers/staging/lustre/lustre/libcfs/hash.c | 4 ++-- > fs/namespace.c | 2 +- > fs/notify/inode_mark.c | 2 +- > fs/notify/vfsmount_mark.c| 2 +- > include/linux/list.h | 4 ++-- > include/linux/rculist.h | 8 > net/batman-adv/fragmentation.c | 2 +- > net/bridge/br_multicast.c| 2 +- > net/ipv4/fib_trie.c | 2 +- > net/ipv6/addrlabel.c | 2 +- > net/xfrm/xfrm_policy.c | 4 ++-- > 15 files changed, 21 insertions(+), 21 deletions(-) -- next part -- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20140608/b0ed1b72/attachment.sig>
Re: [PATCH 08/51] DMA-API: net: intel/ixgbevf: fix 32-bit DMA mask handling
On Thu, 2013-09-19 at 22:32 +0100, Russell King wrote:
> The fallback to 32-bit DMA mask is rather odd:
> if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
> !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
> pci_using_dac = 1;
> } else {
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> if (err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(32));
> if (err) {
> dev_err(&pdev->dev, "No usable DMA "
> "configuration, aborting\n");
> goto err_dma;
> }
> }
> pci_using_dac = 0;
> }
> This means we only set the coherent DMA mask in the fallback path if
> the DMA mask set failed, which is silly. This fixes it to set the
> coherent DMA mask only if dma_set_mask() succeeded, and to error out
> if either fails.
>
> Signed-off-by: Russell King
> ---
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 15
> +--
> 1 files changed, 5 insertions(+), 10 deletions(-)
Acked-by: Jeff Kirsher
signature.asc
Description: This is a digitally signed message part
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 07/51] DMA-API: net: intel/ixgbe: fix 32-bit DMA mask handling
On Thu, 2013-09-19 at 22:31 +0100, Russell King wrote:
> The fallback to 32-bit DMA mask is rather odd:
> if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
> !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
> pci_using_dac = 1;
> } else {
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> if (err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(32));
> if (err) {
> dev_err(&pdev->dev,
> "No usable DMA configuration,
> aborting\n");
> goto err_dma;
> }
> }
> pci_using_dac = 0;
> }
> This means we only set the coherent DMA mask in the fallback path if
> the DMA mask set failed, which is silly. This fixes it to set the
> coherent DMA mask only if dma_set_mask() succeeded, and to error out
> if either fails.
>
> Signed-off-by: Russell King
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 15 +--
> 1 files changed, 5 insertions(+), 10 deletions(-)
Acked-by: Jeff Kirsher
signature.asc
Description: This is a digitally signed message part
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 06/51] DMA-API: net: intel/ixgb: fix 32-bit DMA mask handling
On Thu, 2013-09-19 at 22:30 +0100, Russell King wrote:
> The fallback to 32-bit DMA mask is rather odd:
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
> if (!err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(64));
> if (!err)
> pci_using_dac = 1;
> } else {
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> if (err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(32));
> if (err) {
> pr_err("No usable DMA configuration,
> aborting\n");
> goto err_dma_mask;
> }
> }
> }
> This means we only set the coherent DMA mask in the fallback path if
> the DMA mask set failed, which is silly. This fixes it to set the
> coherent DMA mask only if dma_set_mask() succeeded, and to error out
> if either fails.
>
> Signed-off-by: Russell King
> ---
> drivers/net/ethernet/intel/ixgb/ixgb_main.c | 16 +---
> 1 files changed, 5 insertions(+), 11 deletions(-)
Acked-by: Jeff Kirsher
signature.asc
Description: This is a digitally signed message part
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 05/51] DMA-API: net: intel/igbvf: fix 32-bit DMA mask handling
On Thu, 2013-09-19 at 22:29 +0100, Russell King wrote:
> The fallback to 32-bit DMA mask is rather odd:
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
> if (!err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(64));
> if (!err)
> pci_using_dac = 1;
> } else {
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> if (err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(32));
> if (err) {
> dev_err(&pdev->dev, "No usable DMA "
> "configuration, aborting\n");
> goto err_dma;
> }
> }
> }
> This means we only set the coherent DMA mask in the fallback path if
> the DMA mask set failed, which is silly. This fixes it to set the
> coherent DMA mask only if dma_set_mask() succeeded, and to error out
> if either fails.
>
> Signed-off-by: Russell King
> ---
> drivers/net/ethernet/intel/igbvf/netdev.c | 18 ++
> 1 files changed, 6 insertions(+), 12 deletions(-)
Acked-by: Jeff Kirsher
signature.asc
Description: This is a digitally signed message part
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 04/51] DMA-API: net: intel/igb: fix 32-bit DMA mask handling
On Thu, 2013-09-19 at 22:28 +0100, Russell King wrote:
> The fallback to 32-bit DMA mask is rather odd:
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
> if (!err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(64));
> if (!err)
> pci_using_dac = 1;
> } else {
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> if (err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(32));
> if (err) {
> dev_err(&pdev->dev,
> "No usable DMA configuration,
> aborting\n");
> goto err_dma;
> }
> }
> }
> This means we only set the coherent DMA mask in the fallback path if
> the DMA mask set failed, which is silly. This fixes it to set the
> coherent DMA mask only if dma_set_mask() succeeded, and to error out
> if either fails.
>
> Signed-off-by: Russell King
> ---
> drivers/net/ethernet/intel/igb/igb_main.c | 18 ++
> 1 files changed, 6 insertions(+), 12 deletions(-)
Acked-by: Jeff Kirsher
signature.asc
Description: This is a digitally signed message part
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 03/51] DMA-API: net: intel/e1000e: fix 32-bit DMA mask handling
On Thu, 2013-09-19 at 22:27 +0100, Russell King wrote:
> The fallback to 32-bit DMA mask is rather odd:
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
> if (!err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(64));
> if (!err)
> pci_using_dac = 1;
> } else {
> err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> if (err) {
> err = dma_set_coherent_mask(&pdev->dev,
> DMA_BIT_MASK(32));
> if (err) {
> dev_err(&pdev->dev,
> "No usable DMA configuration,
> aborting\n");
> goto err_dma;
> }
> }
> }
> This means we only set the coherent DMA mask in the fallback path if
> the DMA mask set failed, which is silly. This fixes it to set the
> coherent DMA mask only if dma_set_mask() succeeded, and to error out
> if either fails.
>
> Signed-off-by: Russell King
> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 18 ++
> 1 files changed, 6 insertions(+), 12 deletions(-)
Acked-by: Jeff Kirsher
signature.asc
Description: This is a digitally signed message part
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 12/51] DMA-API: net: intel/e1000: replace dma_set_mask()+dma_set_coherent_mask() with new helper
On Thu, 2013-09-19 at 22:37 +0100, Russell King wrote: > Replace the following sequence: > > dma_set_mask(dev, mask); > dma_set_coherent_mask(dev, mask); > > with a call to the new helper dma_set_mask_and_coherent(). > > Signed-off-by: Russell King > --- > drivers/net/ethernet/intel/e1000/e1000_main.c |9 ++--- > 1 files changed, 2 insertions(+), 7 deletions(-) Acked-by: Jeff Kirsher signature.asc Description: This is a digitally signed message part ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
