Vincent Palatin [Sat, 27 Oct 2012 01:04:06 +0000 (18:04 -0700)]
CHROMIUM: exynos: dts: configure hotplug pin on Spring
Spring does not use the dedicated DP hotplug detection pin but a
standard GPIO.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:14491
TEST=boot on Spring, see the display coming up automatically.
Change-Id: I716b8d0a070503d3d94bfb995d7d7ed2427de41d
Reviewed-on: https://gerrit.chromium.org/gerrit/36827
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Vincent Palatin [Sat, 27 Oct 2012 00:54:01 +0000 (17:54 -0700)]
CHROMIUM: drm: exynos: optional DP hotplug on a GPIO
Allow to setup the Display Port hotplug detection on a vanilla GPIO
instead of the dedicated DP_HPD pin.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:14491
TEST=boot on Spring, see the display coming up automatically.
Change-Id: I8eaba89bff0fcdc56d05abf769d7097df05807e1
Reviewed-on: https://gerrit.chromium.org/gerrit/36825
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Vincent Palatin [Sat, 27 Oct 2012 01:01:10 +0000 (18:01 -0700)]
CHROMIUM: exynos: add DP hotplug gpio configuration
Allow to define an optional gpio in DP platform data used for
DP hotplug detection if the machine is not using the dedicated DP_HPD
pin.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:14491
TEST=build and run on Spring and Snow.
Change-Id: Ib1a552b369bceffd739e7d09aeea70cbc80785df
Reviewed-on: https://gerrit.chromium.org/gerrit/36826
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Yufeng Shen [Tue, 30 Oct 2012 20:06:51 +0000 (16:06 -0400)]
CHROMIUM: Input: atmel_mxt_ts - make mxt_initialize async
mxt_probe() calles mxt_initialize() to initialize the device, which includes
a soft reset and then msleep for the reset to finish. This has big impact on
the system boot time. This patch makes the mxt_initizlize() call async to
reduce the system boot time.
BUG=chrome-os-partner:15743
TEST=Boot the device and check the kernel timestamp in dmesg to see that
the device initialization is parallelized.
Signed-off-by: Yufeng Shen <miletus@chromium.org>
Change-Id: If106af37a52a0fa874cdc8255c91fdde36776e1f
Reviewed-on: https://gerrit.chromium.org/gerrit/36964
Reviewed-by: Benson Leung <bleung@chromium.org>
Tested-by: Simon Que <sque@chromium.org>
Commit-Ready: Yufeng Shen <miletus@chromium.org>
Luigi Semenzato [Tue, 30 Oct 2012 20:35:18 +0000 (13:35 -0700)]
CHROMIUM: avoid deadlock in OOM killer
This removes code that prevents a memory starvation in low-memory situations.
select_bad_process may fail to find a victim for the OOM-kill by returning
ERR_PTR(-1). In theory this should happen only when there is a guarantee
that memory will be freed shortly. But in some cases this is not true.
If any process tries to allocate memory between setting the PF_EXITING
bit of p->flags and setting p->exit_state to non-zero, it prevents
the OOM-killer from making any progress, and nobody is able to
allocate memory.
I have found a process that does exactly that:
[ 4687.418818] [<
8104512d>] __cond_resched+0x1b/0x2b
[ 4687.418828] [<
813b67a7>] _cond_resched+0x18/0x21
[ 4687.418840] [<
81093940>] shrink_slab+0x224/0x22f
[ 4687.418856] [<
81095a96>] try_to_free_pages+0x1b7/0x2e6
[ 4687.418868] [<
8108df2a>] __alloc_pages_nodemask+0x40a/0x61f
[ 4687.418882] [<
810a9dbe>] read_swap_cache_async+0x4a/0xcf
[ 4687.418894] [<
810a9ea4>] swapin_readahead+0x61/0x8d
[ 4687.418906] [<
8109fff4>] handle_pte_fault+0x310/0x5fb
[ 4687.418918] [<
810a0420>] handle_mm_fault+0xae/0xbd
[ 4687.418932] [<
8101d0f9>] do_page_fault+0x265/0x284
[ 4687.419002] [<
813b7887>] error_code+0x67/0x6c
[ 4687.419060] [<
8102351d>] mm_release+0x1d/0xc3
[ 4687.419070] [<
81026ce9>] exit_mm+0x1d/0xe9
[ 4687.419090] [<
81028082>] do_exit+0x19b/0x640
mm_release gets its page fault in the vicinity of this
code which is related to futexes:
if (unlikely(tsk->robust_list)) {
exit_robust_list(tsk);
tsk->robust_list = NULL;
}
Since robust_list is a userspace structure, the page
fault looks legitimate, and this is likely a design bug
(also see comment about deadlocks earlier in select_bad_process)
and difficult to fix completely.
In any case we're happy to trade spurious OOM kills for no hangs.
BUG=chromium-os:32321
TEST=tested with a load that reliably causes a hang before and none after
Change-Id: I7037e68cc3eef3a36ca355b9535af0f559b3a148
Signed-off-by: Luigi Semenzato <semenzato@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36953
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Sam Leffler [Thu, 25 Oct 2012 16:35:33 +0000 (09:35 -0700)]
CHROMIUM: config: enable mali hw counter support
Enable support for collecting mali hw counter data via trace events.
Signed-off-by: sleffler@chromium.org
BUG=chrome-os-partner:14556
TEST=boot on snow and collect data
Change-Id: I6b905f2469004238d2e0c7e1fc6c8362d0416f71
Reviewed-on: https://gerrit.chromium.org/gerrit/36565
Tested-by: Sam Leffler <sleffler@chromium.org>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Commit-Ready: Sam Leffler <sleffler@chromium.org>
Michael Spang [Tue, 30 Oct 2012 17:13:58 +0000 (13:13 -0400)]
CHROMIUM: ASoC: samsung: Fix warnings in daisy_max98095
This fixes the following build warnings:
sound/soc/samsung/daisy_max98095.c: In function 'daisy_init':
sound/soc/samsung/daisy_max98095.c:407:9: warning: assignment makes pointer from integer without a cast
sound/soc/samsung/daisy_max98095.c: In function 'daisy_resume_post':
sound/soc/samsung/daisy_max98095.c:437:1: warning: no return statement in function returning non-void
BUG=none
TEST=build
Change-Id: I287ddfe7f48afd2bb519af3b3ec1ae10ee7f60e8
Signed-off-by: Michael Spang <spang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36912
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Michael Spang [Tue, 30 Oct 2012 17:08:23 +0000 (13:08 -0400)]
CHROMIUM: block: Fix warning in disk_block_events
This fixes the following warning due to type mismatch for
spin_lock_irqsave() flags.
block/genhd.c: In function 'disk_unblock_events':
block/genhd.c:1504:79: warning: comparison of distinct pointer types lacks a cast
BUG=none
TEST=build
Change-Id: Ia692f29445053eef05e94a8b3e8df9a8b59d193f
Signed-off-by: Michael Spang <spang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36911
Reviewed-by: Paul Taysom <taysom@chromium.org>
Sam Leffler [Fri, 12 Oct 2012 16:28:19 +0000 (09:28 -0700)]
ARM: MALI: connect kbase trace events to system tracing
Adapt kbase's trace event mechanism to system trace events. This facility
is enabled with a new CONFIG_MALI_SYSTEM_TRACE config knob (hidden under
CONFIG_MALI_EXPERT).
Signed-off-by: sleffler@chromium.org
BUG=chrome-os-partner:14556
TEST=verify kbase trace events are generated when enabled
Change-Id: Ic5df3133619c52ae52e9bcd7264494b892e47c86
Reviewed-on: https://gerrit.chromium.org/gerrit/35994
Commit-Ready: Sam Leffler <sleffler@chromium.org>
Reviewed-by: Sam Leffler <sleffler@chromium.org>
Tested-by: Sam Leffler <sleffler@chromium.org>
Sameer Nanda [Tue, 30 Oct 2012 18:50:34 +0000 (11:50 -0700)]
acpi: thermal: initialize tz_enabled to 1
In the acpi_thermal_add path, acpi_thermal_get_info gets called before
acpi_thermal_register_thermal_zone. Since tz_enabled was getting set to
1 only in acpi_thermal_register_thermal_zone, acpi_thermal_get_info
ended up disabling thermal polling.
Moved setting of tz_enabled to 1 into acpi_thermal_add itself.
BUG=chrome-os-partner:15697
TEST=on kiev, run CPU soaker threads ("while true; do true; done") and ensure
that the fan turns on as the CPU heats up.
Change-Id: Ib2ad69621ce32f252a8b913387e1560d0750b822
Signed-off-by: Sameer Nanda <snanda@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36927
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
Sam Leffler [Fri, 12 Oct 2012 16:28:19 +0000 (09:28 -0700)]
CHROMIUM: ARM: MALI: add hardware performance counter support
Add support for dispatching hardware performance counter data through
system trace events. To enable a counter the associated trace event must
be enabled before turning on hardware counter polling through sysfs.
Data are collected at each vblank event. Note the set of counters
collected is fixed at the time polling is enabled; to change the set of
counters first disable polling.
This functionality is enabled by CONFIG_MALI_HWC_TRACE.
Signed-off-by: sleffler@chromium.org
BUG=chrome-os-partner:14556
TEST=enable events (e.g. mali_hwc_FRAG_TRANS_ELIM); cat trace_pipe&; echo 1 > /sys/devices/platform/mali.0/hwc_enable; monitor trace data
Change-Id: I801fbfbd87abe69ba5832a1720532ee331fb0314
Reviewed-on: https://gerrit.chromium.org/gerrit/36564
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Reviewed-by: Anush Elangovan <anush@chromium.org>
Commit-Ready: Sam Leffler <sleffler@chromium.org>
Tested-by: Sam Leffler <sleffler@chromium.org>
Sam Leffler [Mon, 29 Oct 2012 17:52:44 +0000 (10:52 -0700)]
CHROMIUM: drm: add vblank notifier
Add a notifier for vblank events.
Signed-off-by: sleffler@chromium.org
BUG=chrome-os-partner:14556
TEST=collect hardware counter data (dependent cl)
Change-Id: I314186947f9c93b46d3729ffdd5b8f0b0317b88f
Reviewed-on: https://gerrit.chromium.org/gerrit/36781
Reviewed-by: Anush Elangovan <anush@chromium.org>
Commit-Ready: Sam Leffler <sleffler@chromium.org>
Tested-by: Sam Leffler <sleffler@chromium.org>
Jonathan Kliegman [Thu, 25 Oct 2012 18:49:28 +0000 (14:49 -0400)]
CHROMIUM: config: exynos: turn on CONFIG_SAMSUNG_PM_CHECK
Enable checking memory on suspend/resume cycles.
BUG=chrome-os-partner:15600
TEST=Ensure /sys/modules/pm_check exists
Full pm_check functionality tested in CL 36475
Signed-off-by: Jonathan Kliegman <kliegs@chromium.org>
Change-Id: If13496c68ff97a0d6335d9dbfa9ad58b03af377c
Reviewed-on: https://gerrit.chromium.org/gerrit/36575
Tested-by: Jon Kliegman <kliegs@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Commit-Ready: Jon Kliegman <kliegs@chromium.org>
Jonathan Kliegman [Thu, 18 Oct 2012 22:16:16 +0000 (18:16 -0400)]
HACK: samsung: pm-check: Add runtime options to enable and panic
Add runtime options to enable, panic and switch between xor and crc
checks of memory.
Update the exclusions to ignore log_buf and sleep_save_sp
BUG=chrome-os-partner:15600
TEST=Tested that with pm_check_should_panic system panics after an
error and continues running when not set
Set and unset pm_check_use_xor - confirmed differences in time and
difference in values for errors
Set and unset pm_check_enabled, validated log messages for running or not
Chanaged pm_check_chunksize, saw size of crc error blocks change
Confirmed correct error messages with pm_check_printskips
Confirmed suspend_stress_test still catches errors correctly
Change-Id: I4275782391de32378be2f717bd48852ffde634ce
Signed-off-by: Jonathan Kliegman <kliegs@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36475
Reviewed-by: Michael Spang <spang@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Sam Leffler [Tue, 23 Oct 2012 17:42:06 +0000 (10:42 -0700)]
CHROMIUM: add stack trace on gpu reset
Add a stack trace for every gpu reset. This is temporary
for helping with problems in the field.
Signed-off-by: sleffler@chromium.org
BUG=chrome-os-partner:1556
TEST=force gpu reset and verify a stack trace is dumped to the console
Change-Id: I4543367a2bf7321a292bb585bd46e7dfe92cb6e0
Reviewed-on: https://gerrit.chromium.org/gerrit/36498
Reviewed-by: Anush Elangovan <anush@chromium.org>
Commit-Ready: Sam Leffler <sleffler@chromium.org>
Tested-by: Sam Leffler <sleffler@chromium.org>
Bryan Freed [Tue, 28 Aug 2012 23:52:40 +0000 (16:52 -0700)]
CHROMIUM: iio: isl29018: Support suspend and resume.
The driver leaves the device in power-down state anyway,
so there is nothing to do on suspend.
On resume, we just have to make sure the range and ADC
values are updated in the device since it may have been
powered down in suspend.
BUG=chrome-os-partner:9494
TEST=Verify that lux values are generally unchanged after suspend/resume.
This is a bit difficult to reproduce on snow because we have to simulate
a FET5 power-down on suspend by manually hitting the TPS. We also have
to modify a range or resolution value that gets pushed to the device, and
we do not normally do that. This can reproduce the problem:
cd /sys/bus/iio/devices/*
cat in_illuminance0_input
echo 4000 > range
cat in_illuminance0_input # The value changes just a little bit.
i2cset -f -y 4 0x48 0x13 0x02 # Turn off FET5
i2cset -f -y 4 0x48 0x13 0x1f # Turn FET5 back on
powerd_suspend
cat in_illuminance0_input # The value is 4x expected without this patch.
Change-Id: I73e9f9357db3ae3c240a6e1cc5c8acbcf97b6971
Signed-off-by: Bryan Freed <bfreed@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/31662
Reviewed-by: Benson Leung <bleung@chromium.org>
Benson Leung [Wed, 17 Oct 2012 02:20:27 +0000 (19:20 -0700)]
CHROMIUM: Input: cyapa - Add debug messages for bl_exit failure cases.
Print the contents of the three status bytes before concluding
that the current state is CYAPA_STATE_BL_IDLE.
Print these in bl_exit error path after setting
cyapa->debug on the failure to exit bootloader in issue 14206.
Also, fix the debug message for "bl_activate" error path
to be correct. Previously it said "bl_exit"
Signed-off-by: Benson Leung <bleung@chromium.org>
BUG=chrome-os-partner:14206
TEST=Boot the system, and then force a firmware update using
/opt/google/touchpad/firmware/chromeos-touch-firmwareupdate.sh -d cyapa -f
Then, shut the system down to interrupt the firmware update.
Boot the system the next time.
Check dmesg after the recovery firmware update is complete.
Verify that the following appears :
[ 0.863010] cyapa 1-0067: bl_exit failed. Now in state BL_IDLE.
[ 0.863019] cyapa 1-0067: status[REG_OP_STATUS] = 0x00
[ 0.863031] cyapa 1-0067: status[REG_BL_STATUS] = 0x10
[ 0.863038] cyapa 1-0067: status[REG_BL_ERROR] = 0x00
[ 0.863045] cyapa 1-0067: failed to bl_exit. -11
[ 0.863052] cyapa 1-0067: device detected, but not operational, -11
Change-Id: I0680fd06164306f521f052c3027c0389dc501cb6
Reviewed-on: https://gerrit.chromium.org/gerrit/35791
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Commit-Ready: Benson Leung <bleung@chromium.org>
Tested-by: Benson Leung <bleung@chromium.org>
Sean Paul [Wed, 24 Oct 2012 20:53:30 +0000 (16:53 -0400)]
drm/exynos: vidi: Fix compilation error re: pitch
Was getting "'struct exynos_drm_overlay' has no member named 'pitch'"
compilation errors when compiling with VIDI enabled.
BUG=None
TEST=Compiles
Change-Id: I375ba229b538b25601745d01cf1c70dcd751d275
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36476
Simon Que [Tue, 23 Oct 2012 18:54:26 +0000 (11:54 -0700)]
CHROMIUM: i915: do not set redundant DP dpms mode
Add a check to intel_dp_dpms() to skip setting the DP's DPMS mode if
the current mode is the same as the new one.
BUG=chrome-os-partner:13364,chrome-os-partner:12423
TEST=Run power_Resume autotest with screen on and screen off on Link.
The resume time should be about the same in each case.
Change-Id: I4269c84bdbd7101b1f71b9fce9935901df917381
Signed-off-by: Simon Que <sque@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36356
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Stanislaw Gruszka [Mon, 15 Oct 2012 12:52:41 +0000 (14:52 +0200)]
UPSTREAM: cfg80211/mac80211: avoid state mishmash on deauth
Avoid situation when we are on associate state in mac80211 and
on disassociate state in cfg80211. This can results on crash
during modules unload (like showed on this thread:
http://marc.info/?t=
134373976300001&r=1&w=2) and possibly other
problems.
Reported-by: Pedro Francisco <pedrogfrancisco@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chrome-os-partner:14187
TEST=Boot, run, suspend and resume
Change-Id: Ia0fb26d9c5f4df84d460a7b236d9112998ec08ee
Reviewed-on: https://gerrit.chromium.org/gerrit/36438
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Vincent Palatin [Tue, 23 Oct 2012 01:15:58 +0000 (18:15 -0700)]
CHROMIUM: exynos: dts: configure SDIO for Wifi
The Wifi SDIO card is on the MMC1 interface,
and the MMC3 interface is no longer connected to anything.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:14489
TEST=run on Spring and attach to the guest wifi network from the UI
Change-Id: I42b2a96c67b61a6f220e12c1bd1242d7919c5e9a
Reviewed-on: https://gerrit.chromium.org/gerrit/36301
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Sam Leffler <sleffler@chromium.org>
Vincent Palatin [Tue, 23 Oct 2012 20:57:30 +0000 (13:57 -0700)]
CHROMIUM: exynos5: enable/reset Wifi module on Spring
The Wifi SDIO module is controlled by the same GPIOs as Daisy and Snow.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:14490
TEST=run on Spring and attach to the guest wifi network from the UI
Change-Id: I6b0e32c09b25f9b279eb57205a098196753882c5
Reviewed-on: https://gerrit.chromium.org/gerrit/36690
Reviewed-by: Sam Leffler <sleffler@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Benson Leung [Wed, 24 Oct 2012 02:04:29 +0000 (19:04 -0700)]
CHROMIUM: Input: cyapa - Disable irq before changing power modes
There could be a potential race condition here as the irq may
be active as we are trying to read and write to device registers
to change power modes. In order to resolve this, disable irq
before cyapa_set_power_mode in cyapa_suspend.
BUG=chromium-os:35663
TEST=Builds clean.
Check that suspend with power/wakeup enabled and disabled
both work correctly to disable and enable the touchpad wake.
1. echo disabled > /sys/bus/i2c/devices/1-0067/power/wakeup
2. powerd_suspend
3. check that trackpad cannot wake the system.
4. Wake using keyboard. Check mouse is functional.
5. echo enabled > /sys/bus/i2c/devices/1-0067/power/wakeup
6. powerd_suspend
7. check that trackpad can wake the system.
8. Check that the trackpad is operational after resume
Change-Id: Ifd8715c51ddea138c5c4c28b4a4337af8d6021cc
Signed-off-by: Benson Leung <bleung@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36409
Akshay Saraswat [Wed, 24 Oct 2012 06:25:31 +0000 (15:25 +0900)]
drm/exynos: mixer: support for 800x600 resolution
Extend the mixer configuration to include all resolutions that can be
generated by the mixer. This patch adds 800x600 resolution with the
help of workaround 3.
Workaround summary:
1. Set the resolution mode as HD_1080.
2. Set HD_1080 and all kinds of destination X with biasing 0x20.
3. Start display as 3D one path mode, wait 1 frame and change
to 3D two path mode.
BUG=chrome-os-partner:12643
TEST=Tested on snow with mentioned resolution
Change-Id: Ib653291acaf5f2f0c5d4545b876223614be642c5
Signed-off-by: Akshay Saraswat <Akshay.s@samsung.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/34746
Tested-by: Akshay Saraswat <akshay.s@samsung.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Ready: Akshay Saraswat <akshay.s@samsung.com>
Akshay Saraswat [Wed, 24 Oct 2012 05:11:00 +0000 (14:11 +0900)]
drm/exynos: mixer: support for 1440x900 resolution
Extend the mixer configuration to include all resolutions that can be
generated by the mixer. This patch adds 1440x900 resolution with the
help of workaround 4.
Workaround summary:
1. Set the resolution mode as HD_1080.
2. Set HD_1080 and all kinds of destination X with biasing 0xE0.
BUG=chrome-os-partner:12643
TEST=Tested on snow with mentioned resolution
Change-Id: Iaa0cb9ddfe2995a760b4c72a724807c1b6a2031c
Signed-off-by: Akshay Saraswat <Akshay.s@samsung.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/33860
Tested-by: Akshay Saraswat <akshay.s@samsung.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Ready: Akshay Saraswat <akshay.s@samsung.com>
Yogesh Ashok Powar [Sat, 4 Aug 2012 01:06:01 +0000 (18:06 -0700)]
UPSTREAM: mwifiex: correction in MSDU padding logic
Padding arithmetic will always work for MSDUs provided first MSDU
ends on 4-byte boundary. Fixing it by making sure that all MSDU ends
on 4-byte boundary.
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Paul Stewart <pstew@chromium.org>
(cherry picked from commit
bda1b1b77918ea340bbfb2938a0fd7d5203e430c)
BUG=chrome-os-partner:14732
TEST=Over-the-air TCP bitrate increases 14% / 11% downlink/uplink
Change-Id: I7c038453504bb399473f9f3cf0c350fbb2a4094f
Reviewed-on: https://gerrit.chromium.org/gerrit/35914
Tested-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Bing Zhao <bzhao@marvell.com>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>
Benson Leung [Wed, 24 Oct 2012 19:22:51 +0000 (12:22 -0700)]
CHROMIUM: Input: cyapa - Fix warning in cyapa_bl_enter
Fix a warning introduced by https://gerrit.chromium.org/gerrit/#/c/35792.
Used a %d instead of a %s.
Signed-off-by: Benson Leung <bleung@chromium.org>
BUG=chrome-os-partner:14206,chromium-os:35682
TEST=Builds clean.
No warnings when building cyapa.
Change-Id: Ib89e10d60639725098fb6d566c39b0e58f5e8998
Reviewed-on: https://gerrit.chromium.org/gerrit/36452
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Commit-Ready: Benson Leung <bleung@chromium.org>
Tested-by: Benson Leung <bleung@chromium.org>
Bruce Allan [Tue, 9 Oct 2012 01:11:26 +0000 (01:11 +0000)]
UPSTREAM: e1000e: add device IDs for i218
i218 is the next-generation LOM that will be available on systems with the
Lynx Point LP Platform Controller Hub (PCH) chipset from Intel. This patch
provides the initial support of those devices.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
16e310ae6ed352c4963b1f2413fcd88fa693eeda.)
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
BUG=None
TEST=Build and run on a system with an i218 Ethernet controller; verify
connectivity.
Change-Id: I3676d75ea99e893f69be0b7acc2a14e383d2f9c2
Reviewed-on: https://gerrit.chromium.org/gerrit/36441
Commit-Ready: Josh Triplett <josh@joshtriplett.org>
Tested-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
agnescheng [Wed, 24 Oct 2012 06:10:04 +0000 (14:10 +0800)]
CHROMIUM: Input : atkbd - Map standard F14, F15 scancode to keycode 184
(KEY_F14) and 185
Signed-off-by: agnescheng <agnescheng@chromium.org>
BUG=chrome-os-partner:14339
TEST=Stout EC maps PrtSC to F14, Fn to F15.
Test on stout. Run evtest and get below result.
(Press PrtSc)
Event: time
1350876553.697803, type 4 (EV_MSC), code 4 (MSC_SCAN), value
65
Event: time
1350876553.697812, type 1 (EV_KEY), code 184 (KEY_F14),
value 1
(Press Fn)
Event: time
1350876555.477358, type 4 (EV_MSC), code 4 (MSC_SCAN), value
66
Event: time
1350876555.477367, type 1 (EV_KEY), code 185 (KEY_F15),
value 1
Change-Id: Ie5161d5952d98b6db24571db5152b02f856d2d4e
Reviewed-on: https://gerrit.chromium.org/gerrit/36420
Tested-by: Agnes Cheng <agnescheng@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
Commit-Ready: Agnes Cheng <agnescheng@chromium.org>
Benson Leung [Wed, 24 Oct 2012 01:10:02 +0000 (18:10 -0700)]
CHROMIUM: Input: cyapa - remove unused includes
Signed-off-by: Benson Leung <bleung@chromium.org>
BUG=chromium-os:21047
TEST=builds clean
Change-Id: Ie0e19481dcab432f97e6ba31a45880230dc3b33c
Reviewed-on: https://gerrit.chromium.org/gerrit/36407
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Commit-Ready: Benson Leung <bleung@chromium.org>
Tested-by: Benson Leung <bleung@chromium.org>
Benson Leung [Wed, 17 Oct 2012 02:26:36 +0000 (19:26 -0700)]
CHROMIUM: Input: cyapa - get_state at the beginning of cyapa_bl_enter
Rather than trusting the cached value of cyapa->state at the beginning
of cyapa_bl_enter, get state before deciding to return 0 from bl_enter.
If bl_exit failed in early probe, but the trackpad entered operational
mode later, then we may have a discrepancy in state between trackpad
and driver. This will make sure we sync state before we try to
write bytes to the trackpad in bl_activate.
On i2c cypress trackpads, this could result in the bl_activate array
being written into the operational firmware's registers, causing the
trackpad to stop functioning. Instead, this will successfully
update the trackpad firmware.
Signed-off-by: Benson Leung <bleung@chromium.org>
BUG=chrome-os-partner:14206
TEST=Run a forced firmware update.
/opt/google/touchpad/firmware/chromeos-touch-firmwareupdate.sh -d cyapa -f
Verify that the trackpad is functional afterward and that there are no
error messages in dmesg regarding failed firmware update -11.
Change-Id: Ifaf483f30e3f4788d9ef42d023db54cec5c3a44f
Reviewed-on: https://gerrit.chromium.org/gerrit/35792
Commit-Ready: Benson Leung <bleung@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
Tested-by: Benson Leung <bleung@chromium.org>
Macpaul Lin [Fri, 28 Sep 2012 00:40:57 +0000 (08:40 +0800)]
UPSTREAM: staging/gdm72xx: sdio_boot: replace firmware upgrade API
Replace firmware upgrade API in download_image().
Signed-off-by: Macpaul Lin <macpaul.from.taiwan@gmail.com>
Cc: Macpaul Lin <macpaul@gmail.com>
Cc: Paul Stewart <pstew@chromium.org>
Cc: Ben Chan <benchan@chromium.org>
Cc: Sage Ahn <syahn@gctsemi.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
9e412a0a581e07cf1551bbd9b4ae69654e474a3c)
Change-Id: Ic39b571f4d99709826fcba6384413de76f7aa774
Signed-off-by: Ben Chan <benchan@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36310
Reviewed-by: Paul Stewart <pstew@chromium.org>
Macpaul Lin [Sat, 29 Sep 2012 10:08:06 +0000 (18:08 +0800)]
UPSTREAM: staging/gdm72xx: gdm_wimax: fix compile error when enable debug
Fix compile error when enable DEBUG_SDU and DEBUG_HCI.
Replace deprecated NIPQUAD marco to C code.
Signed-off-by: Macpaul Lin <macpaul.from.taiwan@gmail.com>
Cc: Macpaul Lin <macpaul@gmail.com>
Cc: Paul Stewart <pstew@chromium.org>
Cc: Ben Chan <benchan@chromium.org>
Cc: Sage Ahn <syahn@gctsemi.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
2874762b31d8d0eebcfdf189ec9906be9c1460f6)
Change-Id: I4966ab22bddf2225b39a975abbd50e545b8c1a04
Signed-off-by: Ben Chan <benchan@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36309
Reviewed-by: Paul Stewart <pstew@chromium.org>
JasonRuddARM [Tue, 23 Oct 2012 02:43:13 +0000 (19:43 -0700)]
ARM: Update kbase to wk42
Catch up to tip of Barium
BUG=chrome-os-partner:15562
TEST=tested on snow, video playback and webgl aquarium
Change-Id: I5356847b662cafcdbe45ab587f4e79afa666e798
Reviewed-on: https://gerrit.chromium.org/gerrit/36357
Reviewed-by: Anush Elangovan <anush@chromium.org>
Commit-Ready: Anush Elangovan <anush@chromium.org>
Tested-by: Anush Elangovan <anush@chromium.org>
Rajkumar Manoharan [Fri, 7 Sep 2012 10:54:39 +0000 (16:24 +0530)]
UPSTREAM: ath9k_hw: fix ar9462 selfgen chainmask
When the 9462 is operating in 2G mode and MCI is enabled then
reduce the selfgen chain mask to chain 1. Otherwise poor performance
was reported at short range at Rx side when COEX is enabled.
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chrome-os-partner:15083
TEST=Use bluetooth and WiFi
Change-Id: I48b2bba6637673112c95ca9c67c7f02d0abcd824
Reviewed-on: https://gerrit.chromium.org/gerrit/36145
Commit-Ready: Paul Stewart <pstew@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Bryan Freed [Mon, 22 Oct 2012 23:00:43 +0000 (16:00 -0700)]
ARM: EXYNOS5: Increase granularity of snow's backlight PWM.
Explicitly set max_brightness to 2800 from its default of 255.
This gives increased granularity in PWM duty cycles to better
utilize the panel's LED driver.
BUG=chromium-os:34821
TEST=cat /sys/clall/backlight/pwm-backlight.0/max_brightness
Also, set the backlight a bit low (like the 4th step from the bottom),
then cover and uncover the backlight to confirm smooth backlight
transitions that each last about 2 seconds.
Signed-off-by: Bryan Freed <bfreed@chromium.org>
Change-Id: If0565d3cf48b02bec178ac2f0c998cb257c062bf
Reviewed-on: https://gerrit.chromium.org/gerrit/36278
Reviewed-by: Grant Grundler <grundler@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Bryan Freed <bfreed@chromium.org>
Commit-Ready: Bryan Freed <bfreed@chromium.org>
Vincent Palatin [Thu, 18 Oct 2012 16:38:16 +0000 (09:38 -0700)]
CHROMIUM: exynos: dts: configure eDP/LVDS bridge
Put correct settings for Parade PS8622 eDP/LVDS :
- GPIO settings for control signals.
- re-configure properly MMC blocks as MMC2 is now used for GPIO.
- the MAX77686 LDO17 regulator is used to provide 1.2v to the bridge.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:14491
TEST=on Spring, see screen coming up at startup.
Change-Id: Ic305d0b6f6aaf6739ad19818dbfcd8cda90df44a
Reviewed-on: https://gerrit.chromium.org/gerrit/36234
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Vincent Palatin [Mon, 22 Oct 2012 17:18:34 +0000 (10:18 -0700)]
CHROMIUM: exynos5: add support for LCD on Spring
Allow to configure DP output for either NXP or Parade eDP-LVDS bridge.
Set sensible LCD panel settings for Spring.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:14491
TEST=run on Spring and Snow and see display coming up on ChromeOS
startup on both machines.
Change-Id: I3cd46327a9d8fd6010c8d308111c6c0267fedae4
Reviewed-on: https://gerrit.chromium.org/gerrit/36233
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Vincent Palatin [Thu, 18 Oct 2012 17:40:54 +0000 (10:40 -0700)]
CHROMIUM: config: enable Parade bridge
Compile Parade PS8622 eDP/LVDS.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:14491
TEST=on Spring, boot and see the ps8622 initializing with the right
device tree configuration.
Change-Id: I7eb8cb13ee2a742cb5dd025266e4e1db52ee7656
Reviewed-on: https://gerrit.chromium.org/gerrit/36232
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Vincent Palatin [Sat, 4 Aug 2012 16:12:33 +0000 (09:12 -0700)]
CHROMIUM: auxdisplay/ps8620: Add driver for Parade PS8622 bridge
Add a new driver to handle the Parade PS8622 eDP/LVDS bridge chip.
The driver sets properly the SLP_N and RST_N pins and configure the
bridge through I2C.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:14491
TEST=Tested on Spring, see the screen coming up on boot.
Change-Id: I3fd15f9780abe45b1cc93f9234db7d79c65ac5a3
Reviewed-on: https://gerrit.chromium.org/gerrit/36231
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Sean Paul [Thu, 18 Oct 2012 21:12:01 +0000 (17:12 -0400)]
drm/exynos: Don't enable vblank irq early
This patch fixes a bug where the vsync interrupt was being enabled right
from the win_reset routine. If enable_vblank wasn't called before that,
we would finish pageflip on crtc 0 which would cause tearing on fimd.
BUG=chrome-os-partner:15054
TEST=Tested on snow, tested with boot/hotplug/suspend/resume
Change-Id: I067b2d18dcc48ce5d6cdcfc147d64b7e31f47475
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/35979
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Akshay Saraswat [Wed, 10 Oct 2012 09:47:10 +0000 (18:47 +0900)]
drm/exynos: hdmi: support for interlaced mode
This patch adds interlaced mode support for exynos 5 HDMI IP
as per the spec requirement and differing quirk register
values between progressive and interlaced in exynos drm
hdmi driver.
BUG=chrome-os-partner:12642
TEST=Tested with two differnet monitors and
Agilent Technologies N5998A HDMI
protocol analyzer and generator
for 1080i modes at 60Hz and 50Hz
frequencies.
Change-Id: I61743b91d4553089c72c376cfc94b4bb96f1edf6
Signed-off-by: Shirish S <s.shirish@samsung.com>
Signed-off-by: Akshay Saraswat <Akshay.s@samsung.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/33427
Tested-by: Akshay Saraswat <akshay.s@samsung.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Ready: Akshay Saraswat <akshay.s@samsung.com>
Chih-Chung Chang [Tue, 23 Oct 2012 03:57:00 +0000 (11:57 +0800)]
CHROMIUM: ALSA: hda/ca0132: Stop streaming when turning on/off Crystal Voice.
Similar to the previous fix for switching between microphones, if an
active recording stream is running, it has to be stopped before turning
on/off Crystal Voice, otherwise the parameters won't be applied correctly.
The patch is provided by Creative.
BUG=chrome-os-partner:14920
TEST=use "arecord -f cd -B 10000 -d 20 1.wav"
to record audio, and plug/unplug headphone while recording.
Signed-off-by: Chih-Chung Chang <chihchung@chromium.org>
Change-Id: Ic9296b07942cfaeb66c58cc1024dd20bf924a231
Reviewed-on: https://gerrit.chromium.org/gerrit/36314
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Amitkumar Karwar [Sat, 20 Oct 2012 01:27:23 +0000 (21:27 -0400)]
UPSTREAM: mwifiex: minor cleanup and a fix in scan semaphore usage
mwifiex_request_scan() takes care of synchronous internal scan
performed by driver during association.
Currently the semaphore acquired for the scan is unnecessarily
released at the end of different paths. Also, failure paths
returning error code other than "-1" are not considered.
We will release it at the end of routine to fix above issues.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chrome-os-partner:15390
TEST="iw mlan0 scan trigger; ifconfig mlan0 down"
Change-Id: I5b305ad3eca54659e764008bc2373c6dc7d08be8
Reviewed-on: https://gerrit.chromium.org/gerrit/36160
Reviewed-by: Bing Zhao <bzhao@marvell.com>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Felix Fietkau [Wed, 17 Oct 2012 22:57:35 +0000 (00:57 +0200)]
CHROMIUM: ath9k_hw: fix signal strength / noise measurements on ar9462
The nominal noise floor for most channels is -120, though on some it can
reach -127. Use -120 for converting noise floor to channel noise to avoid
overestimating rx signal strength and channel noise.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chrome-os-partner:13074
TEST=Compare RSSI to neighboring device
Change-Id: I88f0e700097a3961ef5e1bb6400f4d84e13d6ffc
Reviewed-on: https://gerrit.chromium.org/gerrit/36149
Commit-Ready: Paul Stewart <pstew@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Daniel Erat [Thu, 18 Oct 2012 23:11:49 +0000 (16:11 -0700)]
CHROMIUM: i915: Allow 0 level when turning on backlight.
Previously, the i915 panel driver would set the backlight to
its maximum level if the level was 0 when turning the
display on. We don't need this (powerd already does it),
and removing it avoids a potential race where we jump to
100% brightness when the brightness-up key is pressed due to
Chrome turning on the display before powerd sets a non-zero
level.
BUG=chromium-os:31795,chromium-os:32447,chromium-os:35481
TEST=manual: no bright flash when increasing the backlight
from 0% on lumpy or resuming from suspend
CQ-DEPEND=I26f11562df8e01927c0220cddd91e665fe087be9
CQ-DEPEND=Ia961baae656044c3713fb967d8ad173d317c4217
Signed-off-by: Daniel Erat <derat@chromium.org>
Change-Id: I4bafa1c2e1254b09906245b59c935a4be1088d71
Reviewed-on: https://gerrit.chromium.org/gerrit/36135
Reviewed-by: Simon Que <sque@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Rajkumar Manoharan [Wed, 12 Sep 2012 12:41:12 +0000 (18:11 +0530)]
UPSTREAM: ath9k: fix queuing MCI work twice
Right now MCI work is being queued twice by profile and status
updation. Queue MCI work once when it is needed.
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chrome-os-partner:15083
TEST=Use bluetooth and WiFi
Change-Id: I6b6bebbef160ab0f68ab56c08d57732dab65507f
Reviewed-on: https://gerrit.chromium.org/gerrit/36148
Commit-Ready: Paul Stewart <pstew@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Rajkumar Manoharan [Tue, 11 Sep 2012 08:42:47 +0000 (14:12 +0530)]
UPSTREAM: ath9k: move coex param updation within mci work
Update all coex parameters in sigle place. So that we can avoid
redoing the same operation in mutiple places and it eases debugging.
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chrome-os-partner:15083
TEST=Use bluetooth and WiFi
Change-Id: Ia694a641418647b90012b891b873aae9b9aa8f26
Reviewed-on: https://gerrit.chromium.org/gerrit/36147
Commit-Ready: Paul Stewart <pstew@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Rajkumar Manoharan [Wed, 12 Sep 2012 17:38:52 +0000 (23:08 +0530)]
UPSTREAM: ath9k: flush bt profile whenever it is requested
Before processing BT profiles or status messages, check whether
it is requested to flush BT profile. Otherwise it might increase
number of BT profiles that affects the WLAN performance. Also
flush the profiles when MCI is recovering from broken rx. After
flushing BT profiles, query BT topology to refetch them.
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chrome-os-partner:15083
TEST=Use bluetooth and WiFi
Change-Id: If6b1d76594407dbddc0b6549491846247fe1c3ca
Reviewed-on: https://gerrit.chromium.org/gerrit/36146
Commit-Ready: Paul Stewart <pstew@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Mohammed Shafi Shajakhan [Wed, 12 Sep 2012 17:33:44 +0000 (23:03 +0530)]
UPSTREAM: ath9k: Fix BTCOEX timer triggering comparision
Its more correct to convert btcoex_period to 'us' while
comparing with btcoex_no_stomp which is in 'us'.
Did not find any functionality issues being fixed,
as the generic hardware timer triggers are usually
refreshed with the newer duty cycle.
Cc: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chrome-os-partner:15083
TEST=Use bluetooth and WiFi
Change-Id: I98778ad94bf4affd2b7e0443fda6f25950a89488
Reviewed-on: https://gerrit.chromium.org/gerrit/36144
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Paul Stewart [Fri, 19 Oct 2012 21:51:37 +0000 (14:51 -0700)]
CHROMIUM: mwifiex: Abort scan when interface is down
When the interface is marked down, scans should be aborted,
otherwise we risk memory leaks and code paths that may cause
a crash.
Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chrome-os-partner:15390
TEST="iw mlan0 scan trigger; ifconfig mlan0 down"
Change-Id: I7a9010ce3086a19fbcd143db60dee27290f1e78b
Reviewed-on: https://gerrit.chromium.org/gerrit/36151
Reviewed-by: Bing Zhao <bzhao@marvell.com>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Ben Chan [Sat, 20 Oct 2012 02:56:58 +0000 (19:56 -0700)]
CHROMIUM: gobi: fix a crash due to use-after-free of the qcusbnet object
usbnet_disconnect() calls qcnet_unbind(), which accesses the qcusbnet
object. This patch makes sure that the qcusbnet object is freed after
usbnet_disconnect() is called.
BUG=chrome-os-partner:14889
TEST=Tested the following:
1. emerge-lumpy chromeos-kernel
2. Turn on full SLUB debugging and run suspend_stress_test on a system
with a Gobi 3000 modem.
Change-Id: I3172565bc0df0c3a283d239424d59b58ae1c262f
Signed-off-by: Ben Chan <benchan@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36177
Reviewed-by: Olof Johansson <olofj@chromium.org>
Ben Chan [Sat, 13 Oct 2012 21:53:03 +0000 (14:53 -0700)]
CHROMIUM: cdc_ether: handle Novatel E362 modem with updated firmware
This patch is suggested by Novatel Wireless to allow cdc_ether to
correctly detect a Novatel E362 modem with updated firmware.
BUG=chromium-os:15365
TEST=Verified that the cdc_ether driver correctly detects Novatel E362
modem with firmware 1.41 and 4.08.
Change-Id: If880d26140448fcbdaf89ea1fc546ee861882a19
Signed-off-by: Ben Chan <benchan@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36043
Reviewed-by: Paul Stewart <pstew@chromium.org>
Ben Chan [Sat, 13 Oct 2012 20:41:16 +0000 (13:41 -0700)]
CHROMIUM: usb: option: handle identity morphing on Novatel E362 modem
This patch is suggested by Novatel Wireless to address identity morphing
on Novatel E362 modem such that the correct USB configuration is
selected and detected by the option driver.
BUG=chromium-os:15365
TEST=Verified that the option driver correctly detects Novatel E362
modem with firmware 1.41 and 4.08.
Change-Id: I3449de2327e2b42417e26ff6024f84b72b140853
Signed-off-by: Ben Chan <benchan@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36042
Reviewed-by: Paul Stewart <pstew@chromium.org>
Stéphane Marchesin [Mon, 15 Oct 2012 18:43:33 +0000 (11:43 -0700)]
drm/exynos: Switch debug message DRM_DEBUG_KMS.
BUG=none
TEST=by hand; boots, works, doesn't display debug message.
Change-Id: I5f798f352a5455059dcf9241b1dd1ebc02924352
Reviewed-on: https://gerrit.chromium.org/gerrit/35596
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
Julius Werner [Fri, 19 Oct 2012 20:37:36 +0000 (13:37 -0700)]
CHROMIUM: Log RTM_NEWLINK messages broadcast from the kernel (temporary)
Several recent bug reports document a problem where attached USB
Ethernet adapters are not correctly detected by shill. The issue
persists until reboot once it has happened, but is not generally
reproducable. Logs show that the kernel correctly loads the appropriate
driver, so the issue is believed to be caused by communication problems
between the kernel and shill (via NETLINK_ROUTE sockets).
This patch logs every broadcast of a netlink message with the
RTM_NEWLINK type from the kernel. The surrounding code is slightly
augmented to gather a little more information about the amount of
receipients, but preserves the overall program logic in all cases.
This patch is intended to be temporary. It shall run on production
systems until more reports of the problem (with now more detailed info)
show up, which will hopefully help us nail it down. It should be rolled
back as soon as enough data is available. The additional log burden is
expected to be small (one message per addition, removal and flags change
of a network interface).
BUG=chrome-os-partner:14952,chromium-os:35479
TEST=Add new network interfaces to the system (e.g. by plugging in a USB
Ethernet adapter). Watch RTM_NEWLINK(...) messages appear in dmesg.
Change-Id: I5cf47d0991451679b8a52f9e982d1d695a4f2810
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36150
Reviewed-by: Sameer Nanda <snanda@chromium.org>
Bruce Allan [Fri, 17 Aug 2012 06:18:23 +0000 (06:18 +0000)]
BACKPORT: e1000e: update driver version number
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
076d807024052a2c0d76050edd89cd94d0515684)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I60ff19e8f775efa79df42ae406a2a0c7049684c9
Reviewed-on: https://gerrit.chromium.org/gerrit/36132
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Fri, 17 Aug 2012 06:18:13 +0000 (06:18 +0000)]
BACKPORT: e1000e: cleanup - remove unnecessary variable
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
70443ae9d07f1c1de2431327814b2594b86a99bb)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I702db3cc922690b83b364c829bbcf3d60751bdb8
Reviewed-on: https://gerrit.chromium.org/gerrit/36131
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Fri, 17 Aug 2012 06:18:02 +0000 (06:18 +0000)]
BACKPORT: e1000e: cleanup - remove inapplicable comment
Early Receive has been disabled in the driver so this comment is no longer
applicable.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
419e551caa9e9689aa2f68a8897f9eaf44958eb3)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I9dda059f86d3cc49ccbe031fb06b78800524c46a
Reviewed-on: https://gerrit.chromium.org/gerrit/36130
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Fri, 17 Aug 2012 06:17:57 +0000 (06:17 +0000)]
BACKPORT: e1000e: cleanup strict checkpatch check
CHECK: multiple assignments should be avoided
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
06a402ef51b374f2308b0a6c790b301311df786f)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: If5583527e5abab52556e983e204c6395a8eccae5
Reviewed-on: https://gerrit.chromium.org/gerrit/36129
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Fri, 17 Aug 2012 06:18:07 +0000 (06:18 +0000)]
BACKPORT: e1000e: cleanup strict checkpatch MEMORY_BARRIER checks
Add comments to memory barriers per strict checkpatch.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
bc76329d4a788b1c5f2de7208b2fae4e9204223c)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Ia389d29fab4068e1130a8d77aede0f7f3f94bce2
Reviewed-on: https://gerrit.chromium.org/gerrit/36128
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Fri, 17 Aug 2012 06:17:51 +0000 (06:17 +0000)]
BACKPORT: e1000e: use correct type for read of 32-bit register
The POEMB register is 32 bits, not 16.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
efc38d2af55d80b4420dab71f6634ad7aa34a38c)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Ic86f71b0f7f36c989b9b5dbefa693617331392d7
Reviewed-on: https://gerrit.chromium.org/gerrit/36127
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Fri, 24 Aug 2012 20:38:11 +0000 (20:38 +0000)]
BACKPORT: e1000e: DoS while TSO enabled caused by link partner with small MSS
With a low enough MSS on the link partner and TSO enabled locally, the
networking stack can periodically send a very large (e.g. 64KB) TCP
message for which the driver will attempt to use more Tx descriptors than
are available by default in the Tx ring. This is due to a workaround in
the code that imposes a limit of only 4 MSS-sized segments per descriptor
which appears to be a carry-over from the older e1000 driver and may be
applicable only to some older PCI or PCIx parts which are not supported in
e1000e. When the driver gets a message that is too large to fit across the
configured number of Tx descriptors, it stops the upper stack from queueing
any more and gets stuck in this state. After a timeout, the upper stack
assumes the adapter is hung and calls the driver to reset it.
Remove the unnecessary limitation of using up to only 4 MSS-sized segments
per Tx descriptor, and put in a hard failure test to catch when attempting
to check for message sizes larger than would fit in the whole Tx ring.
Refactor the remaining logic that limits the size of data per Tx descriptor
from a seemingly arbitrary 8KB to a limit based on the dynamic size of the
Tx packet buffer as described in the hardware specification.
Also, fix the logic in the check for space in the Tx ring for the next
largest possible packet after the current one has been successfully queued
for transmit, and use the appropriate defines for default ring sizes in
e1000_probe instead of magic values.
This issue goes back to the introduction of e1000e in 2.6.24 when it was
split off from e1000.
Reported-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Cc: Stable <stable@vger.kernel.org> [2.6.24+]
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit
d821a4c4d11ad160925dab2bb009b8444beff484)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I74b2ec062acf7236a5617d2cc5bc09e2206245ec
Reviewed-on: https://gerrit.chromium.org/gerrit/36126
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Jesse Brandeburg [Thu, 26 Jul 2012 02:31:14 +0000 (02:31 +0000)]
BACKPORT: e1000e: implement MDI/MDI-X control
Some users report issues with link failing when connected to certain
switches. This gives the user the ability to control the MDI state
from the driver, allowing users to work around some improperly
behaving switches.
Forcing in this driver is for now only allowed when auto-neg is
enabled.
This is in regards to the related ethtool app patch and
bugzilla.kernel.org bug 11998
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: bruce.w.allan@intel.com
CC: n.poppelier@xs4all.nl
CC: bastien@durel.org
CC: jsveiga@it.eng.br
Tested-by: Aaron Brown aaron.f.brown@intel.com
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
4e8186b68fb944ad9e7fd4080cd8bd8f10eb7cbd)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Id19381f7f9233f5d44d4cf9ceeb7cbb339fe9b2f
Reviewed-on: https://gerrit.chromium.org/gerrit/36125
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce W Allan [Thu, 26 Jul 2012 02:30:59 +0000 (02:30 +0000)]
BACKPORT: e1000e: implement 82577/579 MDI setting support
In order for e1000e to support MDI setting support via
ethtool this code is needed to allow setting the MDI state
via software.
This is in regards to the related ethtool patch and
fixes bugzilla.kernel.org bug 11998
Signed-off-by: Bruce W Allan <bruce.w.allan@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Aaron Brown aaron.f.brown@intel.com
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
e86fd89188abcc3288ca760a064000054110b2bb)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I69a6ca5367e05cc73551c65857497b41080efc67
Reviewed-on: https://gerrit.chromium.org/gerrit/36124
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Emil Tantilov [Wed, 1 Aug 2012 08:12:21 +0000 (08:12 +0000)]
BACKPORT: e1000e: fix panic while dumping packets on Tx hang with IOMMU
This patch resolves a "BUG: unable to handle kernel paging request at ..."
oops while dumping packet data. The issue occurs with IOMMU enabled due to
the address provided by phys_to_virt().
This patch avoids phys_to_virt() by using skb->data and the address of the
pages allocated for Rx.
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
(cherry picked from commit
f0c5dadff3fbda77a65b8577fee437c3d771233d)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I1631ae1da604c1c805deb5119319599903989e32
Reviewed-on: https://gerrit.chromium.org/gerrit/36123
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Tushar Dave [Wed, 1 Aug 2012 02:11:15 +0000 (02:11 +0000)]
BACKPORT: e1000e: 82571 Tx Data Corruption during Tx hang recovery
A bus trace shows that while executing e1000e_down, TCTL is cleared except
for the PSP bit. This occurs while in the middle of fetching a TSO packet
since the Tx packet buffer is full at that point. Before the device is
reset, the e1000_watchdog_task starts to run from the middle (it was
apparently pre-empted earlier, although that is not in the trace) and sets
TCTL.EN. At that point, 82571 transmits the corrupted packet, apparently
because TCTL.MULR was cleared in the middle of fetching a packet, which is
forbidden.
Driver should just clear TCTL.EN in e1000_reset_hw_82571 instead of
clearing the entire register, so as not to change any settings in the
middle of fetching a packet.
Signed-off-by: Tushar Dave <tushar.n.dave@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
(cherry picked from commit
eca90f550494171f54f8a700caee65ec16455a5b)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Ie6c609dda317b0abcb3ded958a04d31f18040914
Reviewed-on: https://gerrit.chromium.org/gerrit/36122
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Tushar Dave [Tue, 31 Jul 2012 02:02:43 +0000 (02:02 +0000)]
BACKPORT: e1000e: NIC goes up and immediately goes down
commit
b7ec70be01a87f2c85df3ae11046e74f9b67e323 upstream.
Found that commit
d478eb44 was a bad commit.
If the link partner is transmitting codeword (even if NULL codeword),
then the RXCW.C bit will be set so check for RXCW.CW is unnecessary.
Ref: RH BZ 840642
Reported-by: Fabio Futigami <ffutigam@redhat.com>
Signed-off-by: Tushar Dave <tushar.n.dave@intel.com>
CC: Marcelo Ricardo Leitner <mleitner@redhat.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
733e9ad978a1530328ff78aff3186c20000e5b4e)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I3b2347514d74ec7dff07a3cb73bebc91f26c016d
Reviewed-on: https://gerrit.chromium.org/gerrit/36121
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Matthew Vick [Thu, 12 Jul 2012 00:02:42 +0000 (00:02 +0000)]
BACKPORT: e1000e: Program the correct register for ITR when using MSI-X.
When configuring interrupt throttling on 82574 in MSI-X mode, we need to
be programming the EITR registers instead of the ITR register.
-rc2: Renamed e1000_write_itr() to e1000e_write_itr(), fixed whitespace
issues, and removed unnecessary !! operation.
-rc3: Reduced the scope of the loop variable in e1000e_write_itr().
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Acked-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
22a4cca2f4c2d60c703cdc42158c907570f508e6)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I884a0620d5a87dd3a493b09a27227d084a7419d1
Reviewed-on: https://gerrit.chromium.org/gerrit/36120
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Tushar Dave [Thu, 12 Jul 2012 08:00:15 +0000 (08:00 +0000)]
BACKPORT: e1000e: Cleanup code logic in e1000_check_for_serdes_link_82571()
Cleanup code to make it more clean and readable.
Signed-off-by: Tushar Dave <tushar.n.dave@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
18115f82bc93094a3554f3013cc314ee366a6e7a)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Iac1ad06a179c454a5ae88a676f24bfb3112df1de
Reviewed-on: https://gerrit.chromium.org/gerrit/36119
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Sat, 14 Jul 2012 04:23:58 +0000 (04:23 +0000)]
BACKPORT: e1000e: fix test for PHY being accessible on 82577/8/9 and I217
Occasionally, the PHY can be initially inaccessible when the first read of
a PHY register, e.g. PHY_ID1, happens (signified by the returned value
0xFFFF) but subsequent accesses of the PHY work as expected. Add a retry
counter similar to how it is done in the generic e1000_get_phy_id().
Also, when the PHY is completely inaccessible (i.e. when subsequent reads
of the PHY_IDx registers returns all F's) and the MDIO access mode must be
set to slow before attempting to read the PHY ID again, the functions that
do these latter two actions expect the SW/FW/HW semaphore is not already
set so the semaphore must be released before and re-acquired after calling
them otherwise there is an unnecessarily inordinate amount of delay during
device initialization.
Reported-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
a52359b56c29f55aaadf1dab80a0e1043b982676)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I464fb0f854f1b77749a54e72622af23f8cefe123
Reviewed-on: https://gerrit.chromium.org/gerrit/36118
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Tushar Dave [Thu, 12 Jul 2012 08:56:56 +0000 (08:56 +0000)]
BACKPORT: e1000e: Correct link check logic for 82571 serdes
commit
d0efa8f23a644f7cb7d1f8e78dd9a223efa412a3 upstream.
SYNCH bit and IV bit of RXCW register are sticky. Before examining these bits,
RXCW should be read twice to filter out one-time false events and have correct
values for these bits. Incorrect values of these bits in link check logic can
cause weird link stability issues if auto-negotiation fails.
Reported-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: Tushar Dave <tushar.n.dave@intel.com>
Reviewed-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
3cc4e0e187e4187a6ec13a79dafc1b0f72e31afa)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I8e72c4b8430345d5abb0c15f6887710ba50baf1b
Reviewed-on: https://gerrit.chromium.org/gerrit/36117
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Sat, 30 Jun 2012 20:02:42 +0000 (20:02 +0000)]
BACKPORT: e1000e: remove use of IP payload checksum
commit
2e1706f234f86ff71056ef69683d734fbf7e9e40 upstream.
Currently only used when packet split mode is enabled with jumbo frames,
IP payload checksum (for fragmented UDP packets) is mutually exclusive with
receive hashing offload since the hardware uses the same space in the
receive descriptor for the hardware-provided packet checksum and the RSS
hash, respectively. Users currently must disable jumbos when receive
hashing offload is enabled, or vice versa, because of this incompatibility.
Since testing has shown that IP payload checksum does not provide any real
benefit, just remove it so that there is no longer a choice between jumbos
or receive hashing offload but not both as done in other Intel GbE drivers
(e.g. e1000, igb).
Also, add a missing check for IP checksum error reported by the hardware;
let the stack verify the checksum when this happens.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
e10e76db80d80227dea2a55ea83613c6a4023e67)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I11aed1e04df72a2f2a47c2934624915765ca0f1c
Reviewed-on: https://gerrit.chromium.org/gerrit/36116
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Thu, 7 Jun 2012 02:23:37 +0000 (02:23 +0000)]
BACKPORT: e1000e: use more informative logging macros when netdev not yet registered
Based on a report from Ethan Zhao, before calling register_netdev() the
driver should be using logging macros that do not display the potentially
confusing "(unregistered net_device)" yet still display the useful driver
name and PCI bus/device/function.
Reported-by: Ethan Zhao <ethan.kernel@gmail.com>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
185095fb80ce57c0f3db8738e36ad7c02dc34d33)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I3daf6ec165251830e364ee3aea010b5f6e199098
Reviewed-on: https://gerrit.chromium.org/gerrit/36115
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Sat, 26 May 2012 06:08:48 +0000 (06:08 +0000)]
BACKPORT: e1000e: test for valid check_reset_block function pointer
commit
470a54207ccf7045a59df727573bd9d148988582 upstream.
commit
44abd5c12767a8c567dc4e45fd9aec3b13ca85e0 introduced NULL pointer
dereferences when attempting to access the check_reset_block function
pointer on 8257x and 80003es2lan non-copper devices.
This fix should be applied back through 3.4.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
e831cf2d290e1ecf7825d2ecfabeb0d6733b133d)
Conflicts:
drivers/net/ethernet/intel/e1000e/ethtool.c
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I487be15ace5bdf6ffdebbf0a699dcbcb3132ef91
Reviewed-on: https://gerrit.chromium.org/gerrit/36114
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Thu, 10 May 2012 02:51:17 +0000 (02:51 +0000)]
BACKPORT: e1000e: fix Rapid Start Technology support for i217
The definition of I217_PROXY_CTRL must use the BM_PHY_REG() macro instead
of the PHY_REG() macro for PHY page 800 register 70 since it is for a PHY
register greater than the maximum allowed by the latter macro, and fix a
typo setting the I217_MEMPWR register in e1000_suspend_workarounds_ich8lan.
Also for clarity, rename a few defines as bit definitions instead of masks.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
6d7407bfba0b4eb21d843ff1f9e9c86156e502b2)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I68b2fc4a603469f39583a24d49f65fc20caabaa8
Reviewed-on: https://gerrit.chromium.org/gerrit/36113
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Thu, 10 May 2012 02:34:39 +0000 (02:34 +0000)]
BACKPORT: e1000e: fix typo in definition of E1000_CTRL_EXT_FORCE_SMBUS
This define is needed by i217.
Reported-by: Bjorn Mork <bjorn@mork.no>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
ba9e186faf9f6bffa5a9bb62891bf9beed9dd7ca)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Ic74198fa7a7ecc5387755cba0ee3ac9cdd999d14
Reviewed-on: https://gerrit.chromium.org/gerrit/36112
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Jeff Kirsher [Wed, 9 May 2012 09:23:46 +0000 (02:23 -0700)]
BACKPORT: e1000e: Fix merge conflict (net->net-next)
During merge of net to net-next the changes in patch:
e1000e: Fix default interrupt throttle rate not set in NIC HW
got munged in param.c of the e1000e driver. This rectifies the
merge issues.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit
2e7d21c54adbab6d10481eddc685328f89bb6389)
Conflicts:
drivers/net/ethernet/intel/e1000e/param.c
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I286eb399a70b2004479f2b2594d886d1b5153d80
Reviewed-on: https://gerrit.chromium.org/gerrit/36111
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Fri, 4 May 2012 08:52:03 +0000 (08:52 +0000)]
BACKPORT: e1000e: increase version number
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
a61d3d14227eaa70d45a8c13d15cb9f1abe01f73)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I3bc42dbef42a72d9c7335c8f40148955286bc873
Reviewed-on: https://gerrit.chromium.org/gerrit/36110
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Richard Alpe [Fri, 20 Apr 2012 15:24:50 +0000 (15:24 +0000)]
BACKPORT: e1000e: clear REQ and GNT in EECD (82571 && 82572)
Clear the REQ and GNT bit in the eeprom control register (EECD).
This is required if the eeprom is to be accessed with auto read
EERD register.
After a cold reset this doesn't matter but if PBIST MAC test was
executed before booting, the register was left in a dirty state
(the 2 bits where set), which caused the read operation to time out
and returning 0.
Reference (page 312):
http://download.intel.com/design/network/manuals/316080.pdf
Reported-by: Aleksandar Igic <aleksandar.igic@dektech.com.au>
Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
1f56f45df9f19cdb87bb90020163046f09df9b45)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I4550b3d9640cbf27a393b03ee7c0b1a836308cf9
Reviewed-on: https://gerrit.chromium.org/gerrit/36109
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Tue, 20 Mar 2012 03:47:41 +0000 (03:47 +0000)]
BACKPORT: e1000e: enable forced master/slave on 82577
Like other supported (igp) PHYs, the driver needs to be able to force the
master/slave mode on 82577. Since the code is the same as what already
exists in the code flow for igp PHYs, move it to a new function to be
called for both flows.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
7b9f7e3500ae118bbd5833425e318647da8901f4)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Ie6342a86c219c3bf79c51f4e751cabbe118377ae
Reviewed-on: https://gerrit.chromium.org/gerrit/36108
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Thu, 19 Apr 2012 03:21:47 +0000 (03:21 +0000)]
BACKPORT: e1000e: initial support for i217
i217 is the next-generation LOM that will be available on systems with the
Lynx Point Platform Controller Hub (PCH) chipset from Intel. This patch
provides the initial support for the device.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
2fbe4526e5aafc9ffa5d85fa4749a7c5b22af6b2)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Ia6f696af8b4dc84829d5b9351e7577265465ef3d
Reviewed-on: https://gerrit.chromium.org/gerrit/36107
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Matthew Vick [Wed, 25 Apr 2012 04:45:57 +0000 (04:45 +0000)]
BACKPORT: e1000e: Update driver version number
Version bump to 1.11.3-k.
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
d02c70a8ee1738fc2cf6db18df065977bb44fd50)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I13fe87d4087d630d7d1443023c0d5d6b451c4286
Reviewed-on: https://gerrit.chromium.org/gerrit/36106
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Chris Boot [Tue, 24 Apr 2012 07:24:58 +0000 (07:24 +0000)]
BACKPORT: e1000e: Remove special case for 82573/82574 ASPM L1 disablement
commit
59aed95263bdd0e2b48eb9be5a94346d2d4abf90 upstream.
For the 82573, ASPM L1 gets disabled wholesale so this special-case code
is not required. For the 82574 the previous patch does the same as for
the 82573, disabling L1 on the adapter. Thus, this code is no longer
required and can be removed.
Signed-off-by: Chris Boot <bootc@bootc.net>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
e60a87bab7ce339c034b7d7dd365d687bbffd091)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Id20cb1076f5cd3ed349b33d654ea6b253c84da8d
Reviewed-on: https://gerrit.chromium.org/gerrit/36105
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Chris Boot [Tue, 24 Apr 2012 07:24:52 +0000 (07:24 +0000)]
BACKPORT: e1000e: Disable ASPM L1 on 82574
commit
d4a4206ebbaf48b55803a7eb34e330530d83a889 upstream.
ASPM on the 82574 causes trouble. Currently the driver disables L0s for
this NIC but only disables L1 if the MTU is >1500. This patch simply
causes L1 to be disabled regardless of the MTU setting.
Signed-off-by: Chris Boot <bootc@bootc.net>
Cc: "Wyborny, Carolyn" <carolyn.wyborny@intel.com>
Cc: Nix <nix@esperi.org.uk>
Link: https://lkml.org/lkml/2012/3/19/362
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
8d87325fd98f66eceec445bd0d724feb63335c40)
Conflicts:
drivers/net/ethernet/intel/e1000e/82571.c
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I8f10a74aa9c4fbdc638297d1ca4809b7acc4d6cb
Reviewed-on: https://gerrit.chromium.org/gerrit/36104
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Matthew Vick [Wed, 25 Apr 2012 08:01:05 +0000 (08:01 +0000)]
BACKPORT: e1000e: Driver workaround for IPv6 Header Extension Erratum.
Previously, IPv6 extension header parsing was disabled for all devices
supported by e1000e when using packet split mode. However, as per a
silicon errata, only certain devices need this restriction and will need
to disable IPv6 extension header parsing for all modes.
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
f6bd5577a39aed21cefd698bc46f70cfeaa0923c)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I2a8995f20c3343708f0addebc08e7c3ac6a72255
Reviewed-on: https://gerrit.chromium.org/gerrit/36103
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Matthew Vick [Wed, 25 Apr 2012 07:25:18 +0000 (07:25 +0000)]
BACKPORT: e1000e: Resolve intermittent negotiation issue on 82574/82583.
For 82574 and 82583 devices, resolve an intermittent link issue where
the link negotiates to 100Mbps rather than 1Gbps when powering off the
PHY and powering on the PHY after several seconds.
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
885fe7be4b23d8b9e46cdd87148cefbec926868b)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I7ffc927cdea49ace0065d9d3007063de0e34d6bd
Reviewed-on: https://gerrit.chromium.org/gerrit/36102
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Sat, 14 Apr 2012 04:21:52 +0000 (04:21 +0000)]
BACKPORT: e1000e: cleanup long [read|write]_reg_locked PHY ops function pointers
Calling the locked versions of the read/write PHY ops function pointers
often produces excessively long lines. Shorten these as is done with
the non-locked versions of the PHY register read/write functions.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
f1430d698d0caa743af61f72fd539726055718d3)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Iae97aa4c22b3196a4bb16047eca28068d05ec4ab
Reviewed-on: https://gerrit.chromium.org/gerrit/36101
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Tue, 20 Mar 2012 03:48:08 +0000 (03:48 +0000)]
BACKPORT: e1000e: suggest a possible workaround to a device hang on 82577/8
There is a known issue in the 82577 and 82578 device that can cause a hang
in the device hardware during traffic stress; the current workaround in the
driver is to disable transmit flow control by default. If the user enables
transmit flow control and the device hang occurs, provide a message in the
syslog suggesting to re-enable the workaround.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
7c0427ee76dc96e3f67b90959581d0ba4a38aa63)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Ief4106919592948cc94c150ae3f8252e37a96ecb
Reviewed-on: https://gerrit.chromium.org/gerrit/36100
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Sat, 14 Apr 2012 03:28:50 +0000 (03:28 +0000)]
BACKPORT: e1000e: fix .ndo_set_rx_mode for 82579
Secondary unicast and multicast addresses are added to the Receive
Address registers (RAR) for most parts supported by the driver. For
82579, there is only one actual RAR and a number of Shared Receive Address
registers (SHRAR) that are shared among the driver and f/w which can be
reserved and write-protected by the f/w. On this device, use the SHRARs
that are not taken by f/w for the additional addresses.
Add a MAC ops function pointer infrastructure (similar to other MAC
operations in the driver) for setting RARs, introduce a new rar_set
function for 82579 and convert the existing code that sets RARs on other
devices to a generic rar_set function.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
69e1e0197ce739d86ca33fd275962d6cbd1b107a)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Icb50964adb6a436c662e726e9e24ad74e6f87082
Reviewed-on: https://gerrit.chromium.org/gerrit/36099
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Fri, 13 Apr 2012 03:16:22 +0000 (03:16 +0000)]
BACKPORT: e1000e: PHY initialization flow changes for 82577/8/9
The PHY initialization flows and assorted workarounds for 82577/8/9 done
during driver load and resume from Sx should be the same yet they are not.
Combine the current flows/workarounds into a common set of functions that
are called during the different code paths.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
cb17aab916b0467faecf241c9b3b396b6da045d9)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Id686eccf9974c3349787c7f3b547c82acd5c95e8
Reviewed-on: https://gerrit.chromium.org/gerrit/36098
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Tue, 20 Mar 2012 03:47:57 +0000 (03:47 +0000)]
BACKPORT: e1000e: workaround EEPROM configuration change on 82579
An update to the EEPROM on 82579 will extend a delay in hardware to fix an
issue with WoL not working after a G3->S5 transition which is unrelated to
the driver. However, this extended delay conflicts with nominal operation
of the device when it is initialized by the driver and after every reset
of the hardware (i.e. the driver starts configuring the device before the
hardware is done with it's own configuration work). The workaround for
when the driver is in control of the device is to tell the hardware after
every reset the configuration delay should be the original shorter one.
Some pre-existing variables are renamed generically to be re-used with
new register accesses.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
62bc813e48aef39c187bb426ddd5441862f1d8d1)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I3fd436e801092c95f980e4a39cb2cc29ea6eeca1
Reviewed-on: https://gerrit.chromium.org/gerrit/36097
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Willem de Bruijn [Fri, 27 Apr 2012 09:04:05 +0000 (09:04 +0000)]
BACKPORT: e1000e: add transmit timestamping support
Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit
80be3129d7152fe73b7d5db4595e2f4267497f24)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Ie5da825f38f8ef62190fd79db6dfd31c2b6a7584
Reviewed-on: https://gerrit.chromium.org/gerrit/36096
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Tue, 20 Mar 2012 03:47:52 +0000 (03:47 +0000)]
BACKPORT: e1000e: 82579 potential system hang on stress when ME enabled
Previously, a workaround was added to address a hardware bug in the
PCIm2PCI arbiter where a write by the driver of the Transmit/Receive
Descriptor Tail register could happen concurrently with a write of any
MAC CSR register by the Manageability Engine (ME) which could cause the
Tail register to have an incorrect value. The arbiter is supposed to
prevent the concurrent writes but there is a bug that can cause the Host
(driver) access to be acknowledged later than it should.
After further investigation, it was discovered that a driver write access
of any MAC CSR register after being idle for some time can be lost when
ME is accessing a MAC CSR register. When this happens, no further target
access is claimed by the MAC which could hang the system.
The workaround to check bit 24 in the FWSM register (set only when ME is
accessing a MAC CSR register) and delay for a limited amount of time until
it is cleared is now done for all driver writes of MAC CSR registers on
82579 with ME enabled. In the rare case when the driver is writing the
Tail register and ME is accessing any MAC CSR register for a duration
longer than the maximum delay, write the register and verify it has the
correct value before continuing, otherwise reset the device.
This patch also moves some pre-existing macros from the hardware-specific
header file to the more appropriate generic driver header file.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
bdc125f73f3c810754e858b942d54faf4ba6bffe)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: Iaa299878813110ed9a572044efebf83e6e2852ed
Reviewed-on: https://gerrit.chromium.org/gerrit/36095
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Tue, 20 Mar 2012 03:47:47 +0000 (03:47 +0000)]
BACKPORT: e1000e: 82579 packet drop workaround
In K1 mode (a MAC/PHY interconnect power mode), the 82579 device shuts down
the Phase Lock Loop (PLL) of the interconnect to save power. When the PLL
starts working, the 82579 device may start to transfer the packet through
the interconnect before it is fully functional causing packet drops. This
workaround disables shutting down the PLL in K1 mode for 1G link speed.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
36ceeb43cecaf98a488b94bb318a1f3dd5a87033)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I6006064e066297979152d753ee5d7f89db75163a
Reviewed-on: https://gerrit.chromium.org/gerrit/36094
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Matthew Vick [Fri, 16 Mar 2012 09:02:59 +0000 (09:02 +0000)]
BACKPORT: e1000e: Enable DMA Burst Mode on 82574 by default.
Performance testing has shown that enabling DMA burst on 82574
improves performance on small packets, so enable it by default.
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
2cb7a9cc008c25dc03314de563c00c107b3e5432)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I48e2bb29b0a8c0940d279f629036194f8df0bc99
Reviewed-on: https://gerrit.chromium.org/gerrit/36093
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Matthew Vick [Fri, 16 Mar 2012 09:02:58 +0000 (09:02 +0000)]
BACKPORT: e1000e: Disable Far-End LoopBack following reset on 80003ES2LAN.
80003ES2LAN has an errata such that far-end loopback may be activated by
bit errors producing a reserved symbol. In order to disable far-end
loopback quickly enough, disable it immediately following a reset.
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
1c1093a44fd7f994df981c1c4e79e89d33cdedc5)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I9cec2f1a9203b785e45854f65074fb540b51d669
Reviewed-on: https://gerrit.chromium.org/gerrit/36092
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Fri, 13 Apr 2012 00:08:31 +0000 (00:08 +0000)]
BACKPORT: e1000e: cleanup boolean logic
Replace occurrences of 'if (<bool expr> == <1|0>)' with
'if ([!]<bool expr>)'
Replace occurrences of '<bool var> = (<non-bool expr>) ? true : false'
with '<bool var> = <non-bool expr>'.
Replace occurrence of '<bool var> = <non-bool expr>' with
'<bool var> = !!<non-bool expr>'
While the latter replacement is not really necessary, it is done here for
consistency and clarity. No functional changes.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
04499ec4ee945dfad9f0afbdd8d6f8ba12dac6d6)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I01fc79efd2c6544e0d33aa232c950eee80b00cb8
Reviewed-on: https://gerrit.chromium.org/gerrit/36091
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Thu, 12 Apr 2012 05:47:09 +0000 (05:47 +0000)]
BACKPORT: e1000e: cleanup remaining strings split across multiple lines
Now that split strings generate checkpatch warnings (per Chapter 2 of
Documentation/CodingStyle to make it easier to grep the code for the
string) cleanup the remaining instances of them in the driver.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
6ad651456e3c8f3ea77056bc05c85e46ab8ead5a)
Conflicts:
drivers/net/ethernet/intel/e1000e/param.c
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I027c96f301d1ad5f5cc8b5c37e91fc27b9f86db4
Reviewed-on: https://gerrit.chromium.org/gerrit/36090
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
Bruce Allan [Tue, 20 Mar 2012 03:48:29 +0000 (03:48 +0000)]
BACKPORT: e1000e: update driver version number
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit
fad59b0d3f43bfdc6a726ef83f5bc54920ae098f)
BUG=chromium-os:35241
TEST=Checked connectivity on a board with an i217 Ethernet controller
Change-Id: I2530de4b99bf5d47567eba45ac55cd0016a1f4d2
Reviewed-on: https://gerrit.chromium.org/gerrit/36089
Commit-Ready: Olof Johansson <olofj@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Olof Johansson <olofj@chromium.org>
projects / cascardo / linux.git / log